diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 3482ae16e26..4b9345b087e 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -11,6 +11,7 @@ - [ ] NixOS - [ ] macOS - [ ] Linux +- [ ] Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests)) - [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nox --run "nox-review wip"` - [ ] Tested execution of all binary files (usually in `./result/bin/`) - [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md). diff --git a/README.md b/README.md index 1d5fbd218e2..1a0fb5014de 100644 --- a/README.md +++ b/README.md @@ -38,5 +38,5 @@ For pull-requests, please rebase onto nixpkgs `master`. Communication: -* [Mailing list](http://lists.science.uu.nl/mailman/listinfo/nix-dev) +* [Mailing list](https://groups.google.com/forum/#!forum/nix-devel) * [IRC - #nixos on freenode.net](irc://irc.freenode.net/#nixos) diff --git a/doc/configuration.xml b/doc/configuration.xml index ea3acf4e575..ac03b42714c 100644 --- a/doc/configuration.xml +++ b/doc/configuration.xml @@ -243,5 +243,218 @@ set of packages. +
+ Declarative Package Management + +
+ Build an environment + + + Using packageOverrides, it is possible to manage + packages declaratively. This means that we can list all of our desired + packages within a declarative Nix expression. For example, to have + aspell, bc, + ffmpeg, coreutils, + gdb, nixUnstable, + emscripten, jq, + nox, and silver-searcher, we could + use the following in ~/.config/nixpkgs/config.nix: + + + +{ + packageOverrides = pkgs: with pkgs; { + myPackages = pkgs.buildEnv { + name = "my-packages"; + paths = [ aspell bc coreutils gdb ffmpeg nixUnstable emscripten jq nox silver-searcher ]; + }; + }; +} + + + + To install it into our environment, you can just run nix-env -iA + nixpkgs.myPackages. If you want to load the packages to be built + from a working copy of nixpkgs you just run + nix-env -f. -iA myPackages. To explore what's been + installed, just look through ~/.nix-profile/. You can + see that a lot of stuff has been installed. Some of this stuff is useful + some of it isn't. Let's tell Nixpkgs to only link the stuff that we want: + + + +{ + packageOverrides = pkgs: with pkgs; { + myPackages = pkgs.buildEnv { + name = "my-packages"; + paths = [ aspell bc coreutils gdb ffmpeg nixUnstable emscripten jq nox silver-searcher ]; + pathsToLink = [ "/share" "/bin" ]; + }; + }; +} + + + + pathsToLink tells Nixpkgs to only link the paths listed + which gets rid of the extra stuff in the profile. + /bin and /share are good + defaults for a user environment, getting rid of the clutter. If you are + running on Nix on MacOS, you may want to add another path as well, + /Applications, that makes GUI apps available. + + +
+ +
+ Getting documentation + + + After building that new environment, look through + ~/.nix-profile to make sure everything is there that + we wanted. Discerning readers will note that some files are missing. Look + inside ~/.nix-profile/share/man/man1/ to verify this. + There are no man pages for any of the Nix tools! This is because some + packages like Nix have multiple outputs for things like documentation (see + section 4). Let's make Nix install those as well. + + + +{ + packageOverrides = pkgs: with pkgs; { + myPackages = pkgs.buildEnv { + name = "my-packages"; + paths = [ aspell bc coreutils ffmpeg nixUnstable emscripten jq nox silver-searcher ]; + pathsToLink = [ "/share/man" "/share/doc" /bin" ]; + extraOutputsToInstall = [ "man" "doc" ]; + }; + }; +} + + + + This provides us with some useful documentation for using our packages. + However, if we actually want those manpages to be detected by man, we need + to set up our environment. This can also be managed within Nix + expressions. + + + +{ + packageOverrides = pkgs: with pkgs; rec { + myProfile = writeText "my-profile" '' +export PATH=$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/sbin:/bin:/usr/sbin:/usr/bin +export MANPATH=$HOME/.nix-profile/share/man:/nix/var/nix/profiles/default/share/man:/usr/share/man + ''; + myPackages = pkgs.buildEnv { + name = "my-packages"; + paths = [ + (runCommand "profile" {} '' +mkdir -p $out/etc/profile.d +cp ${myProfile} $out/etc/profile.d/my-profile.sh + '') + aspell + bc + coreutils + ffmpeg + man + nixUnstable + emscripten + jq + nox + silver-searcher + ]; + pathsToLink = [ "/share/man" "/share/doc" /bin" "/etc" ]; + extraOutputsToInstall = [ "man" "doc" ]; + }; + }; +} + + + + For this to work fully, you must also have this script sourced when you + are logged in. Try adding something like this to your + ~/.profile file: + + + +#!/bin/sh +if [ -d $HOME/.nix-profile/etc/profile.d ]; then + for i in $HOME/.nix-profile/etc/profile.d/*.sh; do + if [ -r $i ]; then + . $i + fi + done +fi + + + + Now just run source $HOME/.profile and you can starting + loading man pages from your environent. + + +
+ +
+ GNU info setup + + + Configuring GNU info is a little bit trickier than man pages. To work + correctly, info needs a database to be generated. This can be done with + some small modifications to our environment scripts. + + + +{ + packageOverrides = pkgs: with pkgs; rec { + myProfile = writeText "my-profile" '' +export PATH=$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/sbin:/bin:/usr/sbin:/usr/bin +export MANPATH=$HOME/.nix-profile/share/man:/nix/var/nix/profiles/default/share/man:/usr/share/man +export INFOPATH=$HOME/.nix-profile/share/info:/nix/var/nix/profiles/default/share/info:/usr/share/info + ''; + myPackages = pkgs.buildEnv { + name = "my-packages"; + paths = [ + (runCommand "profile" {} '' +mkdir -p $out/etc/profile.d +cp ${myProfile} $out/etc/profile.d/my-profile.sh + '') + aspell + bc + coreutils + ffmpeg + man + nixUnstable + emscripten + jq + nox + silver-searcher + texinfoInteractive + ]; + pathsToLink = [ "/share/man" "/share/doc" "/share/info" "/bin" "/etc" ]; + extraOutputsToInstall = [ "man" "doc" "info" ]; + postBuild = '' + if [ -x $out/bin/install-info -a -w $out/share/info ]; then + shopt -s nullglob + for i in $out/share/info/*.info $out/share/info/*.info.gz; do + $out/bin/install-info $i $out/share/info/dir + done + fi + ''; + }; + }; +} + + + + postBuild tells Nixpkgs to run a command after building + the environment. In this case, install-info adds the + installed info pages to dir which is GNU info's default + root node. Note that texinfoInteractive is added to the + environment to give the install-info command. + + +
+ +
diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml index 7ff35437611..77d020afa2d 100644 --- a/doc/cross-compilation.xml +++ b/doc/cross-compilation.xml @@ -37,8 +37,9 @@ In Nixpkgs, these three platforms are defined as attribute sets under the names buildPlatform, hostPlatform, and targetPlatform. - All three are always defined at the top level, so one can get at them just like a dependency in a function that is imported with callPackage: - { stdenv, buildPlatform, hostPlatform, fooDep, barDep, .. }: ... + All three are always defined as attributes in the standard environment, and at the top level. That means one can get at them just like a dependency in a function that is imported with callPackage: + { stdenv, buildPlatform, hostPlatform, fooDep, barDep, .. }: ...buildPlatform..., or just off stdenv: + { stdenv, fooDep, barDep, .. }: ...stdenv.buildPlatform.... @@ -79,11 +80,6 @@ - - If you dig around nixpkgs, you may notice there is also stdenv.cross. - This field defined as hostPlatform when the host and build platforms differ, but otherwise not defined at all. - This field is obsolete and will soon disappear—please do not use it. - The exact schema these fields follow is a bit ill-defined due to a long and convoluted evolution, but this is slowly being cleaned up. You can see examples of ones used in practice in lib.systems.examples; note how they are not all very consistent. diff --git a/doc/default.nix b/doc/default.nix index 540a209c2ac..cfd51fba257 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -26,7 +26,7 @@ pkgs.stdenv.mkDerivation { extraHeader = ''xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" ''; in '' { - pandoc '${inputFile}' -w docbook ${lib.optionalString useChapters "--chapters"} \ + pandoc '${inputFile}' -w docbook ${lib.optionalString useChapters "--top-level-division=chapter"} \ --smart \ | sed -e 's|||' \ diff --git a/doc/languages-frameworks/beam.xml b/doc/languages-frameworks/beam.xml index efb2e60cf3a..1a18ed27237 100644 --- a/doc/languages-frameworks/beam.xml +++ b/doc/languages-frameworks/beam.xml @@ -2,60 +2,120 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-beam"> - Beam Languages (Erlang & Elixir) + BEAM Languages (Erlang, Elixir & LFE)
Introduction - In this document and related Nix expressions we use the term - Beam to describe the environment. Beam is - the name of the Erlang Virtial Machine and, as far as we know, - from a packaging perspective all languages that run on Beam are - interchangable. The things that do change, like the build - system, are transperant to the users of the package. So we make - no distinction. + In this document and related Nix expressions, we use the term, + BEAM, to describe the environment. BEAM is the name + of the Erlang Virtual Machine and, as far as we're concerned, from a + packaging perspective, all languages that run on the BEAM are + interchangeable. That which varies, like the build system, is transparent + to users of any given BEAM package, so we make no distinction.
-
+
+ Structure + + All BEAM-related expressions are available via the top-level + beam attribute, which includes: + + + + + interpreters: a set of compilers running on the + BEAM, including multiple Erlang/OTP versions + (beam.interpreters.erlangR19, etc), Elixir + (beam.interpreters.elixir) and LFE + (beam.interpreters.lfe). + + + + + packages: a set of package sets, each compiled with + a specific Erlang/OTP version, e.g. + beam.packages.erlangR19. + + + + + The default Erlang compiler, defined by + beam.interpreters.erlang, is aliased as + erlang. The default BEAM package set is defined by + beam.packages.erlang and aliased at the top level as + beamPackages. + + + To create a package set built with a custom Erlang version, use the + lambda, beam.packagesWith, which accepts an Erlang/OTP + derivation and produces a package set similar to + beam.packages.erlang. + + + Many Erlang/OTP distributions available in + beam.interpreters have versions with ODBC and/or Java + enabled. For example, there's + beam.interpreters.erlangR19_odbc_javac, which + corresponds to beam.interpreters.erlangR19. + + + We also provide the lambda, + beam.packages.erlang.callPackage, which simplifies + writing BEAM package definitions by injecting all packages from + beam.packages.erlang into the top-level context. + +
+
Build Tools
Rebar3 - By default Rebar3 wants to manage it's own dependencies. In the - normal non-Nix, this is perfectly acceptable. In the Nix world it - is not. To support this we have created two versions of rebar3, - rebar3 and rebar3-open. The - rebar3 version has been patched to remove the - ability to download anything from it. If you are not running it a - nix-shell or a nix-build then its probably not going to work for - you. rebar3-open is the normal, un-modified - rebar3. It should work exactly as would any other version of - rebar3. Any Erlang package should rely on - rebar3 and thats really what you should be - using too. + By default, Rebar3 wants to manage its own dependencies. This is perfectly + acceptable in the normal, non-Nix setup, but in the Nix world, it is not. + To rectify this, we provide two versions of Rebar3: + + + + rebar3: patched to remove the ability to download + anything. When not running it via nix-shell or + nix-build, it's probably not going to work as + desired. + + + + + rebar3-open: the normal, unmodified Rebar3. It + should work exactly as would any other version of Rebar3. Any Erlang + package should rely on rebar3 instead. See . + + +
Mix & Erlang.mk - Both Mix and Erlang.mk work exactly as you would expect. There - is a bootstrap process that needs to be run for both of - them. However, that is supported by the - buildMix and buildErlangMk derivations. + Both Mix and Erlang.mk work exactly as expected. There is a bootstrap + process that needs to be run for both, however, which is supported by the + buildMix and buildErlangMk + derivations, respectively.
-
- How to install Beam packages + How to Install BEAM Packages - Beam packages are not registered in the top level simply because - they are not relevant to the vast majority of Nix users. They are - installable using the beamPackages attribute - set. + BEAM packages are not registered at the top level, simply because they are + not relevant to the vast majority of Nix users. They are installable using + the beam.packages.erlang attribute set (aliased as + beamPackages), which points to packages built by the + default Erlang/OTP version in Nixpkgs, as defined by + beam.interpreters.erlang. - You can list the avialable packages in the - beamPackages with the following command: + To list the available packages in + beamPackages, use the following command: @@ -69,115 +129,152 @@ beamPackages.meck meck-0.8.3 beamPackages.rebar3-pc pc-1.1.0 - To install any of those packages into your profile, refer to them by - their attribute path (first column): + To install any of those packages into your profile, refer to them by their + attribute path (first column): $ nix-env -f "<nixpkgs>" -iA beamPackages.ibrowse - The attribute path of any Beam packages corresponds to the name - of that particular package in Hex or its OTP Application/Release name. + The attribute path of any BEAM package corresponds to the name of that + particular package in Hex or its + OTP Application/Release name.
- Packaging Beam Applications + Packaging BEAM Applications
Erlang Applications
Rebar3 Packages - There is a Nix functional called - buildRebar3. We use this function to make a - derivation that understands how to build the rebar3 project. For - example, the epression we use to build the hex2nix - project follows. + The Nix function, buildRebar3, defined in + beam.packages.erlang.buildRebar3 and aliased at the + top level, can be used to build a derivation that understands how to + build a Rebar3 project. For example, we can build hex2nix as + follows: - {stdenv, fetchFromGitHub, buildRebar3, ibrowse, jsx, erlware_commons }: + { stdenv, fetchFromGitHub, buildRebar3, ibrowse, jsx, erlware_commons }: - buildRebar3 rec { - name = "hex2nix"; - version = "0.0.1"; + buildRebar3 rec { + name = "hex2nix"; + version = "0.0.1"; - src = fetchFromGitHub { - owner = "ericbmerritt"; - repo = "hex2nix"; - rev = "${version}"; - sha256 = "1w7xjidz1l5yjmhlplfx7kphmnpvqm67w99hd2m7kdixwdxq0zqg"; - }; + src = fetchFromGitHub { + owner = "ericbmerritt"; + repo = "hex2nix"; + rev = "${version}"; + sha256 = "1w7xjidz1l5yjmhlplfx7kphmnpvqm67w99hd2m7kdixwdxq0zqg"; + }; beamDeps = [ ibrowse jsx erlware_commons ]; } - The only visible difference between this derivation and - something like stdenv.mkDerivation is that we - have added erlangDeps to the derivation. If - you add your Beam dependencies here they will be correctly - handled by the system. + Such derivations are callable with + beam.packages.erlang.callPackage (see ). To call this package using the normal + callPackage, refer to dependency packages via + beamPackages, e.g. + beamPackages.ibrowse. - If your package needs to compile native code via Rebar's port - compilation mechenism. You should add compilePort = - true; to the derivation. + Notably, buildRebar3 includes + beamDeps, while + stdenv.mkDerivation does not. BEAM dependencies added + there will be correctly handled by the system. + + + If a package needs to compile native code via Rebar3's port compilation + mechanism, add compilePort = true; to the derivation.
Erlang.mk Packages - Erlang.mk functions almost identically to Rebar. The only real - difference is that buildErlangMk is called - instead of buildRebar3 + Erlang.mk functions similarly to Rebar3, except we use + buildErlangMk instead of + buildRebar3. - { buildErlangMk, fetchHex, cowlib, ranch }: - buildErlangMk { - name = "cowboy"; - version = "1.0.4"; - src = fetchHex { - pkg = "cowboy"; - version = "1.0.4"; - sha256 = - "6a0edee96885fae3a8dd0ac1f333538a42e807db638a9453064ccfdaa6b9fdac"; - }; - beamDeps = [ cowlib ranch ]; + { buildErlangMk, fetchHex, cowlib, ranch }: - meta = { - description = ''Small, fast, modular HTTP server written in - Erlang.''; - license = stdenv.lib.licenses.isc; - homepage = "https://github.com/ninenines/cowboy"; - }; + buildErlangMk { + name = "cowboy"; + version = "1.0.4"; + + src = fetchHex { + pkg = "cowboy"; + version = "1.0.4"; + sha256 = "6a0edee96885fae3a8dd0ac1f333538a42e807db638a9453064ccfdaa6b9fdac"; + }; + + beamDeps = [ cowlib ranch ]; + + meta = { + description = '' + Small, fast, modular HTTP server written in Erlang + ''; + license = stdenv.lib.licenses.isc; + homepage = https://github.com/ninenines/cowboy; + }; }
Mix Packages - Mix functions almost identically to Rebar. The only real - difference is that buildMix is called - instead of buildRebar3 + Mix functions similarly to Rebar3, except we use + buildMix instead of buildRebar3. { buildMix, fetchHex, plug, absinthe }: + buildMix { name = "absinthe_plug"; version = "1.0.0"; + src = fetchHex { pkg = "absinthe_plug"; version = "1.0.0"; - sha256 = - "08459823fe1fd4f0325a8bf0c937a4520583a5a26d73b193040ab30a1dfc0b33"; + sha256 = "08459823fe1fd4f0325a8bf0c937a4520583a5a26d73b193040ab30a1dfc0b33"; }; - beamDeps = [ plug absinthe]; + + beamDeps = [ plug absinthe ]; meta = { - description = ''A plug for Absinthe, an experimental GraphQL - toolkit''; + description = '' + A plug for Absinthe, an experimental GraphQL toolkit + ''; license = stdenv.lib.licenses.bsd3; - homepage = "https://github.com/CargoSense/absinthe_plug"; + homepage = https://github.com/CargoSense/absinthe_plug; + }; + } + + + Alternatively, we can use buildHex as a shortcut: + + + { buildHex, buildMix, plug, absinthe }: + + buildHex { + name = "absinthe_plug"; + version = "1.0.0"; + + sha256 = "08459823fe1fd4f0325a8bf0c937a4520583a5a26d73b193040ab30a1dfc0b33"; + + builder = buildMix; + + beamDeps = [ plug absinthe ]; + + meta = { + description = '' + A plug for Absinthe, an experimental GraphQL toolkit + ''; + license = stdenv.lib.licenses.bsd3; + homepage = https://github.com/CargoSense/absinthe_plug; }; } @@ -185,18 +282,18 @@ $ nix-env -f "<nixpkgs>" -iA beamPackages.ibrowse
- How to develop + How to Develop
Accessing an Environment - Often, all you want to do is be able to access a valid - environment that contains a specific package and its - dependencies. we can do that with the env - part of a derivation. For example, lets say we want to access an - erlang repl with ibrowse loaded up. We could do the following. + Often, we simply want to access a valid environment that contains a + specific package and its dependencies. We can accomplish that with the + env attribute of a derivation. For example, let's say + we want to access an Erlang REPL with ibrowse loaded + up. We could do the following: - ~/w/nixpkgs ❯❯❯ nix-shell -A beamPackages.ibrowse.env --run "erl" + $ nix-shell -A beamPackages.ibrowse.env --run "erl" Erlang/OTP 18 [erts-7.0] [source] [64-bit] [smp:4:4] [async-threads:10] [hipe] [kernel-poll:false] Eshell V7.0 (abort with ^G) @@ -237,20 +334,19 @@ $ nix-env -f "<nixpkgs>" -iA beamPackages.ibrowse 2> - Notice the -A beamPackages.ibrowse.env.That - is the key to this functionality. + Notice the -A beamPackages.ibrowse.env. That is the key + to this functionality.
Creating a Shell Getting access to an environment often isn't enough to do real - development. Many times we need to create a - shell.nix file and do our development inside - of the environment specified by that file. This file looks a lot - like the packaging described above. The main difference is that - src points to project root and we call the - package directly. + development. Usually, we need to create a shell.nix + file and do our development inside of the environment specified therein. + This file looks a lot like the packaging described above, except that + src points to the project root and we call the package + directly. { pkgs ? import "<nixpkgs"> {} }: @@ -264,18 +360,19 @@ let name = "hex2nix"; version = "0.1.0"; src = ./.; - erlangDeps = [ ibrowse jsx erlware_commons ]; + beamDeps = [ ibrowse jsx erlware_commons ]; }; drv = beamPackages.callPackage f {}; in - drv + + drv
- Building in a shell + Building in a Shell (for Mix Projects) - We can leveral the support of the Derivation, regardless of - which build Derivation is called by calling the commands themselv.s + We can leverage the support of the derivation, irrespective of the build + derivation, by calling the commands themselves. # ============================================================================= @@ -335,42 +432,43 @@ analyze: build plt - If you add the shell.nix as described and - user rebar as follows things should simply work. Aside from the + Using a shell.nix as described (see ) should just work. Aside from test, plt, and - analyze the talks work just fine for all of - the build Derivations. + analyze, the Make targets work just fine for all of the + build derivations.
- Generating Packages from Hex with Hex2Nix + Generating Packages from Hex with <literal>hex2nix</literal> - Updating the Hex packages requires the use of the - hex2nix tool. Given the path to the Erlang - modules (usually - pkgs/development/erlang-modules). It will - happily dump a file called - hex-packages.nix. That file will contain all - the packages that use a recognized build system in Hex. However, - it can't know whether or not all those packages are buildable. + Updating the Hex package set + requires hex2nix. Given the + path to the Erlang modules (usually + pkgs/development/erlang-modules), it will dump a file + called hex-packages.nix, containing all the packages that + use a recognized build system in Hex. It can't be determined, however, + whether every package is buildable. - To make life easier for our users, it makes good sense to go - ahead and attempt to build all those packages and remove the - ones that don't build. To do that, simply run the command (in - the root of your nixpkgs repository). that follows. + To make life easier for our users, try to build every Hex package and remove those that fail. + To do that, simply run the following command in the root of your + nixpkgs repository: $ nix-build -A beamPackages - That will build every package in - beamPackages. Then you can go through and - manually remove the ones that fail. Hopefully, someone will - improve hex2nix in the future to automate - that. + That will attempt to build every package in + beamPackages. Then manually remove those that fail. + Hopefully, someone will improve hex2nix in the + future to automate the process.
diff --git a/doc/languages-frameworks/go.xml b/doc/languages-frameworks/go.xml index 026acb4e8fb..54ea60c9021 100644 --- a/doc/languages-frameworks/go.xml +++ b/doc/languages-frameworks/go.xml @@ -13,7 +13,7 @@ standard Go programs. deis = buildGoPackage rec { name = "deis-${version}"; version = "1.13.0"; - + goPackagePath = "github.com/deis/deis"; subPackages = [ "client" ]; @@ -130,6 +130,9 @@ the following arguments are of special significance to the function: +To extract dependency information from a Go package in automated way use go2nix. + It can produce complete derivation and goDeps file for Go programs. + buildGoPackage produces where bin includes program binaries. You can test build a Go binary as follows: @@ -160,7 +163,4 @@ done -To extract dependency information from a Go package in automated way use go2nix. - It can produce complete derivation and goDeps file for Go programs.
- diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.md index 2ae3e39bb65..ce2889f744f 100644 --- a/doc/languages-frameworks/haskell.md +++ b/doc/languages-frameworks/haskell.md @@ -912,14 +912,14 @@ nix-build -A haskell.packages.integer-simple.ghc802.scientific - The *Journey into the Haskell NG infrastructure* series of postings describe the new Haskell infrastructure in great detail: - - [Part 1](http://lists.science.uu.nl/pipermail/nix-dev/2015-January/015591.html) + - [Part 1](https://nixos.org/nix-dev/2015-January/015591.html) explains the differences between the old and the new code and gives instructions how to migrate to the new setup. - - [Part 2](http://lists.science.uu.nl/pipermail/nix-dev/2015-January/015608.html) + - [Part 2](https://nixos.org/nix-dev/2015-January/015608.html) looks in-depth at how to tweak and configure your setup by means of overrides. - - [Part 3](http://lists.science.uu.nl/pipermail/nix-dev/2015-April/016912.html) + - [Part 3](https://nixos.org/nix-dev/2015-April/016912.html) describes the infrastructure that keeps the Haskell package set in Nixpkgs up-to-date. diff --git a/doc/languages-frameworks/vim.md b/doc/languages-frameworks/vim.md index 5442d706cb0..1d6a4fe8da8 100644 --- a/doc/languages-frameworks/vim.md +++ b/doc/languages-frameworks/vim.md @@ -8,15 +8,48 @@ date: 2016-06-25 You'll get a vim(-your-suffix) in PATH also loading the plugins you want. Loading can be deferred; see examples. -VAM (=vim-addon-manager) and Pathogen plugin managers are supported. -Vundle, NeoBundle could be your turn. +Vim packages, VAM (=vim-addon-manager) and Pathogen are supported to load +packages. -## dependencies by Vim plugins +## Custom configuration + +Adding custom .vimrc lines can be done using the following code: + +``` +vim_configurable.customize { + name = "vim-with-plugins"; + + vimrcConfig.customRC = '' + set hidden + ''; +} +``` + +## Vim packages + +To store you plugins in Vim packages the following example can be used: + +``` +vim_configurable.customize { + vimrcConfig.packages.myVimPackage = with pkgs.vimPlugins; { + # loaded on launch + start = [ youcompleteme fugitive ]; + # manually loadable by calling `:packadd $plugin-name` + opt = [ phpCompletion elm-vim ]; + # To automatically load a plugin when opening a filetype, add vimrc lines like: + # autocmd FileType php :packadd phpCompletion + } +}; +``` + +## VAM + +### dependencies by Vim plugins VAM introduced .json files supporting dependencies without versioning assuming that "using latest version" is ok most of the time. -## HOWTO +### Example First create a vim-scripts file having one plugin name per line. Example: diff --git a/doc/quick-start.xml b/doc/quick-start.xml index 5ed959abace..ca86e6c9519 100644 --- a/doc/quick-start.xml +++ b/doc/quick-start.xml @@ -212,7 +212,7 @@ $ nix-env -f . -iA libfoo Optionally commit the new package and open a pull request, or send a patch to - nix-dev@cs.uu.nl. + https://groups.google.com/forum/#!forum/nix-devel.
diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 9ec14d5a782..e637962fbb7 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -640,6 +640,16 @@ script) if it exists. true. + + configurePlatforms + + By default, when cross compiling, the configure script has and passed. + Packages can instead pass [ "build" "host" "target" ] or a subset to control exactly which platform flags are passed. + Compilers and other tools should use this to also pass the target platform, for example. + Note eventually these will be passed when in native builds too, to improve determinism: build-time guessing, as is done today, is a risk of impurity. + + + preConfigure Hook executed at the start of the configure diff --git a/lib/customisation.nix b/lib/customisation.nix index 6d6c0234087..98a46ca6c61 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -51,6 +51,24 @@ rec { else { })); + /* `makeOverridable` takes a function from attribute set to attribute set and + injects `override` attibute which can be used to override arguments of + the function. + + nix-repl> x = {a, b}: { result = a + b; } + + nix-repl> y = lib.makeOverridable x { a = 1; b = 2; } + + nix-repl> y + { override = «lambda»; overrideDerivation = «lambda»; result = 3; } + + nix-repl> y.override { a = 10; } + { override = «lambda»; overrideDerivation = «lambda»; result = 12; } + + Please refer to "Nixpkgs Contributors Guide" section + ".overrideDerivation" to learn about `overrideDerivation` and caveats + related to its use. + */ makeOverridable = f: origArgs: let ff = f origArgs; diff --git a/lib/debug.nix b/lib/debug.nix index 5b3878554c5..925e0d405a7 100644 --- a/lib/debug.nix +++ b/lib/debug.nix @@ -20,8 +20,32 @@ rec { traceXMLValMarked = str: x: trace (str + builtins.toXML x) x; # strict trace functions (traced structure is fully evaluated and printed) + + /* `builtins.trace`, but the value is `builtins.deepSeq`ed first. */ traceSeq = x: y: trace (builtins.deepSeq x x) y; + + /* Like `traceSeq`, but only down to depth n. + * This is very useful because lots of `traceSeq` usages + * lead to an infinite recursion. + */ + traceSeqN = depth: x: y: with lib; + let snip = v: if isList v then noQuotes "[…]" v + else if isAttrs v then noQuotes "{…}" v + else v; + noQuotes = str: v: { __pretty = const str; val = v; }; + modify = n: fn: v: if (n == 0) then fn v + else if isList v then map (modify (n - 1) fn) v + else if isAttrs v then mapAttrs + (const (modify (n - 1) fn)) v + else v; + in trace (generators.toPretty { allowPrettyValues = true; } + (modify depth snip x)) y; + + /* `traceSeq`, but the same value is traced and returned */ traceValSeq = v: traceVal (builtins.deepSeq v v); + /* `traceValSeq` but with fixed depth */ + traceValSeqN = depth: v: traceSeqN depth v v; + # this can help debug your code as well - designed to not produce thousands of lines traceShowVal = x: trace (showVal x) x; diff --git a/lib/deprecated.nix b/lib/deprecated.nix index 983e8d26892..d4e78c39250 100644 --- a/lib/deprecated.nix +++ b/lib/deprecated.nix @@ -423,4 +423,12 @@ rec { else if isInt x then "int" else "string"; + /* deprecated: + + For historical reasons, imap has an index starting at 1. + + But for consistency with the rest of the library we want an index + starting at zero. + */ + imap = imap1; } diff --git a/lib/generators.nix b/lib/generators.nix index 4d3c920b0ae..4419c3c8891 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -90,4 +90,41 @@ rec { * parsers as well. */ toYAML = {}@args: toJSON args; + + /* Pretty print a value, akin to `builtins.trace`. + * Should probably be a builtin as well. + */ + toPretty = { + /* If this option is true, attrsets like { __pretty = fn; val = …; } + will use fn to convert val to a pretty printed representation. + (This means fn is type Val -> String.) */ + allowPrettyValues ? false + }@args: v: with builtins; + if isInt v then toString v + else if isBool v then (if v == true then "true" else "false") + else if isString v then "\"" + v + "\"" + else if null == v then "null" + else if isFunction v then + let fna = functionArgs v; + showFnas = concatStringsSep "," (libAttr.mapAttrsToList + (name: hasDefVal: if hasDefVal then "(${name})" else name) + fna); + in if fna == {} then "<λ>" + else "<λ:{${showFnas}}>" + else if isList v then "[ " + + libStr.concatMapStringsSep " " (toPretty args) v + + " ]" + else if isAttrs v then + # apply pretty values if allowed + if attrNames v == [ "__pretty" "val" ] && allowPrettyValues + then v.__pretty v.val + # TODO: there is probably a better representation? + else if v ? type && v.type == "derivation" then "<δ>" + else "{ " + + libStr.concatStringsSep " " (libAttr.mapAttrsToList + (name: value: + "${toPretty args name} = ${toPretty args value};") v) + + " }" + else "toPretty: should never happen (v = ${v})"; + } diff --git a/lib/lists.nix b/lib/lists.nix index fd746f4f97b..6a8fd8a1840 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -77,15 +77,21 @@ rec { */ foldl' = builtins.foldl' or foldl; - /* Map with index - - FIXME(zimbatm): why does this start to count at 1? + /* Map with index starting from 0 Example: - imap (i: v: "${v}-${toString i}") ["a" "b"] + imap0 (i: v: "${v}-${toString i}") ["a" "b"] + => [ "a-0" "b-1" ] + */ + imap0 = f: list: genList (n: f n (elemAt list n)) (length list); + + /* Map with index starting from 1 + + Example: + imap1 (i: v: "${v}-${toString i}") ["a" "b"] => [ "a-1" "b-2" ] */ - imap = f: list: genList (n: f (n + 1) (elemAt list n)) (length list); + imap1 = f: list: genList (n: f (n + 1) (elemAt list n)) (length list); /* Map and concatenate the result. @@ -471,4 +477,12 @@ rec { */ subtractLists = e: filter (x: !(elem x e)); + /* Test if two lists have no common element. + It should be slightly more efficient than (intersectLists a b == []) + */ + mutuallyExclusive = a: b: + (builtins.length a) == 0 || + (!(builtins.elem (builtins.head a) b) && + mutuallyExclusive (builtins.tail a) b); + } diff --git a/lib/maintainers.nix b/lib/maintainers.nix index d4f9d1c31a8..e10136bf070 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -16,6 +16,7 @@ acowley = "Anthony Cowley "; adelbertc = "Adelbert Chang "; adev = "Adrien Devresse "; + adisbladis = "Adam Hose "; Adjective-Object = "Maxwell Huang-Hobbs "; adnelson = "Allen Nelson "; adolfogc = "Adolfo E. García Castro "; @@ -42,6 +43,7 @@ andrewrk = "Andrew Kelley "; andsild = "Anders Sildnes "; aneeshusa = "Aneesh Agrawal "; + ankhers = "Justin Wood "; antono = "Antono Vasiljev "; apeschar = "Albert Peschar "; apeyroux = "Alexandre Peyroux "; @@ -61,6 +63,7 @@ bachp = "Pascal Bach "; badi = "Badi' Abdul-Wahid "; balajisivaraman = "Balaji Sivaraman"; + barrucadu = "Michael Walker "; basvandijk = "Bas van Dijk "; Baughn = "Svein Ove Aas "; bcarrell = "Brandon Carrell "; @@ -141,17 +144,20 @@ dfoxfranke = "Daniel Fox Franke "; dgonyeo = "Derek Gonyeo "; dipinhora = "Dipin Hora "; + disassembler = "Samuel Leathers "; dmalikov = "Dmitry Malikov "; DmitryTsygankov = "Dmitry Tsygankov "; dmjio = "David Johnson "; dochang = "Desmond O. Chang "; domenkozar = "Domen Kozar "; + dotlambda = "Robert Schütz "; doublec = "Chris Double "; dpaetzel = "David Pätzel "; drets = "Dmytro Rets "; drewkett = "Andrew Burkett "; dsferruzza = "David Sferruzza "; dtzWill = "Will Dietz "; + dywedir = "Vladyslav M. "; e-user = "Alexander Kahl "; ebzzry = "Rommel Martinez "; edanaher = "Evan Danaher "; @@ -166,6 +172,7 @@ ekleog = "Leo Gaspard "; elasticdog = "Aaron Bull Schaefer "; eleanor = "Dejan Lukan "; + elijahcaine = "Elijah Caine "; elitak = "Eric Litak "; ellis = "Ellis Whitehead "; eperuffo = "Emanuele Peruffo "; @@ -181,6 +188,7 @@ fadenb = "Tristan Helmich "; fare = "Francois-Rene Rideau "; falsifian = "James Cook "; + florianjacob = "Florian Jacob "; flosse = "Markus Kohlhase "; fluffynukeit = "Daniel Austin "; fmthoma = "Franz Thoma "; @@ -212,6 +220,7 @@ goodrone = "Andrew Trachenko "; gpyh = "Yacine Hmito "; grahamc = "Graham Christensen "; + grburst = "Julius Elias "; gridaphobe = "Eric Seidel "; guibert = "David Guibert "; guillaumekoenig = "Guillaume Koenig "; @@ -220,8 +229,10 @@ havvy = "Ryan Scheel "; hbunke = "Hendrik Bunke "; hce = "Hans-Christian Esperer "; + hectorj = "Hector Jusforgues "; heel = "Sergii Paryzhskyi "; henrytill = "Henry Till "; + hhm = "hhm "; hinton = "Tom Hinton "; hodapp = "Chris Hodapp "; hrdinka = "Christoph Hrdinka "; @@ -245,6 +256,7 @@ jensbin = "Jens Binkert "; jerith666 = "Matt McHenry "; jfb = "James Felix Black "; + jfrankenau = "Johannes Frankenau "; jgeerds = "Jascha Geerds "; jgertm = "Tim Jaeger "; jgillich = "Jakob Gillich "; @@ -257,12 +269,14 @@ joelmo = "Joel Moberg "; joelteon = "Joel Taylor "; johbo = "Johannes Bornhold "; + johnramsden = "John Ramsden "; joko = "Ioannis Koutras "; jonafato = "Jon Banafato "; jpbernardy = "Jean-Philippe Bernardy "; jpierre03 = "Jean-Pierre PRUNARET "; jpotier = "Martin Potier "; jraygauthier = "Raymond Gauthier "; + jtojnar = "Jan Tojnar "; juliendehos = "Julien Dehos "; jwiegley = "John Wiegley "; jwilberding = "Jordan Wilberding "; @@ -308,6 +322,7 @@ luispedro = "Luis Pedro Coelho "; lukego = "Luke Gorrie "; lw = "Sergey Sofeychuk "; + lyt = "Tim Liou "; m3tti = "Mathaeus Sander "; ma27 = "Maximilian Bosch "; madjar = "Georges Dubus "; @@ -373,11 +388,12 @@ nand0p = "Fernando Jose Pando "; Nate-Devv = "Nathan Moore "; nathan-gs = "Nathan Bijnens "; - nckx = "Tobias Geerinckx-Rice "; + nckx = "Tobias Geerinckx-Rice "; ndowens = "Nathan Owens "; neeasade = "Nathan Isom "; nequissimus = "Tim Steinbach "; nfjinjing = "Jinjing Wang "; + nh2 = "Niklas Hambüchen "; nhooyr = "Anmol Sethi "; nickhu = "Nick Hu "; nicknovitski = "Nick Novitski "; @@ -397,6 +413,7 @@ okasu = "Okasu "; olcai = "Erik Timan "; olejorgenb = "Ole Jørgen Brønner "; + olynch = "Owen Lynch "; orbekk = "KJ Ørbekk "; orbitz = "Malcolm Matalka "; orivej = "Orivej Desh "; @@ -467,6 +484,7 @@ rob = "Rob Vermaas "; robberer = "Longrin Wischnewski "; robbinch = "Robbin C. "; + roberth = "Robert Hensing "; robgssp = "Rob Glossop "; roblabla = "Robin Lambertz "; roconnor = "Russell O'Connor "; @@ -477,6 +495,7 @@ rushmorem = "Rushmore Mushambi "; rvl = "Rodney Lorrimar "; rvlander = "Gaëtan André "; + rvolosatovs = "Roman Volosatovs "1-foo2-bar" */ - concatImapStrings = f: list: concatStrings (lib.imap f list); + concatImapStrings = f: list: concatStrings (lib.imap1 f list); /* Place an element between each element of a list @@ -70,7 +70,7 @@ rec { concatImapStringsSep "-" (pos: x: toString (x / pos)) [ 6 6 6 ] => "6-3-2" */ - concatImapStringsSep = sep: f: list: concatStringsSep sep (lib.imap f list); + concatImapStringsSep = sep: f: list: concatStringsSep sep (lib.imap1 f list); /* Construct a Unix-style search path consisting of each `subDir" directory of the given list of packages. diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index 241c9365f2e..a81e88989c0 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -1,20 +1,22 @@ with import ./parse.nix; with import ../attrsets.nix; +with import ../lists.nix; rec { - patterns = { + patterns = rec { "32bit" = { cpu = { bits = 32; }; }; "64bit" = { cpu = { bits = 64; }; }; i686 = { cpu = cpuTypes.i686; }; x86_64 = { cpu = cpuTypes.x86_64; }; + PowerPC = { cpu = cpuTypes.powerpc; }; x86 = { cpu = { family = "x86"; }; }; Arm = { cpu = { family = "arm"; }; }; Mips = { cpu = { family = "mips"; }; }; BigEndian = { cpu = { significantByte = significantBytes.bigEndian; }; }; LittleEndian = { cpu = { significantByte = significantBytes.littleEndian; }; }; - Unix = { kernel = { families = { inherit (kernelFamilies) unix; }; }; }; BSD = { kernel = { families = { inherit (kernelFamilies) bsd; }; }; }; + Unix = [ BSD Darwin Linux SunOS Hurd Cygwin ]; Darwin = { kernel = kernels.darwin; }; Linux = { kernel = kernels.linux; }; @@ -27,11 +29,15 @@ rec { Cygwin = { kernel = kernels.windows; abi = abis.cygnus; }; MinGW = { kernel = kernels.windows; abi = abis.gnu; }; - Arm32 = recursiveUpdate patterns.Arm patterns."32bit"; - Arm64 = recursiveUpdate patterns.Arm patterns."64bit"; + Arm32 = recursiveUpdate Arm patterns."32bit"; + Arm64 = recursiveUpdate Arm patterns."64bit"; }; + matchAnyAttrs = patterns: + if builtins.isList patterns then attrs: any (pattern: matchAttrs pattern attrs) patterns + else matchAttrs patterns; + predicates = mapAttrs' - (name: value: nameValuePair ("is" + name) (matchAttrs value)) + (name: value: nameValuePair ("is" + name) (matchAnyAttrs value)) patterns; } diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 34272b45b8b..befe90f9abe 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -44,7 +44,7 @@ rec { i686 = { bits = 32; significantByte = littleEndian; family = "x86"; }; x86_64 = { bits = 64; significantByte = littleEndian; family = "x86"; }; mips64el = { bits = 32; significantByte = littleEndian; family = "mips"; }; - powerpc = { bits = 32; significantByte = bigEndian; family = "powerpc"; }; + powerpc = { bits = 32; significantByte = bigEndian; family = "power"; }; }; isVendor = isType "vendor"; @@ -68,21 +68,20 @@ rec { isKernelFamily = isType "kernel-family"; kernelFamilies = setTypes "kernel-family" { bsd = {}; - unix = {}; }; isKernel = x: isType "kernel" x; kernels = with execFormats; with kernelFamilies; setTypesAssert "kernel" (x: isExecFormat x.execFormat && all isKernelFamily (attrValues x.families)) { - darwin = { execFormat = macho; families = { inherit unix; }; }; - freebsd = { execFormat = elf; families = { inherit unix bsd; }; }; - hurd = { execFormat = elf; families = { inherit unix; }; }; - linux = { execFormat = elf; families = { inherit unix; }; }; - netbsd = { execFormat = elf; families = { inherit unix bsd; }; }; - none = { execFormat = unknown; families = { inherit unix; }; }; - openbsd = { execFormat = elf; families = { inherit unix bsd; }; }; - solaris = { execFormat = elf; families = { inherit unix; }; }; + darwin = { execFormat = macho; families = { }; }; + freebsd = { execFormat = elf; families = { inherit bsd; }; }; + hurd = { execFormat = elf; families = { }; }; + linux = { execFormat = elf; families = { }; }; + netbsd = { execFormat = elf; families = { inherit bsd; }; }; + none = { execFormat = unknown; families = { }; }; + openbsd = { execFormat = elf; families = { inherit bsd; }; }; + solaris = { execFormat = elf; families = { }; }; windows = { execFormat = pe; families = { }; }; } // { # aliases # TODO(@Ericson2314): Handle these Darwin version suffixes more generally. @@ -164,7 +163,7 @@ rec { mkSystemFromString = s: mkSystemFromSkeleton (mkSkeletonFromList (lib.splitString "-" s)); doubleFromSystem = { cpu, vendor, kernel, abi, ... }: - if vendor == kernels.windows && abi == abis.cygnus + if abi == abis.cygnus then "${cpu.name}-cygwin" else "${cpu.name}-${kernel.name}"; diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 22557bdfeef..4c4c06fe78d 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -285,6 +285,38 @@ runTests { expected = builtins.toJSON val; }; + testToPretty = { + expr = mapAttrs (const (generators.toPretty {})) rec { + int = 42; + bool = true; + string = "fnord"; + null_ = null; + function = x: x; + functionArgs = { arg ? 4, foo }: arg; + list = [ 3 4 function [ false ] ]; + attrs = { foo = null; "foo bar" = "baz"; }; + drv = derivation { name = "test"; system = builtins.currentSystem; }; + }; + expected = rec { + int = "42"; + bool = "true"; + string = "\"fnord\""; + null_ = "null"; + function = "<λ>"; + functionArgs = "<λ:{(arg),foo}>"; + list = "[ 3 4 ${function} [ false ] ]"; + attrs = "{ \"foo\" = null; \"foo bar\" = \"baz\"; }"; + drv = "<δ>"; + }; + }; + + testToPrettyAllowPrettyValues = { + expr = generators.toPretty { allowPrettyValues = true; } + { __pretty = v: "«" + v + "»"; val = "foo"; }; + expected = "«foo»"; + }; + + # MISC testOverridableDelayableArgsTest = { diff --git a/lib/types.nix b/lib/types.nix index 50aa6d77085..a7dcd3f1e1c 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -179,9 +179,9 @@ rec { description = "list of ${elemType.description}s"; check = isList; merge = loc: defs: - map (x: x.value) (filter (x: x ? value) (concatLists (imap (n: def: + map (x: x.value) (filter (x: x ? value) (concatLists (imap1 (n: def: if isList def.value then - imap (m: def': + imap1 (m: def': (mergeDefinitions (loc ++ ["[definition ${toString n}-entry ${toString m}]"]) elemType @@ -220,7 +220,7 @@ rec { if isList def.value then { inherit (def) file; value = listToAttrs ( - imap (elemIdx: elem: + imap1 (elemIdx: elem: { name = elem.name or "unnamed-${toString defIdx}.${toString elemIdx}"; value = elem; }) def.value); @@ -233,7 +233,7 @@ rec { name = "loaOf"; description = "list or attribute set of ${elemType.description}s"; check = x: isList x || isAttrs x; - merge = loc: defs: attrOnly.merge loc (imap convertIfList defs); + merge = loc: defs: attrOnly.merge loc (imap1 convertIfList defs); getSubOptions = prefix: elemType.getSubOptions (prefix ++ [""]); getSubModules = elemType.getSubModules; substSubModules = m: loaOf (elemType.substSubModules m); diff --git a/maintainers/scripts/gnome.sh b/maintainers/scripts/gnome.sh index 9398331d0d6..a6f0dca2b82 100755 --- a/maintainers/scripts/gnome.sh +++ b/maintainers/scripts/gnome.sh @@ -6,7 +6,7 @@ GNOME_FTP="ftp.gnome.org/pub/GNOME/sources" # projects that don't follow the GNOME major versioning, or that we don't want to # programmatically update -NO_GNOME_MAJOR="gtkhtml gdm" +NO_GNOME_MAJOR="ghex gtkhtml gdm" usage() { echo "Usage: $0 gnome_dir || [major.minor]" >&2 diff --git a/maintainers/scripts/update-python-libraries b/maintainers/scripts/update-python-libraries index 278c467b054..7c73510c353 100755 --- a/maintainers/scripts/update-python-libraries +++ b/maintainers/scripts/update-python-libraries @@ -91,7 +91,9 @@ def _get_latest_version_pypi(package, extension): if release['filename'].endswith(extension): # TODO: In case of wheel we need to do further checks! sha256 = release['digests']['sha256'] - + break + else: + sha256 = None return version, sha256 diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 40d49f1541b..9413d71a34c 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -65,7 +65,7 @@ let chmod -R u+w . ln -s ${modulesDoc} configuration/modules.xml ln -s ${optionsDocBook} options-db.xml - echo "${version}" > version + printf "%s" "${version}" > version ''; toc = builtins.toFile "toc.xml" @@ -94,25 +94,43 @@ let "--stringparam chunk.toc ${toc}" ]; + manual-combined = runCommand "nixos-manual-combined" + { inherit sources; + buildInputs = [ libxml2 libxslt ]; + meta.description = "The NixOS manual as plain docbook XML"; + } + '' + ${copySources} + + xmllint --xinclude --output ./manual-combined.xml ./manual.xml + xmllint --xinclude --noxincludenode \ + --output ./man-pages-combined.xml ./man-pages.xml + + xmllint --debug --noout --nonet \ + --relaxng ${docbook5}/xml/rng/docbook/docbook.rng \ + manual-combined.xml + xmllint --debug --noout --nonet \ + --relaxng ${docbook5}/xml/rng/docbook/docbook.rng \ + man-pages-combined.xml + + + mkdir $out + cp manual-combined.xml $out/ + cp man-pages-combined.xml $out/ + ''; + olinkDB = runCommand "manual-olinkdb" { inherit sources; buildInputs = [ libxml2 libxslt ]; } '' - ${copySources} - xsltproc \ ${manualXsltprocOptions} \ --stringparam collect.xref.targets only \ --stringparam targets.filename "$out/manual.db" \ - --nonet --xinclude \ + --nonet \ ${docbook5_xsl}/xml/xsl/docbook/xhtml/chunktoc.xsl \ - ./manual.xml - - # Check the validity of the man pages sources. - xmllint --noout --nonet --xinclude --noxincludenode \ - --relaxng ${docbook5}/xml/rng/docbook/docbook.rng \ - ./man-pages.xml + ${manual-combined}/manual-combined.xml cat > "$out/olinkdb.xml" < @@ -158,21 +176,15 @@ in rec { allowedReferences = ["out"]; } '' - ${copySources} - - # Check the validity of the manual sources. - xmllint --noout --nonet --xinclude --noxincludenode \ - --relaxng ${docbook5}/xml/rng/docbook/docbook.rng \ - manual.xml - # Generate the HTML manual. dst=$out/share/doc/nixos mkdir -p $dst xsltproc \ ${manualXsltprocOptions} \ --stringparam target.database.document "${olinkDB}/olinkdb.xml" \ - --nonet --xinclude --output $dst/ \ - ${docbook5_xsl}/xml/xsl/docbook/xhtml/chunktoc.xsl ./manual.xml + --nonet --output $dst/ \ + ${docbook5_xsl}/xml/xsl/docbook/xhtml/chunktoc.xsl \ + ${manual-combined}/manual-combined.xml mkdir -p $dst/images/callouts cp ${docbook5_xsl}/xml/xsl/docbook/images/callouts/*.gif $dst/images/callouts/ @@ -190,13 +202,6 @@ in rec { buildInputs = [ libxml2 libxslt zip ]; } '' - ${copySources} - - # Check the validity of the manual sources. - xmllint --noout --nonet --xinclude --noxincludenode \ - --relaxng ${docbook5}/xml/rng/docbook/docbook.rng \ - manual.xml - # Generate the epub manual. dst=$out/share/doc/nixos @@ -204,10 +209,11 @@ in rec { ${manualXsltprocOptions} \ --stringparam target.database.document "${olinkDB}/olinkdb.xml" \ --nonet --xinclude --output $dst/epub/ \ - ${docbook5_xsl}/xml/xsl/docbook/epub/docbook.xsl ./manual.xml + ${docbook5_xsl}/xml/xsl/docbook/epub/docbook.xsl \ + ${manual-combined}/manual-combined.xml mkdir -p $dst/epub/OEBPS/images/callouts - cp -r ${docbook5_xsl}/xml/xsl/docbook/images/callouts/*.gif $dst/epub/OEBPS/images/callouts + cp -r ${docbook5_xsl}/xml/xsl/docbook/images/callouts/*.gif $dst/epub/OEBPS/images/callouts # */ echo "application/epub+zip" > mimetype manual="$dst/nixos-manual.epub" zip -0Xq "$manual" mimetype @@ -227,23 +233,16 @@ in rec { allowedReferences = ["out"]; } '' - ${copySources} - - # Check the validity of the man pages sources. - xmllint --noout --nonet --xinclude --noxincludenode \ - --relaxng ${docbook5}/xml/rng/docbook/docbook.rng \ - ./man-pages.xml - # Generate manpages. mkdir -p $out/share/man - xsltproc --nonet --xinclude \ + xsltproc --nonet \ --param man.output.in.separate.dir 1 \ --param man.output.base.dir "'$out/share/man/'" \ --param man.endnotes.are.numbered 0 \ --param man.break.after.slash 1 \ --stringparam target.database.document "${olinkDB}/olinkdb.xml" \ ${docbook5_xsl}/xml/xsl/docbook/manpages/docbook.xsl \ - ./man-pages.xml + ${manual-combined}/man-pages-combined.xml ''; } diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml index 2c28dd44801..9aa332f026d 100644 --- a/nixos/doc/manual/manual.xml +++ b/nixos/doc/manual/manual.xml @@ -18,7 +18,7 @@ If you encounter problems, please report them on the nix-dev@lists.science.uu.nl + xlink:href="https://groups.google.com/forum/#!forum/nix-devel">nix-devel mailing list or on the #nixos channel on Freenode. Bugs should diff --git a/nixos/doc/manual/release-notes/rl-1509.xml b/nixos/doc/manual/release-notes/rl-1509.xml index 967fbcf869d..6c1c46844cc 100644 --- a/nixos/doc/manual/release-notes/rl-1509.xml +++ b/nixos/doc/manual/release-notes/rl-1509.xml @@ -28,7 +28,7 @@ has the following highlights: since version 0.0 as well as the most recent Stackage Nightly snapshot. The announcement "Full + xlink:href="https://nixos.org/nix-dev/2015-September/018138.html">"Full Stackage Support in Nixpkgs" gives additional details. diff --git a/nixos/doc/manual/release-notes/rl-1609.xml b/nixos/doc/manual/release-notes/rl-1609.xml index ade7d5581ce..3abafac9737 100644 --- a/nixos/doc/manual/release-notes/rl-1609.xml +++ b/nixos/doc/manual/release-notes/rl-1609.xml @@ -78,13 +78,13 @@ following incompatible changes: our package set it loosely based on the latest available LTS release, i.e. LTS 7.x at the time of this writing. New releases of NixOS and Nixpkgs will drop those old names entirely. The + xlink:href="https://nixos.org/nix-dev/2016-June/020585.html">The motivation for this change has been discussed at length on the nix-dev mailing list and in Github issue #14897. Development strategies for Haskell hackers who want to rely on Nix and NixOS have been described in another + xlink:href="https://nixos.org/nix-dev/2016-June/020642.html">another nix-dev article. diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml index 28c573e6d23..6147b983013 100644 --- a/nixos/doc/manual/release-notes/rl-1703.xml +++ b/nixos/doc/manual/release-notes/rl-1703.xml @@ -315,7 +315,7 @@ following incompatible changes: let pkgs = import <nixpkgs> {}; in - import pkgs.path { overlays = [(self: super: ...)] } + import pkgs.path { overlays = [(self: super: ...)]; } diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml index 34cfe1702e9..72dfd60bedd 100644 --- a/nixos/doc/manual/release-notes/rl-1709.xml +++ b/nixos/doc/manual/release-notes/rl-1709.xml @@ -85,6 +85,10 @@ rmdir /var/lib/ipfs/.ipfs + + The following changes apply if the stateVersion is changed to 17.09 or higher. + For stateVersion = "17.03 or lower the old behavior is preserved. + The postgres default version was changed from 9.5 to 9.6. @@ -94,6 +98,9 @@ rmdir /var/lib/ipfs/.ipfs The postgres default dataDir has changed from /var/db/postgres to /var/lib/postgresql/$psqlSchema where $psqlSchema is 9.6 for example. + + The mysql default dataDir has changed from /var/mysql to /var/lib/mysql. + @@ -113,9 +120,18 @@ rmdir /var/lib/ipfs/.ipfs also serve as a SSH agent if enableSSHSupport is set. + + + The services.tinc.networks.<name>.listenAddress + option had a misleading name that did not correspond to its behavior. It + now correctly defines the ip to listen for incoming connections on. To + keep the previous behaviour, use + services.tinc.networks.<name>.bindToAddress + instead. Refer to the description of the options for more details. + + - Other notable improvements: diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index 6be119bbf33..cd375352c4c 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -219,8 +219,8 @@ sub waitForMonitorPrompt { sub retry { my ($coderef) = @_; my $n; - for ($n = 0; $n < 900; $n++) { - return if &$coderef; + for ($n = 899; $n >=0; $n--) { + return if &$coderef($n); sleep 1; } die "action timed out after $n seconds"; @@ -518,6 +518,12 @@ sub waitUntilTTYMatches { $self->nest("waiting for $regexp to appear on tty $tty", sub { retry sub { + my ($retries_remaining) = @_; + if ($retries_remaining == 0) { + $self->log("Last chance to match /$regexp/ on TTY$tty, which currently contains:"); + $self->log($self->getTTYText($tty)); + } + return 1 if $self->getTTYText($tty) =~ /$regexp/; } }); @@ -566,6 +572,12 @@ sub waitForText { my ($self, $regexp) = @_; $self->nest("waiting for $regexp to appear on the screen", sub { retry sub { + my ($retries_remaining) = @_; + if ($retries_remaining == 0) { + $self->log("Last chance to match /$regexp/ on the screen, which currently contains:"); + $self->log($self->getScreenText); + } + return 1 if $self->getScreenText =~ /$regexp/; } }); @@ -600,6 +612,13 @@ sub waitForWindow { $self->nest("waiting for a window to appear", sub { retry sub { my @names = $self->getWindowNames; + + my ($retries_remaining) = @_; + if ($retries_remaining == 0) { + $self->log("Last chance to match /$regexp/ on the the window list, which currently contains:"); + $self->log(join(", ", @names)); + } + foreach my $n (@names) { return 1 if $n =~ /$regexp/; } diff --git a/nixos/modules/config/ldap.nix b/nixos/modules/config/ldap.nix index da875d6e482..710dfdd01af 100644 --- a/nixos/modules/config/ldap.nix +++ b/nixos/modules/config/ldap.nix @@ -19,7 +19,6 @@ let bind_policy ${config.users.ldap.bind.policy} ${optionalString config.users.ldap.useTLS '' ssl start_tls - tls_checkpeer no ''} ${optionalString (config.users.ldap.bind.distinguishedName != "") '' binddn ${config.users.ldap.bind.distinguishedName} diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index d503f5a8b20..cc967947dff 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -223,7 +223,9 @@ in ''; } // optionalAttrs config.services.resolved.enable { - "resolv.conf".source = "/run/systemd/resolve/resolv.conf"; + # symlink the static version of resolv.conf as recommended by upstream: + # https://www.freedesktop.org/software/systemd/man/systemd-resolved.html#/etc/resolv.conf + "resolv.conf".source = "${pkgs.systemd}/lib/systemd/resolv.conf"; } // optionalAttrs (config.services.resolved.enable && dnsmasqResolve) { "dnsmasq-resolv.conf".source = "/run/systemd/resolve/resolv.conf"; }; diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix index d541fff140e..16c43a99ad5 100644 --- a/nixos/modules/config/nsswitch.nix +++ b/nixos/modules/config/nsswitch.nix @@ -6,24 +6,29 @@ with lib; let - inherit (config.services.avahi) nssmdns; - inherit (config.services.samba) nsswins; - ldap = (config.users.ldap.enable && config.users.ldap.nsswitch); - sssd = config.services.sssd.enable; - resolved = config.services.resolved.enable; + # only with nscd up and running we can load NSS modules that are not integrated in NSS + canLoadExternalModules = config.services.nscd.enable; + myhostname = canLoadExternalModules; + mymachines = canLoadExternalModules; + nssmdns = canLoadExternalModules && config.services.avahi.nssmdns; + nsswins = canLoadExternalModules && config.services.samba.nsswins; + ldap = canLoadExternalModules && (config.users.ldap.enable && config.users.ldap.nsswitch); + sssd = canLoadExternalModules && config.services.sssd.enable; + resolved = canLoadExternalModules && config.services.resolved.enable; - hostArray = [ "files" "mymachines" ] + hostArray = [ "files" ] + ++ optionals mymachines [ "mymachines" ] ++ optionals nssmdns [ "mdns_minimal [!UNAVAIL=return]" ] ++ optionals nsswins [ "wins" ] - ++ optionals resolved ["resolv [!UNAVAIL=return]"] + ++ optionals resolved ["resolve [!UNAVAIL=return]"] ++ [ "dns" ] ++ optionals nssmdns [ "mdns" ] - ++ ["myhostname" ]; + ++ optionals myhostname ["myhostname" ]; passwdArray = [ "files" ] ++ optional sssd "sss" ++ optionals ldap [ "ldap" ] - ++ [ "mymachines" ]; + ++ optionals mymachines [ "mymachines" ]; shadowArray = [ "files" ] ++ optional sssd "sss" @@ -36,6 +41,7 @@ in { options = { # NSS modules. Hacky! + # Only works with nscd! system.nssModules = mkOption { type = types.listOf types.path; internal = true; @@ -55,6 +61,18 @@ in { }; config = { + assertions = [ + { + # generic catch if the NixOS module adding to nssModules does not prevent it with specific message. + assertion = config.system.nssModules.path != "" -> canLoadExternalModules; + message = "Loading NSS modules from path ${config.system.nssModules.path} requires nscd being enabled."; + } + { + # resolved does not need to add to nssModules, therefore needs an extra assertion + assertion = resolved -> canLoadExternalModules; + message = "Loading systemd-resolved's nss-resolve NSS module requires nscd being enabled."; + } + ]; # Name Service Switch configuration file. Required by the C # library. !!! Factor out the mdns stuff. The avahi module @@ -78,7 +96,7 @@ in { # configured IP addresses, or ::1 and 127.0.0.2 as # fallbacks. Systemd also provides nss-mymachines to return IP # addresses of local containers. - system.nssModules = [ config.systemd.package.out ]; + system.nssModules = optionals canLoadExternalModules [ config.systemd.package.out ]; }; } diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index bd80c811348..b12ef2fe861 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -6,6 +6,7 @@ with lib; let cfg = config.hardware.pulseaudio; + alsaCfg = config.sound; systemWide = cfg.enable && cfg.systemWide; nonSystemWide = cfg.enable && !cfg.systemWide; @@ -76,6 +77,7 @@ let ctl.!default { type pulse } + ${alsaCfg.extraConfig} ''); in { diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index 3ac5f634c7a..cf3cc2f2262 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -115,7 +115,6 @@ in "/share/mime" "/share/nano" "/share/org" - "/share/terminfo" "/share/themes" "/share/vim-plugins" "/share/vulkan" diff --git a/nixos/modules/config/terminfo.nix b/nixos/modules/config/terminfo.nix new file mode 100644 index 00000000000..4fd6ba5ea60 --- /dev/null +++ b/nixos/modules/config/terminfo.nix @@ -0,0 +1,33 @@ +# This module manages the terminfo database +# and its integration in the system. +{ config, ... }: +{ + config = { + + environment.pathsToLink = [ + "/share/terminfo" + ]; + + environment.etc."terminfo" = { + source = "${config.system.path}/share/terminfo"; + }; + + environment.profileRelativeEnvVars = { + TERMINFO_DIRS = [ "/share/terminfo" ]; + }; + + environment.extraInit = '' + + # reset TERM with new TERMINFO available (if any) + export TERM=$TERM + ''; + + security.sudo.extraConfig = '' + + # Keep terminfo database for root and %wheel. + Defaults:root,%wheel env_keep+=TERMINFO_DIRS + Defaults:root,%wheel env_keep+=TERMINFO + ''; + + }; +} diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 80241cd3ebe..4568a20e778 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,5 +1,5 @@ { - x86_64-linux = "/nix/store/crqd5wmrqipl4n1fcm5kkc1zg4sj80js-nix-1.11.11"; - i686-linux = "/nix/store/wsjn14xp5ja509d4dxb1c78zhirw0b5x-nix-1.11.11"; - x86_64-darwin = "/nix/store/zqkqnhk85g2shxlpb04y72h1i3db3gpl-nix-1.11.11"; + x86_64-linux = "/nix/store/avwiw7hb1qckag864sc6ixfxr8qmf94w-nix-1.11.13"; + i686-linux = "/nix/store/8wv3ms0afw95hzsz4lxzv0nj4w3614z9-nix-1.11.13"; + x86_64-darwin = "/nix/store/z21lvakv1l7lhasmv5fvaz8mlzxia8k9-nix-1.11.13"; } diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index e2ae2ee9fdf..087fbcd4512 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -140,7 +140,7 @@ channel_closure="$tmpdir/channel.closure" nix-store --export $channel_root > $channel_closure # Populate the target root directory with the basics -@prepare_root@/bin/nixos-prepare-root $mountPoint $channel_root $system_root @nixClosure@ $system_closure $channel_closure +@prepare_root@/bin/nixos-prepare-root "$mountPoint" "$channel_root" "$system_root" @nixClosure@ "$system_closure" "$channel_closure" # nixos-prepare-root doesn't currently do anything with file ownership, so we set it up here instead chown @root_uid@:@nixbld_gid@ $mountPoint/nix/store diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index 4b5e7b3230c..9ede74a54cd 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -250,7 +250,7 @@ trap cleanup EXIT # If --repair is given, don't try to use the Nix daemon, because the # flag can only be used directly. if [ -z "$repair" ] && systemctl show nix-daemon.socket nix-daemon.service | grep -q ActiveState=active; then - export NIX_REMOTE=${NIX_REMOTE:-daemon} + export NIX_REMOTE=${NIX_REMOTE-daemon} fi diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index d7459e3fe91..84d89510679 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -139,6 +139,7 @@ btsync = 113; minecraft = 114; #monetdb = 115; # unused (not packaged), removed 2016-09-19 + vault = 115; rippled = 116; murmur = 117; foundationdb = 118; @@ -166,7 +167,7 @@ dnsmasq = 141; uhub = 142; yandexdisk = 143; - collectd = 144; + #collectd = 144; #unused consul = 145; mailpile = 146; redmine = 147; @@ -295,6 +296,7 @@ aria2 = 277; clickhouse = 278; rslsync = 279; + minio = 280; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -414,6 +416,7 @@ btsync = 113; #minecraft = 114; # unused #monetdb = 115; # unused (not packaged), removed 2016-09-19 + vault = 115; #ripped = 116; # unused #murmur = 117; # unused foundationdb = 118; @@ -559,6 +562,7 @@ aria2 = 277; clickhouse = 278; rslsync = 279; + minio = 280; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/misc/meta.nix b/nixos/modules/misc/meta.nix index 6a5738e47ff..7a1e751394c 100644 --- a/nixos/modules/misc/meta.nix +++ b/nixos/modules/misc/meta.nix @@ -17,7 +17,7 @@ let # } merge = loc: defs: zipAttrs - (flatten (imap (n: def: imap (m: def': + (flatten (imap1 (n: def: imap1 (m: def': maintainer.merge (loc ++ ["[${toString n}-${toString m}]"]) [{ inherit (def) file; value = def'; }]) def.value) defs)); }; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 7f94d6569e9..8f78652fbfd 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -21,6 +21,7 @@ ./config/sysctl.nix ./config/system-environment.nix ./config/system-path.nix + ./config/terminfo.nix ./config/timezone.nix ./config/unix-odbc-drivers.nix ./config/users-groups.nix @@ -115,6 +116,7 @@ ./security/apparmor.nix ./security/apparmor-suid.nix ./security/audit.nix + ./security/auditd.nix ./security/ca.nix ./security/chromium-suid-sandbox.nix ./security/dhparams.nix @@ -235,16 +237,18 @@ ./services/hardware/udisks2.nix ./services/hardware/upower.nix ./services/hardware/thermald.nix + ./services/logging/SystemdJournal2Gelf.nix ./services/logging/awstats.nix ./services/logging/fluentd.nix ./services/logging/graylog.nix + ./services/logging/heartbeat.nix ./services/logging/journalbeat.nix + ./services/logging/journalwatch.nix ./services/logging/klogd.nix ./services/logging/logcheck.nix ./services/logging/logrotate.nix ./services/logging/logstash.nix ./services/logging/rsyslogd.nix - ./services/logging/SystemdJournal2Gelf.nix ./services/logging/syslog-ng.nix ./services/logging/syslogd.nix ./services/mail/dovecot.nix @@ -252,6 +256,7 @@ ./services/mail/exim.nix ./services/mail/freepops.nix ./services/mail/mail.nix + ./services/mail/mailhog.nix ./services/mail/mlmmj.nix ./services/mail/offlineimap.nix ./services/mail/opendkim.nix @@ -322,6 +327,7 @@ ./services/misc/ripple-data-api.nix ./services/misc/rogue.nix ./services/misc/siproxd.nix + ./services/misc/snapper.nix ./services/misc/sonarr.nix ./services/misc/spice-vdagentd.nix ./services/misc/ssm-agent.nix @@ -554,12 +560,14 @@ ./services/security/tor.nix ./services/security/torify.nix ./services/security/torsocks.nix + ./services/security/vault.nix ./services/system/cgmanager.nix ./services/system/cloud-init.nix ./services/system/dbus.nix ./services/system/earlyoom.nix ./services/system/kerberos.nix ./services/system/nscd.nix + ./services/system/saslauthd.nix ./services/system/uptimed.nix ./services/torrent/deluge.nix ./services/torrent/flexget.nix @@ -575,6 +583,7 @@ ./services/web-apps/frab.nix ./services/web-apps/mattermost.nix ./services/web-apps/nixbot.nix + ./services/web-apps/piwik.nix ./services/web-apps/pump.io.nix ./services/web-apps/tt-rss.nix ./services/web-apps/selfoss.nix @@ -584,9 +593,11 @@ ./services/web-servers/fcgiwrap.nix ./services/web-servers/jboss/default.nix ./services/web-servers/lighttpd/cgit.nix + ./services/web-servers/lighttpd/collectd.nix ./services/web-servers/lighttpd/default.nix ./services/web-servers/lighttpd/gitweb.nix ./services/web-servers/lighttpd/inginious.nix + ./services/web-servers/minio.nix ./services/web-servers/nginx/default.nix ./services/web-servers/phpfpm/default.nix ./services/web-servers/shellinabox.nix diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix index 530b2fbffd1..6e6ae98e19f 100644 --- a/nixos/modules/profiles/all-hardware.nix +++ b/nixos/modules/profiles/all-hardware.nix @@ -41,6 +41,9 @@ # Virtio (QEMU, KVM etc.) support. "virtio_net" "virtio_pci" "virtio_blk" "virtio_scsi" "virtio_balloon" "virtio_console" + + # VMware support. + "mptspi" "vmw_balloon" "vmwgfx" "vmw_vmci" "vmw_vsock_vmci_transport" "vmxnet3" "vsock" # Hyper-V support. "hv_storvsc" diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix index 8bde2e4f498..0a0838431da 100644 --- a/nixos/modules/profiles/hardened.nix +++ b/nixos/modules/profiles/hardened.nix @@ -55,7 +55,7 @@ with lib; # same privileges as it would have inside it. This is particularly # bad in the common case of running as root within the namespace. # - # Setting the number of allowed userns to 0 effectively disables + # Setting the number of allowed user namespaces to 0 effectively disables # the feature at runtime. Attempting to create a user namespace # with unshare will then fail with "no space left on device". boot.kernel.sysctl."user.max_user_namespaces" = mkDefault 0; diff --git a/nixos/modules/programs/browserpass.nix b/nixos/modules/programs/browserpass.nix index 2b7ec185643..a073c7e66eb 100644 --- a/nixos/modules/programs/browserpass.nix +++ b/nixos/modules/programs/browserpass.nix @@ -6,21 +6,17 @@ with lib; ###### interface options = { - programs.browserpass = { - enable = mkOption { - default = false; - type = types.bool; - description = '' - Whether to install the NativeMessaging configuration for installed browsers. - ''; - }; - }; + programs.browserpass.enable = mkEnableOption "the NativeMessaging configuration for Chromium, Chrome, and Vivaldi."; }; ###### implementation config = mkIf config.programs.browserpass.enable { environment.systemPackages = [ pkgs.browserpass ]; - environment.etc."chromium/native-messaging-hosts/com.dannyvankooten.browserpass.json".source = "${pkgs.browserpass}/etc/chrome-host.json"; - environment.etc."opt/chrome/native-messaging-hosts/com.dannyvankooten.browserpass.json".source = "${pkgs.browserpass}/etc/chrome-host.json"; + environment.etc = { + "chromium/native-messaging-hosts/com.dannyvankooten.browserpass.json".source = "${pkgs.browserpass}/etc/chrome-host.json"; + "chromium/policies/managed/com.dannyvankooten.browserpass.json".source = "${pkgs.browserpass}/etc/chrome-policy.json"; + "opt/chrome/native-messaging-hosts/com.dannyvankooten.browserpass.json".source = "${pkgs.browserpass}/etc/chrome-host.json"; + "opt/chrome/policies/managed/com.dannyvankooten.browserpass.json".source = "${pkgs.browserpass}/etc/chrome-policy.json"; + }; }; } diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix index ba356a8ad2d..401d152941a 100644 --- a/nixos/modules/programs/environment.nix +++ b/nixos/modules/programs/environment.nix @@ -34,7 +34,6 @@ in { PATH = [ "/bin" ]; INFOPATH = [ "/info" "/share/info" ]; PKG_CONFIG_PATH = [ "/lib/pkgconfig" ]; - TERMINFO_DIRS = [ "/share/terminfo" ]; PERL5LIB = [ "/lib/perl5/site_perl" ]; KDEDIRS = [ "" ]; STRIGI_PLUGIN_PATH = [ "/lib/strigi/" ]; @@ -50,9 +49,6 @@ in environment.extraInit = '' - # reset TERM with new TERMINFO available (if any) - export TERM=$TERM - unset ASPELL_CONF for i in ${concatStringsSep " " (reverseList cfg.profiles)} ; do if [ -d "$i/lib/aspell" ]; then diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix index 68adee94f79..8af55f38992 100644 --- a/nixos/modules/programs/gnupg.nix +++ b/nixos/modules/programs/gnupg.nix @@ -55,79 +55,24 @@ in }; config = mkIf cfg.agent.enable { - systemd.user.services.gpg-agent = { - serviceConfig = { - ExecStart = [ - "" - ("${pkgs.gnupg}/bin/gpg-agent --supervised " - + optionalString cfg.agent.enableSSHSupport "--enable-ssh-support") - ]; - ExecReload = "${pkgs.gnupg}/bin/gpgconf --reload gpg-agent"; - }; - }; - systemd.user.sockets.gpg-agent = { wantedBy = [ "sockets.target" ]; - listenStreams = [ "%t/gnupg/S.gpg-agent" ]; - socketConfig = { - FileDescriptorName = "std"; - SocketMode = "0600"; - DirectoryMode = "0700"; - }; }; systemd.user.sockets.gpg-agent-ssh = mkIf cfg.agent.enableSSHSupport { wantedBy = [ "sockets.target" ]; - listenStreams = [ "%t/gnupg/S.gpg-agent.ssh" ]; - socketConfig = { - FileDescriptorName = "ssh"; - Service = "gpg-agent.service"; - SocketMode = "0600"; - DirectoryMode = "0700"; - }; }; systemd.user.sockets.gpg-agent-extra = mkIf cfg.agent.enableExtraSocket { wantedBy = [ "sockets.target" ]; - listenStreams = [ "%t/gnupg/S.gpg-agent.extra" ]; - socketConfig = { - FileDescriptorName = "extra"; - Service = "gpg-agent.service"; - SocketMode = "0600"; - DirectoryMode = "0700"; - }; }; systemd.user.sockets.gpg-agent-browser = mkIf cfg.agent.enableBrowserSocket { wantedBy = [ "sockets.target" ]; - listenStreams = [ "%t/gnupg/S.gpg-agent.browser" ]; - socketConfig = { - FileDescriptorName = "browser"; - Service = "gpg-agent.service"; - SocketMode = "0600"; - DirectoryMode = "0700"; - }; }; - systemd.user.services.dirmngr = { - requires = [ "dirmngr.socket" ]; - after = [ "dirmngr.socket" ]; - unitConfig = { - RefuseManualStart = "true"; - }; - serviceConfig = { - ExecStart = "${pkgs.gnupg}/bin/dirmngr --supervised"; - ExecReload = "${pkgs.gnupg}/bin/gpgconf --reload dirmngr"; - }; - }; - - systemd.user.sockets.dirmngr = { + systemd.user.sockets.dirmngr = mkIf cfg.dirmngr.enable { wantedBy = [ "sockets.target" ]; - listenStreams = [ "%t/gnupg/S.dirmngr" ]; - socketConfig = { - SocketMode = "0600"; - DirectoryMode = "0700"; - }; }; systemd.packages = [ pkgs.gnupg ]; diff --git a/nixos/modules/programs/nylas-mail.nix b/nixos/modules/programs/nylas-mail.nix new file mode 100644 index 00000000000..9a6cf755f2a --- /dev/null +++ b/nixos/modules/programs/nylas-mail.nix @@ -0,0 +1,37 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.nylas-mail; + defaultUser = "nylas-mail"; +in { + ###### interface + options = { + services.nylas-mail = { + + enable = mkEnableOption '' + nylas-mail - Open-source mail client built on the modern web with Electron, React, and Flux + ''; + + gnome3-keyring = mkOption { + type = types.bool; + default = true; + description = "Enable gnome3 keyring for nylas-mail."; + }; + }; + }; + + + ###### implementation + + config = mkIf cfg.enable { + + environment.systemPackages = [ pkgs.nylas-mail-bin ]; + + services.gnome3.gnome-keyring = mkIf cfg.gnome3-keyring { + enable = true; + }; + + }; +} diff --git a/nixos/modules/programs/zsh/oh-my-zsh.nix b/nixos/modules/programs/zsh/oh-my-zsh.nix index 446c05da39d..aa5844cdc4d 100644 --- a/nixos/modules/programs/zsh/oh-my-zsh.nix +++ b/nixos/modules/programs/zsh/oh-my-zsh.nix @@ -42,6 +42,10 @@ in }; config = mkIf cfg.enable { + + # Prevent zsh from overwriting oh-my-zsh's prompt + programs.zsh.promptInit = mkDefault ""; + environment.systemPackages = with pkgs; [ oh-my-zsh ]; programs.zsh.interactiveShellInit = with pkgs; with builtins; '' diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index acb3e987aee..a055291282c 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -97,45 +97,6 @@ in config = mkIf cfg.enable { - programs.zsh = { - - shellInit = '' - . ${config.system.build.setEnvironment} - - ${cfge.shellInit} - ''; - - loginShellInit = cfge.loginShellInit; - - interactiveShellInit = '' - # history defaults - SAVEHIST=2000 - HISTSIZE=2000 - HISTFILE=$HOME/.zsh_history - - setopt HIST_IGNORE_DUPS SHARE_HISTORY HIST_FCNTL_LOCK - - # Tell zsh how to find installed completions - for p in ''${(z)NIX_PROFILES}; do - fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions) - done - - ${if cfg.enableCompletion then "autoload -U compinit && compinit" else ""} - - ${optionalString (cfg.enableAutosuggestions) - "source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh" - } - - ${zshAliases} - ${cfg.promptInit} - - ${cfge.interactiveShellInit} - - HELPDIR="${pkgs.zsh}/share/zsh/$ZSH_VERSION/help" - ''; - - }; - environment.etc."zshenv".text = '' # /etc/zshenv: DO NOT EDIT -- this file has been generated automatically. @@ -146,6 +107,10 @@ in if [ -n "$__ETC_ZSHENV_SOURCED" ]; then return; fi export __ETC_ZSHENV_SOURCED=1 + . ${config.system.build.setEnvironment} + + ${cfge.shellInit} + ${cfg.shellInit} # Read system-wide modifications. @@ -163,6 +128,8 @@ in if [ -n "$__ETC_ZPROFILE_SOURCED" ]; then return; fi __ETC_ZPROFILE_SOURCED=1 + ${cfge.loginShellInit} + ${cfg.loginShellInit} # Read system-wide modifications. @@ -182,8 +149,34 @@ in . /etc/zinputrc + # history defaults + SAVEHIST=2000 + HISTSIZE=2000 + HISTFILE=$HOME/.zsh_history + + setopt HIST_IGNORE_DUPS SHARE_HISTORY HIST_FCNTL_LOCK + + HELPDIR="${pkgs.zsh}/share/zsh/$ZSH_VERSION/help" + + ${optionalString cfg.enableCompletion "autoload -U compinit && compinit"} + + ${optionalString (cfg.enableAutosuggestions) + "source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh" + } + + ${zshAliases} + + ${cfge.interactiveShellInit} + ${cfg.interactiveShellInit} + ${cfg.promptInit} + + # Tell zsh how to find installed completions + for p in ''${(z)NIX_PROFILES}; do + fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions $p/share/zsh/vendor-completions) + done + # Read system-wide modifications. if test -f /etc/zshrc.local; then . /etc/zshrc.local diff --git a/nixos/modules/security/auditd.nix b/nixos/modules/security/auditd.nix new file mode 100644 index 00000000000..319dce9a6c5 --- /dev/null +++ b/nixos/modules/security/auditd.nix @@ -0,0 +1,26 @@ +{ config, lib, pkgs, ... }: + +with lib; + +{ + options.security.auditd.enable = mkEnableOption "the Linux Audit daemon"; + + config = mkIf config.security.auditd.enable { + systemd.services.auditd = { + description = "Linux Audit daemon"; + wantedBy = [ "basic.target" ]; + + unitConfig = { + ConditionVirtualization = "!container"; + ConditionSecurity = [ "audit" ]; + }; + + path = [ pkgs.audit ]; + + serviceConfig = { + ExecStartPre="${pkgs.coreutils}/bin/mkdir -p /var/log/audit"; + ExecStart = "${pkgs.audit}/bin/auditd -l -n -s nochange"; + }; + }; + }; +} diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix index 67a9b9a45ee..cfd0595e63b 100644 --- a/nixos/modules/security/sudo.nix +++ b/nixos/modules/security/sudo.nix @@ -66,10 +66,6 @@ in # Don't edit this file. Set the NixOS options ‘security.sudo.configFile’ # or ‘security.sudo.extraConfig’ instead. - # Environment variables to keep for root and %wheel. - Defaults:root,%wheel env_keep+=TERMINFO_DIRS - Defaults:root,%wheel env_keep+=TERMINFO - # Keep SSH_AUTH_SOCK so that pam_ssh_agent_auth.so can do its magic. Defaults env_keep+=SSH_AUTH_SOCK diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix index dc1227c5628..a6dc8faaae9 100644 --- a/nixos/modules/security/wrappers/default.nix +++ b/nixos/modules/security/wrappers/default.nix @@ -171,7 +171,7 @@ in ###### setcap activation script system.activationScripts.wrappers = - lib.stringAfter [ "users" ] + lib.stringAfter [ "specialfs" "users" ] '' # Look in the system path and in the default profile for # programs to be wrapped. diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix index 53786dbc627..acf48d3c3d0 100644 --- a/nixos/modules/services/audio/alsa.nix +++ b/nixos/modules/services/audio/alsa.nix @@ -7,6 +7,8 @@ let inherit (pkgs) alsaUtils; + pulseaudioEnabled = config.hardware.pulseaudio.enable; + in { @@ -80,7 +82,7 @@ in environment.systemPackages = [ alsaUtils ]; - environment.etc = mkIf (config.sound.extraConfig != "") + environment.etc = mkIf (!pulseaudioEnabled && config.sound.extraConfig != "") [ { source = pkgs.writeText "asound.conf" config.sound.extraConfig; target = "asound.conf"; diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index 56af8fe152e..bd6c316243c 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -10,9 +10,11 @@ let gid = config.ids.gids.mpd; cfg = config.services.mpd; + playlistDir = "${cfg.dataDir}/playlists"; + mpdConf = pkgs.writeText "mpd.conf" '' music_directory "${cfg.musicDirectory}" - playlist_directory "${cfg.dataDir}/playlists" + playlist_directory "${playlistDir}" db_file "${cfg.dbFile}" state_file "${cfg.dataDir}/state" sticker_file "${cfg.dataDir}/sticker.sql" @@ -42,6 +44,16 @@ in { ''; }; + startWhenNeeded = mkOption { + type = types.bool; + default = false; + description = '' + If set, mpd is socket-activated; that + is, instead of having it permanently running as a daemon, + systemd will start it on the first incoming connection. + ''; + }; + musicDirectory = mkOption { type = types.path; default = "${cfg.dataDir}/music"; @@ -121,16 +133,42 @@ in { config = mkIf cfg.enable { + systemd.sockets.mpd = mkIf cfg.startWhenNeeded { + description = "Music Player Daemon Socket"; + wantedBy = [ "sockets.target" ]; + listenStreams = [ + "${optionalString (cfg.network.listenAddress != "any") "${cfg.network.listenAddress}:"}${toString cfg.network.port}" + ]; + socketConfig = { + Backlog = 5; + KeepAlive = true; + PassCredentials = true; + }; + }; + systemd.services.mpd = { after = [ "network.target" "sound.target" ]; description = "Music Player Daemon"; - wantedBy = [ "multi-user.target" ]; + wantedBy = optional (!cfg.startWhenNeeded) "multi-user.target"; - preStart = "mkdir -p ${cfg.dataDir} && chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir}"; + preStart = '' + mkdir -p "${cfg.dataDir}" && chown -R ${cfg.user}:${cfg.group} "${cfg.dataDir}" + mkdir -p "${playlistDir}" && chown -R ${cfg.user}:${cfg.group} "${playlistDir}" + ''; serviceConfig = { User = "${cfg.user}"; PermissionsStartOnly = true; ExecStart = "${pkgs.mpd}/bin/mpd --no-daemon ${mpdConf}"; + Type = "notify"; + LimitRTPRIO = 50; + LimitRTTIME = "infinity"; + ProtectSystem = true; + NoNewPrivileges = true; + ProtectKernelTunables = true; + ProtectControlGroups = true; + ProtectKernelModules = true; + RestrictAddressFamilies = "AF_INET AF_INET6 AF_UNIX AF_NETLINK"; + RestrictNamespaces = true; }; }; diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix index 68917af5094..4c9d9aad0e2 100644 --- a/nixos/modules/services/cluster/kubernetes.nix +++ b/nixos/modules/services/cluster/kubernetes.nix @@ -44,7 +44,7 @@ let cniConfig = pkgs.buildEnv { name = "kubernetes-cni-config"; - paths = imap (i: entry: + paths = imap1 (i: entry: pkgs.writeTextDir "${toString (10+i)}-${entry.type}.conf" (builtins.toJSON entry) ) cfg.kubelet.cni.config; }; diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix index ee38a42199e..fb91a29a400 100644 --- a/nixos/modules/services/computing/slurm/slurm.nix +++ b/nixos/modules/services/computing/slurm/slurm.nix @@ -36,9 +36,9 @@ in package = mkOption { type = types.package; - default = pkgs.slurm-llnl; - defaultText = "pkgs.slurm-llnl"; - example = literalExample "pkgs.slurm-llnl-full"; + default = pkgs.slurm; + defaultText = "pkgs.slurm"; + example = literalExample "pkgs.slurm-full"; description = '' The package to use for slurm binaries. ''; diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix index fe0c452d067..846efc8b5b9 100644 --- a/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -225,11 +225,7 @@ in { User = cfg.user; Group = cfg.group; WorkingDirectory = cfg.home; - Environment = "PYTHONPATH=${cfg.package}/lib/python2.7/site-packages:${pkgs.buildbot-plugins.www}/lib/python2.7/site-packages:${pkgs.buildbot-plugins.waterfall-view}/lib/python2.7/site-packages:${pkgs.buildbot-plugins.console-view}/lib/python2.7/site-packages:${pkgs.python27Packages.future}/lib/python2.7/site-packages:${pkgs.python27Packages.dateutil}/lib/python2.7/site-packages:${pkgs.python27Packages.six}/lib/python2.7/site-packages:${pkgs.python27Packages.sqlalchemy}/lib/python2.7/site-packages:${pkgs.python27Packages.jinja2}/lib/python2.7/site-packages:${pkgs.python27Packages.markupsafe}/lib/python2.7/site-packages:${pkgs.python27Packages.sqlalchemy_migrate}/lib/python2.7/site-packages:${pkgs.python27Packages.tempita}/lib/python2.7/site-packages:${pkgs.python27Packages.decorator}/lib/python2.7/site-packages:${pkgs.python27Packages.sqlparse}/lib/python2.7/site-packages:${pkgs.python27Packages.txaio}/lib/python2.7/site-packages:${pkgs.python27Packages.autobahn}/lib/python2.7/site-packages:${pkgs.python27Packages.pyjwt}/lib/python2.7/site-packages:${pkgs.python27Packages.distro}/lib/python2.7/site-packages:${pkgs.python27Packages.pbr}/lib/python2.7/site-packages:${pkgs.python27Packages.urllib3}/lib/python2.7/site-packages"; - - # NOTE: call twistd directly with stdout logging for systemd - #ExecStart = "${cfg.package}/bin/buildbot start --nodaemon ${cfg.buildbotDir}"; - ExecStart = "${pkgs.python27Packages.twisted}/bin/twistd -n -l - -y ${cfg.buildbotDir}/buildbot.tac"; + ExecStart = "${cfg.package}/bin/buildbot start --nodaemon ${cfg.buildbotDir}"; }; }; diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix index 048343b3360..b11bc031b3f 100644 --- a/nixos/modules/services/continuous-integration/gitlab-runner.nix +++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix @@ -15,6 +15,23 @@ in description = "Verbatim config.toml to use"; }; + gracefulTermination = mkOption { + default = false; + type = types.bool; + description = '' + Finish all remaining jobs before stopping, restarting or reconfiguring. + If not set gitlab-runner will stop immediatly without waiting for jobs to finish, + which will lead to failed builds. + ''; + }; + + gracefulTimeout = mkOption { + default = "infinity"; + type = types.str; + example = "5min 20s"; + description = ''Time to wait until a graceful shutdown is turned into a forceful one.''; + }; + workDir = mkOption { default = "/var/lib/gitlab-runner"; type = types.path; @@ -45,6 +62,11 @@ in --service gitlab-runner \ --user gitlab-runner \ ''; + + } // optionalAttrs (cfg.gracefulTermination) { + TimeoutStopSec = "${cfg.gracefulTimeout}"; + KillSignal = "SIGQUIT"; + KillMode = "process"; }; }; diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index c515622d11a..fcc0f58637c 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -308,6 +308,7 @@ in requires = [ "hydra-init.service" ]; after = [ "hydra-init.service" ]; environment = serverEnv; + restartTriggers = [ hydraConf ]; serviceConfig = { ExecStart = "@${cfg.package}/bin/hydra-server hydra-server -f -h '${cfg.listenHost}' " @@ -324,6 +325,7 @@ in requires = [ "hydra-init.service" ]; after = [ "hydra-init.service" "network.target" ]; path = [ cfg.package pkgs.nettools pkgs.openssh pkgs.bzip2 config.nix.package ]; + restartTriggers = [ hydraConf ]; environment = env // { PGPASSFILE = "${baseDir}/pgpass-queue-runner"; # grrr IN_SYSTEMD = "1"; # to get log severity levels @@ -344,7 +346,8 @@ in { wantedBy = [ "multi-user.target" ]; requires = [ "hydra-init.service" ]; after = [ "hydra-init.service" "network.target" ]; - path = [ cfg.package pkgs.nettools ]; + path = with pkgs; [ cfg.package nettools jq ]; + restartTriggers = [ hydraConf ]; environment = env; serviceConfig = { ExecStart = "@${cfg.package}/bin/hydra-evaluator hydra-evaluator"; diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index bae6b170c47..6027f109285 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -20,6 +20,7 @@ let '' [mysqld] port = ${toString cfg.port} + ${optionalString (cfg.bind != null) "bind-address = ${cfg.bind}" } ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "log-bin=mysql-bin"} ${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "server-id = ${toString cfg.replication.serverId}"} ${optionalString (cfg.replication.role == "slave" && !atLeast55) @@ -58,6 +59,13 @@ in "; }; + bind = mkOption { + type = types.nullOr types.str; + default = null; + example = literalExample "0.0.0.0"; + description = "Address to bind to. The default it to bind to all addresses"; + }; + port = mkOption { type = types.int; default = 3306; diff --git a/nixos/modules/services/databases/rethinkdb.nix b/nixos/modules/services/databases/rethinkdb.nix new file mode 100644 index 00000000000..cd8c386b08d --- /dev/null +++ b/nixos/modules/services/databases/rethinkdb.nix @@ -0,0 +1,110 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.rethinkdb; + rethinkdb = cfg.package; +in + +{ + + ###### interface + + options = { + + services.rethinkdb = { + + enable = mkOption { + default = false; + description = "Whether to enable the RethinkDB server."; + }; + + #package = mkOption { + # default = pkgs.rethinkdb; + # description = "Which RethinkDB derivation to use."; + #}; + + user = mkOption { + default = "rethinkdb"; + description = "User account under which RethinkDB runs."; + }; + + group = mkOption { + default = "rethinkdb"; + description = "Group which rethinkdb user belongs to."; + }; + + dbpath = mkOption { + default = "/var/db/rethinkdb"; + description = "Location where RethinkDB stores its data, 1 data directory per instance."; + }; + + pidpath = mkOption { + default = "/var/run/rethinkdb"; + description = "Location where each instance's pid file is located."; + }; + + #cfgpath = mkOption { + # default = "/etc/rethinkdb/instances.d"; + # description = "Location where RethinkDB stores it config files, 1 config file per instance."; + #}; + + # TODO: currently not used by our implementation. + #instances = mkOption { + # type = types.attrsOf types.str; + # default = {}; + # description = "List of named RethinkDB instances in our cluster."; + #}; + + }; + + }; + + ###### implementation + config = mkIf config.services.rethinkdb.enable { + + environment.systemPackages = [ rethinkdb ]; + + systemd.services.rethinkdb = { + description = "RethinkDB server"; + + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + # TODO: abstract away 'default', which is a per-instance directory name + # allowing end user of this nix module to provide multiple instances, + # and associated directory per instance + ExecStart = "${rethinkdb}/bin/rethinkdb -d ${cfg.dbpath}/default"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + User = cfg.user; + Group = cfg.group; + PIDFile = "${cfg.pidpath}/default.pid"; + PermissionsStartOnly = true; + }; + + preStart = '' + if ! test -e ${cfg.dbpath}; then + install -d -m0755 -o ${cfg.user} -g ${cfg.group} ${cfg.dbpath} + install -d -m0755 -o ${cfg.user} -g ${cfg.group} ${cfg.dbpath}/default + chown -R ${cfg.user}:${cfg.group} ${cfg.dbpath} + fi + if ! test -e "${cfg.pidpath}/default.pid"; then + install -D -o ${cfg.user} -g ${cfg.group} /dev/null "${cfg.pidpath}/default.pid" + fi + ''; + }; + + users.extraUsers.rethinkdb = mkIf (cfg.user == "rethinkdb") + { name = "rethinkdb"; + description = "RethinkDB server user"; + }; + + users.extraGroups = optionalAttrs (cfg.group == "rethinkdb") (singleton + { name = "rethinkdb"; + }); + + }; + +} diff --git a/nixos/modules/services/games/factorio.nix b/nixos/modules/services/games/factorio.nix index e7f070d0877..1dc8ce93a0e 100644 --- a/nixos/modules/services/games/factorio.nix +++ b/nixos/modules/services/games/factorio.nix @@ -39,7 +39,7 @@ let admins = []; }; serverSettingsFile = pkgs.writeText "server-settings.json" (builtins.toJSON (filterAttrsRecursive (n: v: v != null) serverSettings)); - modDir = pkgs.factorio-mkModDirDrv cfg.mods; + modDir = pkgs.factorio-utils.mkModDirDrv cfg.mods; in { options = { diff --git a/nixos/modules/services/logging/heartbeat.nix b/nixos/modules/services/logging/heartbeat.nix new file mode 100644 index 00000000000..b595ac07bf5 --- /dev/null +++ b/nixos/modules/services/logging/heartbeat.nix @@ -0,0 +1,72 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.heartbeat; + + heartbeatYml = pkgs.writeText "heartbeat.yml" '' + name: ${cfg.name} + tags: ${builtins.toJSON cfg.tags} + + ${cfg.extraConfig} + ''; + +in +{ + options = { + + services.heartbeat = { + + enable = mkEnableOption "heartbeat"; + + name = mkOption { + type = types.str; + default = "heartbeat"; + description = "Name of the beat"; + }; + + tags = mkOption { + type = types.listOf types.str; + default = []; + description = "Tags to place on the shipped log messages"; + }; + + stateDir = mkOption { + type = types.str; + default = "/var/lib/heartbeat"; + description = "The state directory. heartbeat's own logs and other data are stored here."; + }; + + extraConfig = mkOption { + type = types.lines; + default = '' + heartbeat.monitors: + - type: http + urls: ["http://localhost:9200"] + schedule: '@every 10s' + ''; + description = "Any other configuration options you want to add"; + }; + + }; + }; + + config = mkIf cfg.enable { + + systemd.services.heartbeat = with pkgs; { + description = "heartbeat log shipper"; + wantedBy = [ "multi-user.target" ]; + preStart = '' + mkdir -p "${cfg.stateDir}"/{data,logs} + chown nobody:nogroup "${cfg.stateDir}"/{data,logs} + ''; + serviceConfig = { + User = "nobody"; + PermissionsStartOnly = true; + AmbientCapabilities = "cap_net_raw"; + ExecStart = "${pkgs.heartbeat}/bin/heartbeat -c \"${heartbeatYml}\" -path.data \"${cfg.stateDir}/data\" -path.logs \"${cfg.stateDir}/logs\""; + }; + }; + }; +} diff --git a/nixos/modules/services/logging/journalwatch.nix b/nixos/modules/services/logging/journalwatch.nix new file mode 100644 index 00000000000..d49795fe2b7 --- /dev/null +++ b/nixos/modules/services/logging/journalwatch.nix @@ -0,0 +1,246 @@ +{ config, lib, pkgs, services, ... }: +with lib; + +let + cfg = config.services.journalwatch; + user = "journalwatch"; + dataDir = "/var/lib/${user}"; + + journalwatchConfig = pkgs.writeText "config" ('' + # (File Generated by NixOS journalwatch module.) + [DEFAULT] + mail_binary = ${cfg.mailBinary} + priority = ${toString cfg.priority} + mail_from = ${cfg.mailFrom} + '' + + optionalString (cfg.mailTo != null) '' + mail_to = ${cfg.mailTo} + '' + + cfg.extraConfig); + + journalwatchPatterns = pkgs.writeText "patterns" '' + # (File Generated by NixOS journalwatch module.) + + ${mkPatterns cfg.filterBlocks} + ''; + + # empty line at the end needed to to separate the blocks + mkPatterns = filterBlocks: concatStringsSep "\n" (map (block: '' + ${block.match} + ${block.filters} + + '') filterBlocks); + + +in { + options = { + services.journalwatch = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + If enabled, periodically check the journal with journalwatch and report the results by mail. + ''; + }; + + priority = mkOption { + type = types.int; + default = 6; + description = '' + Lowest priority of message to be considered. + A value between 7 ("debug"), and 0 ("emerg"). Defaults to 6 ("info"). + If you don't care about anything with "info" priority, you can reduce + this to e.g. 5 ("notice") to considerably reduce the amount of + messages without needing many . + ''; + }; + + # HACK: this is a workaround for journalwatch's usage of socket.getfqdn() which always returns localhost if + # there's an alias for the localhost on a separate line in /etc/hosts, or take for ages if it's not present and + # then return something right-ish in the direction of /etc/hostname. Just bypass it completely. + mailFrom = mkOption { + type = types.str; + default = "journalwatch@${config.networking.hostName}"; + description = '' + Mail address to send journalwatch reports from. + ''; + }; + + mailTo = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Mail address to send journalwatch reports to. + ''; + }; + + mailBinary = mkOption { + type = types.path; + default = "/run/wrappers/bin/sendmail"; + description = '' + Sendmail-compatible binary to be used to send the messages. + ''; + }; + + extraConfig = mkOption { + type = types.str; + default = ""; + description = '' + Extra lines to be added verbatim to the journalwatch/config configuration file. + You can add any commandline argument to the config, without the '--'. + See journalwatch --help for all arguments and their description. + ''; + }; + + filterBlocks = mkOption { + type = types.listOf (types.submodule { + options = { + match = mkOption { + type = types.str; + example = "SYSLOG_IDENTIFIER = systemd"; + description = '' + Syntax: field = value + Specifies the log entry field this block should apply to. + If the field of a message matches this value, + this patternBlock's are applied. + If value starts and ends with a slash, it is interpreted as + an extended python regular expression, if not, it's an exact match. + The journal fields are explained in systemd.journal-fields(7). + ''; + }; + + filters = mkOption { + type = types.str; + example = '' + (Stopped|Stopping|Starting|Started) .* + (Reached target|Stopped target) .* + ''; + description = '' + The filters to apply on all messages which satisfy . + Any of those messages that match any specified filter will be removed from journalwatch's output. + Each filter is an extended Python regular expression. + You can specify multiple filters and separate them by newlines. + Lines starting with '#' are comments. Inline-comments are not permitted. + ''; + }; + }; + }); + + example = [ + # examples taken from upstream + { + match = "_SYSTEMD_UNIT = systemd-logind.service"; + filters = '' + New session [a-z]?\d+ of user \w+\. + Removed session [a-z]?\d+\. + ''; + } + + { + match = "SYSLOG_IDENTIFIER = /(CROND|crond)/"; + filters = '' + pam_unix\(crond:session\): session (opened|closed) for user \w+ + \(\w+\) CMD .* + ''; + } + ]; + + # another example from upstream. + # very useful on priority = 6, and required as journalwatch throws an error when no pattern is defined at all. + default = [ + { + match = "SYSLOG_IDENTIFIER = systemd"; + filters = '' + (Stopped|Stopping|Starting|Started) .* + (Created slice|Removed slice) user-\d*\.slice\. + Received SIGRTMIN\+24 from PID .* + (Reached target|Stopped target) .* + Startup finished in \d*ms\. + ''; + } + ]; + + + description = '' + filterBlocks can be defined to blacklist journal messages which are not errors. + Each block matches on a log entry field, and the filters in that block then are matched + against all messages with a matching log entry field. + + All messages whose PRIORITY is at least 6 (INFO) are processed by journalwatch. + If you don't specify any filterBlocks, PRIORITY is reduced to 5 (NOTICE) by default. + + All regular expressions are extended Python regular expressions, for details + see: http://doc.pyschools.com/html/regex.html + ''; + }; + + interval = mkOption { + type = types.str; + default = "hourly"; + description = '' + How often to run journalwatch. + + The format is described in systemd.time(7). + ''; + }; + accuracy = mkOption { + type = types.str; + default = "10min"; + description = '' + The time window around the interval in which the journalwatch run will be scheduled. + + The format is described in systemd.time(7). + ''; + }; + }; + }; + + config = mkIf cfg.enable { + + users.extraUsers.${user} = { + isSystemUser = true; + createHome = true; + home = dataDir; + # for journal access + group = "systemd-journal"; + }; + + systemd.services.journalwatch = { + environment = { + XDG_DATA_HOME = "${dataDir}/share"; + XDG_CONFIG_HOME = "${dataDir}/config"; + }; + serviceConfig = { + User = user; + Type = "oneshot"; + PermissionsStartOnly = true; + ExecStart = "${pkgs.python3Packages.journalwatch}/bin/journalwatch mail"; + # lowest CPU and IO priority, but both still in best-effort class to prevent starvation + Nice=19; + IOSchedulingPriority=7; + }; + preStart = '' + chown -R ${user}:systemd-journal ${dataDir} + chmod -R u+rwX,go-w ${dataDir} + mkdir -p ${dataDir}/config/journalwatch + ln -sf ${journalwatchConfig} ${dataDir}/config/journalwatch/config + ln -sf ${journalwatchPatterns} ${dataDir}/config/journalwatch/patterns + ''; + }; + + systemd.timers.journalwatch = { + description = "Periodic journalwatch run"; + wantedBy = [ "timers.target" ]; + timerConfig = { + OnCalendar = cfg.interval; + AccuracySec = cfg.accuracy; + Persistent = true; + }; + }; + + }; + + meta = { + maintainers = with stdenv.lib.maintainers; [ florianjacob ]; + }; +} diff --git a/nixos/modules/services/mail/mailhog.nix b/nixos/modules/services/mail/mailhog.nix new file mode 100644 index 00000000000..206fb50d31a --- /dev/null +++ b/nixos/modules/services/mail/mailhog.nix @@ -0,0 +1,43 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.mailhog; +in { + ###### interface + + options = { + + services.mailhog = { + enable = mkEnableOption "MailHog"; + user = mkOption { + type = types.str; + default = "mailhog"; + description = "User account under which mailhog runs."; + }; + }; + }; + + + ###### implementation + + config = mkIf cfg.enable { + + users.extraUsers.mailhog = { + name = cfg.user; + description = "MailHog service user"; + }; + + systemd.services.mailhog = { + description = "MailHog service"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "simple"; + ExecStart = "${pkgs.mailhog}/bin/MailHog"; + User = cfg.user; + }; + }; + }; +} diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index caaa87b94d6..845c6acc7fe 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -9,7 +9,8 @@ let group = cfg.group; setgidGroup = cfg.setgidGroup; - haveAliases = cfg.postmasterAlias != "" || cfg.rootAlias != "" || cfg.extraAliases != ""; + haveAliases = cfg.postmasterAlias != "" || cfg.rootAlias != "" + || cfg.extraAliases != ""; haveTransport = cfg.transport != ""; haveVirtual = cfg.virtual != ""; @@ -25,149 +26,275 @@ let clientRestrictions = concatStringsSep ", " (clientAccess ++ dnsBl); - mainCf = - '' - compatibility_level = 9999 + mainCf = let + escape = replaceStrings ["$"] ["$$"]; + mkList = items: "\n " + concatMapStringsSep "\n " escape items; + mkVal = value: + if isList value then mkList value + else " " + (if value == true then "yes" + else if value == false then "no" + else toString value); + mkEntry = name: value: "${escape name} =${mkVal value}"; + in + concatStringsSep "\n" (mapAttrsToList mkEntry (recursiveUpdate defaultConf cfg.config)) + + "\n" + cfg.extraConfig; - mail_owner = ${user} - default_privs = nobody + defaultConf = { + compatibility_level = "9999"; + mail_owner = user; + default_privs = "nobody"; - # NixOS specific locations - data_directory = /var/lib/postfix/data - queue_directory = /var/lib/postfix/queue + # NixOS specific locations + data_directory = "/var/lib/postfix/data"; + queue_directory = "/var/lib/postfix/queue"; - # Default location of everything in package - meta_directory = ${pkgs.postfix}/etc/postfix - command_directory = ${pkgs.postfix}/bin - sample_directory = /etc/postfix - newaliases_path = ${pkgs.postfix}/bin/newaliases - mailq_path = ${pkgs.postfix}/bin/mailq - readme_directory = no - sendmail_path = ${pkgs.postfix}/bin/sendmail - daemon_directory = ${pkgs.postfix}/libexec/postfix - manpage_directory = ${pkgs.postfix}/share/man - html_directory = ${pkgs.postfix}/share/postfix/doc/html - shlib_directory = no + # Default location of everything in package + meta_directory = "${pkgs.postfix}/etc/postfix"; + command_directory = "${pkgs.postfix}/bin"; + sample_directory = "/etc/postfix"; + newaliases_path = "${pkgs.postfix}/bin/newaliases"; + mailq_path = "${pkgs.postfix}/bin/mailq"; + readme_directory = false; + sendmail_path = "${pkgs.postfix}/bin/sendmail"; + daemon_directory = "${pkgs.postfix}/libexec/postfix"; + manpage_directory = "${pkgs.postfix}/share/man"; + html_directory = "${pkgs.postfix}/share/postfix/doc/html"; + shlib_directory = false; + relayhost = if cfg.lookupMX || cfg.relayHost == "" + then cfg.relayHost + else "[${cfg.relayHost}]"; + mail_spool_directory = "/var/spool/mail/"; + setgid_group = setgidGroup; + } + // optionalAttrs config.networking.enableIPv6 { inet_protocols = "all"; } + // optionalAttrs (cfg.networks != null) { mynetworks = cfg.networks; } + // optionalAttrs (cfg.networksStyle != "") { mynetworks_style = cfg.networksStyle; } + // optionalAttrs (cfg.hostname != "") { myhostname = cfg.hostname; } + // optionalAttrs (cfg.domain != "") { mydomain = cfg.domain; } + // optionalAttrs (cfg.origin != "") { myorigin = cfg.origin; } + // optionalAttrs (cfg.destination != null) { mydestination = cfg.destination; } + // optionalAttrs (cfg.relayDomains != null) { relay_domains = cfg.relayDomains; } + // optionalAttrs (cfg.recipientDelimiter != "") { recipient_delimiter = cfg.recipientDelimiter; } + // optionalAttrs haveAliases { alias_maps = "${cfg.aliasMapType}:/etc/postfix/aliases"; } + // optionalAttrs haveTransport { transport_maps = "hash:/etc/postfx/transport"; } + // optionalAttrs haveVirtual { virtual_alias_maps = "${cfg.virtualMapType}:/etc/postfix/virtual"; } + // optionalAttrs (cfg.dnsBlacklists != []) { smtpd_client_restrictions = clientRestrictions; } + // optionalAttrs cfg.enableHeaderChecks { header_checks = "regexp:/etc/postfix/header_checks"; } + // optionalAttrs (cfg.sslCert != "") { + smtp_tls_CAfile = cfg.sslCACert; + smtp_tls_cert_file = cfg.sslCert; + smtp_tls_key_file = cfg.sslKey; - '' - + optionalString config.networking.enableIPv6 '' - inet_protocols = all - '' - + (if cfg.networks != null then - '' - mynetworks = ${concatStringsSep ", " cfg.networks} - '' - else if cfg.networksStyle != "" then - '' - mynetworks_style = ${cfg.networksStyle} - '' - else - "") - + optionalString (cfg.hostname != "") '' - myhostname = ${cfg.hostname} - '' - + optionalString (cfg.domain != "") '' - mydomain = ${cfg.domain} - '' - + optionalString (cfg.origin != "") '' - myorigin = ${cfg.origin} - '' - + optionalString (cfg.destination != null) '' - mydestination = ${concatStringsSep ", " cfg.destination} - '' - + optionalString (cfg.relayDomains != null) '' - relay_domains = ${concatStringsSep ", " cfg.relayDomains} - '' - + '' - relayhost = ${if cfg.lookupMX || cfg.relayHost == "" then - cfg.relayHost - else - "[" + cfg.relayHost + "]"} + smtp_use_tls = true; - mail_spool_directory = /var/spool/mail/ + smtpd_tls_CAfile = cfg.sslCACert; + smtpd_tls_cert_file = cfg.sslCert; + smtpd_tls_key_file = cfg.sslKey; - setgid_group = ${setgidGroup} - '' - + optionalString (cfg.sslCert != "") '' + smtpd_use_tls = true; + }; - smtp_tls_CAfile = ${cfg.sslCACert} - smtp_tls_cert_file = ${cfg.sslCert} - smtp_tls_key_file = ${cfg.sslKey} + masterCfOptions = { options, config, name, ... }: { + options = { + name = mkOption { + type = types.str; + default = name; + example = "smtp"; + description = '' + The name of the service to run. Defaults to the attribute set key. + ''; + }; - smtp_use_tls = yes + type = mkOption { + type = types.enum [ "inet" "unix" "fifo" "pass" ]; + default = "unix"; + example = "inet"; + description = "The type of the service"; + }; - smtpd_tls_CAfile = ${cfg.sslCACert} - smtpd_tls_cert_file = ${cfg.sslCert} - smtpd_tls_key_file = ${cfg.sslKey} + private = mkOption { + type = types.bool; + example = false; + description = '' + Whether the service's sockets and storage directory is restricted to + be only available via the mail system. If null is + given it uses the postfix default true. + ''; + }; - smtpd_use_tls = yes - '' - + optionalString (cfg.recipientDelimiter != "") '' - recipient_delimiter = ${cfg.recipientDelimiter} - '' - + optionalString haveAliases '' - alias_maps = hash:/etc/postfix/aliases - '' - + optionalString haveTransport '' - transport_maps = hash:/etc/postfix/transport - '' - + optionalString haveVirtual '' - virtual_alias_maps = hash:/etc/postfix/virtual - '' - + optionalString (cfg.dnsBlacklists != []) '' - smtpd_client_restrictions = ${clientRestrictions} - '' - + cfg.extraConfig; + privileged = mkOption { + type = types.bool; + example = true; + description = ""; + }; - masterCf = '' - # ========================================================================== - # service type private unpriv chroot wakeup maxproc command + args - # (yes) (yes) (no) (never) (100) - # ========================================================================== - smtp inet n - n - - smtpd - '' + optionalString cfg.enableSubmission '' - submission inet n - n - - smtpd - ${concatStringsSep "\n " (mapAttrsToList (x: y: "-o " + x + "=" + y) cfg.submissionOptions)} - '' - + '' - pickup unix n - n 60 1 pickup - cleanup unix n - n - 0 cleanup - qmgr unix n - n 300 1 qmgr - tlsmgr unix - - n 1000? 1 tlsmgr - rewrite unix - - n - - trivial-rewrite - bounce unix - - n - 0 bounce - defer unix - - n - 0 bounce - trace unix - - n - 0 bounce - verify unix - - n - 1 verify - flush unix n - n 1000? 0 flush - proxymap unix - - n - - proxymap - proxywrite unix - - n - 1 proxymap - '' - + optionalString cfg.enableSmtp '' - smtp unix - - n - - smtp - relay unix - - n - - smtp - -o smtp_fallback_relay= - # -o smtp_helo_timeout=5 -o smtp_connect_timeout=5 - '' - + '' - showq unix n - n - - showq - error unix - - n - - error - retry unix - - n - - error - discard unix - - n - - discard - local unix - n n - - local - virtual unix - n n - - virtual - lmtp unix - - n - - lmtp - anvil unix - - n - 1 anvil - scache unix - - n - 1 scache - ${cfg.extraMasterConf} - ''; + chroot = mkOption { + type = types.bool; + example = true; + description = '' + Whether the service is chrooted to have only access to the + and the closure of + store paths specified by the option. + ''; + }; - aliases = + wakeup = mkOption { + type = types.int; + example = 60; + description = '' + Automatically wake up the service after the specified number of + seconds. If 0 is given, never wake the service + up. + ''; + }; + + wakeupUnusedComponent = mkOption { + type = types.bool; + example = false; + description = '' + If set to false the component will only be woken + up if it is used. This is equivalent to postfix' notion of adding a + question mark behind the wakeup time in + master.cf + ''; + }; + + maxproc = mkOption { + type = types.int; + example = 1; + description = '' + The maximum number of processes to spawn for this service. If the + value is 0 it doesn't have any limit. If + null is given it uses the postfix default of + 100. + ''; + }; + + command = mkOption { + type = types.str; + default = name; + example = "smtpd"; + description = '' + A program name specifying a Postfix service/daemon process. + By default it's the attribute . + ''; + }; + + args = mkOption { + type = types.listOf types.str; + default = []; + example = [ "-o" "smtp_helo_timeout=5" ]; + description = '' + Arguments to pass to the . There is no shell + processing involved and shell syntax is passed verbatim to the + process. + ''; + }; + + rawEntry = mkOption { + type = types.listOf types.str; + default = []; + internal = true; + description = '' + The raw configuration line for the master.cf. + ''; + }; + }; + + config.rawEntry = let + mkBool = bool: if bool then "y" else "n"; + mkArg = arg: "${optionalString (hasPrefix "-" arg) "\n "}${arg}"; + + maybeOption = fun: option: + if options.${option}.isDefined then fun config.${option} else "-"; + + # This is special, because we have two options for this value. + wakeup = let + wakeupDefined = options.wakeup.isDefined; + wakeupUCDefined = options.wakeupUnusedComponent.isDefined; + finalValue = toString config.wakeup + + optionalString (!config.wakeupUnusedComponent) "?"; + in if wakeupDefined && wakeupUCDefined then finalValue else "-"; + + in [ + config.name + config.type + (maybeOption mkBool "private") + (maybeOption (b: mkBool (!b)) "privileged") + (maybeOption mkBool "chroot") + wakeup + (maybeOption toString "maxproc") + (config.command + " " + concatMapStringsSep " " mkArg config.args) + ]; + }; + + masterCfContent = let + + labels = [ + "# service" "type" "private" "unpriv" "chroot" "wakeup" "maxproc" + "command + args" + ]; + + labelDefaults = [ + "# " "" "(yes)" "(yes)" "(no)" "(never)" "(100)" "" "" + ]; + + masterCf = mapAttrsToList (const (getAttr "rawEntry")) cfg.masterConfig; + + # A list of the maximum width of the columns across all lines and labels + maxWidths = let + foldLine = line: acc: let + columnLengths = map stringLength line; + in zipListsWith max acc columnLengths; + # We need to handle the last column specially here, because it's + # open-ended (command + args). + lines = [ labels labelDefaults ] ++ (map (l: init l ++ [""]) masterCf); + in fold foldLine (genList (const 0) (length labels)) lines; + + # Pad a string with spaces from the right (opposite of fixedWidthString). + pad = width: str: let + padWidth = width - stringLength str; + padding = concatStrings (genList (const " ") padWidth); + in str + optionalString (padWidth > 0) padding; + + # It's + 2 here, because that's the amount of spacing between columns. + fullWidth = fold (width: acc: acc + width + 2) 0 maxWidths; + + formatLine = line: concatStringsSep " " (zipListsWith pad maxWidths line); + + formattedLabels = let + sep = "# " + concatStrings (genList (const "=") (fullWidth + 5)); + lines = [ sep (formatLine labels) (formatLine labelDefaults) sep ]; + in concatStringsSep "\n" lines; + + in formattedLabels + "\n" + concatMapStringsSep "\n" formatLine masterCf + "\n"; + + headerCheckOptions = { ... }: + { + options = { + pattern = mkOption { + type = types.str; + default = "/^.*/"; + example = "/^X-Mailer:/"; + description = "A regexp pattern matching the header"; + }; + action = mkOption { + type = types.str; + default = "DUNNO"; + example = "BCC mail@example.com"; + description = "The action to be executed when the pattern is matched"; + }; + }; + }; + + headerChecks = concatStringsSep "\n" (map (x: "${x.pattern} ${x.action}") cfg.headerChecks) + cfg.extraHeaderChecks; + + aliases = let seperator = if cfg.aliasMapType == "hash" then ":" else ""; in optionalString (cfg.postmasterAlias != "") '' - postmaster: ${cfg.postmasterAlias} + postmaster${seperator} ${cfg.postmasterAlias} '' + optionalString (cfg.rootAlias != "") '' - root: ${cfg.rootAlias} + root${seperator} ${cfg.rootAlias} '' + cfg.extraAliases ; @@ -176,8 +303,9 @@ let virtualFile = pkgs.writeText "postfix-virtual" cfg.virtual; checkClientAccessFile = pkgs.writeText "postfix-check-client-access" cfg.dnsBlacklistOverrides; mainCfFile = pkgs.writeText "postfix-main.cf" mainCf; - masterCfFile = pkgs.writeText "postfix-master.cf" masterCf; + masterCfFile = pkgs.writeText "postfix-master.cf" masterCfContent; transportFile = pkgs.writeText "postfix-transport" cfg.transport; + headerChecksFile = pkgs.writeText "postfix-header-checks" headerChecks; in @@ -199,27 +327,29 @@ in default = true; description = "Whether to enable smtp in master.cf."; }; - + enableSubmission = mkOption { type = types.bool; default = false; - description = "Whether to enable smtp submission"; + description = "Whether to enable smtp submission."; }; submissionOptions = mkOption { type = types.attrs; - default = { "smtpd_tls_security_level" = "encrypt"; - "smtpd_sasl_auth_enable" = "yes"; - "smtpd_client_restrictions" = "permit_sasl_authenticated,reject"; - "milter_macro_daemon_name" = "ORIGINATING"; - }; + default = { + smtpd_tls_security_level = "encrypt"; + smtpd_sasl_auth_enable = "yes"; + smtpd_client_restrictions = "permit_sasl_authenticated,reject"; + milter_macro_daemon_name = "ORIGINATING"; + }; + example = { + smtpd_tls_security_level = "encrypt"; + smtpd_sasl_auth_enable = "yes"; + smtpd_sasl_type = "dovecot"; + smtpd_client_restrictions = "permit_sasl_authenticated,reject"; + milter_macro_daemon_name = "ORIGINATING"; + }; description = "Options for the submission config in master.cf"; - example = { "smtpd_tls_security_level" = "encrypt"; - "smtpd_sasl_auth_enable" = "yes"; - "smtpd_sasl_type" = "dovecot"; - "smtpd_client_restrictions" = "permit_sasl_authenticated,reject"; - "milter_macro_daemon_name" = "ORIGINATING"; - }; }; setSendmail = mkOption { @@ -352,6 +482,25 @@ in "; }; + aliasMapType = mkOption { + type = with types; enum [ "hash" "regexp" "pcre" ]; + default = "hash"; + example = "regexp"; + description = "The format the alias map should have. Use regexp if you want to use regular expressions."; + }; + + config = mkOption { + type = with types; attrsOf (either bool (either str (listOf str))); + default = defaultConf; + description = '' + The main.cf configuration file as key value set. + ''; + example = { + mail_owner = "postfix"; + smtp_use_tls = true; + }; + }; + extraConfig = mkOption { type = types.lines; default = ""; @@ -395,6 +544,14 @@ in "; }; + virtualMapType = mkOption { + type = types.enum ["hash" "regexp" "pcre"]; + default = "hash"; + description = '' + What type of virtual alias map file to use. Use "regexp" for regular expressions. + ''; + }; + transport = mkOption { default = ""; description = " @@ -413,6 +570,22 @@ in description = "contents of check_client_access for overriding dnsBlacklists"; }; + masterConfig = mkOption { + type = types.attrsOf (types.submodule masterCfOptions); + default = {}; + example = + { submission = { + type = "inet"; + args = [ "-o" "smtpd_tls_security_level=encrypt" ]; + }; + }; + description = '' + An attribute set of service options, which correspond to the service + definitions usually done within the Postfix + master.cf file. + ''; + }; + extraMasterConf = mkOption { type = types.lines; default = ""; @@ -420,6 +593,27 @@ in description = "Extra lines to append to the generated master.cf file."; }; + enableHeaderChecks = mkOption { + type = types.bool; + default = false; + example = true; + description = "Whether to enable postfix header checks"; + }; + + headerChecks = mkOption { + type = types.listOf (types.submodule headerCheckOptions); + default = []; + example = [ { pattern = "/^X-Spam-Flag:/"; action = "REDIRECT spam@example.com"; } ]; + description = "Postfix header checks."; + }; + + extraHeaderChecks = mkOption { + type = types.lines; + default = ""; + example = "/^X-Spam-Flag:/ REDIRECT spam@example.com"; + description = "Extra lines to /etc/postfix/header_checks file."; + }; + aliasFiles = mkOption { type = types.attrsOf types.path; default = {}; @@ -530,6 +724,101 @@ in ${pkgs.postfix}/bin/postfix set-permissions config_directory=/var/lib/postfix/conf ''; }; + + services.postfix.masterConfig = { + smtp_inet = { + name = "smtp"; + type = "inet"; + private = false; + command = "smtpd"; + }; + pickup = { + private = false; + wakeup = 60; + maxproc = 1; + }; + cleanup = { + private = false; + maxproc = 0; + }; + qmgr = { + private = false; + wakeup = 300; + maxproc = 1; + }; + tlsmgr = { + wakeup = 1000; + wakeupUnusedComponent = false; + maxproc = 1; + }; + rewrite = { + command = "trivial-rewrite"; + }; + bounce = { + maxproc = 0; + }; + defer = { + maxproc = 0; + command = "bounce"; + }; + trace = { + maxproc = 0; + command = "bounce"; + }; + verify = { + maxproc = 1; + }; + flush = { + private = false; + wakeup = 1000; + wakeupUnusedComponent = false; + maxproc = 0; + }; + proxymap = { + command = "proxymap"; + }; + proxywrite = { + maxproc = 1; + command = "proxymap"; + }; + showq = { + private = false; + }; + error = {}; + retry = { + command = "error"; + }; + discard = {}; + local = { + privileged = true; + }; + virtual = { + privileged = true; + }; + lmtp = { + }; + anvil = { + maxproc = 1; + }; + scache = { + maxproc = 1; + }; + } // optionalAttrs cfg.enableSubmission { + submission = { + type = "inet"; + private = false; + command = "smtpd"; + args = let + mkKeyVal = opt: val: [ "-o" (opt + "=" + val) ]; + in concatLists (mapAttrsToList mkKeyVal cfg.submissionOptions); + }; + } // optionalAttrs cfg.enableSmtp { + smtp = {}; + relay = { + command = "smtp"; + args = [ "-o" "smtp_fallback_relay=" ]; + }; + }; } (mkIf haveAliases { @@ -541,9 +830,14 @@ in (mkIf haveVirtual { services.postfix.mapFiles."virtual" = virtualFile; }) + (mkIf cfg.enableHeaderChecks { + services.postfix.mapFiles."header_checks" = headerChecksFile; + }) (mkIf (cfg.dnsBlacklists != []) { services.postfix.mapFiles."client_access" = checkClientAccessFile; }) + (mkIf (cfg.extraConfig != "") { + warnings = [ "The services.postfix.extraConfig option was deprecated. Please use services.postfix.config instead." ]; + }) ]); - } diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 0ed5a539e7d..ccc1854d254 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -439,6 +439,8 @@ in { environment.GITLAB_SHELL_CONFIG_PATH = gitlabEnv.GITLAB_SHELL_CONFIG_PATH; path = with pkgs; [ gitAndTools.git + gnutar + gzip openssh gitlab-workhorse ]; diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix index 622607f3b32..515864ec2e2 100644 --- a/nixos/modules/services/misc/nixos-manual.nix +++ b/nixos/modules/services/misc/nixos-manual.nix @@ -62,8 +62,7 @@ let name = "nixos-manual"; desktopName = "NixOS Manual"; genericName = "View NixOS documentation in a web browser"; - # TODO: find a better icon (Nix logo + help overlay?) - icon = "system-help"; + icon = "nix-snowflake"; exec = "${helpScript}/bin/nixos-help"; categories = "System"; }; @@ -115,7 +114,7 @@ in environment.systemPackages = [ manual.manual helpScript ] - ++ optional config.services.xserver.enable desktopItem + ++ optionals config.services.xserver.enable [desktopItem pkgs.nixos-icons] ++ optional config.programs.man.enable manual.manpages; boot.extraTTYs = mkIf cfg.showManual ["tty${toString cfg.ttyNumber}"]; diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix index ecd9a6f52da..e37b486375b 100644 --- a/nixos/modules/services/misc/plex.nix +++ b/nixos/modules/services/misc/plex.nix @@ -82,7 +82,7 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; preStart = '' - test -d "${cfg.dataDir}" || { + test -d "${cfg.dataDir}/Plex Media Server" || { echo "Creating initial Plex data directory in \"${cfg.dataDir}\"." mkdir -p "${cfg.dataDir}/Plex Media Server" chown -R ${cfg.user}:${cfg.group} "${cfg.dataDir}" diff --git a/nixos/modules/services/misc/snapper.nix b/nixos/modules/services/misc/snapper.nix new file mode 100644 index 00000000000..62b344d11b0 --- /dev/null +++ b/nixos/modules/services/misc/snapper.nix @@ -0,0 +1,152 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.snapper; +in + +{ + options.services.snapper = { + + snapshotInterval = mkOption { + type = types.str; + default = "hourly"; + description = '' + Snapshot interval. + + The format is described in + systemd.time + 7. + ''; + }; + + cleanupInterval = mkOption { + type = types.str; + default = "1d"; + description = '' + Cleanup interval. + + The format is described in + systemd.time + 7. + ''; + }; + + filters = mkOption { + type = types.nullOr types.lines; + default = null; + description = '' + Global display difference filter. See man:snapper(8) for more details. + ''; + }; + + configs = mkOption { + default = { }; + example = literalExample { + "home" = { + subvolume = "/home"; + extraConfig = '' + ALLOW_USERS="alice" + ''; + }; + }; + + description = '' + Subvolume configuration + ''; + + type = types.attrsOf (types.submodule { + options = { + subvolume = mkOption { + type = types.path; + description = '' + Path of the subvolume or mount point. + This path is a subvolume and has to contain a subvolume named + .snapshots. + See also man:snapper(8) section PERMISSIONS. + ''; + }; + + fstype = mkOption { + type = types.enum [ "btrfs" ]; + default = "btrfs"; + description = '' + Filesystem type. Only btrfs is stable and tested. + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Additional configuration next to SUBVOLUME and FSTYPE. + See man:snapper-configs(5). + ''; + }; + }; + }); + }; + }; + + config = mkIf (cfg.configs != {}) (let + documentation = [ "man:snapper(8)" "man:snapper-configs(5)" ]; + in { + + environment = { + + systemPackages = [ pkgs.snapper ]; + + # Note: snapper/config-templates/default is only needed for create-config + # which is not the NixOS way to configure. + etc = { + + "sysconfig/snapper".text = '' + SNAPPER_CONFIGS="${lib.concatStringsSep " " (builtins.attrNames cfg.configs)}" + ''; + + } + // (mapAttrs' (name: subvolume: nameValuePair "snapper/configs/${name}" ({ + text = '' + ${subvolume.extraConfig} + FSTYPE="${subvolume.fstype}" + SUBVOLUME="${subvolume.subvolume}" + ''; + })) cfg.configs) + // (lib.optionalAttrs (cfg.filters != null) { + "snapper/filters/default.txt".text = cfg.filters; + }); + + }; + + services.dbus.packages = [ pkgs.snapper ]; + + systemd.services.snapper-timeline = { + description = "Timeline of Snapper Snapshots"; + inherit documentation; + serviceConfig.ExecStart = "${pkgs.snapper}/lib/snapper/systemd-helper --timeline"; + }; + + systemd.timers.snapper-timeline = { + description = "Timeline of Snapper Snapshots"; + inherit documentation; + wantedBy = [ "basic.target" ]; + timerConfig.OnCalendar = cfg.snapshotInterval; + }; + + systemd.services.snapper-cleanup = { + description = "Cleanup of Snapper Snapshots"; + inherit documentation; + serviceConfig.ExecStart = "${pkgs.snapper}/lib/snapper/systemd-helper --cleanup"; + }; + + systemd.timers.snapper-cleanup = { + description = "Cleanup of Snapper Snapshots"; + inherit documentation; + wantedBy = [ "basic.target" ]; + timerConfig.OnBootSec = "10m"; + timerConfig.OnUnitActiveSec = cfg.cleanupInterval; + }; + }); +} + diff --git a/nixos/modules/services/misc/spice-vdagentd.nix b/nixos/modules/services/misc/spice-vdagentd.nix index f8133394ffd..f322ba4cbd5 100644 --- a/nixos/modules/services/misc/spice-vdagentd.nix +++ b/nixos/modules/services/misc/spice-vdagentd.nix @@ -23,7 +23,7 @@ in ''; serviceConfig = { Type = "forking"; - ExecStart = "/bin/sh -c '${pkgs.spice-vdagent}/bin/spice-vdagentd'"; + ExecStart = "${pkgs.spice-vdagent}/bin/spice-vdagentd"; }; }; }; diff --git a/nixos/modules/services/misc/taskserver/helper-tool.py b/nixos/modules/services/misc/taskserver/helper-tool.py index b97bc1df74f..22a3d8d5311 100644 --- a/nixos/modules/services/misc/taskserver/helper-tool.py +++ b/nixos/modules/services/misc/taskserver/helper-tool.py @@ -448,6 +448,8 @@ def cli(ctx): """ Manage Taskserver users and certificates """ + if not IS_AUTO_CONFIG: + return for path in (CA_KEY, CA_CERT, CRL_FILE): if not os.path.exists(path): msg = "CA setup not done or incomplete, missing file {}." diff --git a/nixos/modules/services/monitoring/collectd.nix b/nixos/modules/services/monitoring/collectd.nix index 79a8a1ff5ae..dfbac3446e0 100644 --- a/nixos/modules/services/monitoring/collectd.nix +++ b/nixos/modules/services/monitoring/collectd.nix @@ -7,7 +7,6 @@ let conf = pkgs.writeText "collectd.conf" '' BaseDir "${cfg.dataDir}" - PIDFile "${cfg.pidFile}" AutoLoadPlugin ${boolToString cfg.autoLoadPlugin} Hostname "${config.networking.hostName}" @@ -26,13 +25,7 @@ let in { options.services.collectd = with types; { - enable = mkOption { - default = false; - description = '' - Whether to enable collectd agent. - ''; - type = bool; - }; + enable = mkEnableOption "collectd agent"; package = mkOption { default = pkgs.collectd; @@ -59,14 +52,6 @@ in { type = path; }; - pidFile = mkOption { - default = "/var/run/collectd.pid"; - description = '' - Location of collectd pid file. - ''; - type = path; - }; - autoLoadPlugin = mkOption { default = false; description = '' @@ -100,27 +85,20 @@ in { wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = "${cfg.package}/sbin/collectd -C ${conf} -P ${cfg.pidFile}"; - Type = "forking"; - PIDFile = cfg.pidFile; - User = optional (cfg.user!="root") cfg.user; + ExecStart = "${cfg.package}/sbin/collectd -C ${conf} -f"; + User = cfg.user; PermissionsStartOnly = true; }; preStart = '' - mkdir -p ${cfg.dataDir} - chmod 755 ${cfg.dataDir} - install -D /dev/null ${cfg.pidFile} - if [ "$(id -u)" = 0 ]; then - chown -R ${cfg.user} ${cfg.dataDir}; - chown ${cfg.user} ${cfg.pidFile} - fi + mkdir -p "${cfg.dataDir}" + chmod 755 "${cfg.dataDir}" + chown -R ${cfg.user} "${cfg.dataDir}" ''; - }; + }; users.extraUsers = optional (cfg.user == "collectd") { name = "collectd"; - uid = config.ids.uids.collectd; }; }; } diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index b9435c02b1d..c12b5f35dea 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -66,15 +66,6 @@ let How frequently to evaluate rules by default. ''; }; - - labels = mkOption { - type = types.attrsOf types.str; - default = {}; - description = '' - The labels to add to any timeseries that this Prometheus instance - scrapes. - ''; - }; }; }; diff --git a/nixos/modules/services/networking/bitlbee.nix b/nixos/modules/services/networking/bitlbee.nix index e72ea20ccce..bd26804788f 100644 --- a/nixos/modules/services/networking/bitlbee.nix +++ b/nixos/modules/services/networking/bitlbee.nix @@ -7,6 +7,10 @@ let cfg = config.services.bitlbee; bitlbeeUid = config.ids.uids.bitlbee; + bitlbeePkg = if cfg.libpurple_plugins == [] + then pkgs.bitlbee + else pkgs.bitlbee.override { enableLibPurple = true; }; + bitlbeeConfig = pkgs.writeText "bitlbee.conf" '' [settings] @@ -25,6 +29,12 @@ let ${cfg.extraDefaults} ''; + purple_plugin_path = + lib.concatMapStringsSep ":" + (plugin: "${plugin}/lib/pidgin/") + cfg.libpurple_plugins + ; + in { @@ -90,6 +100,15 @@ in ''; }; + libpurple_plugins = mkOption { + type = types.listOf types.package; + default = []; + example = literalExample "[ pkgs.purple-matrix ]"; + description = '' + The list of libpurple plugins to install. + ''; + }; + configDir = mkOption { default = "/var/lib/bitlbee"; type = types.path; @@ -144,14 +163,16 @@ in }; systemd.services.bitlbee = - { description = "BitlBee IRC to other chat networks gateway"; + { + environment.PURPLE_PLUGIN_PATH = purple_plugin_path; + description = "BitlBee IRC to other chat networks gateway"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig.User = "bitlbee"; - serviceConfig.ExecStart = "${pkgs.bitlbee}/sbin/bitlbee -F -n -c ${bitlbeeConfig}"; + serviceConfig.ExecStart = "${bitlbeePkg}/sbin/bitlbee -F -n -c ${bitlbeeConfig}"; }; - environment.systemPackages = [ pkgs.bitlbee ]; + environment.systemPackages = [ bitlbeePkg ]; }; diff --git a/nixos/modules/services/networking/libreswan.nix b/nixos/modules/services/networking/libreswan.nix index c87e738d2a2..e7a6c565f4f 100644 --- a/nixos/modules/services/networking/libreswan.nix +++ b/nixos/modules/services/networking/libreswan.nix @@ -11,7 +11,7 @@ let trim = chars: str: let nonchars = filter (x : !(elem x.value chars)) - (imap (i: v: {ind = (sub i 1); value = v;}) (stringToCharacters str)); + (imap0 (i: v: {ind = i; value = v;}) (stringToCharacters str)); in if length nonchars == 0 then "" else substring (head nonchars).ind (add 1 (sub (last nonchars).ind (head nonchars).ind)) str; diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index f8b7f26f5f2..ab161b7e772 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -9,15 +9,18 @@ let # /var/lib/misc is for dnsmasq.leases. stateDirs = "/var/lib/NetworkManager /var/lib/dhclient /var/lib/misc"; + dns = + if cfg.useDnsmasq then "dnsmasq" + else if config.services.resolved.enable then "systemd-resolved" + else "default"; + configFile = writeText "NetworkManager.conf" '' [main] plugins=keyfile dhcp=${cfg.dhcp} - dns=${if cfg.useDnsmasq then "dnsmasq" else "default"} + dns=${dns} [keyfile] - ${optionalString (config.networking.hostName != "") - ''hostname=${config.networking.hostName}''} ${optionalString (cfg.unmanaged != []) ''unmanaged-devices=${lib.concatStringsSep ";" cfg.unmanaged}''} @@ -255,7 +258,7 @@ in { { source = overrideNameserversScript; target = "NetworkManager/dispatcher.d/02overridedns"; } - ++ lib.imap (i: s: { + ++ lib.imap1 (i: s: { inherit (s) source; target = "NetworkManager/dispatcher.d/${dispatcherTypesSubdirMap.${s.type}}03userscript${lib.fixedWidthNumber 4 i}"; }) cfg.dispatcherScripts; diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index bebf4e145ca..0f58536b4b7 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -21,6 +21,8 @@ let daemon reads in addition to the the user's authorized_keys file. You can combine the keys and keyFiles options. + Warning: If you are using NixOps then don't use this + option since it will replace the key required for deployment via ssh. ''; }; diff --git a/nixos/modules/services/networking/strongswan.nix b/nixos/modules/services/networking/strongswan.nix index 8778b0364f9..b0eb0460b9b 100644 --- a/nixos/modules/services/networking/strongswan.nix +++ b/nixos/modules/services/networking/strongswan.nix @@ -120,7 +120,7 @@ in wantedBy = [ "multi-user.target" ]; path = with pkgs; [ kmod iproute iptables utillinux ]; # XXX Linux wants = [ "keys.target" ]; - after = [ "network.target" "keys.target" ]; + after = [ "network-online.target" "keys.target" ]; environment = { STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secrets; }; }; diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index 79a0aa953fe..7376d2d24a0 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -79,7 +79,15 @@ in default = null; type = types.nullOr types.str; description = '' - The ip adress to bind to. + The ip address to listen on for incoming connections. + ''; + }; + + bindToAddress = mkOption { + default = null; + type = types.nullOr types.str; + description = '' + The ip address to bind to (both listen on and send packets from). ''; }; @@ -131,7 +139,8 @@ in Name = ${if data.name == null then "$HOST" else data.name} DeviceType = ${data.interfaceType} ${optionalString (data.ed25519PrivateKeyFile != null) "Ed25519PrivateKeyFile = ${data.ed25519PrivateKeyFile}"} - ${optionalString (data.listenAddress != null) "BindToAddress = ${data.listenAddress}"} + ${optionalString (data.listenAddress != null) "ListenAddress = ${data.listenAddress}"} + ${optionalString (data.bindToAddress != null) "BindToAddress = ${data.bindToAddress}"} Device = /dev/net/tun Interface = tinc.${network} ${data.extraConfig} diff --git a/nixos/modules/services/networking/toxvpn.nix b/nixos/modules/services/networking/toxvpn.nix index 911836fdee4..5e13402d764 100644 --- a/nixos/modules/services/networking/toxvpn.nix +++ b/nixos/modules/services/networking/toxvpn.nix @@ -18,6 +18,13 @@ with lib; default = 33445; description = "udp port for toxcore, port-forward to help with connectivity if you run many nodes behind one NAT"; }; + + auto_add_peers = mkOption { + type = types.listOf types.string; + default = []; + example = ''[ "toxid1" "toxid2" ]''; + description = "peers to automacally connect to on startup"; + }; }; }; @@ -33,8 +40,13 @@ with lib; chown toxvpn /run/toxvpn ''; + path = [ pkgs.toxvpn ]; + + script = '' + exec toxvpn -i ${config.services.toxvpn.localip} -l /run/toxvpn/control -u toxvpn -p ${toString config.services.toxvpn.port} ${lib.concatMapStringsSep " " (x: "-a ${x}") config.services.toxvpn.auto_add_peers} + ''; + serviceConfig = { - ExecStart = "${pkgs.toxvpn}/bin/toxvpn -i ${config.services.toxvpn.localip} -l /run/toxvpn/control -u toxvpn -p ${toString config.services.toxvpn.port}"; KillMode = "process"; Restart = "on-success"; Type = "notify"; @@ -43,6 +55,8 @@ with lib; restartIfChanged = false; # Likely to be used for remote admin }; + environment.systemPackages = [ pkgs.toxvpn ]; + users.extraUsers = { toxvpn = { uid = config.ids.uids.toxvpn; diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix index 62ff708d244..d5b21ef1a23 100644 --- a/nixos/modules/services/networking/wireguard.nix +++ b/nixos/modules/services/networking/wireguard.nix @@ -23,8 +23,23 @@ let privateKey = mkOption { example = "yAnz5TF+lXXJte14tji3zlMNq+hd2rYUIgJBgB3fBmk="; - type = types.str; - description = "Base64 private key generated by wg genkey."; + type = with types; nullOr str; + default = null; + description = '' + Base64 private key generated by wg genkey. + + Warning: Consider using privateKeyFile instead if you do not + want to store the key in the world-readable Nix store. + ''; + }; + + privateKeyFile = mkOption { + example = "/private/wireguard_key"; + type = with types; nullOr str; + default = null; + description = '' + Private key file as generated by wg genkey. + ''; }; listenPort = mkOption { @@ -91,7 +106,22 @@ let example = "rVXs/Ni9tu3oDBLS4hOyAUAa1qTWVA3loR8eL20os3I="; type = with types; nullOr str; description = '' - base64 preshared key generated by wg genpsk. Optional, + Base64 preshared key generated by wg genpsk. Optional, + and may be omitted. This option adds an additional layer of + symmetric-key cryptography to be mixed into the already existing + public-key cryptography, for post-quantum resistance. + + Warning: Consider using presharedKeyFile instead if you do not + want to store the key in the world-readable Nix store. + ''; + }; + + presharedKeyFile = mkOption { + default = null; + example = "/private/wireguard_psk"; + type = with types; nullOr str; + description = '' + File pointing to preshared key as generated by wg pensk. Optional, and may be omitted. This option adds an additional layer of symmetric-key cryptography to be mixed into the already existing public-key cryptography, for post-quantum resistance. @@ -134,54 +164,59 @@ let }; - generateConf = name: values: pkgs.writeText "wireguard-${name}.conf" '' - [Interface] - PrivateKey = ${values.privateKey} - ${optionalString (values.listenPort != null) "ListenPort = ${toString values.listenPort}"} - - ${concatStringsSep "\n\n" (map (peer: '' - [Peer] - PublicKey = ${peer.publicKey} - ${optionalString (peer.presharedKey != null) "PresharedKey = ${peer.presharedKey}"} - ${optionalString (peer.allowedIPs != []) "AllowedIPs = ${concatStringsSep ", " peer.allowedIPs}"} - ${optionalString (peer.endpoint != null) "Endpoint = ${peer.endpoint}"} - ${optionalString (peer.persistentKeepalive != null) "PersistentKeepalive = ${toString peer.persistentKeepalive}"} - '') values.peers)} - ''; - ipCommand = "${pkgs.iproute}/bin/ip"; wgCommand = "${pkgs.wireguard}/bin/wg"; generateUnit = name: values: + # exactly one way to specify the private key must be set + assert (values.privateKey != null) != (values.privateKeyFile != null); + let privKey = if values.privateKeyFile != null then values.privateKeyFile else pkgs.writeText "wg-key" values.privateKey; + in nameValuePair "wireguard-${name}" { description = "WireGuard Tunnel - ${name}"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; + serviceConfig = { Type = "oneshot"; RemainAfterExit = true; - ExecStart = lib.flatten([ + ExecStart = flatten([ values.preSetup "-${ipCommand} link del dev ${name}" "${ipCommand} link add dev ${name} type wireguard" - "${wgCommand} setconf ${name} ${generateConf name values}" (map (ip: - ''${ipCommand} address add ${ip} dev ${name}'' + "${ipCommand} address add ${ip} dev ${name}" ) values.ips) + ("${wgCommand} set ${name} private-key ${privKey}" + + optionalString (values.listenPort != null) " listen-port ${toString values.listenPort}") + + (map (peer: + assert (peer.presharedKeyFile == null) || (peer.presharedKey == null); # at most one of the two must be set + let psk = if peer.presharedKey != null then pkgs.writeText "wg-psk" peer.presharedKey else peer.presharedKeyFile; + in + "${wgCommand} set ${name} peer ${peer.publicKey}" + + optionalString (psk != null) " preshared-key ${psk}" + + optionalString (peer.endpoint != null) " endpoint ${peer.endpoint}" + + optionalString (peer.persistentKeepalive != null) " persistent-keepalive ${toString peer.persistentKeepalive}" + + optionalString (peer.allowedIPs != []) " allowed-ips ${concatStringsSep "," peer.allowedIPs}" + ) values.peers) + "${ipCommand} link set up dev ${name}" - (flatten (map (peer: (map (ip: + (map (peer: (map (ip: "${ipCommand} route add ${ip} dev ${name}" - ) peer.allowedIPs)) values.peers)) + ) peer.allowedIPs)) values.peers) values.postSetup ]); - - ExecStop = [ ''${ipCommand} link del dev "${name}"'' ] ++ values.postShutdown; + ExecStop = flatten([ + "${ipCommand} link del dev ${name}" + values.postShutdown + ]); }; }; diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index 7ce2ae38fb3..855c8930384 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -37,7 +37,7 @@ let [ cups.out additionalBackends cups-filters pkgs.ghostscript ] ++ optional cfg.gutenprint gutenprint ++ cfg.drivers; - pathsToLink = [ "/lib/cups" "/share/cups" "/bin" ]; + pathsToLink = [ "/lib" "/share/cups" "/bin" ]; postBuild = cfg.bindirCmds; ignoreCollisions = true; }; @@ -324,6 +324,8 @@ in fi ''} ''; + + serviceConfig.PrivateTmp = true; }; systemd.services.cups-browsed = mkIf avahiEnabled diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix index e292fd9851e..3e5087766b1 100644 --- a/nixos/modules/services/security/oauth2_proxy.nix +++ b/nixos/modules/services/security/oauth2_proxy.nix @@ -21,21 +21,20 @@ let ''; github = cfg: '' - $(optionalString (!isNull cfg.github.org) "--github-org=${cfg.github.org}") \ - $(optionalString (!isNull cfg.github.team) "--github-org=${cfg.github.team}") \ + ${optionalString (!isNull cfg.github.org) "--github-org=${cfg.github.org}"} \ + ${optionalString (!isNull cfg.github.team) "--github-org=${cfg.github.team}"} \ ''; google = cfg: '' --google-admin-email=${cfg.google.adminEmail} \ --google-service-account=${cfg.google.serviceAccountJSON} \ - $(repeatedArgs (group: "--google-group=${group}") cfg.google.groups) \ + ${repeatedArgs (group: "--google-group=${group}") cfg.google.groups} \ ''; }; authenticatedEmailsFile = pkgs.writeText "authenticated-emails" cfg.email.addresses; - getProviderOptions = cfg: provider: - if providerSpecificOptions ? provider then providerSpecificOptions.provider cfg else ""; + getProviderOptions = cfg: provider: providerSpecificOptions.${provider} or (_: "") cfg; mkCommandLine = cfg: '' --provider='${cfg.provider}' \ diff --git a/nixos/modules/services/security/vault.nix b/nixos/modules/services/security/vault.nix new file mode 100644 index 00000000000..146afec344a --- /dev/null +++ b/nixos/modules/services/security/vault.nix @@ -0,0 +1,143 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.services.vault; + + configFile = pkgs.writeText "vault.hcl" '' + listener "tcp" { + address = "${cfg.address}" + ${if (cfg.tlsCertFile == null || cfg.tlsKeyFile == null) then '' + tls_disable = "true" + '' else '' + tls_cert_file = "${cfg.tlsCertFile}" + tls_key_file = "${cfg.tlsKeyFile}" + ''} + ${cfg.listenerExtraConfig} + } + storage "${cfg.storageBackend}" { + ${optionalString (cfg.storagePath != null) ''path = "${cfg.storagePath}"''} + ${optionalString (cfg.storageConfig != null) cfg.storageConfig} + } + ${optionalString (cfg.telemetryConfig != "") '' + telemetry { + ${cfg.telemetryConfig} + } + ''} + ''; +in +{ + options = { + + services.vault = { + + enable = mkEnableOption "Vault daemon"; + + address = mkOption { + type = types.str; + default = "127.0.0.1:8200"; + description = "The name of the ip interface to listen to"; + }; + + tlsCertFile = mkOption { + type = types.nullOr types.str; + default = null; + example = "/path/to/your/cert.pem"; + description = "TLS certificate file. TLS will be disabled unless this option is set"; + }; + + tlsKeyFile = mkOption { + type = types.nullOr types.str; + default = null; + example = "/path/to/your/key.pem"; + description = "TLS private key file. TLS will be disabled unless this option is set"; + }; + + listenerExtraConfig = mkOption { + type = types.lines; + default = '' + tls_min_version = "tls12" + ''; + description = "extra configuration"; + }; + + storageBackend = mkOption { + type = types.enum [ "inmem" "file" "consul" "zookeeper" "s3" "azure" "dynamodb" "etcd" "mssql" "mysql" "postgresql" "swift" "gcs" ]; + default = "inmem"; + description = "The name of the type of storage backend"; + }; + + storagePath = mkOption { + type = types.nullOr types.path; + default = if cfg.storageBackend == "file" then "/var/lib/vault" else null; + description = "Data directory for file backend"; + }; + + storageConfig = mkOption { + type = types.nullOr types.lines; + default = null; + description = "Storage configuration"; + }; + + telemetryConfig = mkOption { + type = types.lines; + default = ""; + description = "Telemetry configuration"; + }; + }; + }; + + config = mkIf cfg.enable { + assertions = [ + { assertion = cfg.storageBackend == "inmem" -> (cfg.storagePath == null && cfg.storageConfig == null); + message = ''The "inmem" storage expects no services.vault.storagePath nor services.vault.storageConfig''; + } + { assertion = (cfg.storageBackend == "file" -> (cfg.storagePath != null && cfg.storageConfig == null)) && (cfg.storagePath != null -> cfg.storageBackend == "file"); + message = ''You must set services.vault.storagePath only when using the "file" backend''; + } + ]; + + users.extraUsers.vault = { + name = "vault"; + group = "vault"; + uid = config.ids.uids.vault; + description = "Vault daemon user"; + }; + users.extraGroups.vault.gid = config.ids.gids.vault; + + systemd.services.vault = { + description = "Vault server daemon"; + + wantedBy = ["multi-user.target"]; + after = [ "network.target" ] + ++ optional (config.services.consul.enable && cfg.storageBackend == "consul") "consul.service"; + + restartIfChanged = false; # do not restart on "nixos-rebuild switch". It would seal the storage and disrupt the clients. + + preStart = optionalString (cfg.storagePath != null) '' + install -d -m0700 -o vault -g vault "${cfg.storagePath}" + ''; + + serviceConfig = { + User = "vault"; + Group = "vault"; + PermissionsStartOnly = true; + ExecStart = "${pkgs.vault}/bin/vault server -config ${configFile}"; + PrivateDevices = true; + PrivateTmp = true; + ProtectSystem = "full"; + ProtectHome = "read-only"; + AmbientCapabilities = "cap_ipc_lock"; + NoNewPrivileges = true; + KillSignal = "SIGINT"; + TimeoutStopSec = "30s"; + Restart = "on-failure"; + StartLimitInterval = "60s"; + StartLimitBurst = 3; + }; + + unitConfig.RequiresMountsFor = optional (cfg.storagePath != null) cfg.storagePath; + }; + }; + +} diff --git a/nixos/modules/services/system/saslauthd.nix b/nixos/modules/services/system/saslauthd.nix new file mode 100644 index 00000000000..281716cf186 --- /dev/null +++ b/nixos/modules/services/system/saslauthd.nix @@ -0,0 +1,63 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + nssModulesPath = config.system.nssModules.path; + cfg = config.services.saslauthd; + +in + +{ + + ###### interface + + options = { + + services.saslauthd = { + + enable = mkEnableOption "Whether to enable the Cyrus SASL authentication daemon."; + + package = mkOption { + default = pkgs.cyrus_sasl.bin; + defaultText = "pkgs.cyrus_sasl.bin"; + type = types.package; + description = "Cyrus SASL package to use."; + }; + + mechanism = mkOption { + type = types.str; + default = "pam"; + description = "Auth mechanism to use"; + }; + + config = mkOption { + type = types.lines; + default = ""; + description = "Configuration to use for Cyrus SASL authentication daemon."; + }; + + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + + systemd.services.saslauthd = { + description = "Cyrus SASL authentication daemon"; + + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + ExecStart = "@${cfg.package}/sbin/saslauthd saslauthd -a ${cfg.mechanism} -O ${pkgs.writeText "saslauthd.conf" cfg.config}"; + Type = "forking"; + PIDFile = "/run/saslauthd/saslauthd.pid"; + Restart = "always"; + }; + }; + }; +} diff --git a/nixos/modules/services/web-apps/piwik-doc.xml b/nixos/modules/services/web-apps/piwik-doc.xml new file mode 100644 index 00000000000..a1d8a5b7556 --- /dev/null +++ b/nixos/modules/services/web-apps/piwik-doc.xml @@ -0,0 +1,97 @@ + + + Piwik + + Piwik is a real-time web analytics application. + This module configures php-fpm as backend for piwik, optionally configuring an nginx vhost as well. + + + + An automatic setup is not suported by piwik, so you need to configure piwik itself in the browser-based piwik setup. + + + +
+ Database Setup + + + You also need to configure a MariaDB or MySQL database and -user for piwik yourself, + and enter those credentials in your browser. + You can use passwordless database authentication via the UNIX_SOCKET authentication plugin + with the following SQL commands: + + INSTALL PLUGIN unix_socket SONAME 'auth_socket'; + ALTER USER root IDENTIFIED VIA unix_socket; + CREATE DATABASE piwik; + CREATE USER 'piwik'@'localhost' IDENTIFIED VIA unix_socket; + GRANT ALL PRIVILEGES ON piwik.* TO 'piwik'@'localhost'; + + Then fill in piwik as database user and database name, and leave the password field blank. + This works with MariaDB and MySQL. This authentication works by allowing only the piwik unix + user to authenticate as piwik database (without needing a password), but no other users. + For more information on passwordless login, see + . + + + + Of course, you can use password based authentication as well, e.g. when the database is not on the same host. + +
+ + +
+ Backup + + You only need to take backups of your MySQL database and the + /var/lib/piwik/config/config.ini.php file. + Use a user in the piwik group or root to access the file. + For more information, see . + +
+ + +
+ Issues + + + + Piwik's file integrity check will warn you. + This is due to the patches necessary for NixOS, you can safely ignore this. + + + + + + Piwik will warn you that the JavaScript tracker is not writable. + This is because it's located in the read-only nix store. + You can safely ignore this, unless you need a plugin that needs JavaScript tracker access. + + + + + + Sending mail from piwik, e.g. for the password reset function, might not work out of the box: + There's a problem with using sendmail from php-fpm that is + being investigated at . + If you have (or don't have) this problem as well, please report it. You can enable SMTP as method + to send mail in piwik's General Settings > Mail Server Settings instead. + + + +
+ + +
+ Using other Web Servers than nginx + + + You can use other web servers by forwarding calls for index.php and + piwik.php to the /run/phpfpm-piwik.sock fastcgi unix socket. + You can use the nginx configuration in the module code as a reference to what else should be configured. + +
+
diff --git a/nixos/modules/services/web-apps/piwik.nix b/nixos/modules/services/web-apps/piwik.nix new file mode 100644 index 00000000000..26342a9c5f0 --- /dev/null +++ b/nixos/modules/services/web-apps/piwik.nix @@ -0,0 +1,219 @@ +{ config, lib, pkgs, services, ... }: +with lib; +let + cfg = config.services.piwik; + + user = "piwik"; + dataDir = "/var/lib/${user}"; + + pool = user; + # it's not possible to use /run/phpfpm/${pool}.sock because /run/phpfpm/ is root:root 0770, + # and therefore is not accessible by the web server. + phpSocket = "/run/phpfpm-${pool}.sock"; + phpExecutionUnit = "phpfpm-${pool}"; + databaseService = "mysql.service"; + +in { + options = { + services.piwik = { + # NixOS PR for database setup: https://github.com/NixOS/nixpkgs/pull/6963 + # piwik issue for automatic piwik setup: https://github.com/piwik/piwik/issues/10257 + # TODO: find a nice way to do this when more NixOS MySQL and / or piwik automatic setup stuff is implemented. + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable piwik web analytics with php-fpm backend. + ''; + }; + + webServerUser = mkOption { + type = types.str; + example = "nginx"; + description = '' + Name of the owner of the ${phpSocket} fastcgi socket for piwik. + If you want to use another webserver than nginx, you need to set this to that server's user + and pass fastcgi requests to `index.php` and `piwik.php` to this socket. + ''; + }; + + phpfpmProcessManagerConfig = mkOption { + type = types.str; + default = '' + ; default phpfpm process manager settings + pm = dynamic + pm.max_children = 75 + pm.start_servers = 10 + pm.min_spare_servers = 5 + pm.max_spare_servers = 20 + pm.max_requests = 500 + + ; log worker's stdout, but this has a performance hit + catch_workers_output = yes + ''; + description = '' + Settings for phpfpm's process manager. You might need to change this depending on the load for piwik. + ''; + }; + + nginx = mkOption { + # TODO: for maximum flexibility, it would be nice to use nginx's vhost_options module + # but this only makes sense if we can somehow specify defaults suitable for piwik. + # But users can always copy the piwik nginx config to their configuration.nix and customize it. + type = types.nullOr (types.submodule { + options = { + virtualHost = mkOption { + type = types.str; + default = "piwik.${config.networking.hostName}"; + example = "piwik.$\{config.networking.hostName\}"; + description = '' + Name of the nginx virtualhost to use and set up. + ''; + }; + enableSSL = mkOption { + type = types.bool; + default = true; + description = "Whether to enable https."; + }; + forceSSL = mkOption { + type = types.bool; + default = true; + description = "Whether to always redirect to https."; + }; + enableACME = mkOption { + type = types.bool; + default = true; + description = "Whether to ask Let's Encrypt to sign a certificate for this vhost."; + }; + }; + }); + default = null; + example = { virtualHost = "stats.$\{config.networking.hostName\}"; }; + description = '' + The options to use to configure an nginx virtualHost. + If null (the default), no nginx virtualHost will be configured. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + + users.extraUsers.${user} = { + isSystemUser = true; + createHome = true; + home = dataDir; + group = user; + }; + users.extraGroups.${user} = {}; + + systemd.services.piwik_setup_update = { + # everything needs to set up and up to date before piwik php files are executed + requiredBy = [ "${phpExecutionUnit}.service" ]; + before = [ "${phpExecutionUnit}.service" ]; + # the update part of the script can only work if the database is already up and running + requires = [ databaseService ]; + after = [ databaseService ]; + path = [ pkgs.piwik ]; + serviceConfig = { + Type = "oneshot"; + User = user; + # hide especially config.ini.php from other + UMask = "0007"; + Environment = "PIWIK_USER_PATH=${dataDir}"; + # chown + chmod in preStart needs root + PermissionsStartOnly = true; + }; + # correct ownership and permissions in case they're not correct anymore, + # e.g. after restoring from backup or moving from another system. + # Note that ${dataDir}/config/config.ini.php might contain the MySQL password. + preStart = '' + chown -R ${user}:${user} ${dataDir} + chmod -R ug+rwX,o-rwx ${dataDir} + ''; + script = '' + # Use User-Private Group scheme to protect piwik data, but allow administration / backup via piwik group + # Copy config folder + chmod g+s "${dataDir}" + cp -r "${pkgs.piwik}/config" "${dataDir}/" + chmod -R u+rwX,g+rwX,o-rwx "${dataDir}" + + # check whether user setup has already been done + if test -f "${dataDir}/config/config.ini.php"; then + # then execute possibly pending database upgrade + piwik-console core:update --yes + fi + ''; + }; + + systemd.services.${phpExecutionUnit} = { + # stop phpfpm on package upgrade, do database upgrade via piwik_setup_update, and then restart + restartTriggers = [ pkgs.piwik ]; + # stop config.ini.php from getting written with read permission for others + serviceConfig.UMask = "0007"; + }; + + services.phpfpm.poolConfigs = { + ${pool} = '' + listen = "${phpSocket}" + listen.owner = ${cfg.webServerUser} + listen.group = root + listen.mode = 0600 + user = ${user} + env[PIWIK_USER_PATH] = ${dataDir} + ${cfg.phpfpmProcessManagerConfig} + ''; + }; + + + services.nginx.virtualHosts = mkIf (cfg.nginx != null) { + # References: + # https://fralef.me/piwik-hardening-with-nginx-and-php-fpm.html + # https://github.com/perusio/piwik-nginx + ${cfg.nginx.virtualHost} = { + root = "${pkgs.piwik}/share"; + enableSSL = cfg.nginx.enableSSL; + enableACME = cfg.nginx.enableACME; + forceSSL = cfg.nginx.forceSSL; + + locations."/" = { + index = "index.php"; + }; + # allow index.php for webinterface + locations."= /index.php".extraConfig = '' + fastcgi_pass unix:${phpSocket}; + ''; + # allow piwik.php for tracking + locations."= /piwik.php".extraConfig = '' + fastcgi_pass unix:${phpSocket}; + ''; + # Any other attempt to access any php files is forbidden + locations."~* ^.+\.php$".extraConfig = '' + return 403; + ''; + # Disallow access to unneeded directories + # config and tmp are already removed + locations."~ ^/(?:core|lang|misc)/".extraConfig = '' + return 403; + ''; + # Disallow access to several helper files + locations."~* \.(?:bat|git|ini|sh|txt|tpl|xml|md)$".extraConfig = '' + return 403; + ''; + # No crawling of this site for bots that obey robots.txt - no useful information here. + locations."= /robots.txt".extraConfig = '' + return 200 "User-agent: *\nDisallow: /\n"; + ''; + # let browsers cache piwik.js + locations."= /piwik.js".extraConfig = '' + expires 1M; + ''; + }; + }; + }; + + meta = { + doc = ./piwik-doc.xml; + maintainers = with stdenv.lib.maintainers; [ florianjacob ]; + }; +} diff --git a/nixos/modules/services/web-servers/lighttpd/collectd.nix b/nixos/modules/services/web-servers/lighttpd/collectd.nix new file mode 100644 index 00000000000..35b5edced68 --- /dev/null +++ b/nixos/modules/services/web-servers/lighttpd/collectd.nix @@ -0,0 +1,58 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.lighttpd.collectd; + + collectionConf = pkgs.writeText "collection.conf" '' + datadir: "${config.services.collectd.dataDir}" + libdir: "${config.services.collectd.package}/lib/collectd" + ''; + + defaultCollectionCgi = config.services.collectd.package.overrideDerivation(old: { + name = "collection.cgi"; + configurePhase = "true"; + buildPhase = "true"; + installPhase = '' + substituteInPlace contrib/collection.cgi --replace '"/etc/collection.conf"' '$ENV{COLLECTION_CONF}' + cp contrib/collection.cgi $out + ''; + }); +in +{ + + options.services.lighttpd.collectd = { + + enable = mkEnableOption "collectd subservice accessible at http://yourserver/collectd"; + + collectionCgi = mkOption { + type = types.path; + default = defaultCollectionCgi; + description = '' + Path to collection.cgi script from (collectd sources)/contrib/collection.cgi + This option allows to use a customized version + ''; + }; + }; + + config = mkIf cfg.enable { + services.lighttpd.enableModules = [ "mod_cgi" "mod_alias" "mod_setenv" ]; + + services.lighttpd.extraConfig = '' + $HTTP["url"] =~ "^/collectd" { + cgi.assign = ( + ".cgi" => "${pkgs.perl}/bin/perl" + ) + alias.url = ( + "/collectd" => "${cfg.collectionCgi}" + ) + setenv.add-environment = ( + "PERL5LIB" => "${with pkgs; lib.makePerlPath [ perlPackages.CGI perlPackages.HTMLParser perlPackages.URI rrdtool ]}", + "COLLECTION_CONF" => "${collectionConf}" + ) + } + ''; + }; + +} diff --git a/nixos/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix index 84cd0a4095d..8c3f7b219ac 100644 --- a/nixos/modules/services/web-servers/lighttpd/default.nix +++ b/nixos/modules/services/web-servers/lighttpd/default.nix @@ -177,7 +177,7 @@ in configText = mkOption { default = ""; type = types.lines; - example = ''...verbatim config file contents...''; + example = ''...verbatim config file contents...''; description = '' Overridable config file contents to use for lighttpd. By default, use the contents automatically generated by NixOS. diff --git a/nixos/modules/services/web-servers/minio.nix b/nixos/modules/services/web-servers/minio.nix new file mode 100644 index 00000000000..843f0d98687 --- /dev/null +++ b/nixos/modules/services/web-servers/minio.nix @@ -0,0 +1,111 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.minio; +in +{ + meta.maintainers = [ maintainers.bachp ]; + + options.services.minio = { + enable = mkEnableOption "Minio Object Storage"; + + listenAddress = mkOption { + default = ":9000"; + type = types.str; + description = "Listen on a specific IP address and port."; + }; + + dataDir = mkOption { + default = "/var/lib/minio/data"; + type = types.path; + description = "The data directory, for storing the objects."; + }; + + configDir = mkOption { + default = "/var/lib/minio/config"; + type = types.path; + description = "The config directory, for the access keys and other settings."; + }; + + accessKey = mkOption { + default = ""; + type = types.str; + description = '' + Access key of 5 to 20 characters in length that clients use to access the server. + This overrides the access key that is generated by minio on first startup and stored inside the + configDir directory. + ''; + }; + + secretKey = mkOption { + default = ""; + type = types.str; + description = '' + Specify the Secret key of 8 to 40 characters in length that clients use to access the server. + This overrides the secret key that is generated by minio on first startup and stored inside the + configDir directory. + ''; + }; + + region = mkOption { + default = "us-east-1"; + type = types.str; + description = '' + The physical location of the server. By default it is set to us-east-1, which is same as AWS S3's and Minio's default region. + ''; + }; + + browser = mkOption { + default = true; + type = types.bool; + description = "Enable or disable access to web UI."; + }; + + package = mkOption { + default = pkgs.minio; + defaultText = "pkgs.minio"; + type = types.package; + description = "Minio package to use."; + }; + }; + + config = mkIf cfg.enable { + systemd.services.minio = { + description = "Minio Object Storage"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + preStart = '' + # Make sure directories exist with correct owner + mkdir -p ${cfg.configDir} + chown -R minio:minio ${cfg.configDir} + mkdir -p ${cfg.dataDir} + chown minio:minio ${cfg.dataDir} + ''; + serviceConfig = { + PermissionsStartOnly = true; + ExecStart = "${cfg.package}/bin/minio server --address ${cfg.listenAddress} --config-dir=${cfg.configDir} ${cfg.dataDir}"; + Type = "simple"; + User = "minio"; + Group = "minio"; + LimitNOFILE = 65536; + }; + environment = { + MINIO_REGION = "${cfg.region}"; + MINIO_BROWSER = "${if cfg.browser then "on" else "off"}"; + } // optionalAttrs (cfg.accessKey != "") { + MINIO_ACCESS_KEY = "${cfg.accessKey}"; + } // optionalAttrs (cfg.secretKey != "") { + MINIO_SECRET_KEY = "${cfg.secretKey}"; + }; + }; + + users.extraUsers.minio = { + group = "minio"; + uid = config.ids.uids.minio; + }; + + users.extraGroups.minio.gid = config.ids.uids.minio; + }; +} diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index ae14aa28ae3..2310912d0fd 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -65,6 +65,7 @@ let gzip_proxied any; gzip_comp_level 9; gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript; + gzip_vary on; ''} ${optionalString (cfg.recommendedProxySettings) '' @@ -123,45 +124,49 @@ let vhosts = concatStringsSep "\n" (mapAttrsToList (vhostName: vhost: let - serverName = vhost.serverName; ssl = vhost.enableSSL || vhost.forceSSL; - port = if vhost.port != null then vhost.port else (if ssl then 443 else 80); - listenString = toString port + optionalString ssl " ssl http2" - + optionalString vhost.default " default_server"; - acmeLocation = optionalString vhost.enableACME ('' + defaultPort = if ssl then 443 else 80; + + listenString = { addr, port, ... }: + "listen ${addr}:${toString (if port != null then port else defaultPort)} " + + optionalString ssl "ssl http2 " + + optionalString vhost.default "default_server" + + ";"; + + redirectListenString = { addr, ... }: + "listen ${addr}:80 ${optionalString vhost.default "default_server"};"; + + acmeLocation = '' location /.well-known/acme-challenge { ${optionalString (vhost.acmeFallbackHost != null) "try_files $uri @acme-fallback;"} root ${vhost.acmeRoot}; auth_basic off; } - '' + (optionalString (vhost.acmeFallbackHost != null) '' - location @acme-fallback { - auth_basic off; - proxy_pass http://${vhost.acmeFallbackHost}; - } - '')); + ${optionalString (vhost.acmeFallbackHost != null) '' + location @acme-fallback { + auth_basic off; + proxy_pass http://${vhost.acmeFallbackHost}; + } + ''} + ''; + in '' ${optionalString vhost.forceSSL '' server { - listen 80 ${optionalString vhost.default "default_server"}; - ${optionalString enableIPv6 - ''listen [::]:80 ${optionalString vhost.default "default_server"};'' - } + ${concatMapStringsSep "\n" redirectListenString vhost.listen} - server_name ${serverName} ${concatStringsSep " " vhost.serverAliases}; - ${acmeLocation} + server_name ${vhost.serverName} ${concatStringsSep " " vhost.serverAliases}; + ${optionalString vhost.enableACME acmeLocation} location / { - return 301 https://$host${optionalString (port != 443) ":${toString port}"}$request_uri; + return 301 https://$host$request_uri; } } ''} server { - listen ${listenString}; - ${optionalString enableIPv6 "listen [::]:${listenString};"} - - server_name ${serverName} ${concatStringsSep " " vhost.serverAliases}; - ${acmeLocation} + ${concatMapStringsSep "\n" listenString vhost.listen} + server_name ${vhost.serverName} ${concatStringsSep " " vhost.serverAliases}; + ${optionalString vhost.enableACME acmeLocation} ${optionalString (vhost.root != null) "root ${vhost.root};"} ${optionalString (vhost.globalRedirect != null) '' return 301 http${optionalString ssl "s"}://${vhost.globalRedirect}$request_uri; @@ -380,7 +385,7 @@ in virtualHosts = mkOption { type = types.attrsOf (types.submodule (import ./vhost-options.nix { - inherit lib; + inherit config lib; })); default = { localhost = {}; diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix index c0ea645b3df..60260512bc2 100644 --- a/nixos/modules/services/web-servers/nginx/vhost-options.nix +++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix @@ -3,7 +3,7 @@ # has additional options that affect the web server as a whole, like # the user/group to run under.) -{ lib }: +{ config, lib }: with lib; { @@ -26,12 +26,26 @@ with lib; ''; }; - port = mkOption { - type = types.nullOr types.int; - default = null; + listen = mkOption { + type = with types; listOf (submodule { + options = { + addr = mkOption { type = str; description = "IP address."; }; + port = mkOption { type = nullOr int; description = "Port number."; }; + }; + }); + default = + [ { addr = "0.0.0.0"; port = null; } ] + ++ optional config.networking.enableIPv6 + { addr = "[::]"; port = null; }; + example = [ + { addr = "195.154.1.1"; port = 443; } + { addr = "192.168.1.2"; port = 443; } + ]; description = '' - Port for the server. Defaults to 80 for http - and 443 for https (i.e. when enableSSL is set). + Listen addresses and ports for this virtual host. + IPv6 addresses must be enclosed in square brackets. + Setting the port to null defaults + to 80 for http and 443 for https (i.e. when enableSSL is set). ''; }; diff --git a/nixos/modules/services/x11/desktop-managers/lumina.nix b/nixos/modules/services/x11/desktop-managers/lumina.nix index ec5fbb13b32..5fe84cfb82e 100644 --- a/nixos/modules/services/x11/desktop-managers/lumina.nix +++ b/nixos/modules/services/x11/desktop-managers/lumina.nix @@ -33,7 +33,6 @@ in environment.systemPackages = [ pkgs.fluxbox pkgs.libsForQt5.kwindowsystem - pkgs.kdeFrameworks.oxygen-icons5 pkgs.lumina pkgs.numlockx pkgs.qt5.qtsvg diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 09fcdd0b72b..638509e710b 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -71,7 +71,7 @@ let name = "multihead${toString num}"; inherit config; }; - in imap mkHead cfg.xrandrHeads; + in imap1 mkHead cfg.xrandrHeads; xrandrDeviceSection = let monitors = flip map xrandrHeads (h: '' @@ -648,34 +648,53 @@ in services.xserver.xkbDir = mkDefault "${pkgs.xkeyboard_config}/etc/X11/xkb"; - system.extraDependencies = [ - (pkgs.runCommand "xkb-layouts-exist" { - layouts=cfg.layout; - } '' - missing=() - while read -d , layout - do - [[ -f "${cfg.xkbDir}/symbols/$layout" ]] || missing+=($layout) - done <<< "$layouts," - if [[ ''${#missing[@]} -eq 0 ]] - then - touch $out - exit 0 + system.extraDependencies = singleton (pkgs.runCommand "xkb-layouts-exist" { + inherit (cfg) layout xkbDir; + } '' + # We can use the default IFS here, because the layouts won't contain + # spaces or tabs and are ruled out by the sed expression below. + availableLayouts="$( + sed -n -e ':i /^! \(layout\|variant\) *$/ { + # Loop through all of the layouts/variants until we hit another ! at + # the start of the line or the line is empty ('t' branches only if + # the last substitution was successful, so if the line is empty the + # substition will fail). + :l; n; /^!/bi; s/^ *\([^ ]\+\).*/\1/p; tl + }' "$xkbDir/rules/base.lst" | sort -u + )" + + layoutNotFound() { + echo >&2 + echo "The following layouts and variants are available:" >&2 + echo >&2 + + # While an output width of 80 is more desirable for small terminals, we + # really don't know the amount of columns of the terminal from within + # the builder. The content in $availableLayouts however is pretty + # large, so let's opt for a larger width here, because it will print a + # smaller amount of lines on modern KMS/framebuffer terminals and won't + # lose information even in smaller terminals (it only will look a bit + # ugly). + echo "$availableLayouts" | ${pkgs.utillinux}/bin/column -c 150 >&2 + + echo >&2 + echo "However, the keyboard layout definition in" \ + "\`services.xserver.layout' contains the layout \`$1', which" \ + "isn't a valid layout or variant." >&2 + echo >&2 + exit 1 + } + + # Again, we don't need to take care of IFS, see the comment for + # $availableLayouts. + for l in ''${layout//,/ }; do + if ! echo "$availableLayouts" | grep -qxF "$l"; then + layoutNotFound "$l" fi + done - cat >&2 </dev/mapper/name. ''; diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index f96dde15361..b151b568892 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -94,7 +94,7 @@ let checkNetwork = checkUnitConfig "Network" [ (assertOnlyFields [ "Description" "DHCP" "DHCPServer" "IPForward" "IPMasquerade" "IPv4LL" "IPv4LLRoute" - "LLMNR" "Domains" "Bridge" "Bond" + "LLMNR" "MulticastDNS" "Domains" "Bridge" "Bond" ]) (assertValueOneOf "DHCP" ["both" "none" "v4" "v6"]) (assertValueOneOf "DHCPServer" boolValues) @@ -103,6 +103,7 @@ let (assertValueOneOf "IPv4LL" boolValues) (assertValueOneOf "IPv4LLRoute" boolValues) (assertValueOneOf "LLMNR" boolValues) + (assertValueOneOf "MulticastDNS" boolValues) ]; checkAddress = checkUnitConfig "Address" [ diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 9a125dcb0ae..1f4ab3eae07 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -301,6 +301,7 @@ mountFS() { *x-nixos.autoresize*) if [ "$fsType" = ext2 -o "$fsType" = ext3 -o "$fsType" = ext4 ]; then echo "resizing $device..." + e2fsck -fp "$device" resize2fs "$device" fi ;; diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 73608a0e27f..02870878c0f 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -135,7 +135,7 @@ let $out/bin/ash -c 'echo hello world' | grep "hello world" export LD_LIBRARY_PATH=$out/lib $out/bin/mount --help 2>&1 | grep -q "BusyBox" - $out/bin/blkid --help 2>&1 | grep -q 'libblkid' + $out/bin/blkid -V 2>&1 | grep -q 'libblkid' $out/bin/udevadm --version $out/bin/dmsetup --version 2>&1 | tee -a log | grep -q "version:" LVM_SYSTEM_DIR=$out $out/bin/lvm version 2>&1 | tee -a log | grep -q "LVM" diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 00d6d370dd7..46761fdc0e9 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -659,16 +659,22 @@ in })); }; + systemd.user.paths = mkOption { + default = {}; + type = with types; attrsOf (submodule [ { options = pathOptions; } unitConfig ]); + description = "Definition of systemd per-user path units."; + }; + systemd.user.services = mkOption { default = {}; type = with types; attrsOf (submodule [ { options = serviceOptions; } unitConfig serviceConfig ] ); description = "Definition of systemd per-user service units."; }; - systemd.user.timers = mkOption { + systemd.user.slices = mkOption { default = {}; - type = with types; attrsOf (submodule [ { options = timerOptions; } unitConfig ] ); - description = "Definition of systemd per-user timer units."; + type = with types; attrsOf (submodule [ { options = sliceOptions; } unitConfig ] ); + description = "Definition of systemd per-user slice units."; }; systemd.user.sockets = mkOption { @@ -683,6 +689,12 @@ in description = "Definition of systemd per-user target units."; }; + systemd.user.timers = mkOption { + default = {}; + type = with types; attrsOf (submodule [ { options = timerOptions; } unitConfig ] ); + description = "Definition of systemd per-user timer units."; + }; + systemd.additionalUpstreamSystemUnits = mkOption { default = [ ]; type = types.listOf types.str; @@ -799,12 +811,12 @@ in }; systemd.units = - mapAttrs' (n: v: nameValuePair "${n}.target" (targetToUnit n v)) cfg.targets + mapAttrs' (n: v: nameValuePair "${n}.path" (pathToUnit n v)) cfg.paths // mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.services - // mapAttrs' (n: v: nameValuePair "${n}.socket" (socketToUnit n v)) cfg.sockets - // mapAttrs' (n: v: nameValuePair "${n}.timer" (timerToUnit n v)) cfg.timers - // mapAttrs' (n: v: nameValuePair "${n}.path" (pathToUnit n v)) cfg.paths - // mapAttrs' (n: v: nameValuePair "${n}.slice" (sliceToUnit n v)) cfg.slices + // mapAttrs' (n: v: nameValuePair "${n}.slice" (sliceToUnit n v)) cfg.slices + // mapAttrs' (n: v: nameValuePair "${n}.socket" (socketToUnit n v)) cfg.sockets + // mapAttrs' (n: v: nameValuePair "${n}.target" (targetToUnit n v)) cfg.targets + // mapAttrs' (n: v: nameValuePair "${n}.timer" (timerToUnit n v)) cfg.timers // listToAttrs (map (v: let n = escapeSystemdPath v.where; in nameValuePair "${n}.mount" (mountToUnit n v)) cfg.mounts) @@ -813,7 +825,9 @@ in in nameValuePair "${n}.automount" (automountToUnit n v)) cfg.automounts); systemd.user.units = - mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.user.services + mapAttrs' (n: v: nameValuePair "${n}.path" (pathToUnit n v)) cfg.user.paths + // mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.user.services + // mapAttrs' (n: v: nameValuePair "${n}.slice" (sliceToUnit n v)) cfg.user.slices // mapAttrs' (n: v: nameValuePair "${n}.socket" (socketToUnit n v)) cfg.user.sockets // mapAttrs' (n: v: nameValuePair "${n}.target" (targetToUnit n v)) cfg.user.targets // mapAttrs' (n: v: nameValuePair "${n}.timer" (timerToUnit n v)) cfg.user.timers; diff --git a/nixos/modules/virtualisation/azure-images.nix b/nixos/modules/virtualisation/azure-images.nix new file mode 100644 index 00000000000..22c82fc14f6 --- /dev/null +++ b/nixos/modules/virtualisation/azure-images.nix @@ -0,0 +1,5 @@ +let self = { + "16.09" = "https://nixos.blob.core.windows.net/images/nixos-image-16.09.1694.019dcc3-x86_64-linux.vhd"; + + latest = self."16.09"; +}; in self diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index c26cae06cd1..25274c440e6 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -94,6 +94,37 @@ in docker daemon. ''; }; + + autoPrune = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to periodically prune Docker resources. If enabled, a systemd timer will run + docker system prune -f once a day. + ''; + }; + + flags = mkOption { + type = types.listOf types.str; + default = []; + example = [ "--all" ]; + description = '' + Any additional flags passed to docker system prune. + ''; + }; + + dates = mkOption { + default = "weekly"; + type = types.str; + description = '' + Specification (in the format described by + systemd.time + 7) of the time at + which the prune will occur. + ''; + }; + }; }; ###### implementation @@ -137,6 +168,22 @@ in SocketGroup = "docker"; }; }; + + + systemd.services.docker-prune = { + description = "Prune docker resources"; + + restartIfChanged = false; + unitConfig.X-StopOnRemoval = false; + + serviceConfig.Type = "oneshot"; + + script = '' + ${pkgs.docker}/bin/docker system prune -f ${toString cfg.autoPrune.flags} + ''; + + startAt = optional cfg.autoPrune.enable cfg.autoPrune.dates; + }; } ]); diff --git a/nixos/modules/virtualisation/gce-images.nix b/nixos/modules/virtualisation/gce-images.nix new file mode 100644 index 00000000000..8a9bda1b60c --- /dev/null +++ b/nixos/modules/virtualisation/gce-images.nix @@ -0,0 +1,8 @@ +let self = { + "14.12" = "gs://nixos-cloud-images/nixos-14.12.471.1f09b77-x86_64-linux.raw.tar.gz"; + "15.09" = "gs://nixos-cloud-images/nixos-15.09.425.7870f20-x86_64-linux.raw.tar.gz"; + "16.03" = "gs://nixos-cloud-images/nixos-image-16.03.847.8688c17-x86_64-linux.raw.tar.gz"; + "17.03" = "gs://nixos-cloud-images/nixos-image-17.03.1082.4aab5c5798-x86_64-linux.raw.tar.gz"; + + latest = self."17.03"; +}; in self diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 3943a62f8a4..4a8dadaa281 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -3,13 +3,11 @@ with lib; let diskSize = 1024; # MB + gce = pkgs.google-compute-engine; in { imports = [ ../profiles/headless.nix ../profiles/qemu-guest.nix ./grow-partition.nix ]; - # https://cloud.google.com/compute/docs/tutorials/building-images - networking.firewall.enable = mkDefault false; - system.build.googleComputeImage = import ../../lib/make-disk-image.nix { name = "google-compute-image"; postVM = '' @@ -49,12 +47,18 @@ in services.openssh.permitRootLogin = "prohibit-password"; services.openssh.passwordAuthentication = mkDefault false; + # Use GCE udev rules for dynamic disk volumes + services.udev.packages = [ gce ]; + # Force getting the hostname from Google Compute. networking.hostName = mkDefault ""; # Always include cryptsetup so that NixOps can use it. environment.systemPackages = [ pkgs.cryptsetup ]; + # Rely on GCP's firewall instead + networking.firewall.enable = mkDefault false; + # Configure default metadata hostnames networking.extraHosts = '' 169.254.169.254 metadata.google.internal metadata @@ -64,6 +68,132 @@ in networking.usePredictableInterfaceNames = false; + # allow the google-accounts-daemon to manage users + users.mutableUsers = true; + # and allow users to sudo without password + security.sudo.enable = true; + security.sudo.extraConfig = '' + %google-sudoers ALL=(ALL:ALL) NOPASSWD:ALL + ''; + + # NOTE: google-accounts tries to write to /etc/sudoers.d but the folder doesn't exist + # FIXME: not such file or directory on dynamic SSH provisioning + systemd.services.google-accounts-daemon = { + description = "Google Compute Engine Accounts Daemon"; + # This daemon creates dynamic users + enable = config.users.mutableUsers; + after = [ + "network.target" + "google-instance-setup.service" + "google-network-setup.service" + ]; + wantedBy = [ "multi-user.target" ]; + requires = ["network.target"]; + path = with pkgs; [ shadow ]; + serviceConfig = { + Type = "simple"; + ExecStart = "${gce}/bin/google_accounts_daemon --debug"; + }; + }; + + systemd.services.google-clock-skew-daemon = { + description = "Google Compute Engine Clock Skew Daemon"; + after = [ + "network.target" + "google-instance-setup.service" + "google-network-setup.service" + ]; + requires = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "simple"; + ExecStart = "${gce}/bin/google_clock_skew_daemon --debug"; + }; + }; + + systemd.services.google-instance-setup = { + description = "Google Compute Engine Instance Setup"; + after = ["fs.target" "network-online.target" "network.target" "rsyslog.service"]; + before = ["sshd.service"]; + wants = ["local-fs.target" "network-online.target" "network.target"]; + wantedBy = [ "sshd.service" "multi-user.target" ]; + path = with pkgs; [ ethtool ]; + serviceConfig = { + ExecStart = "${gce}/bin/google_instance_setup --debug"; + Type = "oneshot"; + }; + }; + + systemd.services.google-ip-forwarding-daemon = { + description = "Google Compute Engine IP Forwarding Daemon"; + after = ["network.target" "google-instance-setup.service" "google-network-setup.service"]; + requires = ["network.target"]; + wantedBy = [ "multi-user.target" ]; + path = with pkgs; [ iproute ]; + serviceConfig = { + Type = "simple"; + ExecStart = "${gce}/bin/google_ip_forwarding_daemon --debug"; + }; + }; + + systemd.services.google-shutdown-scripts = { + description = "Google Compute Engine Shutdown Scripts"; + after = [ + "local-fs.target" + "network-online.target" + "network.target" + "rsyslog.service" + "google-instance-setup.service" + "google-network-setup.service" + ]; + wants = [ "local-fs.target" "network-online.target" "network.target"]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "${pkgs.coreutils}/bin/true"; + ExecStop = "${gce}/bin/google_metadata_script_runner --debug --script-type shutdown"; + Type = "oneshot"; + RemainAfterExit = true; + TimeoutStopSec = 0; + }; + }; + + systemd.services.google-network-setup = { + description = "Google Compute Engine Network Setup"; + after = [ + "local-fs.target" + "network-online.target" + "network.target" + "rsyslog.service" + ]; + wants = [ "local-fs.target" "network-online.target" "network.target"]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "${gce}/bin/google_network_setup --debug"; + KillMode = "process"; + Type = "oneshot"; + }; + }; + + systemd.services.google-startup-scripts = { + description = "Google Compute Engine Startup Scripts"; + after = [ + "local-fs.target" + "network-online.target" + "network.target" + "rsyslog.service" + "google-instance-setup.service" + "google-network-setup.service" + ]; + wants = [ "local-fs.target" "network-online.target" "network.target"]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "${gce}/bin/google_metadata_script_runner --debug --script-type startup"; + KillMode = "process"; + Type = "oneshot"; + }; + }; + + # TODO: remove this systemd.services.fetch-ssh-keys = { description = "Fetch host keys and authorized_keys for root user"; @@ -113,9 +243,13 @@ in serviceConfig.StandardOutput = "journal+console"; }; - # Setings taken from https://cloud.google.com/compute/docs/tutorials/building-images#providedkernel + # Settings taken from https://github.com/GoogleCloudPlatform/compute-image-packages/blob/master/google_config/sysctl/11-gce-network-security.conf boot.kernel.sysctl = { - # enables syn flood protection + # Turn on SYN-flood protections. Starting with 2.6.26, there is no loss + # of TCP functionality/features under normal conditions. When flood + # protections kick in under high unanswered-SYN load, the system + # should remain more stable, with a trade off of some loss of TCP + # functionality/features (e.g. TCP Window scaling). "net.ipv4.tcp_syncookies" = mkDefault "1"; # ignores source-routed packets @@ -169,6 +303,11 @@ in # randomizes addresses of mmap base, heap, stack and VDSO page "kernel.randomize_va_space" = mkDefault "2"; + # Reboot the machine soon after a kernel panic. + "kernel.panic" = mkDefault "10"; + + ## Not part of the original config + # provides protection from ToCToU races "fs.protected_hardlinks" = mkDefault "1"; diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 10a38b99f87..b24ea0f33c9 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -162,11 +162,14 @@ in { for file in /var/lib/libvirt/qemu/*.xml /var/lib/libvirt/lxc/*.xml; do test -f "$file" || continue # get (old) emulator path from config file - emulator=$(grep "^[[:space:]]*" "$file" | sed 's,^[[:space:]]*\(.*\).*,\1,') + emulator=$("${pkgs.xmlstarlet}/bin/xmlstarlet" select --template --value-of "/domain/devices/emulator" "$file") # get a (definitely) working emulator path by re-scanning $PATH new_emulator=$(PATH=${pkgs.libvirt}/libexec:$PATH command -v $(basename "$emulator")) # write back - sed -i "s,^[[:space:]]*.*, $new_emulator ," "$file" + "${pkgs.xmlstarlet}/bin/xmlstarlet" edit --inplace --update "/domain/devices/emulator" -v "$new_emulator" "$file" + + # Also refresh the OVMF path. Files with no matches are ignored. + "${pkgs.xmlstarlet}/bin/xmlstarlet" edit --inplace --update "/domain/os/loader" -v "${pkgs.OVMF.fd}/FV/OVMF_CODE.fd" "$file" done ''; # */ diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix index f6f2d5dad01..5239652d407 100644 --- a/nixos/modules/virtualisation/xen-dom0.nix +++ b/nixos/modules/virtualisation/xen-dom0.nix @@ -267,26 +267,36 @@ in mkdir -p /var/lib/xen # so we create them here unconditionally. grep -q control_d /proc/xen/capabilities ''; - serviceConfig.ExecStart = '' - ${cfg.stored}${optionalString cfg.trace " -T /var/log/xen/xenstored-trace.log"} --no-fork - ''; + serviceConfig = if cfg.package.version < "4.8" then + { ExecStart = '' + ${cfg.stored}${optionalString cfg.trace " -T /var/log/xen/xenstored-trace.log"} --no-fork + ''; + } else { + ExecStart = '' + ${cfg.package}/etc/xen/scripts/launch-xenstore + ''; + Type = "notify"; + RemainAfterExit = true; + NotifyAccess = "all"; + }; postStart = '' - time=0 - timeout=30 - # Wait for xenstored to actually come up, timing out after 30 seconds - while [ $time -lt $timeout ] && ! `${cfg.package}/bin/xenstore-read -s / >/dev/null 2>&1` ; do - time=$(($time+1)) - sleep 1 - done + ${optionalString (cfg.package.version < "4.8") '' + time=0 + timeout=30 + # Wait for xenstored to actually come up, timing out after 30 seconds + while [ $time -lt $timeout ] && ! `${cfg.package}/bin/xenstore-read -s / >/dev/null 2>&1` ; do + time=$(($time+1)) + sleep 1 + done - # Exit if we timed out - if ! [ $time -lt $timeout ] ; then - echo "Could not start Xenstore Daemon" - exit 1 - fi - - ${cfg.package}/bin/xenstore-write "/local/domain/0/name" "Domain-0" - ${cfg.package}/bin/xenstore-write "/local/domain/0/domid" 0 + # Exit if we timed out + if ! [ $time -lt $timeout ] ; then + echo "Could not start Xenstore Daemon" + exit 1 + fi + ''} + echo "executing xen-init-dom0" + ${cfg.package}/lib/xen/bin/xen-init-dom0 ''; }; @@ -306,6 +316,7 @@ in description = "Xen Console Daemon"; wantedBy = [ "multi-user.target" ]; after = [ "xen-store.service" ]; + requires = [ "xen-store.service" ]; preStart = '' mkdir -p /var/run/xen ${optionalString cfg.trace "mkdir -p /var/log/xen"} @@ -313,7 +324,9 @@ in ''; serviceConfig = { ExecStart = '' - ${cfg.package}/bin/xenconsoled${optionalString cfg.trace " --log=all --log-dir=/var/log/xen"} + ${cfg.package}/bin/xenconsoled\ + ${optionalString ((cfg.package.version >= "4.8")) " -i"}\ + ${optionalString cfg.trace " --log=all --log-dir=/var/log/xen"} ''; }; }; @@ -323,6 +336,7 @@ in description = "Xen Qemu Daemon"; wantedBy = [ "multi-user.target" ]; after = [ "xen-console.service" ]; + requires = [ "xen-store.service" ]; serviceConfig.ExecStart = '' ${cfg.qemu} -xen-attach -xen-domid 0 -name dom0 -M xenpv \ -nographic -monitor /dev/null -serial /dev/null -parallel /dev/null @@ -333,7 +347,7 @@ in systemd.services.xen-watchdog = { description = "Xen Watchdog Daemon"; wantedBy = [ "multi-user.target" ]; - after = [ "xen-qemu.service" ]; + after = [ "xen-qemu.service" "xen-domains.service" ]; serviceConfig.ExecStart = "${cfg.package}/bin/xenwatchdogd 30 15"; serviceConfig.Type = "forking"; serviceConfig.RestartSec = "1"; @@ -426,6 +440,7 @@ in description = "Xen domains - automatically starts, saves and restores Xen domains"; wantedBy = [ "multi-user.target" ]; after = [ "xen-bridge.service" "xen-qemu.service" ]; + requires = [ "xen-bridge.service" "xen-qemu.service" ]; ## To prevent a race between dhcpcd and xend's bridge setup script ## (which renames eth* to peth* and recreates eth* as a virtual ## device), start dhcpcd after xend. diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 4217f5940ec..ecbd317cb9a 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -52,6 +52,7 @@ in rec { (all nixos.tests.firefox) (all nixos.tests.firewall) nixos.tests.gnome3.x86_64-linux # FIXME: i686-linux + nixos.tests.installer.zfsroot.x86_64-linux # ZFS is 64bit only (all nixos.tests.installer.lvm) (all nixos.tests.installer.luksroot) (all nixos.tests.installer.separateBoot) @@ -72,6 +73,12 @@ in rec { (all nixos.tests.ecryptfs) (all nixos.tests.ipv6) (all nixos.tests.i3wm) + (all nixos.tests.keymap.azerty) + (all nixos.tests.keymap.colemak) + (all nixos.tests.keymap.dvorak) + (all nixos.tests.keymap.dvp) + (all nixos.tests.keymap.neo) + (all nixos.tests.keymap.qwertz) (all nixos.tests.plasma5) #(all nixos.tests.lightdm) (all nixos.tests.login) diff --git a/nixos/release.nix b/nixos/release.nix index 467e3bb8cd6..0dbdadf9781 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -303,6 +303,7 @@ in rec { tests.simple = callTest tests/simple.nix {}; tests.slim = callTest tests/slim.nix {}; tests.smokeping = callTest tests/smokeping.nix {}; + tests.snapper = callTest tests/snapper.nix {}; tests.taskserver = callTest tests/taskserver.nix {}; tests.tomcat = callTest tests/tomcat.nix {}; tests.udisks2 = callTest tests/udisks2.nix {}; diff --git a/nixos/tests/ammonite.nix b/nixos/tests/ammonite.nix new file mode 100644 index 00000000000..e1dee71fddf --- /dev/null +++ b/nixos/tests/ammonite.nix @@ -0,0 +1,20 @@ +import ./make-test.nix ({ pkgs, ...} : { + name = "ammonite"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ nequissimus ]; + }; + + nodes = { + amm = + { config, pkgs, ... }: + { + environment.systemPackages = [ pkgs.ammonite ]; + }; + }; + + testScript = '' + startAll; + + $amm->succeed("amm -c 'val foo = 21; println(foo * 2)' | grep 42") + ''; +}) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 85d31334d6b..a6afe8a4b72 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -171,6 +171,7 @@ let makeInstallerTest = name: { createPartitions, preBootCommands ? "", extraConfig ? "" + , extraInstallerConfig ? {} , bootLoader ? "grub" # either "grub" or "systemd-boot" , grubVersion ? 2, grubDevice ? "/dev/vda", grubIdentifier ? "uuid" , enableOCR ? false, meta ? {} @@ -192,6 +193,7 @@ let { imports = [ ../modules/profiles/installation-device.nix ../modules/profiles/base.nix + extraInstallerConfig ]; virtualisation.diskSize = 8 * 1024; @@ -332,6 +334,43 @@ in { ''; }; + # zfs on / with swap + zfsroot = makeInstallerTest "zfs-root" + { + extraInstallerConfig = { + boot.supportedFilesystems = [ "zfs" ]; + }; + + extraConfig = '' + boot.supportedFilesystems = [ "zfs" ]; + + # Using by-uuid overrides the default of by-id, and is unique + # to the qemu disks, as they don't produce by-id paths for + # some reason. + boot.zfs.devNodes = "/dev/disk/by-uuid/"; + networking.hostId = "00000000"; + ''; + + createPartitions = + '' + $machine->succeed( + "parted /dev/vda mklabel msdos", + "parted /dev/vda -- mkpart primary linux-swap 1M 1024M", + "parted /dev/vda -- mkpart primary 1024M -1s", + "udevadm settle", + + "mkswap /dev/vda1 -L swap", + "swapon -L swap", + + "zpool create rpool /dev/vda2", + "zfs create -o mountpoint=legacy rpool/root", + "mount -t zfs rpool/root /mnt", + + "udevadm settle" + ); + ''; + }; + # Create two physical LVM partitions combined into one volume group # that contains the logical swap and root partitions. lvm = makeInstallerTest "lvm" diff --git a/nixos/tests/minio.nix b/nixos/tests/minio.nix new file mode 100644 index 00000000000..a349265b2f5 --- /dev/null +++ b/nixos/tests/minio.nix @@ -0,0 +1,32 @@ +import ./make-test.nix ({ pkgs, ...} : { + name = "minio"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ bachp ]; + }; + + nodes = { + machine = { config, pkgs, ... }: { + services.minio = { + enable = true; + accessKey = "BKIKJAA5BMMU2RHO6IBB"; + secretKey = "V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12"; + }; + environment.systemPackages = [ pkgs.minio-client ]; + }; + }; + + testScript = + '' + startAll; + $machine->waitForUnit("minio.service"); + $machine->waitForOpenPort(9000); + $machine->succeed("curl --fail http://localhost:9000/minio/index.html"); + + # Create a test bucket on the server + $machine->succeed("mc config host add minio http://localhost:9000 BKIKJAA5BMMU2RHO6IBB V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12 S3v4"); + $machine->succeed("mc mb minio/test-bucket"); + $machine->succeed("mc ls minio") =~ /test-bucket/ or die; + $machine->shutdown; + + ''; +}) diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix index b926a62194b..1b24551009c 100644 --- a/nixos/tests/misc.nix +++ b/nixos/tests/misc.nix @@ -34,7 +34,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; subtest "nixos-rebuild", sub { - $machine->succeed("nixos-rebuild --help | grep SYNOPSIS"); + $machine->succeed("nixos-rebuild --help | grep 'NixOS module' "); }; # Sanity check for uid/gid assignment. diff --git a/nixos/tests/postgresql.nix b/nixos/tests/postgresql.nix index 1f4f43a2666..0ce37b55bb7 100644 --- a/nixos/tests/postgresql.nix +++ b/nixos/tests/postgresql.nix @@ -13,8 +13,10 @@ let INSERT INTO sth (id) VALUES (1); INSERT INTO sth (id) VALUES (1); INSERT INTO sth (id) VALUES (1); + CREATE TABLE xmltest ( doc xml ); + INSERT INTO xmltest (doc) VALUES ('ok'); -- check if libxml2 enabled ''; - make-postgresql-test = postgresql-name: postgresql-package: { + make-postgresql-test = postgresql-name: postgresql-package: makeTest { name = postgresql-name; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ zagy ]; @@ -27,17 +29,23 @@ let }; testScript = '' + sub check_count { + my ($select, $nlines) = @_; + return 'test $(sudo -u postgres psql postgres -tAc "' . $select . '"|wc -l) -eq ' . $nlines; + } + $machine->start; $machine->waitForUnit("postgresql"); # postgresql should be available just after unit start - $machine->succeed("cat ${test-sql} | psql postgres"); + $machine->succeed("cat ${test-sql} | sudo -u postgres psql"); $machine->shutdown; # make sure that postgresql survive restart (bug #1735) sleep(2); $machine->start; $machine->waitForUnit("postgresql"); - $machine->fail('test $(psql postgres -tAc "SELECT * FROM sth;"|wc -l) -eq 3'); - $machine->succeed('test $(psql postgres -tAc "SELECT * FROM sth;"|wc -l) -eq 5'); - $machine->fail('test $(psql postgres -tAc "SELECT * FROM sth;"|wc -l) -eq 4'); + $machine->fail(check_count("SELECT * FROM sth;", 3)); + $machine->succeed(check_count("SELECT * FROM sth;", 5)); + $machine->fail(check_count("SELECT * FROM sth;", 4)); + $machine->succeed(check_count("SELECT xpath(\'/test/text()\', doc) FROM xmltest;", 1)); $machine->shutdown; ''; diff --git a/nixos/tests/sddm.nix b/nixos/tests/sddm.nix index 82be9bc1d72..1ce2b815784 100644 --- a/nixos/tests/sddm.nix +++ b/nixos/tests/sddm.nix @@ -24,7 +24,7 @@ let user = nodes.machine.config.users.extraUsers.alice; in '' startAll; - $machine->waitForText(qr/ALICE/); + $machine->waitForText(qr/select your user/i); $machine->screenshot("sddm"); $machine->sendChars("${user.password}\n"); $machine->waitForFile("/home/alice/.Xauthority"); diff --git a/nixos/tests/snapper.nix b/nixos/tests/snapper.nix new file mode 100644 index 00000000000..74ec22fd349 --- /dev/null +++ b/nixos/tests/snapper.nix @@ -0,0 +1,43 @@ +import ./make-test.nix ({ ... }: +{ + name = "snapper"; + + machine = { pkgs, lib, ... }: { + boot.initrd.postDeviceCommands = '' + ${pkgs.btrfs-progs}/bin/mkfs.btrfs -f -L aux /dev/vdb + ''; + + virtualisation.emptyDiskImages = [ 4096 ]; + + fileSystems = lib.mkVMOverride { + "/home" = { + device = "/dev/disk/by-label/aux"; + fsType = "btrfs"; + }; + }; + services.snapper.configs.home.subvolume = "/home"; + services.snapper.filters = "/nix"; + }; + + testScript = '' + $machine->succeed("btrfs subvolume create /home/.snapshots"); + + $machine->succeed("snapper -c home list"); + + $machine->succeed("snapper -c home create --description empty"); + + $machine->succeed("echo test > /home/file"); + $machine->succeed("snapper -c home create --description file"); + + $machine->succeed("snapper -c home status 1..2"); + + $machine->succeed("snapper -c home undochange 1..2"); + $machine->fail("ls /home/file"); + + $machine->succeed("snapper -c home delete 2"); + + $machine->succeed("systemctl --wait start snapper-timeline.service"); + + $machine->succeed("systemctl --wait start snapper-cleanup.service"); + ''; +}) diff --git a/nixos/tests/taskserver.nix b/nixos/tests/taskserver.nix index cdccb11d888..75be97a507d 100644 --- a/nixos/tests/taskserver.nix +++ b/nixos/tests/taskserver.nix @@ -246,6 +246,10 @@ in { }; subtest "check manual configuration", sub { + # Remove the keys from automatic CA creation, to make sure the new + # generation doesn't use keys from before. + $server->succeed('rm -rf ${cfg.dataDir}/keys/* >&2'); + $server->succeed('${switchToNewServer} >&2'); $server->waitForUnit("taskserver.service"); $server->waitForOpenPort(${portStr}); diff --git a/pkgs/applications/altcoins/dapp.nix b/pkgs/applications/altcoins/dapp.nix new file mode 100644 index 00000000000..51de4d202e8 --- /dev/null +++ b/pkgs/applications/altcoins/dapp.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, fetchFromGitHub, makeWrapper +, seth, git, solc, shellcheck, nodejs, hsevm }: + +stdenv.mkDerivation rec { + name = "dapp"; + version = "0.5.3"; + + src = fetchFromGitHub { + owner = "dapphub"; + repo = "dapp"; + rev = "v${version}"; + sha256 = "13b2krd02py8jnzjis44lay5i31d95z0myrsy5afzw7fa25giird"; + }; + + nativeBuildInputs = [makeWrapper shellcheck]; + buildPhase = "true"; + doCheck = true; + checkPhase = "make test"; + makeFlags = ["prefix=$(out)"]; + postInstall = let path = lib.makeBinPath [ + nodejs solc git seth hsevm + ]; in '' + wrapProgram "$out/bin/dapp" --prefix PATH : "${path}" + ''; + + meta = { + description = "Simple tool for creating Ethereum-based dapps"; + homepage = https://github.com/dapphub/dapp/; + maintainers = [stdenv.lib.maintainers.dbrock]; + license = lib.licenses.gpl3; + inherit version; + }; +} diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 1fcfd5f2b60..1fbabc338f2 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -38,9 +38,18 @@ rec { ethabi = callPackage ./ethabi.nix { }; ethrun = callPackage ./ethrun.nix { }; seth = callPackage ./seth.nix { }; + dapp = callPackage ./dapp.nix { }; + + hsevm = (pkgs.haskellPackages.callPackage ./hsevm.nix {}); primecoin = callPackage ./primecoin.nix { withGui = true; }; primecoind = callPackage ./primecoin.nix { withGui = false; }; stellar-core = callPackage ./stellar-core.nix { }; + + zcash = callPackage ./zcash { + withGui = false; + openssl = pkgs.openssl_1_1_0; + boost = pkgs.boost163; + }; } diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix index 3beb38e0d2d..7f7c3f304c2 100644 --- a/pkgs/applications/altcoins/go-ethereum.nix +++ b/pkgs/applications/altcoins/go-ethereum.nix @@ -1,31 +1,20 @@ -{ stdenv, lib, go, fetchgit }: +{ stdenv, lib, clang, buildGoPackage, fetchgit }: -stdenv.mkDerivation rec { +buildGoPackage rec { name = "go-ethereum-${version}"; - version = "1.4.7"; + version = "1.6.6"; rev = "refs/tags/v${version}"; goPackagePath = "github.com/ethereum/go-ethereum"; - buildInputs = [ go ]; + buildInputs = [ clang ]; + preBuild = "export CC=clang"; src = fetchgit { inherit rev; url = "https://${goPackagePath}"; - sha256 = "19q518kxkvrr44cvsph4wv3lr6ivqsckz1f22r62932s3sq6gyd8"; + sha256 = "066s7fp9pbyq670xwnib4p7zaxs941r9kpvj2hm6bkr28yrpvp1a"; }; - buildPhase = '' - export GOROOT=$(mktemp -d --suffix=-goroot) - ln -sv ${go}/share/go/* $GOROOT - ln -svf ${go}/bin $GOROOT - make all - ''; - - installPhase = '' - mkdir -p $out/bin - cp -v build/bin/* $out/bin - ''; - meta = { homepage = "https://ethereum.github.io/go-ethereum/"; description = "Official golang implementation of the Ethereum protocol"; diff --git a/pkgs/applications/altcoins/hsevm.nix b/pkgs/applications/altcoins/hsevm.nix new file mode 100644 index 00000000000..6db55e9ab07 --- /dev/null +++ b/pkgs/applications/altcoins/hsevm.nix @@ -0,0 +1,53 @@ +{ aeson, ansi-wl-pprint, base, base16-bytestring +, base64-bytestring, binary, brick, bytestring, containers +, cryptonite, data-dword, deepseq, directory, filepath, ghci-pretty +, here, HUnit, lens, lens-aeson, memory, mtl, optparse-generic +, process, QuickCheck, quickcheck-text, readline, rosezipper +, stdenv, tasty, tasty-hunit, tasty-quickcheck, temporary, text +, text-format, unordered-containers, vector, vty +, mkDerivation, fetchFromGitHub, lib +, ncurses, zlib, bzip2, solc +}: + +lib.overrideDerivation (mkDerivation rec { + pname = "hsevm"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "dapphub"; + repo = "hsevm"; + rev = "v${version}"; + sha256 = "1c6zpphs03yfvyfbv1cjf04qh5q2miq7rpd7kx2cil77msi8hxw4"; + }; + + isLibrary = false; + isExecutable = true; + enableSharedExecutables = false; + + postInstall = '' + rm -rf $out/{lib,share} + ''; + + extraLibraries = [ + aeson ansi-wl-pprint base base16-bytestring base64-bytestring + binary brick bytestring containers cryptonite data-dword deepseq + directory filepath ghci-pretty lens lens-aeson memory mtl + optparse-generic process QuickCheck quickcheck-text readline + rosezipper temporary text text-format unordered-containers vector + vty + ]; + executableHaskellDepends = [ + readline zlib bzip2 + ]; + testHaskellDepends = [ + base binary bytestring ghci-pretty here HUnit lens mtl QuickCheck + tasty tasty-hunit tasty-quickcheck text vector + ]; + + homepage = "https://github.com/dapphub/hsevm"; + description = "Ethereum virtual machine evaluator"; + license = stdenv.lib.licenses.agpl3; + maintainers = [stdenv.lib.maintainers.dbrock]; +}) (attrs: { + buildInputs = attrs.buildInputs ++ [solc]; +}) diff --git a/pkgs/applications/altcoins/seth.nix b/pkgs/applications/altcoins/seth.nix index bf2d6f65326..b2f5cfdea06 100644 --- a/pkgs/applications/altcoins/seth.nix +++ b/pkgs/applications/altcoins/seth.nix @@ -1,22 +1,22 @@ { stdenv, makeWrapper, lib, fetchFromGitHub -, bc, coreutils, curl, ethabi, git, gnused, jshon, solc, which }: +, bc, coreutils, curl, ethabi, git, gnused, jshon, perl, solc, which }: stdenv.mkDerivation rec { name = "seth-${version}"; - version = "0.5.1"; + version = "0.5.6"; src = fetchFromGitHub { owner = "dapphub"; repo = "seth"; rev = "v${version}"; - sha256 = "1qph1gldj24r8l6aswb1w133lrm8zsxmmxl4krjik0a73bm4ghdm"; + sha256 = "1zl70xy7njjwy4k4g84v7lpf9a2nnnbxh4mkpw7jzqfs2mr636z6"; }; nativeBuildInputs = [makeWrapper]; buildPhase = "true"; makeFlags = ["prefix=$(out)"]; postInstall = let path = lib.makeBinPath [ - bc coreutils curl ethabi git gnused jshon solc which + bc coreutils curl ethabi git gnused jshon perl solc which ]; in '' wrapProgram "$out/bin/seth" --prefix PATH : "${path}" ''; diff --git a/pkgs/applications/altcoins/zcash/default.nix b/pkgs/applications/altcoins/zcash/default.nix new file mode 100644 index 00000000000..0146bad6f86 --- /dev/null +++ b/pkgs/applications/altcoins/zcash/default.nix @@ -0,0 +1,49 @@ +{ stdenv, libsodium, fetchFromGitHub, wget, pkgconfig, autoreconfHook, openssl, db62, boost +, zlib, gtest, gmock, miniupnpc, callPackage, gmp, qt4, utillinux, protobuf, qrencode, libevent +, withGui }: + +let libsnark = callPackage ./libsnark { inherit boost openssl; }; + librustzcash = callPackage ./librustzcash {}; +in +with stdenv.lib; +stdenv.mkDerivation rec{ + + name = "zcash" + (toString (optional (!withGui) "d")) + "-" + version; + version = "1.0.8"; + + src = fetchFromGitHub { + owner = "zcash"; + repo = "zcash"; + rev = "f630519d865ce22a6cf72a29785f2a876902f8e1"; + sha256 = "1zjxg3dp0amjfs67469yp9b223v9hx29lkxid9wz2ivxj3paq7bv"; + }; + + enableParallelBuilding = true; + + buildInputs = [ pkgconfig gtest gmock gmp libsnark autoreconfHook openssl wget db62 boost zlib + miniupnpc protobuf libevent libsodium librustzcash ] + ++ optionals stdenv.isLinux [ utillinux ] + ++ optionals withGui [ qt4 qrencode ]; + + configureFlags = [ "LIBSNARK_INCDIR=${libsnark}/include/libsnark" + "--with-boost-libdir=${boost.out}/lib" + ] ++ optionals withGui [ "--with-gui=qt4" ]; + + patchPhase = '' + sed -i"" '/^\[LIBSNARK_INCDIR/d' configure.ac + sed -i"" 's,-lboost_system-mt,-lboost_system,' configure.ac + sed -i"" 's,-fvisibility=hidden,,g' src/Makefile.am + ''; + + postInstall = '' + cp zcutil/fetch-params.sh $out/bin/zcash-fetch-params + ''; + + meta = { + description = "Peer-to-peer, anonymous electronic cash system"; + homepage = "https://z.cash/"; + maintainers = with maintainers; [ rht ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/altcoins/zcash/librustzcash/default.nix b/pkgs/applications/altcoins/zcash/librustzcash/default.nix new file mode 100644 index 00000000000..4ce9a279d91 --- /dev/null +++ b/pkgs/applications/altcoins/zcash/librustzcash/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + name = "librustzcash-unstable-${version}"; + version = "2017-03-17"; + + src = fetchFromGitHub { + owner = "zcash"; + repo = "librustzcash"; + rev = "91348647a86201a9482ad4ad68398152dc3d635e"; + sha256 = "02l1f46frpvw1r6k1wfh77mrsnmsdvifqx0vnscxz4xgb9ia9d1c"; + }; + + depsSha256 = "02qx8zdhmj7rmhqqq5q9428x9mlrjxxcnn4yhnygz9gfgvada2hx"; + + installPhase = '' + mkdir -p $out/lib + cp target/release/librustzcash.a $out/lib/ + mkdir -p $out/include + cp include/librustzcash.h $out/include/ + ''; + + meta = with stdenv.lib; { + description = "Rust-language assets for Zcash"; + homepage = "https://github.com/zcash/librustzcash"; + maintainers = with maintainers; [ rht ]; + license = with licenses; [ mit asl20 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/altcoins/zcash/libsnark/ate-pairing.nix b/pkgs/applications/altcoins/zcash/libsnark/ate-pairing.nix new file mode 100644 index 00000000000..c5a824cd17d --- /dev/null +++ b/pkgs/applications/altcoins/zcash/libsnark/ate-pairing.nix @@ -0,0 +1,29 @@ +{ stdenv, xbyak, gmp, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "ate-pairing-unstable-${version}"; + version = "2016-05-03"; + + src = fetchFromGitHub { + owner = "herumi"; + repo = "ate-pairing"; + rev = "dcb9da999b1113f90b115bccb6f4b57ddf3a8452"; + sha256 = "0jr6r1cma414k8mhsyp7n8hqaqxi7zklsp6820a095sbb3zajckh"; + }; + + buildInputs = [ gmp xbyak ]; + + installPhase = '' + mkdir -p $out + cp -r lib $out + cp -r include $out + ''; + + meta = with stdenv.lib; { + description = "Optimal Ate Pairing over Barreto-Naehrig Curves"; + homepage = "https://github.com/herumi/ate-pairing"; + maintainers = with maintainers; [ rht ]; + license = licenses.bsd3; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/altcoins/zcash/libsnark/default.nix b/pkgs/applications/altcoins/zcash/libsnark/default.nix new file mode 100644 index 00000000000..9dd3f6886c8 --- /dev/null +++ b/pkgs/applications/altcoins/zcash/libsnark/default.nix @@ -0,0 +1,45 @@ +{ stdenv, libsodium, callPackage, boost, zlib, openssl, gmp, procps, fetchFromGitHub }: + +let atePairing = callPackage ./ate-pairing.nix { inherit xbyak; }; + mie = callPackage ./mie.nix { }; + xbyak = callPackage ./xbyak.nix {}; +in +stdenv.mkDerivation rec{ + name = "libsnark-unstable-${version}"; + version = "2017-02-09"; + + src = fetchFromGitHub { + owner = "zcash"; + repo = "libsnark"; + rev = "9ada3f84ab484c57b2247c2f41091fd6a0916573"; + sha256 = "0vhslcb9rwqab9szavyn856z4h9w1syiamfcixqmj0s908zzlaaq"; + }; + + buildInputs = [ libsodium atePairing mie xbyak zlib openssl boost gmp ]; + + makeFlags = [ + "PREFIX=$(out)" + "CURVE=ALT_BN128" + "NO_SUPERCOP=1" + "STATIC=1" + ]; + + buildPhase = '' + CXXFLAGS="-fPIC -DBINARY_OUTPUT -DNO_PT_COMPRESSION=1" \ + make lib \ + CURVE=ALT_BN128 \ + MULTICORE=1 \ + STATIC=1 \ + NO_PROCPS=1 \ + NO_GTEST=1 \ + FEATUREFLAGS=-DMONTGOMERY_OUTPUT \ + ''; + + meta = with stdenv.lib; { + description = "a C++ library for zkSNARK proofs"; + homepage = "https://github.com/zcash/libsnark"; + maintainers = with maintainers; [ rht ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/altcoins/zcash/libsnark/mie.nix b/pkgs/applications/altcoins/zcash/libsnark/mie.nix new file mode 100644 index 00000000000..c92c113a27a --- /dev/null +++ b/pkgs/applications/altcoins/zcash/libsnark/mie.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "mie-unstable-${version}"; + version = "2016-05-10"; + + src = fetchFromGitHub { + owner = "herumi"; + repo = "mie"; + rev = "704b625b7770a8e1eab26ac65d1fed14c2fcf090"; + sha256 = "144bpmgfs2m4qqv7a2mccgi1aq5jmlr25gnk78ryq09z8cyv88y2"; + }; + + phases = ["unpackPhase" "installPhase"]; + + installPhase = '' + mkdir -p $out + cp -r include $out + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/herumi/mie"; + maintainers = with maintainers; [ rht ]; + license = licenses.bsd3; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/altcoins/zcash/libsnark/xbyak.nix b/pkgs/applications/altcoins/zcash/libsnark/xbyak.nix new file mode 100644 index 00000000000..c0b36ab9344 --- /dev/null +++ b/pkgs/applications/altcoins/zcash/libsnark/xbyak.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "xbyak-unstable-${version}"; + version = "2016-05-03"; + + src = fetchFromGitHub { + owner = "herumi"; + repo = "xbyak"; + rev = "b6133a02dd6b7116bea31d0e6b7142bf97f071aa"; + sha256 = "1rc2nx8kj2lj13whxb9chhh79f4hmjjj4j1hpqsd0lbdb60jikrn"; + }; + + phases = ["unpackPhase" "installPhase"]; + + installPhase = '' + mkdir -p $out/include + cp -r xbyak $out/include + ''; + + meta = with stdenv.lib; { + description = "JIT assembler for x86, x64"; + homepage = "https://github.com/herumi/xbyak"; + maintainers = with maintainers; [ rht ]; + license = licenses.bsd3; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/audio/dr14_tmeter/default.nix b/pkgs/applications/audio/dr14_tmeter/default.nix new file mode 100644 index 00000000000..3e315e2d1a7 --- /dev/null +++ b/pkgs/applications/audio/dr14_tmeter/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, python3Packages, pkgs }: + +python3Packages.buildPythonApplication rec { + name = "dr14_tmeter-${version}"; + version = "1.0.16"; + + disabled = !python3Packages.isPy3k; + + src = fetchFromGitHub { + owner = "simon-r"; + repo = "dr14_t.meter"; + rev = "v${version}"; + sha256 = "1nfsasi7kx0myxkahbd7rz8796mcf5nsadrsjjpx2kgaaw5nkv1m"; + }; + + propagatedBuildInputs = with pkgs; [ + python3Packages.numpy flac vorbis-tools ffmpeg faad2 lame + ]; + + # There are no tests + doCheck = false; + + meta = with stdenv.lib; { + description = "Compute the DR14 of a given audio file according to the procedure described by the Pleasurize Music Foundation"; + license = licenses.gpl3Plus; + homepage = http://dr14tmeter.sourceforge.net/; + maintainers = [ maintainers.adisbladis ]; + }; +} diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix index a52301c34d7..7a2e2a6da45 100644 --- a/pkgs/applications/audio/drumgizmo/default.nix +++ b/pkgs/applications/audio/drumgizmo/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchurl, alsaLib, expat, glib, libjack2, libX11, libpng +{ stdenv, fetchurl, alsaLib, expat, glib, libjack2, libXext, libX11, libpng , libpthreadstubs, libsmf, libsndfile, lv2, pkgconfig, zita-resampler }: stdenv.mkDerivation rec { - version = "0.9.12"; + version = "0.9.14"; name = "drumgizmo-${version}"; src = fetchurl { url = "http://www.drumgizmo.org/releases/${name}/${name}.tar.gz"; - sha256 = "0kqrss9v3vpznmh4jgi3783wmprr645s3i485jlvdscpysjfkh6z"; + sha256 = "1q2jghjz0ygaja8dgvxp914if8yyzpa204amdcwb9yyinpxsahz4"; }; configureFlags = [ "--enable-lv2" ]; buildInputs = [ - alsaLib expat glib libjack2 libX11 libpng libpthreadstubs libsmf - libsndfile lv2 pkgconfig zita-resampler + alsaLib expat glib libjack2 libXext libX11 libpng libpthreadstubs + libsmf libsndfile lv2 pkgconfig zita-resampler ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/flac123/default.nix b/pkgs/applications/audio/flac123/default.nix new file mode 100644 index 00000000000..f0863bfc50b --- /dev/null +++ b/pkgs/applications/audio/flac123/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, autoreconfHook, flac, libao, libogg, popt }: + +stdenv.mkDerivation rec { + name = "flac123-${version}"; + version = "0.0.12"; + + src = fetchurl { + url = "mirror://sourceforge/flac-tools/${name}-release.tar.gz"; + sha256 = "0zg4ahkg7v81za518x32wldf42g0rrvlrcqhrg9sv3li9bayyxhr"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ flac libao libogg popt ]; + + meta = with stdenv.lib; { + homepage = http://flac-tools.sourceforge.net/; + description = "A command-line program for playing FLAC audio files"; + license = licenses.gpl2Plus; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/audio/helm/default.nix b/pkgs/applications/audio/helm/default.nix index 712f309fad0..80fb6a9ef92 100644 --- a/pkgs/applications/audio/helm/default.nix +++ b/pkgs/applications/audio/helm/default.nix @@ -1,21 +1,21 @@ - { stdenv, fetchFromGitHub , xorg, freetype, alsaLib, libjack2 + { stdenv, fetchFromGitHub , xorg, freetype, alsaLib, curl, libjack2 , lv2, pkgconfig, mesa }: stdenv.mkDerivation rec { - version = "0.8.6"; + version = "0.9.0"; name = "helm-${version}"; src = fetchFromGitHub { owner = "mtytel"; repo = "helm"; - rev = "19f86e6b4db83c1c6b143fc27883592ac4e43489"; - sha256 = "0a46wnbfqkns8l136v79rr9gv4hhba065igjwkjddf045c9l94l8"; + rev = "927d2ed27f71a735c3ff2a1226ce3129d1544e7e"; + sha256 = "17ys2vvhncx9i3ydg3xwgz1d3gqv4yr5mqi7vr0i0ca6nad6x3d4"; }; buildInputs = [ xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext xorg.libXinerama xorg.libXrender xorg.libXrandr - freetype alsaLib libjack2 pkgconfig mesa lv2 + freetype alsaLib curl libjack2 pkgconfig mesa lv2 ]; CXXFLAGS = "-DHAVE_LROUND"; @@ -26,6 +26,7 @@ buildPhase = '' make lv2 + make standalone ''; installPhase = '' diff --git a/pkgs/applications/audio/mopidy-iris/default.nix b/pkgs/applications/audio/mopidy-iris/default.nix new file mode 100644 index 00000000000..a39c6327763 --- /dev/null +++ b/pkgs/applications/audio/mopidy-iris/default.nix @@ -0,0 +1,27 @@ +{ stdenv, pythonPackages, mopidy, mopidy-local-images }: + +pythonPackages.buildPythonApplication rec { + name = "mopidy-iris-${version}"; + version = "3.0.5"; + + src = pythonPackages.fetchPypi { + inherit version; + pname = "Mopidy-Iris"; + sha256 = "0rabpzmiis13z4qz3vqlsfc9xjkwracafckahnq2cq97qawyq9y9"; + }; + + propagatedBuildInputs = [ + mopidy + mopidy-local-images + pythonPackages.configobj + pythonPackages.pylast + pythonPackages.spotipy + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/jaedb/Iris"; + description = "A fully-functional Mopidy web client encompassing Spotify and many other backends"; + license = licenses.asl20; + maintainers = [ maintainers.rvolosatovs ]; + }; +} diff --git a/pkgs/applications/audio/mopidy-local-images/default.nix b/pkgs/applications/audio/mopidy-local-images/default.nix new file mode 100644 index 00000000000..e9538273568 --- /dev/null +++ b/pkgs/applications/audio/mopidy-local-images/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, pythonPackages, mopidy }: + +pythonPackages.buildPythonApplication rec { + name = "mopidy-local-images-${version}"; + + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "mopidy"; + repo = "mopidy-local-images"; + rev = "v${version}"; + sha256 = "0gdqxws0jish50mmi57mlqcs659wrllzv00czl18niz94vzvyc0d"; + }; + + propagatedBuildInputs = [ + mopidy + pythonPackages.pykka + pythonPackages.uritools + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/mopidy/mopidy-local-images"; + description = "Mopidy local library proxy extension for handling embedded album art"; + license = licenses.asl20; + maintainers = [ maintainers.rvolosatovs ]; + }; +} diff --git a/pkgs/applications/audio/mopidy-local-sqlite/default.nix b/pkgs/applications/audio/mopidy-local-sqlite/default.nix new file mode 100644 index 00000000000..54501895e31 --- /dev/null +++ b/pkgs/applications/audio/mopidy-local-sqlite/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, pythonPackages, mopidy }: + +pythonPackages.buildPythonApplication rec { + name = "mopidy-local-sqlite-${version}"; + + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "mopidy"; + repo = "mopidy-local-sqlite"; + rev = "v${version}"; + sha256 = "1fjd9ydbfwd1n9b9zw8zjn4l7c5hpam2n0xs51pjkjn82m3zq9zv"; + }; + + propagatedBuildInputs = [ + mopidy + pythonPackages.uritools + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/mopidy/mopidy-local-sqlite"; + description = "Mopidy SQLite local library extension"; + license = licenses.asl20; + maintainers = [ maintainers.rvolosatovs ]; + }; +} diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index 9004a46115e..59012432caf 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -1,4 +1,7 @@ -{stdenv, fetchurl, alsaLib }: +{ stdenv +, fetchurl, alsaLib +, hostPlatform +}: stdenv.mkDerivation rec { name = "mpg123-1.23.8"; @@ -10,10 +13,8 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib; - crossAttrs = { - configureFlags = if stdenv.cross ? mpg123 then - "--with-cpu=${stdenv.cross.mpg123.cpu}" else ""; - }; + configureFlags = + stdenv.lib.optional (hostPlatform ? mpg123) "--with-cpu=${hostPlatform.mpg123.cpu}"; meta = { description = "Fast console MPEG Audio Player and decoder library"; diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index 0660d0b2bc3..1923377e56a 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -1,39 +1,33 @@ { stdenv, fetchurl, boost, mpd_clientlib, ncurses, pkgconfig, readline -, libiconv, icu +, libiconv, icu, curl , outputsSupport ? false # outputs screen , visualizerSupport ? false, fftw ? null # visualizer screen , clockSupport ? false # clock screen -, unicodeSupport ? true # utf8 support -, curlSupport ? true, curl ? null # allow fetching lyrics from the internet , taglibSupport ? true, taglib ? null # tag editor }: assert visualizerSupport -> (fftw != null); -assert curlSupport -> (curl != null); assert taglibSupport -> (taglib != null); with stdenv.lib; stdenv.mkDerivation rec { name = "ncmpcpp-${version}"; - version = "0.7.7"; + version = "0.8"; src = fetchurl { url = "http://ncmpcpp.rybczak.net/stable/${name}.tar.bz2"; - sha256 = "1vq19m36608pvw1g8nbcaqqb89wsw05v35pi45xwr20z7g4bxg5p"; + sha256 = "0nj6ky805a55acj0w57sbn3vfmmkbqp97rhbi0q9848n10f2l3rg"; }; configureFlags = [ "BOOST_LIB_SUFFIX=" ] ++ optional outputsSupport "--enable-outputs" ++ optional visualizerSupport "--enable-visualizer --with-fftw" ++ optional clockSupport "--enable-clock" - ++ optional unicodeSupport "--enable-unicode" - ++ optional curlSupport "--with-curl" ++ optional taglibSupport "--with-taglib"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ boost mpd_clientlib ncurses readline libiconv icu ] - ++ optional curlSupport curl + buildInputs = [ boost mpd_clientlib ncurses readline libiconv icu curl ] ++ optional visualizerSupport fftw ++ optional taglibSupport taglib; @@ -41,7 +35,7 @@ stdenv.mkDerivation rec { description = "A featureful ncurses based MPD client inspired by ncmpc"; homepage = http://ncmpcpp.rybczak.net/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ lovek323 mornfall koral ]; - platforms = platforms.linux; + maintainers = with maintainers; [ jfrankenau koral lovek323 mornfall ]; + platforms = platforms.all; }; } diff --git a/pkgs/applications/audio/nova-filters/default.nix b/pkgs/applications/audio/nova-filters/default.nix index fff3582f7df..b361e6c33ae 100644 --- a/pkgs/applications/audio/nova-filters/default.nix +++ b/pkgs/applications/audio/nova-filters/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { sed -i -e '4d' SConstruct sed -i "s@mfpmath=sse@mfpmath=sse -I ${boost.dev}/include@g" SConstruct sed -i "s@ladspa.h@${ladspaH}/include/ladspa.h@g" filters.cpp + sed -i "s@LADSPA_HINT_SAMPLE_RATE, 0, 0.5@LADSPA_HINT_SAMPLE_RATE, 0.0001, 0.5@g" filters.cpp sed -i "s/= check/= detail::filter_base::check/" nova/source/dsp/filter.hpp ''; @@ -27,10 +28,11 @@ stdenv.mkDerivation rec { scons $sconsFlags "prefix=$out" install ''; - meta = { - homepage = http://klingt.org/~tim/nova-filters/; + meta = with stdenv.lib; { description = "LADSPA plugins based on filters of nova"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + homepage = http://klingt.org/~tim/nova-filters/; + license = licenses.gpl2Plus; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/sisco.lv2/default.nix b/pkgs/applications/audio/sisco.lv2/default.nix index d429d545234..8ac7a9115ca 100644 --- a/pkgs/applications/audio/sisco.lv2/default.nix +++ b/pkgs/applications/audio/sisco.lv2/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { inherit name; srcs = [ src robtkSrc ]; - sourceRoot = "sisco.lv2-${src.rev}-src"; + sourceRoot = src.name; buildInputs = [ pkgconfig lv2 pango cairo libjack2 mesa ]; diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index e5dbf0aab84..266e221649e 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -8,7 +8,7 @@ let # Please update the stable branch! # Latest version number can be found at: # http://repository-origin.spotify.com/pool/non-free/s/spotify-client/ - version = "1.0.55.487.g256699aa-16"; + version = "1.0.57.474.gca9c9538-30"; deps = [ alsaLib @@ -53,7 +53,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "09rhm0jp5prcvyf8zpw4pl422yiy8nkazcjc3lv61ngpznk3n1r0"; + sha256 = "fe46f2084c45c756bee366f744d2821d79e82866b19942e30bb2a20c1e597437"; }; buildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/backup/crashplan/default.nix b/pkgs/applications/backup/crashplan/default.nix index 25842d4a989..3bfee48b8cd 100644 --- a/pkgs/applications/backup/crashplan/default.nix +++ b/pkgs/applications/backup/crashplan/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, makeWrapper, jre, cpio, gawk, gnugrep, gnused, procps, swt, gtk2, glib, libXtst }: stdenv.mkDerivation rec { - version = "4.8.2"; + version = "4.8.3"; rev = "1"; #tracks unversioned changes that occur on download.code42.com from time to time name = "crashplan-${version}-r${rev}"; src = fetchurl { url = "https://download.code42.com/installs/linux/install/CrashPlan/CrashPlan_${version}_Linux.tgz"; - sha256 = "0wh8lcm06ilcyncnp4ckg4yhyf9z3gb6v1kr111j4bpgmnd0v1yf"; + sha256 = "c25d87ec1d442a396b668547e39b70d66dcfe02250cc57a25916ebb42a407113"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/common.nix similarity index 72% rename from pkgs/applications/editors/android-studio/default.nix rename to pkgs/applications/editors/android-studio/common.nix index 0ba89099eb3..e74d04218f4 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -1,3 +1,4 @@ +{ pname, version, build, src, meta }: { bash , buildFHSUserEnv , coreutils @@ -32,12 +33,9 @@ }: let - - version = "2.3.3.0"; - build = "162.4069837"; - androidStudio = stdenv.mkDerivation { - name = "android-studio"; + inherit src meta; + name = "${pname}"; buildInputs = [ makeWrapper unzip @@ -96,32 +94,21 @@ let --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ --set FONTCONFIG_FILE ${fontsConf} ''; - src = fetchurl { - url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip"; - sha256 = "0zzis9m2xp44xwkj0zvcqw5rh3iyd3finyi5nqhgira1fkacz0qk"; - }; - meta = with stdenv.lib; { - description = "The Official IDE for Android"; - homepage = https://developer.android.com/studio/index.html; - license = licenses.asl20; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ primeos ]; - }; }; # Android Studio downloads prebuilt binaries as part of the SDK. These tools # (e.g. `mksdcard`) have `/lib/ld-linux.so.2` set as the interpreter. An FHS # environment is used as a work around for that. fhsEnv = buildFHSUserEnv { - name = "android-studio-fhs-env"; + name = "${pname}-fhs-env"; }; in writeTextFile { - name = "android-studio-${version}"; - destination = "/bin/android-studio"; + name = "${pname}-${version}"; + destination = "/bin/${pname}"; executable = true; text = '' #!${bash}/bin/bash - ${fhsEnv}/bin/android-studio-fhs-env ${androidStudio}/bin/studio.sh + ${fhsEnv}/bin/${pname}-fhs-env ${androidStudio}/bin/studio.sh ''; } diff --git a/pkgs/applications/editors/android-studio/packages.nix b/pkgs/applications/editors/android-studio/packages.nix new file mode 100644 index 00000000000..860f1e53297 --- /dev/null +++ b/pkgs/applications/editors/android-studio/packages.nix @@ -0,0 +1,47 @@ +{ stdenv, callPackage, fetchurl, makeFontsConf }: +let + mkStudio = opts: callPackage (import ./common.nix opts); +in rec { + stable = mkStudio rec { + pname = "android-studio"; + version = "2.3.3.0"; + build = "162.4069837"; + + src = fetchurl { + url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip"; + sha256 = "0zzis9m2xp44xwkj0zvcqw5rh3iyd3finyi5nqhgira1fkacz0qk"; + }; + + meta = with stdenv.lib; { + description = "The Official IDE for Android"; + homepage = https://developer.android.com/studio/index.html; + license = licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ primeos ]; + }; + } { + fontsConf = makeFontsConf { + fontDirectories = []; + }; + }; + + preview = mkStudio rec { + pname = "android-studio-preview"; + version = "3.0.0.6"; + build = "171.4182969"; + + src = fetchurl { + url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip"; + sha256 = "0s26k5qr0qg6az77yw2mvnhavwi4aza4ifvd45ljank8aqr6sp5i"; + }; + + meta = stable.meta // { + homepage = https://developer.android.com/studio/preview/index.html; + maintainers = with stdenv.lib.maintainers; [ tomsmeets ]; + }; + } { + fontsConf = makeFontsConf { + fontDirectories = []; + }; + }; +} diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index 60bece1fafc..6a5bc3e7b0f 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -1,5 +1,5 @@ { stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender -, zlib, jdk, glib, gtk2, libXtst, gsettings_desktop_schemas, webkitgtk2 +, zlib, jdk, glib, gtk2, libXtst, gsettings_desktop_schemas, webkitgtk24x-gtk2 , makeWrapper, ... }: { name, src ? builtins.getAttr stdenv.system sources, sources ? null, description }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ fontconfig freetype glib gsettings_desktop_schemas gtk2 jdk libX11 libXrender libXtst makeWrapper zlib - ] ++ stdenv.lib.optional (webkitgtk2 != null) webkitgtk2; + ] ++ stdenv.lib.optional (webkitgtk24x-gtk2 != null) webkitgtk24x-gtk2; buildCommand = '' # Unpack tarball. @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { makeWrapper $out/eclipse/eclipse $out/bin/eclipse \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk2 libXtst ] ++ stdenv.lib.optional (webkitgtk2 != null) webkitgtk2)} \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk2 libXtst ] ++ stdenv.lib.optional (webkitgtk24x-gtk2 != null) webkitgtk24x-gtk2)} \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration" diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 8ef855e48c8..b039bd168d8 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, makeDesktopItem, makeWrapper , freetype, fontconfig, libX11, libXext, libXrender, zlib , glib, gtk2, libXtst, jdk, gsettings_desktop_schemas -, webkitgtk2 ? null # for internal web browser +, webkitgtk24x-gtk2 ? null # for internal web browser , buildEnv, writeText, runCommand , callPackage }: @@ -12,27 +12,27 @@ rec { buildEclipse = import ./build-eclipse.nix { inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib - jdk glib gtk2 libXtst gsettings_desktop_schemas webkitgtk2 + jdk glib gtk2 libXtst gsettings_desktop_schemas webkitgtk24x-gtk2 makeWrapper; }; ### Eclipse CPP - eclipse-cpp = eclipse-cpp-46; # always point to latest + eclipse-cpp = eclipse-cpp-47; # always point to latest - eclipse-cpp-46 = buildEclipse { - name = "eclipse-cpp-4.6.0"; - description = "Eclipse IDE for C/C++ Developers, Neon release"; + eclipse-cpp-47 = buildEclipse { + name = "eclipse-cpp-4.7.0"; + description = "Eclipse IDE for C/C++ Developers, Oxygen release"; src = if stdenv.system == "x86_64-linux" then fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/neon/R/eclipse-cpp-neon-R-linux-gtk-x86_64.tar.gz; - sha256 = "09fqsgvbjfdqvn7z03crkii34z4bsb34y272q68ib8741bxk0i6m"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/oxygen/R/eclipse-cpp-oxygen-R-linux-gtk-x86_64.tar.gz; + sha512 = "813c791e739d7d0e2ab242a5bacadca135bbeee20ef97aa830353cd90f63fa6e9c89cfcc6aadf635c742befe035bd6e3f15103013f63c419f6144e86ebde3ed1"; } else if stdenv.system == "i686-linux" then fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/neon/R/eclipse-cpp-neon-R-linux-gtk.tar.gz; - sha256 = "0a12qmqq22v7sbmwn1hjv1zcrkmp64bf0ajmdjljhs9ac79mxn5h"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/oxygen/R/eclipse-cpp-oxygen-R-linux-gtk.tar.gz; + sha512 = "2b50f4a00306a89cda1aaaa606e62285cacbf93464a9dd3f3319dca3e2c578b802e685de6f78e5e617d269e21271188effe73d41f491a6de946e28795d82db8a"; } else throw "Unsupported system: ${stdenv.system}"; }; @@ -56,21 +56,21 @@ rec { ### Eclipse Modeling - eclipse-modeling = eclipse-modeling-46; # always point to latest + eclipse-modeling = eclipse-modeling-47; # always point to latest - eclipse-modeling-46 = buildEclipse { - name = "eclipse-modeling-4.6"; + eclipse-modeling-47 = buildEclipse { + name = "eclipse-modeling-4.7"; description = "Eclipse Modeling Tools"; src = if stdenv.system == "x86_64-linux" then fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/neon/1a/eclipse-modeling-neon-1a-linux-gtk-x86_64.tar.gz; - sha1 = "3695fd049c4cca2d235f424557e19877795a8183"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/oxygen/R/eclipse-modeling-oxygen-R-linux-gtk-x86_64.tar.gz; + sha512 = "3b9a7ad4b5d6b77fbdd64e8d323e0adb6c2904763ad042b374b4d87cef8607408cb407e395870fc755d58c0c800e20818adcf456ebe193d76cede16c5fe12271"; } else fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/neon/1a/eclipse-modeling-neon-1a-linux-gtk.tar.gz; - sha1 = "fa0694a0b44e8e9c2301417f84dba45cf9ac6e61"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/oxygen/R/eclipse-modeling-oxygen-R-linux-gtk.tar.gz; + sha512 = "b8597c1dec117e69c72a5e1a53e09b1f81a7c9de86ed7e71a9d007664603202df301745f186ded02b2e76410345863e80a2ba40867d6848e5375601289999206"; }; }; @@ -93,7 +93,7 @@ rec { ### Eclipse Platform - eclipse-platform = eclipse-platform-46; # always point to latest + eclipse-platform = eclipse-platform-47; # always point to latest eclipse-platform-46 = buildEclipse { name = "eclipse-platform-4.6.2"; @@ -110,6 +110,21 @@ rec { }; }; + eclipse-platform-47 = buildEclipse { + name = "eclipse-platform-4.7"; + description = "Eclipse Platform Oxygen"; + sources = { + "x86_64-linux" = fetchurl { + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7-201706120950/eclipse-platform-4.7-linux-gtk-x86_64.tar.gz; + sha256 = "0hrgijydxvd2zz1npv5qw8d79f48a6lsdw3qy1wqf7k59aqyg2fq"; + }; + "i686-linux" = fetchurl { + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7-201706120950/eclipse-platform-4.7-linux-gtk.tar.gz; + sha256 = "00m89j26m8nj190q144wx8d88mldx1z6i797p8isg3rhbz3x5dbc"; + }; + }; + }; + ### Eclipse Scala SDK eclipse-scala-sdk = eclipse-scala-sdk-441; # always point to latest @@ -132,7 +147,7 @@ rec { ### Eclipse SDK - eclipse-sdk = eclipse-sdk-46; # always point to latest + eclipse-sdk = eclipse-sdk-47; # always point to latest eclipse-sdk-46 = buildEclipse { name = "eclipse-sdk-4.6.2"; @@ -149,6 +164,21 @@ rec { }; }; + eclipse-sdk-47 = buildEclipse { + name = "eclipse-sdk-4.7"; + description = "Eclipse Oxygen Classic"; + sources = { + "x86_64-linux" = fetchurl { + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7-201706120950/eclipse-SDK-4.7-linux-gtk-x86_64.tar.gz; + sha256 = "1nz0hl0gg4a8iffnaggbhdw0ra8a7wljlimvijbbybh0nhvfd9n3"; + }; + "i686-linux" = fetchurl { + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7-201706120950/eclipse-SDK-4.7-linux-gtk.tar.gz; + sha256 = "0dar69v7d7bkl18si45bccvil809a85ghb7k88m1q2cq1kd2r8z5"; + }; + }; + }; + eclipse-sdk-37 = buildEclipse { name = "eclipse-sdk-3.7"; description = "Eclipse Classic"; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index f48378b1122..c0c96d9e1a4 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -194,12 +194,12 @@ rec { checkstyle = buildEclipseUpdateSite rec { name = "checkstyle-${version}"; - version = "7.3.0.201612142232"; + version = "8.0.0.201707161819"; src = fetchzip { stripRoot = false; - url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/7.3.0/net.sf.eclipsecs-updatesite_${version}.zip"; - sha256 = "1mbiszwnakfmjx5mnh9h2rrp9jzizkmz89p8z4spq2m9kwy1lkqj"; + url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/8.0.0/net.sf.eclipsecs-updatesite_${version}.zip"; + sha256 = "1p07xcf71qc99sh73vqm9xxxgi819m58frv0cpvsn06y6ljr0aj2"; }; meta = with stdenv.lib; { @@ -364,12 +364,12 @@ rec { jdt = buildEclipseUpdateSite rec { name = "jdt-${version}"; - version = "4.6.2"; + version = "4.7"; src = fetchzip { stripRoot = false; - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.2-201611241400/org.eclipse.jdt-4.6.2.zip"; - sha256 = "1nnlrl05lh1hcsh14dlisnx0vwmj21agm4wia98rv0gl2gkp19n1"; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7-201706120950/org.eclipse.jdt-4.7.zip"; + sha256 = "0y17shnlh90gg9226lraknvdnp2i71ck91dnxbbzvxl8b64v8v1p"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix index ec56667a4ba..2404405c307 100644 --- a/pkgs/applications/editors/ed/default.nix +++ b/pkgs/applications/editors/ed/default.nix @@ -1,4 +1,6 @@ -{ fetchurl, stdenv }: +{ stdenv, fetchurl +, buildPlatform, hostPlatform +}: stdenv.mkDerivation rec { name = "ed-${version}"; @@ -28,11 +30,18 @@ stdenv.mkDerivation rec { make: *** [check] Error 127 */ - doCheck = !stdenv.isDarwin; + doCheck = !(hostPlatform.isDarwin || hostPlatform != buildPlatform); - crossAttrs = { - compileFlags = [ "CC=${stdenv.cross.config}-gcc" ]; - }; + # TODO(@Ericson2314): Use placeholder to make this a configure flag once Nix + # 1.12 is released. + preConfigure = '' + export DESTDIR=$out + ''; + + configureFlags = [ + "--exec-prefix=${stdenv.cc.prefix}" + "CC=${stdenv.cc.prefix}cc" + ]; meta = { description = "An implementation of the standard Unix editor"; diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 9bf51fc0904..7d8d01aafd6 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -28,10 +28,10 @@ ada-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, wisi }: elpaBuild { pname = "ada-mode"; - version = "5.2.1"; + version = "5.2.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ada-mode-5.2.1.tar"; - sha256 = "099c8vm6jvwypff981vbs77y6hqq31fn6s8gwqkmncq04mk3vw34"; + url = "https://elpa.gnu.org/packages/ada-mode-5.2.2.tar"; + sha256 = "0c0lrj4vgsbawyshqbfb7gvndf0yb97wybqb0b34z7kan7q0xgvd"; }; packageRequires = [ cl-lib emacs wisi ]; meta = { @@ -95,10 +95,10 @@ ahungry-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "ahungry-theme"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ahungry-theme-1.3.0.tar"; - sha256 = "1p2zaq0s4bbl5cx6wyab24wamw7m0mysb0v47dqjmnvfc25z84rq"; + url = "https://elpa.gnu.org/packages/ahungry-theme-1.4.0.tar"; + sha256 = "1n8k12mfn01f20j0pyd7ycj77x0y3a008xc94frklaaqjc0v26s4"; }; packageRequires = [ emacs ]; meta = { @@ -319,14 +319,15 @@ license = lib.licenses.free; }; }) {}; - cobol-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + cobol-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: + elpaBuild { pname = "cobol-mode"; version = "1.0.0"; src = fetchurl { url = "https://elpa.gnu.org/packages/cobol-mode-1.0.0.el"; sha256 = "1zmcfpl7v787yacc7gxm8mkp53fmrznp5mnad628phf3vj4kwnxi"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://elpa.gnu.org/packages/cobol-mode.html"; license = lib.licenses.free; @@ -360,10 +361,10 @@ }) {}; company = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "company"; - version = "0.9.3"; + version = "0.9.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/company-0.9.3.tar"; - sha256 = "1b38najmah4s2smxslik6wbdvb0x77rm6fv45pcq5x5aaiplh5ap"; + url = "https://elpa.gnu.org/packages/company-0.9.4.tar"; + sha256 = "1wm2nzjfn9cmjb6f5yvawrss7pg1r0swwwqqx602wg8hjrsiabay"; }; packageRequires = [ emacs ]; meta = { @@ -821,10 +822,10 @@ gited = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "gited"; - version = "0.2.2"; + version = "0.3.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gited-0.2.2.tar"; - sha256 = "0ncxcrmiqhfzy18ssfkvbzmzwjbmr41ac1x7fpykrgihqiqglzfq"; + url = "https://elpa.gnu.org/packages/gited-0.3.2.tar"; + sha256 = "1y40zn1w5m2srrqffkpvvzk3j5zzq21smsqychyx2diggn4c0hgi"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1221,10 +1222,10 @@ metar = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "metar"; - version = "0.2"; + version = "0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/metar-0.2.el"; - sha256 = "0rfzq79llh6ixw02kjpn8s2shxrabvfvsq48pagwak1jl2s0askf"; + url = "https://elpa.gnu.org/packages/metar-0.3.el"; + sha256 = "07gv0v0xwb5yzynwagmvf0n5c9wljy1jg4ympnxpa2d9r1zqc02g"; }; packageRequires = [ cl-lib ]; meta = { @@ -1445,10 +1446,10 @@ }) {}; org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20170606"; + version = "20170717"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-20170606.tar"; - sha256 = "0m2gln3wz9v3aflyxxy2317808yy05rrzrjx35spw2d90d10hmkz"; + url = "https://elpa.gnu.org/packages/org-20170717.tar"; + sha256 = "0jrkfclwlbfcdkf56awnmvyw5vb9qwbfyyf2z4ilwx29zps9mxnh"; }; packageRequires = []; meta = { @@ -1472,10 +1473,10 @@ other-frame-window = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "other-frame-window"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/other-frame-window-1.0.3.el"; - sha256 = "0vq1zfsdnxdjvmb7lkjyax27kfv0rw0141rd5fjnl6ap9yjwpxkv"; + url = "https://elpa.gnu.org/packages/other-frame-window-1.0.4.el"; + sha256 = "0hg82j8zjh0ann6bf56r0p8s0y3a016zny8byp80mcvkw63wrn5i"; }; packageRequires = [ emacs ]; meta = { @@ -1651,10 +1652,10 @@ }) {}; rnc-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "rnc-mode"; - version = "0.1"; + version = "0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rnc-mode-0.1.el"; - sha256 = "18hm9g05ld8i1apr28dmd9ccq6dc0w6rdqhi0k7ka95jxxdr9m6d"; + url = "https://elpa.gnu.org/packages/rnc-mode-0.2.el"; + sha256 = "0xhvcfqjkb010wc7r218xcjidv1c8597vayyv09vk97z4qxqkrbd"; }; packageRequires = []; meta = { @@ -1771,10 +1772,10 @@ soap-client = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "soap-client"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/soap-client-3.1.2.tar"; - sha256 = "0crfpp2ksqvzf2j3q44qq6z8zh1r10q9kw12cxbmjiih89q01b68"; + url = "https://elpa.gnu.org/packages/soap-client-3.1.3.tar"; + sha256 = "1s5m6dc7z532wchdih2ax2a791khyajjxb2xaw5rklk47yc5v3nk"; }; packageRequires = [ cl-lib ]; meta = { @@ -1784,10 +1785,10 @@ }) {}; sokoban = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "sokoban"; - version = "1.4"; + version = "1.4.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/sokoban-1.4.tar"; - sha256 = "1yfkaw8rjris03qpj32vqhg5lfml4hz9v3adka6sw6dv4n67j9w1"; + url = "https://elpa.gnu.org/packages/sokoban-1.4.2.tar"; + sha256 = "0sciv7rl1p1ar1jris1py2slrd8kr4q6a4plmb0jq6lv9dlqyvc6"; }; packageRequires = []; meta = { @@ -2100,14 +2101,15 @@ license = lib.licenses.free; }; }) {}; - websocket = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + websocket = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: + elpaBuild { pname = "websocket"; version = "1.8"; src = fetchurl { url = "https://elpa.gnu.org/packages/websocket-1.8.tar"; sha256 = "0dcxmnnm8z7cvsc7nkb822a1g6w03klp7cijjnfq0pz84p3w9cd9"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://elpa.gnu.org/packages/websocket.html"; license = lib.licenses.free; @@ -2129,10 +2131,10 @@ wisi = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "wisi"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wisi-1.1.4.tar"; - sha256 = "1n0bq77vspbxpzs54r0rigb2fhj5a5vm8qxwgdnqdawanmq72l4r"; + url = "https://elpa.gnu.org/packages/wisi-1.1.5.tar"; + sha256 = "1q0dbykh9gvh0355vc1lwpriwlqq07jaydqx8zdrs6s0zyffx3a4"; }; packageRequires = [ cl-lib emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index daea504c24c..53035f2415e 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -316,12 +316,12 @@ ac-clang = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, yasnippet }: melpaBuild { pname = "ac-clang"; - version = "20170608.958"; + version = "20170615.838"; src = fetchFromGitHub { owner = "yaruopooner"; repo = "ac-clang"; - rev = "8fdfbbebf096017ab45cedcff2c43a0a5d8b9686"; - sha256 = "0ik1hh8qs5yjb034zc93fyd6la84mgp6y5gzvpz6rfbjfxy6vf3y"; + rev = "ee692f7cde535f317e440a132b8e60b7c5e34dfd"; + sha256 = "0zg39brrpgdakb6hbylala6ajja09nhbzqf4xl9nzwc7gzpgfl57"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ffe0485048b85825f5e8ba95917d8c9dc64fe5de/recipes/ac-clang"; @@ -738,8 +738,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "eba56378cf8d60c4871e0e9d0d0e201d302778ea"; - sha256 = "0d5pwxla9lkrkb2a5c7y4sm6js7jgm2m8i3lja0c5qzw5b50zwxs"; + rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6"; + sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -755,12 +755,12 @@ ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: melpaBuild { pname = "ac-php-core"; - version = "20170327.542"; + version = "20170612.2134"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "eba56378cf8d60c4871e0e9d0d0e201d302778ea"; - sha256 = "0d5pwxla9lkrkb2a5c7y4sm6js7jgm2m8i3lja0c5qzw5b50zwxs"; + rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6"; + sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -801,8 +801,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "d6af2ad09c99f9c58900665e874dcf97a545c0fa"; - sha256 = "12p22b9q4rkl7jswg12gqc8751sinzgj8h75jjzrggd0vfsg439a"; + rev = "65c8f03ff0112ce5c5e11aff6867ad0eb9019e63"; + sha256 = "0xlacwjmvx5xd8m7yi8l8mqi0lqs2gr2hmjag2frvmxcn4cpb4gc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags"; @@ -1011,8 +1011,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "ace-link"; - rev = "99787dc79ed9ec14a2b87257d6c8ce5b8ec0a0b0"; - sha256 = "103pb0c5g25fsnbjcjgj04aq4damxwhm2fg86fgxihrch8a7bhcn"; + rev = "8af476ac323e56d3c69ec2ecd1c095de56ecd18e"; + sha256 = "0218qfmpjw57842w1wn6p5bkn1qmn39scnnsnc0a1xn8ywz1ivw0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68032f40c0ce4170a22db535be4bfa7099f61f85/recipes/ace-link"; @@ -1174,12 +1174,12 @@ add-hooks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "add-hooks"; - version = "20170518.209"; + version = "20170705.2205"; src = fetchFromGitHub { owner = "nickmccurdy"; repo = "add-hooks"; - rev = "f7a94ef1762ad8eb58d24c0857751863ea93cd5b"; - sha256 = "1j524wvl9l9hzahq8by9bnh745kg2z7l808ad9b0y0wx5kf17xlz"; + rev = "edd4cb032a509b576d88f4cc0521ebfe66a9e6c7"; + sha256 = "1qg1ifkds84xv07ibz4sqp34ks60w4c7dvrq9dch4gvg040hal82"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/901f846aef46d512dc0a1770bab7f07c0ae330cd/recipes/add-hooks"; @@ -1300,12 +1300,12 @@ ag = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ag"; - version = "20170420.1424"; + version = "20170712.1549"; src = fetchFromGitHub { owner = "Wilfred"; repo = "ag.el"; - rev = "2718190a0202aa4ab02b1f1f3d6ba7b996b69d6d"; - sha256 = "1j3l7p3rnlax82jrdrjld1a26gk7cg002jcaj7677fhy261vxmib"; + rev = "2efb3ea5c3f3b4de79a6f21fa8dbcf90afb758f5"; + sha256 = "06aagmalpxvic285v0ipvir6777ipj6l9izfqsblbb7j70klw0dm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/67f410ac3a58a038e194bcf174bc0a8ceceafb9a/recipes/ag"; @@ -1342,12 +1342,12 @@ aggressive-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "aggressive-indent"; - version = "20170515.927"; + version = "20170627.1223"; src = fetchFromGitHub { owner = "Malabarba"; repo = "aggressive-indent-mode"; - rev = "5a019ef01b29b46381b9263f0edb3eee72b60328"; - sha256 = "1vgmkkdnns0xw2khyxprb1cv5pqjpx6vl71zdqrr41zb3kdfl628"; + rev = "d6778ae89cd2d40949aa076a43e327f7acff59c3"; + sha256 = "0xya19w1bwpqrrqvmms0lfhqb168iv7j6kvnn49zbynnf9dhgr9w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/aggressive-indent"; @@ -1403,12 +1403,12 @@ ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ahungry-theme"; - version = "20160721.2122"; + version = "20170702.2226"; src = fetchFromGitHub { owner = "ahungry"; repo = "color-theme-ahungry"; - rev = "3ce72cf77cf5958d91b65bc4867cbacff968da74"; - sha256 = "0wiwxh6k2s48gpklhd9abbsr0ll73jzggwgq1lvm7gha203ji5v4"; + rev = "e3d7e22cb10582a443b0e245be68aca936cd6abf"; + sha256 = "0fsip64bxs55kkqmpfcg4nr391b6wsd8hiq4fxvwww7n52lwsn5s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme"; @@ -1424,12 +1424,12 @@ airline-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }: melpaBuild { pname = "airline-themes"; - version = "20170501.705"; + version = "20170623.958"; src = fetchFromGitHub { owner = "AnthonyDiGirolamo"; repo = "airline-themes"; - rev = "8d2ed9f627c48c3a1c59be344624a3db619a8413"; - sha256 = "1g6xbgzfw218nvm5lydrlshk6y243zrqq23smqvwjxibb7ljlvg3"; + rev = "40cb03bbb56f09cfbfae07ff9ff97f3aaf8324be"; + sha256 = "0pngxrs1zz0vr0m7sbrl11a5gnxsgbqk1kp9566nj79h02y81sd7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/addeb923176132a52807308fa5e71d41c9511802/recipes/airline-themes"; @@ -1466,12 +1466,12 @@ alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }: melpaBuild { pname = "alchemist"; - version = "20170402.2339"; + version = "20170614.218"; src = fetchFromGitHub { owner = "tonini"; repo = "alchemist.el"; - rev = "46d09a6abaa8adf5e06184b77d04638ff3aa9087"; - sha256 = "1wvbn4capcf049y33633b4v8k1aqwi94lscif810f7p3m0xdai30"; + rev = "38c0d2a21e3fedf71eda5f21f51aa79a0fddeb3b"; + sha256 = "1hvkx35hjnpj8jfl41b510mcqfcxbv5msc8zmvd7jmdfx5gcn2d7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist"; @@ -1487,12 +1487,12 @@ alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "alda-mode"; - version = "20170611.1031"; + version = "20170629.2153"; src = fetchFromGitHub { owner = "jgkamat"; repo = "alda-mode"; - rev = "8bf40e0ed78c3d2b6536bee3a4b50a9f78a0c1a1"; - sha256 = "167lmzh4grz4k47pw0pcq5pqbwjncfgw2wgzhvvg5jp66p7pmwqp"; + rev = "24f2495ab209f8f00b7883285637e207b6f07201"; + sha256 = "1rg3gvlqq4jjpmj5k0pd1796c4qii3l595kdg0jvkf6vgf1544rm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode"; @@ -1508,12 +1508,12 @@ alect-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "alect-themes"; - version = "20170202.6"; + version = "20170701.751"; src = fetchFromGitHub { owner = "alezost"; repo = "alect-themes"; - rev = "1812abbe0079d1075525d9fb2da6fcfec7db3766"; - sha256 = "0sl2njnhm37cya06y39ls8p3zwpjwyv1pd7w3yfk5frz24vaxlcq"; + rev = "d1d19c76393ffe80fb11c6837e8582c3cb087d40"; + sha256 = "1gyjswlgbx5p1pq74qncrcjypkrfqd3dxm39bnbaszc6rhb58k8k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84c25a290ae4bcc4674434c83c66ae128e4c4282/recipes/alect-themes"; @@ -1592,12 +1592,12 @@ all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild, memoize }: melpaBuild { pname = "all-the-icons"; - version = "20170516.158"; + version = "20170713.146"; src = fetchFromGitHub { owner = "domtronn"; repo = "all-the-icons.el"; - rev = "7134b7467a7061b57c8cda3503e9644d4ed92a2a"; - sha256 = "0xwj8wyj0ywpy4rcqxz15hkr8jnffn7nrp5fnq56j360v8858q8x"; + rev = "84514026e342aa3cc98d8b6492175e1bdf788e5c"; + sha256 = "0s5cll8sq5hg1jm7g1nkcpbcz0n6f84ax9drzghv9y0m86v819mq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons"; @@ -1631,6 +1631,27 @@ license = lib.licenses.free; }; }) {}; + all-the-icons-gnus = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "all-the-icons-gnus"; + version = "20170711.241"; + src = fetchFromGitHub { + owner = "nlamirault"; + repo = "all-the-icons-gnus"; + rev = "fe2080fe78c28b140be4ee2018cdf3c72b87fa31"; + sha256 = "1lxq6fqrwxzd2cr8a7nvapaaf9pd1mfyqqk0rhg50fp3i16z5nkk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f8ed74d39d165343c81c2a21aa47e3d3895d8119/recipes/all-the-icons-gnus"; + sha256 = "0vdqhpa49p8vzbad426gl0dvniapyk73kbscvjv7mdl4bwhcr309"; + name = "all-the-icons-gnus"; + }; + packageRequires = [ all-the-icons dash emacs ]; + meta = { + homepage = "https://melpa.org/#/all-the-icons-gnus"; + license = lib.licenses.free; + }; + }) {}; all-the-icons-ivy = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "all-the-icons-ivy"; @@ -2334,12 +2355,12 @@ anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anything-tramp"; - version = "20170419.152"; + version = "20170708.1834"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-anything-tramp"; - rev = "5af52ef940493d3d5acb56fc6372004ca48f75ca"; - sha256 = "1n96n45ajx12ksnn8ij44b2jbcyvcki9k834ix96cwm1fcr553vg"; + rev = "c6d0e9bfa0f71c7c0bb75f6df0c82dd81c486f43"; + sha256 = "08ffw4y14c99jypl1nhiq2k3lbmv3lgw2dgmhkb8lpc1szkjg57m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/anything-tramp"; @@ -2416,12 +2437,12 @@ apache-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apache-mode"; - version = "20170407.1140"; + version = "20170711.913"; src = fetchFromGitHub { owner = "zonuexe"; repo = "apache-mode"; - rev = "8fd0d4db7ede5d4e360630235ede3beb1ba56cdf"; - sha256 = "0lawq0xx0y2kn89r633lb8kr4zkrbcm53dv8dylmv7lli9a7g1y9"; + rev = "0906559e0cb2997405d98ea6b2195954e3935d3b"; + sha256 = "0vfyi34qcwkz9975cq5hin1p2zyy3h05fni4f93xyrcs31zvmk22"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b5216c40e60c5a69a6235c15b432b5e9bdda6fd3/recipes/apache-mode"; @@ -2587,8 +2608,8 @@ src = fetchFromGitHub { owner = "waymondo"; repo = "apropospriate-theme"; - rev = "0d918da74a7a225fe5a586e26f5d834e579c5323"; - sha256 = "0hqsq7y89crcmqcfbgn885dlvj7f7b0zd9q6adbhyscphk7kasjw"; + rev = "98c548917bb696d541a58bfcf85f02572d8f7ebd"; + sha256 = "0kr6p1kf0sb036w9pb20xlfs7ynw357fv0zifsb8g7q1va7m5vs7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme"; @@ -2936,12 +2957,12 @@ atom-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "atom-dark-theme"; - version = "20151119.2335"; + version = "20170710.1612"; src = fetchFromGitHub { owner = "whitlockjc"; repo = "atom-dark-theme-emacs"; - rev = "b6963e486d27eae7cd472736c106c7079c2a3d3c"; - sha256 = "0jfpzv8dmvl4nr6kvq5aii830s5h632bq2q3jbnfc4zdql7id464"; + rev = "7fb37fd953e417acbcf7dd3f36e3167bed9bc887"; + sha256 = "040xp0nqa9akjv30kgnw6l1248g2cl5yzihhfwbr8cgywqfir1lw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d1f565871559d6ea4ca4bb2fbaebce58f2f383eb/recipes/atom-dark-theme"; @@ -2999,12 +3020,12 @@ auctex-latexmk = callPackage ({ auctex, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auctex-latexmk"; - version = "20160923.7"; + version = "20170618.936"; src = fetchFromGitHub { owner = "tom-tan"; repo = "auctex-latexmk"; - rev = "0315925ac9a892e73859cf4b720f36f2727f47f1"; - sha256 = "0cdc2wkyqs4c6iypkynm0s540isp7yyyavp80rg5x3cid3hsbinm"; + rev = "4d353522650d7685acbf1d38f7dbc504f734bd84"; + sha256 = "0qvscgffmzqk8lkcg3yk91vciim5ygk2m4crk02qn72ipkw5q13m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f48af615c56f093dff417a5d3b705f9993c518f/recipes/auctex-latexmk"; @@ -3562,12 +3583,12 @@ auto-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-minor-mode"; - version = "20170601.1421"; + version = "20170716.717"; src = fetchFromGitHub { owner = "joewreschnig"; repo = "auto-minor-mode"; - rev = "92871449782f8679f15573ad178b9c2247da8bfd"; - sha256 = "14kh6p34mrqfqyjzr0wvxx4acp72pz2b75w96y3jyhiswvaqfcr1"; + rev = "06fa6975a9fb171b91a8b8234d65ef72374d64e2"; + sha256 = "19r71hdgz367f6cgyqfdpilwlmhrjw5drmijpq8m0fxgysnmz2qd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3ab5f048034777551e344101d8415cac92362c8/recipes/auto-minor-mode"; @@ -3730,12 +3751,12 @@ auto-virtualenvwrapper = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s, virtualenvwrapper }: melpaBuild { pname = "auto-virtualenvwrapper"; - version = "20170518.1442"; + version = "20170618.52"; src = fetchFromGitHub { owner = "robert-zaremba"; repo = "auto-virtualenvwrapper.el"; - rev = "e2fb997e452e62e8bf9f80691941d3d25208e944"; - sha256 = "0c0llr8kpq54zy1k2qjhhln76ii7r0nmgb85s3nrzar5l1z57zqg"; + rev = "516cb0406a98fd5a41d389f37544f11b28b1d027"; + sha256 = "0y82n8354nri2qpz7bn58rbhpjkqiaf82q9izhl6jy12g63g416l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02a209ae8f9fc68feb3bb64d32d129fedef2b80b/recipes/auto-virtualenvwrapper"; @@ -4023,12 +4044,12 @@ avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avy"; - version = "20170411.608"; + version = "20170702.237"; src = fetchFromGitHub { owner = "abo-abo"; repo = "avy"; - rev = "f2bedeeb5804a4863bb53aca6f77195f7d530c38"; - sha256 = "1p2l6zqls2c8v1ahn9rkfj6vvcsx1ymd0rd590scj8kqhjjyq3n7"; + rev = "228ed97d07d51e369eb6ad27bf408c5b3218a23b"; + sha256 = "0qrqlinjp57sd9a2k77cxqll1d97zi1f328nv3ghs8r9jrds7sj7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy"; @@ -4403,12 +4424,12 @@ base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "base16-theme"; - version = "20170606.1402"; + version = "20170713.1237"; src = fetchFromGitHub { owner = "belak"; repo = "base16-emacs"; - rev = "be8f3ea35a2f58a218db062934ce3a1a054db3df"; - sha256 = "01pdwvv1pbphnsw3h38x087xbdp5ry1h18bqiiispzvhyc56xvak"; + rev = "f701a8e191ae9c0bd6ab93926ce993bb18a9e98c"; + sha256 = "026a5frqvd2j09zzbf83mw3hmcj1ps7nsia87k0yn13sk62rd5bk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme"; @@ -4424,12 +4445,12 @@ bash-completion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bash-completion"; - version = "20150514.728"; + version = "20170716.629"; src = fetchFromGitHub { owner = "szermatt"; repo = "emacs-bash-completion"; - rev = "1659c7ca38e2cf591525a3d0b9d97461de33916d"; - sha256 = "06c42531dy5ngscwfvg8rksg6jcsakfn7104hmlg1jp4kvfiy1kg"; + rev = "d673bf1ed020cf1378fe3d90e1308f555cb0d1af"; + sha256 = "18ql2k8zh2znl4lnks5r0k1b5l7x0hl1w9mhkp0anld2p2bv9f14"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/bash-completion"; @@ -4819,12 +4840,12 @@ beginend = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "beginend"; - version = "20170605.541"; + version = "20170714.709"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "beginend"; - rev = "28806d09207e4a194a39eb385650824a0121e0cd"; - sha256 = "17qhbgq3ciyjjl4a1mm6qn5g5y39plmncad6i4kijcda9kx44w48"; + rev = "a06a479c2279da9e852cf42628b6dfa466fff0bd"; + sha256 = "1jbhg73g1rrkbwql5vi2b0ys9avfazmwzwgd90gkzwavw0ch9cvl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31c1157d4fd9e47a780bbd91075252acdc7899dd/recipes/beginend"; @@ -4882,12 +4903,12 @@ better-defaults = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "better-defaults"; - version = "20170425.834"; + version = "20170613.2104"; src = fetchFromGitHub { owner = "technomancy"; repo = "better-defaults"; - rev = "6f502fd2d7aa8940a31fd630f883a63e04a002e6"; - sha256 = "15vayr1wy4qzgsv37pg8gjbv6b5zm9r51ql5j5l5q1x1ks9b6w2f"; + rev = "12d9e6dbf24a8a3369b19650d74471b17b27f78d"; + sha256 = "1rx3p6syp6axnxbscg0l73yihgwdq7bdnkcrvfikz79yflxrsnmq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7bb729c1ad8602a5c0c27e81c9442981a54a924a/recipes/better-defaults"; @@ -5027,12 +5048,12 @@ bibretrieve = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bibretrieve"; - version = "20170417.620"; + version = "20170709.1150"; src = fetchFromGitHub { owner = "pzorin"; repo = "bibretrieve"; - rev = "813730a8967e003ca67342cc45b62c17cda77a7c"; - sha256 = "0wy2013azglz095w4w3g693hr6f68z2fbwpc6gixr85rd0pk9hh9"; + rev = "6aea308680f8f2cab4c5ae06bb3b64bd0a2d9215"; + sha256 = "1lf1az6ijamvqcyvmyyppn53cqf2hp5v0bdj6d95j99rpz38pnfk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e548e0cf8babaf32f1db58099599a72cebdbb84d/recipes/bibretrieve"; @@ -5087,6 +5108,27 @@ license = lib.licenses.free; }; }) {}; + bifocal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "bifocal"; + version = "20170625.1258"; + src = fetchFromGitHub { + owner = "riscy"; + repo = "bifocal-mode"; + rev = "05d1076069d0a19292a38e835c32137e43ee9708"; + sha256 = "1fvr8vvpdd2xawv1j58wpxakbia31rzy513dakd78mlfkih2ixvg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/79e71995bd8452bad2e717884f148ec74c9735fc/recipes/bifocal"; + sha256 = "07qrxsby611l3cwsmw3d53h1n7cd1vg53j4vlc2isg56l2m4qks5"; + name = "bifocal"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/bifocal"; + license = lib.licenses.free; + }; + }) {}; binclock = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "binclock"; @@ -5136,8 +5178,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "726eea13a3a4d75d630aac29d6b71d74d9dc69e3"; - sha256 = "1r75ysdz6cj97vn46lj4g2a3hsab377f667a8bfs17rz007nddv4"; + rev = "7b055494e39efba8b237202b7c97f40aa19e2579"; + sha256 = "0dzvnz8s60gsrmhfrdr121ji7xw67bmfdwfd8vhffa87wyibrh2n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key"; @@ -5449,8 +5491,8 @@ src = fetchFromGitHub { owner = "CodeFalling"; repo = "blog-admin"; - rev = "a7d3fa9317e9aa0b492e61b0706c4d9ca2f7a4b5"; - sha256 = "0ry1n53y1jz0gmijhypp84kaxkxn8g1pma74dwqmsy7f5ayhwi3h"; + rev = "98e397c4014f7c81c42722028778726cbf9baf8c"; + sha256 = "0fj0yri8hayqb6fwgj5i6bw7yx4jsdq7jh9aqd5zdpmyfc6lshzr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/blog-admin"; @@ -5592,12 +5634,12 @@ boogie-friends = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "boogie-friends"; - version = "20170521.1917"; + version = "20170621.1207"; src = fetchFromGitHub { owner = "boogie-org"; repo = "boogie-friends"; - rev = "38ab3efc2021318cd62f9187214b69d34b4afca6"; - sha256 = "01yccb86gzag2anmqj1p196m5374mxnxha1fbhv7krc2avx2j71x"; + rev = "27c372592e19678bda5012f1ec3c60bcf9df78d4"; + sha256 = "1qcjbmkx6qim2j1sbzjjidqhrakjsipay9bdssyfyi4bwwp8mnq2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5bdd06b82d002677c046876642efe1dc01bc3e77/recipes/boogie-friends"; @@ -5612,7 +5654,7 @@ }) {}; bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "bookmark-plus"; - version = "20170512.1631"; + version = "20170703.1431"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/bookmark+.el"; sha256 = "0iqvlwqilwpqlymj8iynw2miifl28h1g7z10q08rly2430fnmi37"; @@ -5653,12 +5695,12 @@ boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }: melpaBuild { pname = "boon"; - version = "20170528.2317"; + version = "20170709.1244"; src = fetchFromGitHub { owner = "jyp"; repo = "boon"; - rev = "4b76f0a86c84b0e4032cdee787c3ee55372e6c31"; - sha256 = "1rr52dwwxq26v0h7apgr6nqpvfahrzm3j6p3zpbyp3lhb4sc2rjw"; + rev = "2b7a41491df809e425b81a574fea64e9d6f7f011"; + sha256 = "1haxw4xccalkwmrln5whd0lgfrq7lhdfyip2firlnrkaq8zw741w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon"; @@ -5842,12 +5884,12 @@ browse-at-remote = callPackage ({ cl-lib ? null, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "browse-at-remote"; - version = "20170523.556"; + version = "20170624.309"; src = fetchFromGitHub { owner = "rmuslimov"; repo = "browse-at-remote"; - rev = "5de73fcaa54b638554fcbd59a693bc647ff9dee1"; - sha256 = "04ad27g1jpy7gdbibyckwrv0y6psq9v66k0zd1hnll1aqlx1k70h"; + rev = "e8b7533f6c37c4660e4ba97cd4856383f4e4ce32"; + sha256 = "0650c2401qidw5zprgvnkvqbar9vs9yyj58njiwc394xf5xwzsmb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/browse-at-remote"; @@ -6424,12 +6466,12 @@ buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buttercup"; - version = "20170520.147"; + version = "20170701.429"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "emacs-buttercup"; - rev = "d8dc80da12cc1e71fcf54b0f4deb8d229bc97beb"; - sha256 = "0zsf2qk41i1ay6h85d1ppj5qnzdrb9n09bzj9s9hk7ysag1rlqj1"; + rev = "b6deeffe032527696e32623b69bdf07b538a315e"; + sha256 = "0ldc26wpgx01i1sfy9kc52dh3lmy53dr3pxxrn841rb37yc4h1rh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup"; @@ -6487,12 +6529,12 @@ c-eldoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "c-eldoc"; - version = "20170227.809"; + version = "20170618.845"; src = fetchFromGitHub { owner = "nflath"; repo = "c-eldoc"; - rev = "2232000692f6f891456fecf23c538d5b47302a60"; - sha256 = "0mr49mvjak30c6x8n4c13xi4rjfnbpnizq27f4zmryx5k8w5f9fp"; + rev = "0899f497e98e285d7d2e9cf897e305587b4b0790"; + sha256 = "0yw59pm25a5xrcdl6mv30i08wnhljy6gndvnlpi09vp2dln37kbq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/c-eldoc"; @@ -6697,16 +6739,16 @@ calfw = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "calfw"; - version = "20170410.1920"; + version = "20170714.840"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-calfw"; - rev = "c538d3746449b4f0e16b16aad3073d4f7379d805"; - sha256 = "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa"; + rev = "3415d8673e2b8ce7ab3a76943bb07cda626b6278"; + sha256 = "1n9yivpmnk61bwj9fjzwpnbhn9n6rnch1m9hcr0a2g77kddmxwcn"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1d1aaab9844413a5fff992509935b399b5154c3d/recipes/calfw"; - sha256 = "1lyb0jzpx19mx50d8xjv9sx201518vkvskxbglykaqpjm9ik2ai8"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw"; + sha256 = "0am1nafc16zax8082gjlz0pi85lryjhrx0v80nzgr23iybj5mfx4"; name = "calfw"; }; packageRequires = []; @@ -6715,6 +6757,27 @@ license = lib.licenses.free; }; }) {}; + calfw-cal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "calfw-cal"; + version = "20170320.506"; + src = fetchFromGitHub { + owner = "kiwanami"; + repo = "emacs-calfw"; + rev = "3415d8673e2b8ce7ab3a76943bb07cda626b6278"; + sha256 = "1n9yivpmnk61bwj9fjzwpnbhn9n6rnch1m9hcr0a2g77kddmxwcn"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-cal"; + sha256 = "1wylkd7jl1ifq56jj04l5b9wfrjkhwncxzrjgnbgg1cl2klf6v4m"; + name = "calfw-cal"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/calfw-cal"; + license = lib.licenses.free; + }; + }) {}; calfw-gcal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "calfw-gcal"; @@ -6736,6 +6799,69 @@ license = lib.licenses.free; }; }) {}; + calfw-howm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "calfw-howm"; + version = "20170703.1704"; + src = fetchFromGitHub { + owner = "kiwanami"; + repo = "emacs-calfw"; + rev = "3415d8673e2b8ce7ab3a76943bb07cda626b6278"; + sha256 = "1n9yivpmnk61bwj9fjzwpnbhn9n6rnch1m9hcr0a2g77kddmxwcn"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-howm"; + sha256 = "08cv16cq211sy2v1i0gk7d81f0gyywv0i9szmamnrbjif3rrv2m0"; + name = "calfw-howm"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/calfw-howm"; + license = lib.licenses.free; + }; + }) {}; + calfw-ical = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "calfw-ical"; + version = "20150703.119"; + src = fetchFromGitHub { + owner = "kiwanami"; + repo = "emacs-calfw"; + rev = "3415d8673e2b8ce7ab3a76943bb07cda626b6278"; + sha256 = "1n9yivpmnk61bwj9fjzwpnbhn9n6rnch1m9hcr0a2g77kddmxwcn"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-ical"; + sha256 = "1bh9ahwp9b5knjxph79kl19fgs48x3w7dga299l0xvbxq2jhs95q"; + name = "calfw-ical"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/calfw-ical"; + license = lib.licenses.free; + }; + }) {}; + calfw-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "calfw-org"; + version = "20160302.1858"; + src = fetchFromGitHub { + owner = "kiwanami"; + repo = "emacs-calfw"; + rev = "3415d8673e2b8ce7ab3a76943bb07cda626b6278"; + sha256 = "1n9yivpmnk61bwj9fjzwpnbhn9n6rnch1m9hcr0a2g77kddmxwcn"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-org"; + sha256 = "1cfpjh08djz3k067w3580yb15p1csks3gzch9c4cbrbcjvg8inh5"; + name = "calfw-org"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/calfw-org"; + license = lib.licenses.free; + }; + }) {}; calmer-forest-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "calmer-forest-theme"; @@ -6764,8 +6890,8 @@ src = fetchFromGitHub { owner = "Malabarba"; repo = "camcorder.el"; - rev = "c96b3392c99b9f83c968bffa330ec4356c41518e"; - sha256 = "0am8asrzjs3iwak9c86fxb4zwgx5smbb9ywp0zn4y7j37blygswj"; + rev = "b13d939990e6709492efefc0945798adc1c0fcb9"; + sha256 = "0y8hw463w77rvf7cn5bqjnfww8h8kfkn37wi1kfjfq8hyirw4zrb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/camcorder"; @@ -6783,7 +6909,7 @@ version = "20151009.845"; src = fetchsvn { url = "https://caml.inria.fr/svn/ocaml/trunk/emacs/"; - rev = "16557"; + rev = "16560"; sha256 = "16qw82m87i1fcnsccqcvr9l6p2cy0jdhljsgaivq0q10hdmbgqdw"; }; recipeFile = fetchurl { @@ -6821,12 +6947,12 @@ cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }: melpaBuild { pname = "cargo"; - version = "20170203.35"; + version = "20170621.1316"; src = fetchFromGitHub { owner = "kwrooijen"; repo = "cargo.el"; - rev = "25ca2fcbd6b664cc7a20b0cccca3adc19e79917a"; - sha256 = "1fzrczx1aq0q130qrvzq8dssc1qm5qc9pclsyd3zn27xbn5lsag3"; + rev = "b0487f95a7de7a1d6f03cdd05220f633977d65a2"; + sha256 = "0r9v7q7hkdw2q3iifyrb6n9jrssz2rcv2xcc7n1nmg1v40av3ijd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo"; @@ -6993,8 +7119,8 @@ src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "25057a27543788079e7040bf42b139e0aa0635b5"; - sha256 = "1fja4c4d8bqnp6ip423n3p2xisq9m9bhnsv0bl6fm5svm8qmcb1f"; + rev = "78798134af82a300e54a5d22d2f10c2885cd11ae"; + sha256 = "1svdv0c9c0q68d0ad65kvaxvkafb15gv62yhxb02a4h4g4w9n4vs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7375cab750a67ede1a021b6a4371b678a7b991b0/recipes/ccc"; @@ -7035,8 +7161,8 @@ src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "25057a27543788079e7040bf42b139e0aa0635b5"; - sha256 = "1fja4c4d8bqnp6ip423n3p2xisq9m9bhnsv0bl6fm5svm8qmcb1f"; + rev = "78798134af82a300e54a5d22d2f10c2885cd11ae"; + sha256 = "1svdv0c9c0q68d0ad65kvaxvkafb15gv62yhxb02a4h4g4w9n4vs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b48fe069ecd95ea0f9768ecad969e0838344e45d/recipes/cdb"; @@ -7219,12 +7345,12 @@ ceylon-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ceylon-mode"; - version = "20170605.1450"; + version = "20170626.1403"; src = fetchFromGitHub { owner = "lucaswerkmeister"; repo = "ceylon-mode"; - rev = "00f790b3ed5ec48e2461e20a4d466ba45c634e13"; - sha256 = "08zk6aspy59gv3989zxz0ibxxwkbjasa83ilpzvpcwszrzq8x640"; + rev = "cd027d71a6cd29b94ba46919b4e067b86f267fc6"; + sha256 = "06knyp3blini231ahlmkml3r0ypdajlz1dm41mwnzgcmg04x0s2h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/09cd1a2ccf33b209a470780a66d54e1b1d597a86/recipes/ceylon-mode"; @@ -7244,8 +7370,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "036c5898eb89e846fa1b86537a5c0569868dbaf0"; - sha256 = "0cz4cwisnlbkclc6cn7rlz7pkpwh5p0646dzrkw92bk5vmwh89pg"; + rev = "28484409e8f64f976bf3d80f10081b18f7724cf5"; + sha256 = "0zvxrbf30hy511jmlfvmqj5yiysfbs73x064w1px7ghavczdjvx5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -7284,7 +7410,7 @@ version = "20170201.347"; src = fetchsvn { url = "https://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs"; - rev = "12230"; + rev = "12270"; sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k"; }; recipeFile = fetchurl { @@ -7301,12 +7427,12 @@ challenger-deep-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "challenger-deep-theme"; - version = "20170428.301"; + version = "20170623.311"; src = fetchFromGitHub { owner = "MaxSt"; repo = "challenger-deep"; - rev = "a1e32cc882de952b887824bcc100aa095cb87b94"; - sha256 = "0f71ws2an3ivy4hyjqm141xxd7r62xh783n6fp21z7ya4zkzlvb5"; + rev = "22022667437e94c2309c7c77a14268970de16146"; + sha256 = "1prvdrc8wjb7dy8dqj5gvjzzdiz6hqv252inlwcyjrqiq4apipxz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7942f539d025c1e2b059d49e1984716cbbc90a67/recipes/challenger-deep-theme"; @@ -7427,12 +7553,12 @@ cheat-sh = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cheat-sh"; - version = "20170606.727"; + version = "20170707.757"; src = fetchFromGitHub { owner = "davep"; repo = "cheat-sh.el"; - rev = "512c74b0cb0798a75303c5384ee165c8a5f3356b"; - sha256 = "1m65k2gqd5irwk4cj97p33q14shn4cpz0zxcpg4m3bgiwl8qmxhs"; + rev = "f61dc1ab9f0d6933dfda5366b8051217f1e9b491"; + sha256 = "028xyflii2ah6ijhq4fpmzsaj1nhps90kprpy7x7a9v4s85yvadx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ebac62fb3828d81e30145b9948d60e781e20eda2/recipes/cheat-sh"; @@ -7908,12 +8034,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "20170525.255"; + version = "20170717.303"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "7ffc207cf0e56305963e1a3387dce3114325544d"; - sha256 = "1n4pik7fp4xlc0xdcnw649mx2r2qaiv1f5w9bbz1n4r4pqhmy5q7"; + rev = "7daf4e968de21e7eb7bb2dc1b6ca30ae4e990532"; + sha256 = "00y8d8gz0nfqr9dfd1nrkm32ckaln4cg6l6k3jbjzc0la673ljfr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -8184,8 +8310,8 @@ version = "20170120.137"; src = fetchsvn { url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format"; - rev = "305184"; - sha256 = "1hs00lf2f2fmxv2abhskrlqr96395j3ywbgs8aacadbzigdx4iq5"; + rev = "308172"; + sha256 = "0qyhvjb3pf0qp7ag2wav4wxrxfgk1zga0dy4kzw8lm32ajzjjavk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69e56114948419a27f06204f6fe5326cc250ae28/recipes/clang-format"; @@ -8570,12 +8696,12 @@ clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-mode"; - version = "20170608.2315"; + version = "20170712.349"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "eacd330f28513276da18e4d6f2607f9041314c49"; - sha256 = "18hl01h390yhcm7g4ayvyz82m8gc29qv7za5vl10apfch5c6d2gw"; + rev = "276dad92886d7a3c7edb95be3e9fb2c17ea8b2a4"; + sha256 = "1hk0pyiz2nfmlh1xziqsjkdzjk7m4hlc4ki62pwyv4f1izajrrdd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode"; @@ -8595,8 +8721,8 @@ src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "eacd330f28513276da18e4d6f2607f9041314c49"; - sha256 = "18hl01h390yhcm7g4ayvyz82m8gc29qv7za5vl10apfch5c6d2gw"; + rev = "276dad92886d7a3c7edb95be3e9fb2c17ea8b2a4"; + sha256 = "1hk0pyiz2nfmlh1xziqsjkdzjk7m4hlc4ki62pwyv4f1izajrrdd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking"; @@ -8633,12 +8759,12 @@ clojure-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "clojure-snippets"; - version = "20170508.42"; + version = "20170713.2310"; src = fetchFromGitHub { owner = "mpenet"; repo = "clojure-snippets"; - rev = "1c6b37578c38d538ae017b23d4cd8697963b077e"; - sha256 = "1pnxxzjbf0irbxapj7f4rqfv9j1x3qdgyq6pzi566c1qld3bkwn6"; + rev = "36207f9d8738851f5b686dfe0225ad0553bf8e68"; + sha256 = "0fb4l4gjzpr5rij4kyvz0r705blv2a5w1rf1c92d34g8jyy2hmd5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4898fc6746b30b0d0453b3b56d02479bfb0f70b9/recipes/clojure-snippets"; @@ -8654,12 +8780,12 @@ clomacs = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "clomacs"; - version = "20170128.850"; + version = "20170705.719"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clomacs"; - rev = "0c7793b52166730a563c3318cdcb9f2b423bc675"; - sha256 = "1sj4awcz6xdk1lq7yz69d8v0d97alipc3avzmnby6lpm2pw1n45a"; + rev = "7af6fa717f08fda930641a27f3a07743c2042514"; + sha256 = "1diavwmjgaz0jxjbkzhlca9klqd7kmpih98clp8wiavhms80ykds"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/345f9797e87e3f5f957c167a5e3d33d1e31b50a3/recipes/clomacs"; @@ -8798,22 +8924,22 @@ license = lib.licenses.free; }; }) {}; - cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, seq }: + cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, s, seq }: melpaBuild { pname = "cmake-ide"; - version = "20170605.12"; + version = "20170712.809"; src = fetchFromGitHub { owner = "atilaneves"; repo = "cmake-ide"; - rev = "b7bb7bf36d442c377988a090fc648b03b50c8eff"; - sha256 = "1iw0blpi38yykqqzl6s0w7z74ym0b56k1rxg5anyw0q9zkp0hb72"; + rev = "a20bf1a6b3c0c70f3637f5a8f4280ff3479ec180"; + sha256 = "07m1z36823pzlf4d0wf3v053svgyi2r8wk7rxjmnzrz717y6xj9h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide"; sha256 = "0xvy7l80zw67jgvk1rkhwzjvsqjqckmd8zj6s67rgbm56z6ypmcg"; name = "cmake-ide"; }; - packageRequires = [ cl-lib emacs levenshtein seq ]; + packageRequires = [ cl-lib emacs levenshtein s seq ]; meta = { homepage = "https://melpa.org/#/cmake-ide"; license = lib.licenses.free; @@ -8826,8 +8952,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "abd1216c1f8a1211d348568bb7695c30505de84e"; - sha256 = "1z3c0wjvk5ry69sjmslvw2mnnri63dk1vk6lbx881fxf67r4wf7f"; + rev = "2d5e494637f9dad13fd0206ac3420e7d26f8b778"; + sha256 = "0wsljwpd0ld4c0qxfn1x1a7xvcq8ik5dmxcys94cb2cw8xxgzbz2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -9176,12 +9302,12 @@ color-identifiers-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-identifiers-mode"; - version = "20161019.1314"; + version = "20170615.1338"; src = fetchFromGitHub { owner = "ankurdave"; repo = "color-identifiers-mode"; - rev = "2b02b8d4ed0233d63a698a7f929b87fcaa8d0048"; - sha256 = "1jqvdask079373q9lgfp058892apx8qcchnrwwwd2zgfnwhjhy1q"; + rev = "d57e162c2dcb926291ded21cbe46b98ad0ca32c8"; + sha256 = "1n12z7qfwgsdvdzzi5gkgkmdaazbrg5064s08xsc6gsfs4rb5d17"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c735755e414fdf169aca5ec6f742533d21472e0/recipes/color-identifiers-mode"; @@ -9322,12 +9448,12 @@ color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme-sanityinc-tomorrow"; - version = "20170604.1611"; + version = "20170626.1417"; src = fetchFromGitHub { owner = "purcell"; repo = "color-theme-sanityinc-tomorrow"; - rev = "21b9b9ae14f2f0084497de00e5a0a00919b87c88"; - sha256 = "0v69lzqknk8qr7digda9vwri7pkhr5600lb39xzlml15m693acin"; + rev = "ffcec9177c8b4393f036acb5ca51b33b53916ea8"; + sha256 = "0w59yfg7chx6srxpxsnwz7qrgyy35pdswv44j6lbh33hylxmclrh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow"; @@ -9593,12 +9719,12 @@ company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company"; - version = "20170611.1356"; + version = "20170715.1035"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "950c54721f85e68fd21f1e92991d597fd38685e4"; - sha256 = "1gkjin7ikghh4zbnpbg7gzhdj1hg125h8kq694aa4ag9379vivw7"; + rev = "a197b072dc93dbad238f1dc70da01e3775ebfb56"; + sha256 = "0is65adahvfgfjamnr8dmnh5xnijcwzhbzsvvi6ixkkfm2xvs5aa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; @@ -9769,12 +9895,12 @@ company-coq = callPackage ({ cl-lib ? null, company, company-math, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "company-coq"; - version = "20170504.1519"; + version = "20170615.1842"; src = fetchFromGitHub { owner = "cpitclaudel"; repo = "company-coq"; - rev = "eddb16e5ed9bd2945c57054b2c0054dee600b985"; - sha256 = "18l442b2gnbgzn6x1qfdcfqn4ilh646fw694qam9g996vd0ncajb"; + rev = "642c0b5b539692242c476eb00af7bacc91d7fcc0"; + sha256 = "0mykqf03c7fbdb851fqdczb97cq6wq1lkinnjc2jaim5j4hc3gig"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq"; @@ -10032,8 +10158,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "843b7a63f621bb441274849d58671870adf1a5ce"; - sha256 = "065fy0hy8mqsqfp06yfxavg8dqkrshacn46famar59ajy9610339"; + rev = "f1eef9a6ba005abb145d7b58fdd225e83a3c6a05"; + sha256 = "1hkr46ikrprx203i2yr6xds1bzxggblh7bg026m2cda6dxgpnsgw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go"; @@ -10070,12 +10196,12 @@ company-irony = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }: melpaBuild { pname = "company-irony"; - version = "20170611.1403"; + version = "20170612.1308"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "company-irony"; - rev = "f68c1b46d64b9f95cfc2a6d611089d0442ed58ba"; - sha256 = "0kfv89vma93qv97vh1ajg74wq62sq7f6gr39pm8hmfvmk0d6y51y"; + rev = "b8001ffc4da7403172835d47bc740cfbac35364d"; + sha256 = "03ym65ckpx6n03l633lwvxiwvcdhm8kjsw91ql1y4f44vijlh2xi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/company-irony"; @@ -10242,8 +10368,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "eba56378cf8d60c4871e0e9d0d0e201d302778ea"; - sha256 = "0d5pwxla9lkrkb2a5c7y4sm6js7jgm2m8i3lja0c5qzw5b50zwxs"; + rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6"; + sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -10374,8 +10500,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "d6af2ad09c99f9c58900665e874dcf97a545c0fa"; - sha256 = "12p22b9q4rkl7jswg12gqc8751sinzgj8h75jjzrggd0vfsg439a"; + rev = "65c8f03ff0112ce5c5e11aff6867ad0eb9019e63"; + sha256 = "0xlacwjmvx5xd8m7yi8l8mqi0lqs2gr2hmjag2frvmxcn4cpb4gc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags"; @@ -10538,12 +10664,12 @@ company-ycmd = callPackage ({ company, dash, deferred, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, ycmd }: melpaBuild { pname = "company-ycmd"; - version = "20170606.49"; + version = "20170622.146"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "29aba538be5e44da81ad76a6078bb65c1c5e1aa6"; - sha256 = "0fpccpiwwsxg0asdzg0m5hlwdv6jyr7khywnd1rb6kvr8m2qm0hf"; + rev = "35e8a31e32d0de890547612db8373d7333db8d8a"; + sha256 = "023bkmviaqb85kwwlpmzfc5gycf4i7w8a43zhbmvasfjjb962yzd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd"; @@ -10640,6 +10766,27 @@ license = lib.licenses.free; }; }) {}; + config-general-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "config-general-mode"; + version = "20170715.733"; + src = fetchFromGitHub { + owner = "tlinden"; + repo = "config-general-mode"; + rev = "dd018f96f631a3fc6230ce5011d6357cf9720ef1"; + sha256 = "15xvp40b3sbwjf492j0abaknwc5f0cz0f7hydy7mdqdlha20qahs"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6c06831528e4bbc44aae1cc5cd6bec60150ae087/recipes/config-general-mode"; + sha256 = "1408xyzmb5aj1yrlgkymwy5x6rb1a9ynkx2m6hgj38qj6dz44cyy"; + name = "config-general-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/config-general-mode"; + license = lib.licenses.free; + }; + }) {}; config-parser = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "config-parser"; @@ -10894,12 +11041,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20170610.2335"; + version = "20170710.1111"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "752ba81f0db3be0568072b3d9a5db458bb647a3c"; - sha256 = "0wzhil3c6g9g7k4dq3l6rsyy9vy3rdnq3igqgw9xzgq6i06a1878"; + rev = "dc146d9f1435b79fbfbfa702f0172b9de05f631d"; + sha256 = "09cfs0rhhb72b12pic2w9chbc000pqnafrl2x0g8v5r065pzp64n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -11020,12 +11167,12 @@ counsel-spotify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "counsel-spotify"; - version = "20170523.1321"; + version = "20170612.1132"; src = fetchFromGitHub { owner = "Lautaro-Garcia"; repo = "counsel-spotify"; - rev = "7cecb359224f24e1e922b513b545187e6774d207"; - sha256 = "0lbh9z0w1czxvrdlbch71gys9wjsc9zr9i6xwq3ah40aydx251x2"; + rev = "dba8c1bf92e15f34f12a9e22b5958a93f10b46c5"; + sha256 = "1j7rzf8mws2yzdvfz8a6k48b5x6cn11lfvfya5s4c90kyy92j8ag"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b386462518a5ebb6454f4d01582df98395239bcc/recipes/counsel-spotify"; @@ -11045,8 +11192,8 @@ src = fetchFromGitHub { owner = "AdamNiederer"; repo = "cov"; - rev = "158d6bacb0986a27aa90a5b6dce81ae820b62cef"; - sha256 = "1n510afmaprwlv6hck2kc9myvj9wsrspqyjzj5vql1y9c6w1xhsc"; + rev = "519239cc37d3ad0204fecac99f42e1694ce57d3d"; + sha256 = "1kb2rmxx91q4cwm1npzyiykwg5jxhhz7waykh5vqxr5y81hr5nza"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d0f35ce436ac157955d6f92de96e14bef9ad69e3/recipes/cov"; @@ -11377,10 +11524,10 @@ crosshairs = callPackage ({ col-highlight, fetchurl, hl-line-plus, lib, melpaBuild, vline }: melpaBuild { pname = "crosshairs"; - version = "20170221.1608"; + version = "20170626.1548"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/crosshairs.el?revision=39"; - sha256 = "1wjj88zv37ak9zd12d7sy7j261x5y17wxmw5jrzk56shkpdvcbq0"; + url = "https://www.emacswiki.org/emacs/download/crosshairs.el?revision=40"; + sha256 = "1dcynm83a3ixdccw3cqy533d9xwzswyi67cydaqmv35q88dg2nqw"; name = "crosshairs.el"; }; recipeFile = fetchurl { @@ -11397,12 +11544,12 @@ crux = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "crux"; - version = "20170510.2148"; + version = "20170626.632"; src = fetchFromGitHub { owner = "bbatsov"; repo = "crux"; - rev = "3b377b4fdd23df35f72bcb1021800d41fdccf863"; - sha256 = "13z0hbkhzrsml30kp3maipc87qciilg99vy8w9lc0da5fv64i7ya"; + rev = "e805ab780a4a1ce22a4436bde09b95e97d150e51"; + sha256 = "007mhf60w8385ki2bqhsfjhhc4zq8k21ivgzpw15z83y641nyjp5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/575e3442a925500a5806e0b900208c1e6bfd11ae/recipes/crux"; @@ -11499,6 +11646,27 @@ license = lib.licenses.free; }; }) {}; + csound-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi, shut-up }: + melpaBuild { + pname = "csound-mode"; + version = "20170715.650"; + src = fetchFromGitHub { + owner = "hlolli"; + repo = "csound-mode"; + rev = "9c96406bbda815a4c8068d9c4a2a0dd5bd8f3325"; + sha256 = "14k2qbdn4l47kal647b8fy1lrcnivydnk651m02y3d6w41vgp7pq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/34dc8853f5978789212cb7983615202c498d4d25/recipes/csound-mode"; + sha256 = "0k4p9w19yxhfccr9zgg51ppl9jf3m4pwwnqiq25yv6qsxmh9q24l"; + name = "csound-mode"; + }; + packageRequires = [ emacs multi shut-up ]; + meta = { + homepage = "https://melpa.org/#/csound-mode"; + license = lib.licenses.free; + }; + }) {}; css-comb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "css-comb"; @@ -11693,8 +11861,8 @@ src = fetchFromGitHub { owner = "mortberg"; repo = "cubicaltt"; - rev = "1fd1023bd5f2ec2f457f13d0d0a165a98c05fde2"; - sha256 = "0gxn0kdzzsc801h5vhbpnn5p6msj6gv5lpy5qq6gyvvd0djp06mn"; + rev = "e1e158d2103f0b441ed27ad4b2c0c123d7d710d7"; + sha256 = "0mbqdnbd6rqhsfdn5rijp9siyp5720s1gj6sadpqp55qi9r1hnpx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt"; @@ -11811,12 +11979,12 @@ cyberpunk-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cyberpunk-theme"; - version = "20170524.803"; + version = "20170712.2110"; src = fetchFromGitHub { owner = "n3mo"; repo = "cyberpunk-theme.el"; - rev = "8c3cc39bcff5def0d476c080b5248436da7f990f"; - sha256 = "1npwrw3pgdmvqhihcqcfi2yrs178iiip5fcj8zhpp6cr9yqsvvgi"; + rev = "c5ad3a1815ba25b91aced8232b6f6268a10379d7"; + sha256 = "1l8m5mk7qdvw9cc6ypqahrrzxfzdx7n5yp1j82dgli9gy0sq027v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c632d1e501d48dab54432ab111ce589aa229125/recipes/cyberpunk-theme"; @@ -11960,8 +12128,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "0898a2f2bdc4dd01cc5ffacdf5dad45c9e38e32b"; - sha256 = "0chfmiy1nk12yalq2bd812580fr38x3di5vjf6z2kyi96p11jw6l"; + rev = "a2db27bb85d0daa4cc4b4b7d65c0e6a7cda5ec2a"; + sha256 = "101gdyvhkb5lzsa69slaq0l81sjmrr34sb5sxbjxrbx5pk5wh9gz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -12037,6 +12205,27 @@ license = lib.licenses.free; }; }) {}; + dad-joke = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "dad-joke"; + version = "20170626.252"; + src = fetchFromGitHub { + owner = "davep"; + repo = "dad-joke.el"; + rev = "98e5e5ed4c57f6076afb55d75af66e787867d9f9"; + sha256 = "017fdcbggnmnj9ri1a7id29l20pingw6mr1sk55xzkwgwf3v30fr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/484d571b2737f7c613816333afdde6460c64e635/recipes/dad-joke"; + sha256 = "1cg8iaq79w5zx1s3dirdl7ymcp162mmsy5c4vly90v20yrijblad"; + name = "dad-joke"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/dad-joke"; + license = lib.licenses.free; + }; + }) {}; dakrone-light-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dakrone-light-theme"; @@ -12082,12 +12271,12 @@ danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "danneskjold-theme"; - version = "20170424.247"; + version = "20170702.1007"; src = fetchFromGitHub { owner = "rails-to-cosmos"; repo = "danneskjold-theme"; - rev = "764382bdcb1056e96f31a66f7910c16de39c7801"; - sha256 = "0gj2hqcmf88i12vlc6i8pr7r6d1hczqhg7ablnycj673hnzzc5jh"; + rev = "f4de0fa84bec756ea31419f8db0b900fd1603c83"; + sha256 = "1wzwiahab6r8y772mg6268sh7l3b1fw4hxl10d38qv2khy641vlv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme"; @@ -12100,22 +12289,22 @@ license = lib.licenses.free; }; }) {}; - dante = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }: melpaBuild { pname = "dante"; - version = "20170508.2347"; + version = "20170708.421"; src = fetchFromGitHub { owner = "jyp"; repo = "dante"; - rev = "05141a7f1ea9c368b469825cdc31c54194740c9d"; - sha256 = "158b083jlx4zi219z63nlim02gj7vds51bxxpvbhyw7222m5ddyv"; + rev = "bf5d2bfc9a1696b97b1658a8090fdf80b6e9a730"; + sha256 = "0y5gg85sp73xzn6hj54w19di4d9x5w0nzl6h7lfp7l9kg94v0dsv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; sha256 = "1j0qwjshh2227k63vd06bvrsccymqssx26yfzams1xf7bp6y0krs"; name = "dante"; }; - packageRequires = [ dash emacs flycheck ]; + packageRequires = [ dash emacs f flycheck s ]; meta = { homepage = "https://melpa.org/#/dante"; license = lib.licenses.free; @@ -12271,12 +12460,12 @@ darkokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darkokai-theme"; - version = "20160803.2058"; + version = "20170711.403"; src = fetchFromGitHub { owner = "sjrmanning"; repo = "darkokai"; - rev = "5c5cee814c370f99db486ad11165f2023a22f7be"; - sha256 = "0by1c73hbc1y32ylb2pbfin6ydzxh2597rrm8xj8lc5g0ilch67n"; + rev = "94f845d0194bfd45e6a3c17222bba19aece9dd63"; + sha256 = "1zdzwjn3qcgxp7azz3sb5nfnmfd5mh9frvjlq5k013syy2p6xh44"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81387a5a70f7c42fbae16b52db765136795a37e1/recipes/darkokai-theme"; @@ -12292,12 +12481,12 @@ darktooth-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darktooth-theme"; - version = "20170528.2201"; + version = "20170715.1624"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-theme-darktooth"; - rev = "e5e2433fccb225b347c84c3bba5e3ed9769c2922"; - sha256 = "0l3clqy9zrd8xbaacx7ck8kw1x6rl1b9vd5ss57wnqpsdz25nggi"; + rev = "257b0674a5c4ec510b51febba0c7a18e0f10a1bf"; + sha256 = "1ww12h19scda90r4rkgiynk3zvhkhk44gwfqj2m49pr89y7j8lap"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme"; @@ -12334,12 +12523,12 @@ dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dash"; - version = "20170523.219"; + version = "20170613.151"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "524e6fe86ba240d4405d3de1c862921fb8085c8d"; - sha256 = "0ipgfwz5xvqm6lk3r3z0pxr49j7rqwsc4zd9d061dh5f9s5vv2qx"; + rev = "0468a3137c9e0d49121213f416fc7e2547d46a77"; + sha256 = "1ax99zbzbrjm1i94wpwgxqisrinxbk12mgd9admrfhsg180qvlhg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash"; @@ -12380,8 +12569,8 @@ src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "524e6fe86ba240d4405d3de1c862921fb8085c8d"; - sha256 = "0ipgfwz5xvqm6lk3r3z0pxr49j7rqwsc4zd9d061dh5f9s5vv2qx"; + rev = "0468a3137c9e0d49121213f416fc7e2547d46a77"; + sha256 = "1ax99zbzbrjm1i94wpwgxqisrinxbk12mgd9admrfhsg180qvlhg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional"; @@ -12586,12 +12775,12 @@ ddskk = callPackage ({ ccc, cdb, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ddskk"; - version = "20170610.1729"; + version = "20170709.839"; src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "25057a27543788079e7040bf42b139e0aa0635b5"; - sha256 = "1fja4c4d8bqnp6ip423n3p2xisq9m9bhnsv0bl6fm5svm8qmcb1f"; + rev = "78798134af82a300e54a5d22d2f10c2885cd11ae"; + sha256 = "1svdv0c9c0q68d0ad65kvaxvkafb15gv62yhxb02a4h4g4w9n4vs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6eccccb79881eaa04af3ed6395cd2ab981d9c894/recipes/ddskk"; @@ -12689,12 +12878,12 @@ decide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "decide"; - version = "20160314.1248"; + version = "20170702.1617"; src = fetchFromGitHub { owner = "lifelike"; repo = "decide-mode"; - rev = "f243afc7cff11d9696552695e2dfc0ca91e1c5b6"; - sha256 = "05n57djagbkm8im4168d5d2fr2ibfnckya7qzrca1f9rmm0ah15j"; + rev = "90133687118c236142b8110571c463304b3192f9"; + sha256 = "04yakjnh9c165ssmcwkkm03lnlhgfx5bnk0v3cm73kmwdmfd2q7s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6adcd300e2ac2c718989cf855fd7b3eef654df00/recipes/decide"; @@ -12859,8 +13048,8 @@ version = "20160610.1739"; src = fetchgit { url = "git://jblevins.org/git/deft.git"; - rev = "59173ba0c048ead287dd1171a5a52ce53fd9a0cb"; - sha256 = "12h6miqn3nmyhf7r5cm57fh9japv79mm6gyvlb3p0qw1zzlwnlcg"; + rev = "86825cd420985112d9dd38060e0edb72b08c6dab"; + sha256 = "0jz8ikh143n9byidh675jyd76bymbwijs0xi2y141982s69r2n0l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/deft"; @@ -12918,12 +13107,12 @@ demo-it = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "demo-it"; - version = "20170126.739"; + version = "20170628.1503"; src = fetchFromGitHub { owner = "howardabrams"; repo = "demo-it"; - rev = "f61f336c8c291208d9feef2ce495e8c659052f77"; - sha256 = "1wb7n4k2qwl3m7y22zag6rdzi1gqb8a5lj7crpkkn5ryycbxbbpi"; + rev = "1e8b42ff6479fa541eeec5699b4727af136d40da"; + sha256 = "1x9crsc8n5pqyp60h46gz6wz98qaj3bygk11vd39qpfh2hxdxxi6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1dec5877db00c29d81d76be0ee2504399bad9cc4/recipes/demo-it"; @@ -13106,12 +13295,12 @@ diff-hl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "diff-hl"; - version = "20170519.1530"; + version = "20170709.2000"; src = fetchFromGitHub { owner = "dgutov"; repo = "diff-hl"; - rev = "63f1687aafb4449761bb19f3f5f1b677ab1b5d91"; - sha256 = "0zaaik87ndbcc77swakhfkh8pbl0zgk5ajq9wfpr7i27mf1x7n2y"; + rev = "bec9889de7bf48d28826039880cec9bfad24a628"; + sha256 = "0f9krv08jlw1sawjajdfy0cp5mzbq7hzvy478z8p54s1fwga6wxd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/diff-hl"; @@ -13340,8 +13529,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "eda68006ce73bbf6b9b995bfd70d08bec8cade36"; - sha256 = "1w7ssl9zssn5rcha6apf4h8drkd02k4xgvs203bdbqyqp9wz9brx"; + rev = "bca0522bf225bb7e82b783aad936ff8703812fdf"; + sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs"; @@ -13354,6 +13543,27 @@ license = lib.licenses.free; }; }) {}; + dired-collapse = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "dired-collapse"; + version = "20170717.208"; + src = fetchFromGitHub { + owner = "Fuco1"; + repo = "dired-hacks"; + rev = "bca0522bf225bb7e82b783aad936ff8703812fdf"; + sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6aab23df1451682ff18d9ad02c35cb7ec612bc38/recipes/dired-collapse"; + sha256 = "1k8h5cl8r68rnr1a3jnbc0ydflzm5mad7v7f1q60wks5hv61dsd1"; + name = "dired-collapse"; + }; + packageRequires = [ dash ]; + meta = { + homepage = "https://melpa.org/#/dired-collapse"; + license = lib.licenses.free; + }; + }) {}; dired-details = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-details"; version = "20130824.458"; @@ -13438,12 +13648,12 @@ dired-explorer = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-explorer"; - version = "20160809.200"; + version = "20170614.1956"; src = fetchFromGitHub { owner = "jidaikobo-shibata"; repo = "dired-explorer"; - rev = "f9ac7c511c4b2e349952eb4b99635047f3603907"; - sha256 = "03zax8q9wwj4q9l13zsznrx18b6d1rqrfgvmvzlkd3y4sqj2i64w"; + rev = "b02b08d73821512853c6a14113c794dded1df75a"; + sha256 = "1kc2j9iw4rsxkbssn6idfi1avxshn23aiv006a0yx8bhgwclnbq4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acd40e02185847dfdcd70b3cacea703133e4356d/recipes/dired-explorer"; @@ -13505,8 +13715,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "eda68006ce73bbf6b9b995bfd70d08bec8cade36"; - sha256 = "1w7ssl9zssn5rcha6apf4h8drkd02k4xgvs203bdbqyqp9wz9brx"; + rev = "bca0522bf225bb7e82b783aad936ff8703812fdf"; + sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter"; @@ -13526,8 +13736,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "eda68006ce73bbf6b9b995bfd70d08bec8cade36"; - sha256 = "1w7ssl9zssn5rcha6apf4h8drkd02k4xgvs203bdbqyqp9wz9brx"; + rev = "bca0522bf225bb7e82b783aad936ff8703812fdf"; + sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils"; @@ -13652,8 +13862,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "eda68006ce73bbf6b9b995bfd70d08bec8cade36"; - sha256 = "1w7ssl9zssn5rcha6apf4h8drkd02k4xgvs203bdbqyqp9wz9brx"; + rev = "bca0522bf225bb7e82b783aad936ff8703812fdf"; + sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow"; @@ -13673,8 +13883,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "eda68006ce73bbf6b9b995bfd70d08bec8cade36"; - sha256 = "1w7ssl9zssn5rcha6apf4h8drkd02k4xgvs203bdbqyqp9wz9brx"; + rev = "bca0522bf225bb7e82b783aad936ff8703812fdf"; + sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open"; @@ -13689,10 +13899,10 @@ }) {}; dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-plus"; - version = "20170530.1023"; + version = "20170630.752"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/dired+.el"; - sha256 = "121i39l4zaw3vhsxbh6r0b088982y3gvm0skf5b8wqldp4nsy55m"; + sha256 = "1jl14z15ilkwl45xv34akabnx4430siqkjv14sqi33g3qmnln90y"; name = "dired+.el"; }; recipeFile = fetchurl { @@ -13734,8 +13944,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "eda68006ce73bbf6b9b995bfd70d08bec8cade36"; - sha256 = "1w7ssl9zssn5rcha6apf4h8drkd02k4xgvs203bdbqyqp9wz9brx"; + rev = "bca0522bf225bb7e82b783aad936ff8703812fdf"; + sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow"; @@ -13755,8 +13965,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "eda68006ce73bbf6b9b995bfd70d08bec8cade36"; - sha256 = "1w7ssl9zssn5rcha6apf4h8drkd02k4xgvs203bdbqyqp9wz9brx"; + rev = "bca0522bf225bb7e82b783aad936ff8703812fdf"; + sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger"; @@ -13855,8 +14065,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "eda68006ce73bbf6b9b995bfd70d08bec8cade36"; - sha256 = "1w7ssl9zssn5rcha6apf4h8drkd02k4xgvs203bdbqyqp9wz9brx"; + rev = "bca0522bf225bb7e82b783aad936ff8703812fdf"; + sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree"; @@ -13935,12 +14145,12 @@ direnv = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "direnv"; - version = "20170501.218"; + version = "20170622.1128"; src = fetchFromGitHub { owner = "wbolster"; repo = "emacs-direnv"; - rev = "2cdf87ea96f9a08dee98762b18b5f8a5198ecf63"; - sha256 = "172jyl8v4zy9bbha8nndq63x8svn9xqkafkj3q17z289na8iaylh"; + rev = "3c632dd1fdf0ad1edb6d9b0a4a09cdbb420c27aa"; + sha256 = "0jajqf7ad0x6ca7i051svrc37mr3ww8pvd1832i0k7nf3i8cv867"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv"; @@ -14801,12 +15011,12 @@ doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "20170611.1109"; + version = "20170717.426"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-themes"; - rev = "4b6482765e3be2c51a9d8d23bbbfb9a0c80bf4ac"; - sha256 = "0g1883qz5a0fra1hsn6kx9r1hply61ba0bxhb8xx08j2zxbwj65s"; + rev = "a00ee6cc48179dfeb8836726d9faa9b4f119783a"; + sha256 = "0f1szgr7xz2bg222x8b9h6kmi6diipc2r4j4yafjpsgkniv6c93c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes"; @@ -15236,7 +15446,7 @@ version = "20130120.1257"; src = fetchsvn { url = "https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/"; - rev = "1798436"; + rev = "1802135"; sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq"; }; recipeFile = fetchurl { @@ -15337,12 +15547,12 @@ dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "dumb-jump"; - version = "20170611.1336"; + version = "20170627.1309"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-jump"; - rev = "9743f3f2736c0e84c5dff860a142c78a0c4ed861"; - sha256 = "19pdgwziriamf31vjca3y4fxcz4pcfdhr8ac2djz1gsfslq9n236"; + rev = "0328d922da4b1bbbb8f41848585c920608f6e9d3"; + sha256 = "1l3s42y90d2canslkjvfs4n5zlpdxp0h4b1yrip9825gh2k4fan7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump"; @@ -15714,12 +15924,12 @@ easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-hugo"; - version = "20170531.216"; + version = "20170708.307"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "451a37fb2e1f36d85a85973d4c41c7a249263f62"; - sha256 = "1s89qs13bnyqmsm7rfzk69hvnh170v2hpbh5adjiicwg3my05dis"; + rev = "226fa5c661391c7f8317a24c9f757396e1900371"; + sha256 = "0g63ajpxr2a42nw5ri14icvwwdc9hs8al91plcjxjs7q7rbkhwp6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; @@ -15861,12 +16071,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }: melpaBuild { pname = "ebib"; - version = "20170605.1440"; + version = "20170711.1234"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "4624e67ca26cb348063a97a8f59a3fbcbf8a5736"; - sha256 = "0ds11hphxp8jxsc50lvnr9n4macvzd82y7siqh8wvswk62l8vb4x"; + rev = "9e5f3377a5e9c6956300de3872c89cd902c2cfc6"; + sha256 = "0rklwdz3d2b065yhhiz7bhyfb3fsg9rcqi6d4rhk7wb8w849vf20"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -16304,8 +16514,8 @@ src = fetchFromGitHub { owner = "stsquad"; repo = "emacs_chrome"; - rev = "0a50fbb524fe256560f481701c000309c627b9ca"; - sha256 = "0ssmhwg4wfh5cxgqv8bl55449204h4zi863m7jhvas4c9zq005kd"; + rev = "f7cf37c3f605812d429fd90699d6d33f6ac9db8d"; + sha256 = "1i4fvw7703pr505mzspkc7sphh3mbg4pvbpfcr847lrg66pdw419"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d98d69008b5ca8b92fa7a6045b9d1af86f269386/recipes/edit-server"; @@ -16363,12 +16573,12 @@ editorconfig-charset-extras = callPackage ({ editorconfig, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig-charset-extras"; - version = "20170508.112"; + version = "20170712.108"; src = fetchFromGitHub { owner = "10sr"; repo = "editorconfig-charset-extras-el"; - rev = "1b8248de9e85bc846af8dfb53b70fdae8900cc69"; - sha256 = "0gqnx5dwy9qxl1npvp8858i0lwjv1znpqr08h129vaycyyq1n69r"; + rev = "bf2d23c57a485ee41d21a9a0015d5bd52baabf85"; + sha256 = "0qgg2v9xpr8bm97pj4pxd9q6j8i6h94gb1j7lla0sn80cwymxwrx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62f27dad806fa135209289933f2131ee4ce8f8bf/recipes/editorconfig-charset-extras"; @@ -16597,22 +16807,30 @@ license = lib.licenses.free; }; }) {}; - ein = callPackage ({ cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }: + ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, skewer-mode, websocket }: melpaBuild { pname = "ein"; - version = "20170606.1325"; + version = "20170714.1753"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "d9c81f3d900f2ffd78fd314685023d66d6d16438"; - sha256 = "1vf2bxxk3dj0npgab0yzqfx6dvfh5aj1bhmbpw1xfhssciyg8q47"; + rev = "08d2792d690cefb9ef2e00a14d3bbb1da55252a9"; + sha256 = "0fw56v0xx4axw24wzy8rk69zy0nhajk4y3fqi1305acfgn6hnnvg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; sha256 = "14blq1cbrp00rq0ilk7z9qppqfj0r4n3jidw3abcpchvh5ln086r"; name = "ein"; }; - packageRequires = [ cl-generic dash deferred request websocket ]; + packageRequires = [ + auto-complete + cl-generic + dash + deferred + request + skewer-mode + websocket + ]; meta = { homepage = "https://melpa.org/#/ein"; license = lib.licenses.free; @@ -16663,12 +16881,12 @@ ejc-sql = callPackage ({ auto-complete, cider, clomacs, dash, direx, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }: melpaBuild { pname = "ejc-sql"; - version = "20170328.706"; + version = "20170621.348"; src = fetchFromGitHub { owner = "kostafey"; repo = "ejc-sql"; - rev = "9595e72e85e7edef0d9df5accf166d232824cd3d"; - sha256 = "0h0ryi027f4vqv9m6dz8dgf9scqmcabcgin692yysxp9b5jkg8d3"; + rev = "438e4f5995285d28fe7dddceacac212c2250dfe2"; + sha256 = "01nxgv2yz9clbqr35kdl36zmip0nkqa45ab6b06npdxpcs4438nq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql"; @@ -16713,12 +16931,12 @@ el-get = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-get"; - version = "20170112.2204"; + version = "20170701.1607"; src = fetchFromGitHub { owner = "dimitri"; repo = "el-get"; - rev = "5b623bc5fa394389be7b0c00fd0b32e8e6b024c3"; - sha256 = "0wisl97gpp9a2mbs34v4mas2q3hkry3zqxmlbll7l3h7r950wyqf"; + rev = "4a1dde57e8a4d4c22ed279bac8253f5f16da9197"; + sha256 = "19570r8y2cs8y51rmihk5hk5sqavck4bf0zanajnplhxw52h0fji"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get"; @@ -16797,12 +17015,12 @@ el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-patch"; - version = "20170513.2050"; + version = "20170706.936"; src = fetchFromGitHub { owner = "raxod502"; repo = "el-patch"; - rev = "22682dd020ac93b621bf45e57c738e551e2cb14b"; - sha256 = "1hv9i78fchvmygmb7pfx1ybkq270aibdhjsidzskipfzw40p0dz2"; + rev = "979ea29884f54c5ac4a6a5b2873547c0964e3dd3"; + sha256 = "021ld1cs7swmrlbvnakwwx6xlyg95g8cnc6d1vk03a81p7s897il"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch"; @@ -16963,12 +17181,12 @@ el2markdown = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el2markdown"; - version = "20160822.1135"; + version = "20170630.1158"; src = fetchFromGitHub { owner = "Lindydancer"; repo = "el2markdown"; - rev = "712364b9f64d2f6501a069e1bfed207de0237881"; - sha256 = "12l50k56h1aiwmvvxrka3y1i82sv5xc7vn99z3y3kl31yl3g6382"; + rev = "368d99313683cd943c99feaffca356be60bdb636"; + sha256 = "1h0cr8qcvj9r3acb6bf5nyglvi5gdglwflkfl5jbzp0nm1p9iqcg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/el2markdown"; @@ -17171,12 +17389,12 @@ elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "20170531.206"; + version = "20170709.954"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "f3eaa7421af79db3d4203b4b3afdf84c4796cd55"; - sha256 = "1sji0k8kal1h5nsdin54qbnxc2ahd6qghn4nwwq5f13gacy4wzpg"; + rev = "79077efc34aad25bb43cf46a28a69a308196c972"; + sha256 = "1xsy7qr9k9ad5ig9vvf9bbxc5ik5xi1kpmq87q9iq3g321idcwnl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -17241,12 +17459,12 @@ elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }: melpaBuild { pname = "elfeed-web"; - version = "20170402.1842"; + version = "20170709.954"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "f3eaa7421af79db3d4203b4b3afdf84c4796cd55"; - sha256 = "1sji0k8kal1h5nsdin54qbnxc2ahd6qghn4nwwq5f13gacy4wzpg"; + rev = "79077efc34aad25bb43cf46a28a69a308196c972"; + sha256 = "1xsy7qr9k9ad5ig9vvf9bbxc5ik5xi1kpmq87q9iq3g321idcwnl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -17472,12 +17690,12 @@ elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }: melpaBuild { pname = "elm-mode"; - version = "20170603.2006"; + version = "20170714.1600"; src = fetchFromGitHub { owner = "jcollard"; repo = "elm-mode"; - rev = "85319b9e75dea9f79e6d16011ee2a15be11eb9c0"; - sha256 = "1gnjx7ay0c167vnl7k9gxmvm93ipqfs93jmcmvy56rlvc7yyk39x"; + rev = "4155f4333545189901ce574601ef34dada07b672"; + sha256 = "1q5qgjmmwnhgq4ckpkzy3wvmnj3cgzcggwm9q9jsdfmz0j1dgwn4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode"; @@ -17703,12 +17921,12 @@ elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "20170519.1544"; + version = "20170701.1412"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "2cf34afa0c3e7249149a65c0ae89e6c593050f2c"; - sha256 = "0i57dhljf0ymsqlqjr1bz0hxr108k7iiw267s24a3bm3p3ac5lfi"; + rev = "6b654b5fdc4e8f09cd842a0dde83ded284223c2f"; + sha256 = "02z965inkp3bxg9nyqscjs14dfzx7s18s3kx7ry50j2yi0iki6rg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -17731,12 +17949,12 @@ elquery = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "elquery"; - version = "20170527.1930"; + version = "20170624.1635"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "elquery"; - rev = "d4309cfebb275495f071fc3449261bf6b23b0afe"; - sha256 = "12qv4fg9dbgl6c05r501va9dcw16ml0yxkmvs32cr7wfffhxjy4w"; + rev = "a5f7f3545330280991dd6334f4ce4f72aaa44145"; + sha256 = "0yf29d1akj1ays5rqcmgmvyfm4gx7j6yibd12x72wpf5mygv1fxi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/121f7d2091b83143402b44542db12e8f78275103/recipes/elquery"; @@ -17920,12 +18138,12 @@ elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elx"; - version = "20161104.1831"; + version = "20170712.510"; src = fetchFromGitHub { owner = "tarsius"; repo = "elx"; - rev = "84c9cd5721be9594de743330e7abcec092d2838c"; - sha256 = "0z2xgy8n3gwh71129pk53nrm13h2x51n61vz7xjqmhm6c11vgrq4"; + rev = "6ce9a2f14ecf7263e71a699e058293f0343bfe4d"; + sha256 = "1i250nv416jmknb39a390bxvdsf0dlgwfjn67n5gn6sia99lgjhq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/91430562ecea439af020e96405ec3f21d768cf9f/recipes/elx"; @@ -18235,12 +18453,12 @@ embrace = callPackage ({ cl-lib ? null, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "embrace"; - version = "20170508.1526"; + version = "20170615.1131"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "embrace.el"; - rev = "02396165b6672c8c4cc800d25bdcc31e28b7f3da"; - sha256 = "045xdfm1li0wkhrcd2h77bviw7n4bxid7d4f482gala16y9mbjvx"; + rev = "394863dd7271e831cb9c257a1cd2249302ba962a"; + sha256 = "14qs180p5kv1h4p9qsv4jj61pq7d7bsrvwm0wm85lhgpx8v64q7i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8f07e3b5ba4ec4b0b79fba5a2cca5a3986218b6/recipes/embrace"; @@ -18295,20 +18513,21 @@ license = lib.licenses.free; }; }) {}; - emms = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { + emms = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "emms"; - version = "20170601.1651"; + version = "20170715.907"; src = fetchgit { url = "https://git.savannah.gnu.org/git/emms.git"; - rev = "0481ca3b8f8d558e545582440dde6dac514818fe"; - sha256 = "1z2kzaw2jr4m189gd8978g6wy6z9wicf1klyh48l623lh7cv48ic"; + rev = "e790730a4e258440184bc8ce5d3015efe09f8984"; + sha256 = "0rh3hsggfw0yp5ssdwjpp0fdnc57cpcw02hxn80mrq16ylpj2zy9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms"; sha256 = "1xpry8h96gvjnc0v8x0vk5dnmlq1r7m3ljpampdwv9pfwl95fh94"; name = "emms"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://melpa.org/#/emms"; license = lib.licenses.free; @@ -18380,12 +18599,12 @@ emms-player-mpv = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms-player-mpv"; - version = "20161204.633"; + version = "20170628.303"; src = fetchFromGitHub { owner = "dochang"; repo = "emms-player-mpv"; - rev = "ce142304d1fe6b096b9b984e40e55c8cc54217c1"; - sha256 = "1s8jmkcr11fp93hmyxq7c781lx7krc5xsk99ar0h50v2hpnmzgbb"; + rev = "8c72282c98f9b10601e9a6901277040cda4b33aa"; + sha256 = "1h37kqhsi1x5xgxfp1i72vfdx5c2klblzmphf6mih3fvw3pcyxi6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9679cb8d4b3b9dce1e0bff16647ea3f3e02c4189/recipes/emms-player-mpv"; @@ -18569,12 +18788,12 @@ emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }: melpaBuild { pname = "emojify"; - version = "20170528.147"; + version = "20170709.207"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "emacs-emojify"; - rev = "033e3b2fa171d73b932ecf27df237be2fd6e1c36"; - sha256 = "0x8ydqzacrps0kl3j50ajp8fwxg8vnggvjpjbnrglkpwwn2j1kzr"; + rev = "5bdf3ccc728ca2db734a686f9d4893c57ed59d90"; + sha256 = "0nxf35b8mblzl3yqq9h2lpr3q6r89pqljyglxm38aid2f5mjnlvx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify"; @@ -18791,12 +19010,12 @@ ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: melpaBuild { pname = "ensime"; - version = "20170611.1428"; + version = "20170710.347"; src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "86a52709a0c45e2f84737319f8f95abd0ea55ff2"; - sha256 = "10ix3yx916c929i8fj2bqkjjm409mwpjzydji6x8n8v5s8lnw6m2"; + rev = "aaaa9e34f5ea023621bc8123064d3183b35339a7"; + sha256 = "11nxhzy4qc4y1gfi0m5c78jv2ib5gpsqdr1p84q0yqkzdc9wvcmd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -18904,12 +19123,12 @@ epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epkg"; - version = "20170301.856"; + version = "20170702.59"; src = fetchFromGitHub { owner = "emacscollective"; repo = "epkg"; - rev = "deb9affaadce11c356df53b6b62ab376ef652d16"; - sha256 = "1515gv9bhjwbmkbz6sivq5zhpalvfb0ias4qia9anz9npqfx24y0"; + rev = "d9c43561d8d50066c1774e3cf3df12e168c9fc92"; + sha256 = "145zn11l9i0lmjr83zvn8snviqqn6kw24dm5ihlllgxycclsvcrm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg"; @@ -19113,12 +19332,12 @@ erc-image = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erc-image"; - version = "20150914.314"; + version = "20170713.1438"; src = fetchFromGitHub { owner = "kidd"; repo = "erc-image.el"; - rev = "270a60706e3e0669350bb7aaea465570ef5074cf"; - sha256 = "03r13x2hxy4hk0n0ri5wld8rp8frx4j3mig6mn2v25k0cr52689f"; + rev = "a7e6c6d766f8c2589abf6fd79c5211f970fcbed3"; + sha256 = "044cbz8r788j80f88d2irijpfvh22m9zjvd9ffj201fck428nakh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/erc-image"; @@ -19432,8 +19651,8 @@ src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "dd9e39dc2b97e30c03b24a00eb757be7d2c2bdc2"; - sha256 = "1q5pd9a5d5513brw5s2x6652fmmql7y7lcnzv18kw3wc4qvccl24"; + rev = "de5cfabdad61d45a112d95e24ac44e3f51a4bd18"; + sha256 = "14mi9qj2q0h21jy9zj4gqjz2205013d5s5l02asq6iid747jhx3j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -19595,16 +19814,16 @@ es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, spark }: melpaBuild { pname = "es-mode"; - version = "20170608.1234"; + version = "20170705.2002"; src = fetchFromGitHub { owner = "dakrone"; repo = "es-mode"; - rev = "3752438d17c45553956cf775022b2358ff3d8731"; - sha256 = "0a2afjg0ygd88qp5pc39ghwck837f6sk57c8zbcsyxwrabxnchhd"; + rev = "61a8bf7d6cc6881e5555922eb36eecc6733a2b87"; + sha256 = "0anc7bdar2q5c41ilah3p04p4z3mxkqlv91nkky72i58sgrw6za6"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/85445b59329bfd81a3fd913d7d6fe7784c31744c/recipes/es-mode"; - sha256 = "1541c7d8gbi4mgxwk886hgsxhq7bfx8is7hjjg80sfn40z6kdwcp"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/9912193f73c4beae03b295822bf41cb2298756e2/recipes/es-mode"; + sha256 = "0zp84k5idqkrvc9qci49ains0b86kpk97lk1jcwyj75s4xsfyp1y"; name = "es-mode"; }; packageRequires = [ cl-lib dash request s spark ]; @@ -19658,12 +19877,12 @@ escreen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "escreen"; - version = "20091203.1013"; + version = "20170613.1534"; src = fetchFromGitHub { owner = "emacsmirror"; repo = "escreen"; - rev = "e3fd46225fec70943024d950c6b6c2eb88e00b96"; - sha256 = "0id7820vjbprlpprj4fyhylkjvx00b87mw4n7jnxn1gczvjgafmc"; + rev = "153dc05b2b7e6e2d4cbd7b6cbe8b10d6a70f73f3"; + sha256 = "0xz3dkvgrbgv91dxgdfcir9zld5qsqpzrmp4q6fxqa548advn9ak"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c64c21a42fd8436bd60e490980ad4ed824b212d1/recipes/escreen"; @@ -19700,12 +19919,12 @@ esh-help = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "esh-help"; - version = "20140107.222"; + version = "20170702.1912"; src = fetchFromGitHub { owner = "tom-tan"; repo = "esh-help"; - rev = "3dc15f2f6086d4e4da977468fda67229a859c927"; - sha256 = "1yfvdx763xxhxf2r6kjjjyafaxrj1lpgrz1sgbhzkyj6nspmm9ms"; + rev = "15994c0d1c36f6209547742690c6d8f2ef505393"; + sha256 = "0a0n05mhgp8gvxkld0510k4kq4m81aq2jdrgmfyafm5am5abz6lp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ab94c66d1ed7cfdbc437ee239984ba70408fd28a/recipes/esh-help"; @@ -19826,12 +20045,12 @@ eshell-prompt-extras = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-prompt-extras"; - version = "20160926.1723"; + version = "20170713.11"; src = fetchFromGitHub { owner = "hiddenlotus"; repo = "eshell-prompt-extras"; - rev = "9825db1b9326e106f821364ae01ec9c7dbdf6d18"; - sha256 = "1zijgwqm9j25ayiy4p5gl3xsrgv10l85j2p317i8bx9hn3v9rk5a"; + rev = "52a8ce66da2c5f419efd41f2a6b6d4af03f78acd"; + sha256 = "1biandbijdngalbjvbfv894qjzmj0fndypa31rmd75c0r5mg2mnf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/eshell-prompt-extras"; @@ -19851,8 +20070,8 @@ src = fetchFromGitHub { owner = "peterwvj"; repo = "eshell-up"; - rev = "2216e149ffdd5cd8eb49d6661187d676b6a22d19"; - sha256 = "1czl7gab46n9lxp91v1l9rgnz72h9x1im20yq4hw8w0x71a45ss7"; + rev = "9c100bae5c3020e8d9307e4332d3b64e7dc28519"; + sha256 = "00zdbcncjabgj5mp47l1chymx5na18v2g4kj730dgmj3rnl3iz2q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eshell-up"; @@ -19910,12 +20129,12 @@ eslintd-fix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eslintd-fix"; - version = "20170313.1943"; + version = "20170711.552"; src = fetchFromGitHub { owner = "aaronjensen"; repo = "eslintd-fix"; - rev = "afa5cd1c1fb644a918e410ef396392b841146632"; - sha256 = "04ixmv1y7zi32xwywn4dz0nvsvpmdk2m80y9fbaxi5skkx9r30g0"; + rev = "895d70be11ccdbcdf0b44d5ae2a85d4ccac2920c"; + sha256 = "1h43l4jvp3wbyyda3745m6c6ik6pn4k7pmq94ia9fbp4zqh4hsvr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c72d2b3ee9b8066d51d09e165e58e9846ca879cc/recipes/eslintd-fix"; @@ -19931,12 +20150,12 @@ espresso-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "espresso-theme"; - version = "20130228.2348"; + version = "20170716.813"; src = fetchFromGitHub { owner = "dgutov"; repo = "espresso-theme"; - rev = "c3a524e873f33923fe511791197a66dea5156687"; - sha256 = "0ir7j4dgy0fq9ybixaqs52kiqk73p9v6prgqzjs8nyicjrpmnpyq"; + rev = "e79c5c14732b7e34aab75dbcc968839536536c59"; + sha256 = "0jdyxyc6mk0vh35wgic8ikvs9cid7b5ffqx94pkg1kpridm2wrzc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/27c929ec2eac0459c7018019702599e09ac908fd/recipes/espresso-theme"; @@ -20015,12 +20234,12 @@ ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "ess"; - version = "20170603.817"; + version = "20170710.118"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "f2643cd3ae6727535ce76ed00a91bf96c09e280f"; - sha256 = "1fyr963y2mnp8wk9jf0fpfp1k74ayhbcdyg1xknvd5jd5lyjgbkb"; + rev = "064174931f0cbf91ad24fda883909a06eee10f6e"; + sha256 = "0f6ikmgcakaa74p271nfkg55gbq2wxdjq978h8kp7x7vaczfjz0n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; @@ -20263,12 +20482,12 @@ euslisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "euslisp-mode"; - version = "20170315.2046"; + version = "20170621.945"; src = fetchFromGitHub { owner = "iory"; repo = "euslisp-mode"; - rev = "fbaa35e77eee91da5ce86fbf5342648722b97d7c"; - sha256 = "0y9l6h1824a7sd4w26s1ql8ffim42pcz8szadmwk2v4p64cya76l"; + rev = "16ee25d6d84d0e0b1b153791c51acedafd8d572b"; + sha256 = "1a496xzw6vs6rv7pp6yv3zmjdxbypjz132r6s6595gjcvwrfisr5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b09a7c4b73203d75c5260f1d08845236cbbeae46/recipes/euslisp-mode"; @@ -20389,16 +20608,16 @@ evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }: melpaBuild { pname = "evil"; - version = "20170612.100"; + version = "20170712.2350"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "d45772929db630be8226e2786132d46e2c6bdb2c"; - sha256 = "07mc036lz2lj0csg10a8gdqxqsf8mxsjfy3ha9wsrmbqhsvwixn9"; + rev = "dc936936666595afdbdbb4cc44c1f82e74c6802c"; + sha256 = "0l0sjrfpp5xk5c74gryh1sf9hpv8qkykdwg59vzsmn0w9ii217p5"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/514964d788f250e1e7893142bc094c63131bc6a5/recipes/evil"; - sha256 = "044k9p32y4cys3zwdfanr1zddgkxz16ahqspfz7vfszyw8yml1jb"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil"; + sha256 = "1d36r6mi5nvrwnk4a9338wmhr72fcbrwj0r8gmvivpjdngjy4k39"; name = "evil"; }; packageRequires = [ cl-lib emacs goto-chg undo-tree ]; @@ -20599,12 +20818,12 @@ evil-ediff = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-ediff"; - version = "20170213.539"; + version = "20170623.707"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil-ediff"; - rev = "4f3b9652e5df58ccc454d970df558f921958894d"; - sha256 = "1nc7xq86v5ns3d47ifwnfm7x7x3qxb18rjqx37mqvga91nz2i1k3"; + rev = "862310e244d406751cdc7eae8e8c0d88414a48c7"; + sha256 = "0088xgvzsy3rmdkw6r90vnxgsxr9mmqkwaw18m9bm4fivday75b0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50315ec837d2951bf5b2bb75809a35dd7ffc8fe8/recipes/evil-ediff"; @@ -20746,12 +20965,12 @@ evil-goggles = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-goggles"; - version = "20170529.2251"; + version = "20170710.724"; src = fetchFromGitHub { owner = "edkolev"; repo = "evil-goggles"; - rev = "d2dfe823d5b1b70e4ed47518db98b238ff67b81a"; - sha256 = "08hffzamrg3d8fqq94z7p9pywkzckhv6a58x7s1x7z8qvg2irlkz"; + rev = "902270eea80594577d9af26298998406f79e59a0"; + sha256 = "11v1zpi3jnsxdwhxv441rvbkyb6v1sg4zyk74aw14l5cf38f0d55"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/811b1261705b4c525e165fa9ee23ae191727a623/recipes/evil-goggles"; @@ -20914,12 +21133,12 @@ evil-magit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "evil-magit"; - version = "20170611.1237"; + version = "20170613.510"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil-magit"; - rev = "f851e5896fa90ae94dfde3d2a7554b4d5f9e665c"; - sha256 = "127ccll30526b38g64pagagnia8mw0bs9db95xri0n48x4vginkd"; + rev = "91c96e6ffdc6e7d5e49fd9b0ffb7df8794f0f2db"; + sha256 = "1nwibif8syk5dfygzcafsbh41gaxaps187zxdv75z2hbdbvqx1l3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50315ec837d2951bf5b2bb75809a35dd7ffc8fe8/recipes/evil-magit"; @@ -20956,12 +21175,12 @@ evil-matchit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-matchit"; - version = "20170119.125"; + version = "20170713.647"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-matchit"; - rev = "277623d8be7bd6ade8f301b9397b88575a0d01b9"; - sha256 = "0bkc90ix8nivqkjkgb6iaq1a0g8dcp91im119dx98l6lxga57qli"; + rev = "2fc961d94b27e528df1fc4b88d297dd9af8ed6d6"; + sha256 = "16fk050q8ibdp4n5fflcz2scsbky7dg1kf97c28f1gszixp6yng0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit"; @@ -20977,12 +21196,12 @@ evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-mc"; - version = "20170526.1158"; + version = "20170716.1806"; src = fetchFromGitHub { owner = "gabesoft"; repo = "evil-mc"; - rev = "506f92dc610906fc279e50c598efe2068161edaa"; - sha256 = "0ng2l70zllkvjsq2ybgdcdzyg0brplaznxr2y3qmbk72vgs3wxra"; + rev = "8127c3161a6d990635684a020f708b7914445593"; + sha256 = "10cy5shnd9dl9xkcl7gx4ksbbn2cqjww9ihw7ifawnwpa77bcf43"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc"; @@ -21040,12 +21259,12 @@ evil-multiedit = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, iedit, lib, melpaBuild }: melpaBuild { pname = "evil-multiedit"; - version = "20170515.337"; + version = "20170623.1135"; src = fetchFromGitHub { owner = "hlissner"; repo = "evil-multiedit"; - rev = "8d146312565949850328e4ef365e1f5d71216281"; - sha256 = "1xw5r3mwyjfbpgdvnm1pv5dfg56qbzvmwhv929x93sjs0j4ybwml"; + rev = "e135fd8662406807bc0d9d0f2688e7dbe89b98c8"; + sha256 = "1dw3mf3dckjhnzvwj7jcwlgzkh592njvcg2xbs2wv1456rnnqaz3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/997f5a6999d1add57fae33ba8eb3e3bc60d7bb56/recipes/evil-multiedit"; @@ -21124,12 +21343,12 @@ evil-org = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "evil-org"; - version = "20170611.1149"; + version = "20170622.1310"; src = fetchFromGitHub { owner = "Somelauw"; repo = "evil-org-mode"; - rev = "4da3d179d71113b906173a974fec933e9f55afa8"; - sha256 = "16d9x89plmy6qrjvc8czrqpc1y53xbcaclc20yd8yyi722sdd4x1"; + rev = "975109dc665f53cef221b3c668612664340b7940"; + sha256 = "0fr0wxd53a0lv2akvayi844fncn8klj88hmld73x2d1igig38p4q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1768558ed0a0249421437b66fe45018dd768e637/recipes/evil-org"; @@ -21208,12 +21427,12 @@ evil-replace-with-register = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-replace-with-register"; - version = "20161127.2159"; + version = "20170713.225"; src = fetchFromGitHub { owner = "Dewdrops"; repo = "evil-ReplaceWithRegister"; - rev = "c979aa2f4d730d2a741358e357d18544edd46cd2"; - sha256 = "168qqbsjwblhrq92mw0v1f86d3q1m2f5rh37xikj1bk589c2izp9"; + rev = "91cc7bf21a94703c441cc9212214075b226b7f67"; + sha256 = "14rpn76qrf287s3y2agmddcxi27r226i53ixjvd694ss039g0r11"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1bd98aebefc13da5a129d1d3f1c8878e4a70654/recipes/evil-replace-with-register"; @@ -21289,22 +21508,22 @@ license = lib.licenses.free; }; }) {}; - evil-snipe = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: + evil-snipe = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-snipe"; - version = "20170405.1644"; + version = "20170702.302"; src = fetchFromGitHub { owner = "hlissner"; repo = "evil-snipe"; - rev = "d6d60b077e31755b6d543337dd165ab7e1c67d36"; - sha256 = "05fxr48r7qilh52ycm6bi108y9kd1zw62mckf8ddhsjrvszx97nb"; + rev = "c50372d152b123fbf7bc26b49504505a22e82635"; + sha256 = "1xvpjs91wr351gl0xb3fbbm4yhv2rcgbqcn8srw022a2snhrdw27"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe"; sha256 = "0gcmpjw3iw7rjk86b2k6clfigp48vakfjd1a9n8qramhnc85rgkn"; name = "evil-snipe"; }; - packageRequires = [ cl-lib evil ]; + packageRequires = [ cl-lib emacs evil ]; meta = { homepage = "https://melpa.org/#/evil-snipe"; license = lib.licenses.free; @@ -21338,8 +21557,8 @@ src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil-surround"; - rev = "a4fc4483dff0bb0e544d832a845fdc6fb85c6214"; - sha256 = "0xqvpr8irkv4qw82gcgnnfb9mjavb4jj9a11cw32wqjdg0106dlr"; + rev = "43a266461517d2eb715338da0a31dc6616073116"; + sha256 = "04pzlkblziir91g38kmlmr7p1q5cxjw4q7difwhly3iz567minkq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9dc47a4c837c44429a74fd998fe468c00639f2/recipes/evil-surround"; @@ -21443,8 +21662,8 @@ src = fetchFromGitHub { owner = "noctuid"; repo = "evil-textobj-anyblock"; - rev = "66dd87d10843f99cb4b7f76e55f00fca9dd48ac3"; - sha256 = "0a0vr4nqnigrdblr0wfxzl6n3xv4sfi7w3rdrsq8n4sywfdzwlap"; + rev = "b611a54e62a6e6ce40bbb8b5094bd88028fc7efd"; + sha256 = "1wgdzl14hrzjsh6wvc83njfd0321rnbhc68mzcvn27g04zx9a1d0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/36b734960313d4cb484cebaac0f112781436631c/recipes/evil-textobj-anyblock"; @@ -21691,11 +21910,11 @@ exiftool = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "exiftool"; - version = "20170301.232"; + version = "20170613.1342"; src = fetchgit { url = "https://git.systemreboot.net/exiftool.el/"; - rev = "b678cffcac678ed0254c5f9e881dc4486816d3c8"; - sha256 = "0afc77iz391y67jlimqzppz59my8ndz7acpp639a24m121xm3zwm"; + rev = "1c9c6feba21b98337665b6f2b4064b2bf5b75af6"; + sha256 = "1m3jn127w95sb4y34f9lb1cv445pxfs4b90f6ia5cjs75706fn03"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4835a76909d020781021e747fbc341111a94dbfa/recipes/exiftool"; @@ -21834,22 +22053,22 @@ license = lib.licenses.free; }; }) {}; - exwm-x = callPackage ({ cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }: + exwm-x = callPackage ({ bind-key, cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }: melpaBuild { pname = "exwm-x"; - version = "20170606.2038"; + version = "20170708.1735"; src = fetchFromGitHub { owner = "tumashu"; repo = "exwm-x"; - rev = "ff656107e55458cb2b453eb4637ad203007068f1"; - sha256 = "1ssbqcrhcprfd1n4bvcbczp3dqhq4hcl75qaz6alc9y11r2jb4ar"; + rev = "e50edd9e4174b729fdbc5750221c5e49b772e9c5"; + sha256 = "0kx4db5mdm295d4gyx88xjgivhsnl6f5p24smvwi1wf3jv35rnds"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x"; sha256 = "1d9q57vz63sk3h1g5gvp9xnmqkpa73wppmiy2bv8mxk11whl6xa3"; name = "exwm-x"; }; - packageRequires = [ cl-lib exwm swiper switch-window ]; + packageRequires = [ bind-key cl-lib exwm swiper switch-window ]; meta = { homepage = "https://melpa.org/#/exwm-x"; license = lib.licenses.free; @@ -22002,6 +22221,27 @@ license = lib.licenses.free; }; }) {}; + face-explorer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "face-explorer"; + version = "20170710.1201"; + src = fetchFromGitHub { + owner = "Lindydancer"; + repo = "face-explorer"; + rev = "13bd4553bc4b09215a04d0267be1cb4ed834775c"; + sha256 = "1zbm92imfbh1sm7j64vc1ig5yq6rdd8izkh80mci5k6nf1p3byk7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2370fdf6421dc518337e04bd2453a5f74e2df2b2/recipes/face-explorer"; + sha256 = "1jfidkkizgwhkkrgvrmq5vrx5ir4zjw4zzc2alw9gkjn1ddq22q7"; + name = "face-explorer"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/face-explorer"; + license = lib.licenses.free; + }; + }) {}; face-remap-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "face-remap-plus"; version = "20170222.1742"; @@ -22314,12 +22554,12 @@ fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fcitx"; - version = "20170602.1912"; + version = "20170615.1143"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "fcitx.el"; - rev = "2e3abe356b464b30350c08e243988a3116818b19"; - sha256 = "0cplg10mhr2r3cp4wcaykyvbzilmjma90hkv4h1m8d8xrfdmmi7g"; + rev = "cddd216402c9a9b4228b5f82afa1bd637b2e0c37"; + sha256 = "0kvn9ikxnv9ahz0cqal3drxv95slwbf758sp37irih6fqh3ybgbl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8c40f09d9397b3ca32a7ed37203f490497dc984/recipes/fcitx"; @@ -22604,8 +22844,8 @@ src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "eb9fec502a2622b46301ca49183147b6b1fcaff6"; - sha256 = "1hrdqdps76c1sfq9m9l6nid32lklsli2hgwzd4sl5ypb0zqhn25k"; + rev = "a6e59891973f3e40ca2e414ca66799cc686d8626"; + sha256 = "16wxw5bxb3nmw6glx2iqcfr75fsya1a9kxd6khv46zy5z85n1bng"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -23356,12 +23596,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20170601.608"; + version = "20170715.1345"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "db3a745edb6b2678286e4d2bccebbb8d388c1a9e"; - sha256 = "057yy3nmvlsczzq4h72a67qi4qbjl5ysv3vz4iw2nr1772a1y9ja"; + rev = "b78d5a6f48c2ebd4298cf33c3364c63d86ae32cc"; + sha256 = "14mp95k9365869fikzsvxha74121kbcrwp0pavv17calf29ycxck"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -23500,15 +23740,36 @@ license = lib.licenses.free; }; }) {}; + flycheck-clang-analyzer = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-clang-analyzer"; + version = "20170704.2333"; + src = fetchFromGitHub { + owner = "alexmurray"; + repo = "flycheck-clang-analyzer"; + rev = "a33752224cb1da13b35d0d60b2017fe73d167781"; + sha256 = "1f6nb92fg1lgf4xz8x1i61njwnqrab94p88kliaa7g9r4hfhgv8j"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8de7b717a1b0caf30f8f29d3e764b4756b93aeff/recipes/flycheck-clang-analyzer"; + sha256 = "0wby4vilvcmmncr6l6abh3v4wznx9m0zbk30vllj8bq98awfcy3a"; + name = "flycheck-clang-analyzer"; + }; + packageRequires = [ emacs flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-clang-analyzer"; + license = lib.licenses.free; + }; + }) {}; flycheck-clang-tidy = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-clang-tidy"; - version = "20170222.512"; + version = "20170621.202"; src = fetchFromGitHub { owner = "ch1bo"; repo = "flycheck-clang-tidy"; - rev = "fe49836f30b37eae308e2255acbdcb0195d3a2ba"; - sha256 = "14i8f5gid9pnrgsvhibwclv4m53j86i05wbfjfj15aprhbf2ii94"; + rev = "5b1c86477f7d1eaabd781bc83dd1bd105c79335c"; + sha256 = "1zd6rqbrpvjxa9sclkldffb91mgyljh1jcvlvvd2cdlajcv98ciw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a289ac549a7735a12eec85521c32f915b9194b85/recipes/flycheck-clang-tidy"; @@ -23587,12 +23848,12 @@ flycheck-coverity = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-coverity"; - version = "20170520.825"; + version = "20170703.1759"; src = fetchFromGitHub { owner = "alexmurray"; repo = "flycheck-coverity"; - rev = "fb8ef7b07ca17681b72272331d43578f30405bec"; - sha256 = "0068wzh2fyrbjn5gvfyf1kpfppfw49mnwkd0n046nhjgaz9y1lc7"; + rev = "cb211e3dd50413a5042eb20175be518214591c9d"; + sha256 = "17c5lppa5axw6wga3k8zqmn5f2syadlqbavrqgsi8k8nlcckxy1x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55e8df91adbcf8b059096e02aba2781424250381/recipes/flycheck-coverity"; @@ -23738,8 +23999,8 @@ src = fetchFromGitHub { owner = "z4139jq"; repo = "flycheck-demjsonlint"; - rev = "1c433150fdf628dda4c9fad938bf7c79610b4460"; - sha256 = "0kmvwmaxw64xjgchq8szk9mhbi6xp2jhv7qpgqndf4svia4pqws6"; + rev = "a3dfe1df8ecdea76c076c0849901427567356228"; + sha256 = "0zra3rl0kn70kn30wx1lqh9218k06mq3j8jadax61nnynw7bzsa5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b66df1afde83607408fb1b30e1260f22015bf448/recipes/flycheck-demjsonlint"; @@ -23965,12 +24226,12 @@ flycheck-haskell = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, let-alist, lib, melpaBuild, seq }: melpaBuild { pname = "flycheck-haskell"; - version = "20170604.447"; + version = "20170622.1248"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-haskell"; - rev = "84a8853d2ed4bd74038bb45d531dfbff0a3b1de0"; - sha256 = "1lzf5wahmbxfqa7944z5gjbs7vfbm5qsv02jc7x3cvj8z22kf4fd"; + rev = "2aeb2ed5cdde7770cd5da9950981390d7b44f74c"; + sha256 = "0h7zb1f0j3b44ad7ikdyv3mhddvh9hfg61g2aic3x3ms8rph86q5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ca601613788ae830655e148a222625035195f55/recipes/flycheck-haskell"; @@ -24046,6 +24307,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-julia = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-julia"; + version = "20170715.945"; + src = fetchFromGitHub { + owner = "gdkrmr"; + repo = "flycheck-julia"; + rev = "0eaa3216dc35679d72c0d107127d48915516df08"; + sha256 = "091zjabzrw1f194pmz60ij3ys8sw54dxj9q3vpl3sigr1jd1qq7v"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4e964e3c6f737d0102b4fd7440fa9d434e6382bf/recipes/flycheck-julia"; + sha256 = "0340bv0lifs8pajk7gh7rngdjg62vaggn5biyysng642dlg5fwqs"; + name = "flycheck-julia"; + }; + packageRequires = [ emacs flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-julia"; + license = lib.licenses.free; + }; + }) {}; flycheck-kotlin = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-kotlin"; @@ -24431,8 +24713,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "d6af2ad09c99f9c58900665e874dcf97a545c0fa"; - sha256 = "12p22b9q4rkl7jswg12gqc8751sinzgj8h75jjzrggd0vfsg439a"; + rev = "65c8f03ff0112ce5c5e11aff6867ad0eb9019e63"; + sha256 = "0xlacwjmvx5xd8m7yi8l8mqi0lqs2gr2hmjag2frvmxcn4cpb4gc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags"; @@ -24595,12 +24877,12 @@ flycheck-vale = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: melpaBuild { pname = "flycheck-vale"; - version = "20170521.109"; + version = "20170619.2322"; src = fetchFromGitHub { owner = "abingham"; repo = "flycheck-vale"; - rev = "7ca0a2a29b6185761bd07369c565774269c909dd"; - sha256 = "1crlyphv00a1zm8wbsysxfxhfasv34bbnckc4a3psnvl913nc1gn"; + rev = "97df981468120aaedeaa4cf8ecfd68b07046d998"; + sha256 = "1zic9mirz2xi25pcj3d6r9sclambyn9q5dp7v9jvvxqkml3vy88c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7693eeb536e601589b49f96d0e2734cd08fad4f2/recipes/flycheck-vale"; @@ -24637,12 +24919,12 @@ flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, ycmd }: melpaBuild { pname = "flycheck-ycmd"; - version = "20170327.1418"; + version = "20170614.1434"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "29aba538be5e44da81ad76a6078bb65c1c5e1aa6"; - sha256 = "0fpccpiwwsxg0asdzg0m5hlwdv6jyr7khywnd1rb6kvr8m2qm0hf"; + rev = "35e8a31e32d0de890547612db8373d7333db8d8a"; + sha256 = "023bkmviaqb85kwwlpmzfc5gycf4i7w8a43zhbmvasfjjb962yzd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd"; @@ -25498,12 +25780,12 @@ focus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "focus"; - version = "20170520.901"; + version = "20170612.743"; src = fetchFromGitHub { owner = "larstvei"; repo = "Focus"; - rev = "155da77a324f28fd37f6167d5c843c491dc3327d"; - sha256 = "0jkfwammgzvfdhs4pg751rkljhrkmbyvqfs762i3smpqw95jqh2w"; + rev = "a84ade00a2b57e47430d5b2df5246069f197356f"; + sha256 = "0qz52gak45nbi6pgsdl3h2a01d89gbzm0glpv1jjy5dvabr98835"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e8f1217224514f9b048b7101c89e3b1a305821e/recipes/focus"; @@ -25748,12 +26030,12 @@ forecast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "forecast"; - version = "20170221.1327"; + version = "20170618.1048"; src = fetchFromGitHub { owner = "cadadr"; repo = "forecast.el"; - rev = "1eb60db1760572e3b1b87f6d672e3aa0812d6d94"; - sha256 = "1imrn4wc744fdcm1pkfjk8gmilzcrjzawbcg6mhdkzsz5cnb7klb"; + rev = "96e37ca81a42061f0e837cc3c4dec1844f682e91"; + sha256 = "0hbz2q9sm70r7sxk56dlnzwh71ckrww7w43xxy3ys1r3p7b3j3aq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e6ff6a4ee29b96bccb2e4bc0644f2bd2e51971ee/recipes/forecast"; @@ -26205,12 +26487,12 @@ fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }: melpaBuild { pname = "fsharp-mode"; - version = "20170606.925"; + version = "20170617.1330"; src = fetchFromGitHub { owner = "rneatherway"; repo = "emacs-fsharp-mode-bin"; - rev = "1020b6ccb5bf7d3eccd9e84b7ab293c87528265e"; - sha256 = "0qbhl4yzn5q156w1gyapj430sxj4iyzgdwh2f5zyl8q791vad9k3"; + rev = "9766952bd7830cb0d319736961af8e42e67d42fe"; + sha256 = "1krncbzdhp6kpypaqdn6fhvxhhc1pvy2ayn4w4ljmsd7wx6zazyi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode"; @@ -26263,11 +26545,11 @@ fuel = callPackage ({ cl-lib ? null, emacs, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fuel"; - version = "20170601.1205"; + version = "20170709.139"; src = fetchgit { url = "git://factorcode.org/git/factor.git"; - rev = "dc0b8994f00bd46de99398f92bf949a784c7a9ee"; - sha256 = "1wka0ldx68psxjp3bl6xwx48mlnawqccvyig1lr4c5vi1avkf6dk"; + rev = "9adddfc5e5666febc2f98b230e4a7d2b4c02ce0b"; + sha256 = "1ya7ghnclgcwha2cgi37z627q257xxd8c3igfl12k22ix4l5wr37"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel"; @@ -26388,12 +26670,12 @@ futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "futhark-mode"; - version = "20170506.1334"; + version = "20170714.1430"; src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "19015c8d84abc84cfd5f39295b02af8af5ef2e94"; - sha256 = "1vp24kgi3hv2j7df6nmczhfy847725c6jpjizmgfl9r2d7d1v9bs"; + rev = "dbc4ae1b8c977435d5369b18e1b624a62f8e8b13"; + sha256 = "0h7244567anfrfm2wpkvy0g6bnczisv03rz2ipr35pqm3gf7hyh8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -26655,12 +26937,12 @@ geben = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geben"; - version = "20170125.1937"; + version = "20170620.2012"; src = fetchFromGitHub { owner = "ahungry"; repo = "geben"; - rev = "7639411604552fcb6352afe88522a9ff1c8132fc"; - sha256 = "02pic12kfa9794sz7qj57ca5ld8x1pk0apfr3h2xzr6zdsmsdday"; + rev = "003abd23a7468daa133dfbc7ef85d0d61a0410dc"; + sha256 = "15ck23xv3dz9i4w5xd9lkg0c6rlsyxdz465xrpkr77fq9qw0c4dg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f8648609e160f7dcefe4a963e8b00475f2fff78/recipes/geben"; @@ -26718,12 +27000,12 @@ geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geiser"; - version = "20170411.1021"; + version = "20170704.1044"; src = fetchFromGitHub { owner = "jaor"; repo = "geiser"; - rev = "41059d6295dbaa207b2203fb6b78003de4888714"; - sha256 = "19ri8q3wbpw3vsw2iq1ym60gk0j4f9bniipiddrjqqirhcns8zzq"; + rev = "49a9e902e404d030e4b4ad22f75548a1b855a8fd"; + sha256 = "0xf0y4qp2cf3zzx8azh8jz4qpqdgp67y445sk8v9g55ns118hv77"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser"; @@ -26739,12 +27021,12 @@ general = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "general"; - version = "20170528.336"; + version = "20170708.104"; src = fetchFromGitHub { owner = "noctuid"; repo = "general.el"; - rev = "a8470934373b2bdd67f38e46e1dd4fb963cee31b"; - sha256 = "17hg6iw3dz1ssxvz1zm8c90927a2sf22yv31g2y7n98jnpq622bs"; + rev = "00efad765a3ace42a2833c65a169d96c7925623b"; + sha256 = "1jp0vp4g46pcxsyz9d8n9iqf1rsaw4lhsrilmdkayj7n3skg4ipj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general"; @@ -26844,12 +27126,12 @@ ggtags = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ggtags"; - version = "20170510.744"; + version = "20170711.1806"; src = fetchFromGitHub { owner = "leoliu"; repo = "ggtags"; - rev = "c7948943155eb712eb5aa1eeae8b50c8bb2eca13"; - sha256 = "0qcwykjpa5424jpkw6s895827ym2cq5rv6j773wksnlbsg0v429v"; + rev = "8579025b9b89c53221c6c608b92a85734ffb0116"; + sha256 = "1fr12adssldynjayylqck85nnlcjx6pf15vp0hhvdnl689imbg3l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b158bb1bc2fbe3de61a6b21174eac7b1457edda2/recipes/ggtags"; @@ -26869,8 +27151,8 @@ src = fetchFromGitHub { owner = "sigma"; repo = "gh.el"; - rev = "6efe3db1acb841c3366878baefc576caa2eb5e09"; - sha256 = "0nchfzlnhzns1d6362yv5qa469qmgcvr15nx8ygcpw8ncf4pqjpw"; + rev = "76255942ccc84d5cf918a2b6411a8ac98a7c8585"; + sha256 = "09b09zqawll6lbrhl352x7g62s4spq97rd8x32shn9m01w6paz9r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gh"; @@ -26907,12 +27189,12 @@ ghc = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "ghc"; - version = "20170526.44"; + version = "20170613.1212"; src = fetchFromGitHub { owner = "DanielG"; repo = "ghc-mod"; - rev = "8bfd542ad210debd00a0be9f15b21c90043b15d4"; - sha256 = "04vjp5m25yyxhdzwc50g0qcggzhg1rs4kyj7d0ax0blfnqzggf2c"; + rev = "d867cd0fee3fdb4e93440d96506c522de743aec6"; + sha256 = "0k615c7fvabs2y28kf0w3j8y3chqsbcdizv5z9jyf3519svb5sxn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc"; @@ -27033,12 +27315,12 @@ ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ghub"; - version = "20170518.358"; + version = "20170702.512"; src = fetchFromGitHub { owner = "tarsius"; repo = "ghub"; - rev = "715dfef4a926228c059674bc68a16e27d4f539ee"; - sha256 = "1y6crh3v3g7g0i225pcp9ff18pcfl5fnpc22yf4wcbf1if7pd2vs"; + rev = "16c3300bb5d82b141aefa94c47ad9f97a58b0011"; + sha256 = "1w1cqz32rx4i4hcjkz2znlchp5h4xg74znm9819k4anlf635lshd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9375cbae3ffe5bf4ba5606358860050f3005d9b7/recipes/ghub"; @@ -27247,8 +27529,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "622c994183294b02893ff286210bffd5255296df"; - sha256 = "1cyzf8xh6ibq9vypcdg4akqsfr1i202y14mdlr7hh2bkxymcq32i"; + rev = "33201f76c27d21e91c2137aa5f19db18b2adb2e5"; + sha256 = "0749yvycd66ddg1wzzyzv8d2z6rxhlrizn83q0gm1zbz296s7rkb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -27520,8 +27802,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "0be857ef001adb9b58770bd4e70d3103d2557277"; - sha256 = "0b7c0dkrm7szvk83945ribdj5k9mxs7pmbillgh2b51rsrkk16rz"; + rev = "9f18eca514d242816a4969e86c4cfd2cf4dfe401"; + sha256 = "0k380f9ff15gg724c2spfd9qml97k24bhn3h9ipv1c7rn9qvhdhc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b4e2ddd2a80875afc0fc654052e6cbff2f3777f/recipes/gitattributes-mode"; @@ -27558,12 +27840,12 @@ gitconfig-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gitconfig-mode"; - version = "20160710.1913"; + version = "20170627.854"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "0be857ef001adb9b58770bd4e70d3103d2557277"; - sha256 = "0b7c0dkrm7szvk83945ribdj5k9mxs7pmbillgh2b51rsrkk16rz"; + rev = "9f18eca514d242816a4969e86c4cfd2cf4dfe401"; + sha256 = "0k380f9ff15gg724c2spfd9qml97k24bhn3h9ipv1c7rn9qvhdhc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44a37f59b87f59a587f6681e7aadfabf137c98d7/recipes/gitconfig-mode"; @@ -27660,6 +27942,27 @@ license = lib.licenses.free; }; }) {}; + github-modern-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "github-modern-theme"; + version = "20170628.2332"; + src = fetchFromGitHub { + owner = "philiparvidsson"; + repo = "GitHub-Modern-Theme-For-Emacs"; + rev = "1890ab87ca8a046b3fc7b54220647d9ef43a6780"; + sha256 = "00jw2qf4x943sib0j6grcmm3lfr0ac23wa3vnzjzc509v4l7jzwp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d5506d93bd8cf59cd281091b377c1bb9a4243666/recipes/github-modern-theme"; + sha256 = "1falal6cffiih3q8q9xdyv7bkzw43p56d8ln13g9ad1jz319b3fi"; + name = "github-modern-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/github-modern-theme"; + license = lib.licenses.free; + }; + }) {}; github-notifier = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "github-notifier"; @@ -27726,12 +28029,12 @@ github-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "github-theme"; - version = "20170413.2100"; + version = "20170630.1501"; src = fetchFromGitHub { owner = "philiparvidsson"; repo = "emacs-github-theme"; - rev = "cf3c1325eb33d3593ba1cc4ad692eff287c33779"; - sha256 = "0abrbhhllkimidv4mi95nlzzigbr3qvjnd683rpv6f3sdqwcyw5f"; + rev = "29f00a51d949a248a5f6355a97131e216747c797"; + sha256 = "16ldfz1k0hxc1b785gzrf70hg0q88ijjxp39hb62iax1k1aw9vlw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4ace4a150faa312ef531182f328a3e039045bd7/recipes/github-theme"; @@ -27751,8 +28054,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "0be857ef001adb9b58770bd4e70d3103d2557277"; - sha256 = "0b7c0dkrm7szvk83945ribdj5k9mxs7pmbillgh2b51rsrkk16rz"; + rev = "9f18eca514d242816a4969e86c4cfd2cf4dfe401"; + sha256 = "0k380f9ff15gg724c2spfd9qml97k24bhn3h9ipv1c7rn9qvhdhc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44a37f59b87f59a587f6681e7aadfabf137c98d7/recipes/gitignore-mode"; @@ -27768,12 +28071,12 @@ gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }: melpaBuild { pname = "gitlab"; - version = "20170120.22"; + version = "20170710.724"; src = fetchFromGitHub { owner = "nlamirault"; repo = "emacs-gitlab"; - rev = "730a86b770b0838c86e7080d8d502528e0c26792"; - sha256 = "11rp2il78av244ba49h243s9a5qvnw5ljqpssiws1j3xcnmbgyz1"; + rev = "67567a354a1888419331b79862f151817d9747c5"; + sha256 = "11bcl5ndwvm2nahcfdbrvxgh48s5i4i7sv74lgnskd90fnjh7gdw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d012991188956f6e06c37d504b0d06ab31487b9/recipes/gitlab"; @@ -27828,6 +28131,27 @@ license = lib.licenses.free; }; }) {}; + gl-conf-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "gl-conf-mode"; + version = "20170714.610"; + src = fetchFromGitHub { + owner = "llloret"; + repo = "gitolite-emacs"; + rev = "9136a9b737e0a5b6471a91571d104c487c43f35b"; + sha256 = "0wls3sfplrf7wkg7g7fxx4s87cvm3p7myxw6k91np6pbfh8p0s9q"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e3117e62d429e44506f7d82fc64252d41bc1a4b6/recipes/gl-conf-mode"; + sha256 = "0lf8xmq309aqyf16ymqlr8gj2qawlsqagbdndj0kgj72dnnw4cfm"; + name = "gl-conf-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/gl-conf-mode"; + license = lib.licenses.free; + }; + }) {}; glab = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "glab"; @@ -28207,12 +28531,12 @@ go-autocomplete = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "go-autocomplete"; - version = "20150903.1940"; + version = "20170626.323"; src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "843b7a63f621bb441274849d58671870adf1a5ce"; - sha256 = "065fy0hy8mqsqfp06yfxavg8dqkrshacn46famar59ajy9610339"; + rev = "f1eef9a6ba005abb145d7b58fdd225e83a3c6a05"; + sha256 = "1hkr46ikrprx203i2yr6xds1bzxggblh7bg026m2cda6dxgpnsgw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete"; @@ -28757,8 +29081,8 @@ src = fetchFromGitHub { owner = "google"; repo = "styleguide"; - rev = "142b0e64babdb0066d2ffebfedb3c886fe75c680"; - sha256 = "0vccg70zf0c7xx6acffrdvhvvih95fcgxq9dw4bsax46p2pffc6q"; + rev = "d75bd35c8fd1c32aab86ea47e7ef4d3c776faa0a"; + sha256 = "0s1q9qw6azzbzr7k4c58m6d83cbz3srn63mi73jlh5fmad1w8g4p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style"; @@ -28837,12 +29161,12 @@ google-translate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "google-translate"; - version = "20161206.1408"; + version = "20170713.119"; src = fetchFromGitHub { owner = "atykhonov"; repo = "google-translate"; - rev = "52d34c96b400b1b933c727933279f79256951b19"; - sha256 = "1acck34q5dqizx2wsm0q31lzwx0wwyzv6g53naf5m94bjw7xv088"; + rev = "d8b84a8359fcc697114d1298840e9a45b111c974"; + sha256 = "1qs4hcg1i2m487z50nnwgs0sa2xj4lpgizbrvi2yda0mf3m75fgc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e3c275e59cbfe6e40f9cd4c470fc66544c9a6d21/recipes/google-translate"; @@ -29024,12 +29348,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "20170316.1124"; + version = "20170629.1129"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "98f52561d70fd95cfb7a5155ec9e62282bc55dc2"; - sha256 = "0vqnsyn80h06qi2ypql4j66a9w1dsnd5f95gcnj5dgwk0scgpfxp"; + rev = "0b533caa1ca0c4412748bde65753fa8c55ba4511"; + sha256 = "14lkhny4s6kmybx7w9hi11bnyvg7imyxnirdk28rb19krj2n7b36"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -29154,8 +29478,8 @@ src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "816182124457bed620678f9a92b349787cbf87bd"; - sha256 = "19rqjfy8gwmxpmw9qgnd6zi6albrhj5jzj1hgrc5nxagb2gp0ckj"; + rev = "1ddbda527268b33f506b50254234fec9bfdcbc9c"; + sha256 = "0qm73a87cydffyqkvjv34k7yss010czl861dhf3cnabvsz0bsp7v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode"; @@ -29267,12 +29591,12 @@ graphql-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "graphql-mode"; - version = "20170503.537"; + version = "20170625.652"; src = fetchFromGitHub { owner = "davazp"; repo = "graphql-mode"; - rev = "2326c1fb185c89b05ad617bc71e1171d97d32ebd"; - sha256 = "1lk5916sbqy6b007q9pjsq8ixanidalgcwcfxiq9cdapbxf4zxnq"; + rev = "3c25bf5cbd5ba4c60dca9c96286412eb765de7c9"; + sha256 = "09y7w6nipg1f59xrdpzmjiynyvjzkyhkmrpc5mbvz1lavkplh6rd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3850073e6706d4d8151bc6ab12963a19deae8be9/recipes/graphql-mode"; @@ -29292,8 +29616,8 @@ src = fetchFromGitHub { owner = "ppareit"; repo = "graphviz-dot-mode"; - rev = "ca0f15158c3bbd516549532be1dd35bc51462c84"; - sha256 = "12r6a3hikzqcdbplmraa4p4w136c006yamylxfjf8580v15xngrf"; + rev = "fdaabbcc95d9156e3dadc84f81a4750c5b692580"; + sha256 = "1s1qh5r0xp6hs0rl5yz5mkmjhpg04bh449c7vgjbb1pjsl1dl714"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6e2f1e66b33fd95142be4622c996911e38d56281/recipes/graphviz-dot-mode"; @@ -29389,27 +29713,6 @@ license = lib.licenses.free; }; }) {}; - gregorio-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "gregorio-mode"; - version = "20151026.720"; - src = fetchFromGitHub { - owner = "cajetanus"; - repo = "gregorio-mode.el"; - rev = "5b618a8d05cc073bd8e6f1e4e56eceb4de60eab3"; - sha256 = "1670pxgmqflzw5d02mzsmqjf3gp0c4wf25z0crmaamyfmwdz9pag"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/81317d4ad793d8a58770844ec9a526a2c695f94a/recipes/gregorio-mode"; - sha256 = "0f226l67bqqc6m8wb97m7lkxvwrfbw74b1riasirca1anzjl8jfx"; - name = "gregorio-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/gregorio-mode"; - license = lib.licenses.free; - }; - }) {}; grep-a-lot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grep-a-lot"; @@ -29535,12 +29838,12 @@ groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "groovy-mode"; - version = "20170609.1120"; + version = "20170712.224"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "816182124457bed620678f9a92b349787cbf87bd"; - sha256 = "19rqjfy8gwmxpmw9qgnd6zi6albrhj5jzj1hgrc5nxagb2gp0ckj"; + rev = "1ddbda527268b33f506b50254234fec9bfdcbc9c"; + sha256 = "0qm73a87cydffyqkvjv34k7yss010czl861dhf3cnabvsz0bsp7v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode"; @@ -29556,12 +29859,12 @@ gruber-darker-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gruber-darker-theme"; - version = "20170330.1211"; + version = "20170716.647"; src = fetchFromGitHub { owner = "rexim"; repo = "gruber-darker-theme"; - rev = "b9e59d9580d2b95dabf9a53ee3d51c2868b693fa"; - sha256 = "16g3rshbh9xzr6ng58vp2qw3zin0ylvlnmdg54p5cf8f0d11fd4a"; + rev = "3e5d5d67f8b004db288d6c2e1a0b02c3844ab5c5"; + sha256 = "1az7fndm19wy8s3p6wxa0ps55amwmmpbschayzy3g3g26a4swcxi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87ade74553c04cb9dcfe16d03f263cc6f1fed046/recipes/gruber-darker-theme"; @@ -29598,12 +29901,12 @@ gruvbox-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gruvbox-theme"; - version = "20170426.150"; + version = "20170712.1607"; src = fetchFromGitHub { owner = "Greduan"; repo = "emacs-theme-gruvbox"; - rev = "693dcf13ee929c1a3e6e5ac54f6fb5c7ec31f249"; - sha256 = "0b6ppxq9yiwhn22f7bbq5l552650lajapqq6j73rixya74a37lzi"; + rev = "a3aafd33d9b027e6c0d5ef81ebb04a2bb8545cf2"; + sha256 = "1d9330yd2lch7yqlfvpv7gxyy00p4w9h6f0imn7bgj3y7wab20dw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme"; @@ -29640,12 +29943,12 @@ gscholar-bibtex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gscholar-bibtex"; - version = "20170509.1134"; + version = "20170713.1934"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "gscholar-bibtex"; - rev = "ba505ea5043092444afb4284ae268d37e1c51e54"; - sha256 = "199jf65px1bbybyag5980fa99vjflrfp9s6dcxq1ascszrram0pl"; + rev = "655bccf0b12c9d95ec992ee4bfb5c7c9a4d0c99b"; + sha256 = "1ivdq3mgym14v5hpv938248vifw1xk9z16d2f38d9xj01icik522"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9fa546d3dce59b07a623ee83e3befe139dc10481/recipes/gscholar-bibtex"; @@ -29682,12 +29985,12 @@ guess-language = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "guess-language"; - version = "20170521.404"; + version = "20170620.308"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "guess-language.el"; - rev = "65dccb18df4d0c766d516c5f1423994bae445b51"; - sha256 = "0w189k3nnkzgh6gqw4zknhjykigym42rxjhcr5xl1b3h3mn0zz7j"; + rev = "1f1602f74d7159e7fb8c90f92ec5a3d1df5429da"; + sha256 = "1764v96sdn3zvpd35ppn31ib4p8cvdrj0bfmbplxg2xhp7xkgmca"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6e78cb707943fcaaba0414d7af2af717efce84d0/recipes/guess-language"; @@ -29745,12 +30048,12 @@ guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: melpaBuild { pname = "guix"; - version = "20170608.303"; + version = "20170702.724"; src = fetchFromGitHub { owner = "alezost"; repo = "guix.el"; - rev = "af57f5e969004dc5141cdb1d4c77c55ece0c6868"; - sha256 = "0nv85nlcac7k5pld2sg9wsbggq394jlmpcayzkrm81yy8a5grm5d"; + rev = "8d07a89736b72021b1a4739a0811f716a61b0b8f"; + sha256 = "0mjcjzsbqnc83ca3wg1wxsz63a864gmhflvx47p97gdg1snnz5fi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; @@ -30015,22 +30318,22 @@ license = lib.licenses.free; }; }) {}; - haml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }: + haml-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haml-mode"; - version = "20170208.28"; + version = "20170624.2148"; src = fetchFromGitHub { owner = "nex3"; repo = "haml-mode"; - rev = "e232abdb908d92a1a346ee1a7671d4a3121310c5"; - sha256 = "1qqwh28rf94pfcvazs0fl4yjz430aw6sadf07i4r408lq6r089dx"; + rev = "c7c96a269f9b1a0302ff81360e1b5e693d784774"; + sha256 = "0lh9m0598rmwx9qacb6wjd12hf6njx7r1srl25bw60fs1l5bnvqd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/haml-mode"; sha256 = "0ih0m7zr6kgn6zd45zbp1jgs1ydc5i5gmq6l080wma83v5w1436f"; name = "haml-mode"; }; - packageRequires = [ ruby-mode ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/haml-mode"; license = lib.licenses.free; @@ -30249,12 +30552,12 @@ haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-mode"; - version = "20170601.2103"; + version = "20170704.1445"; src = fetchFromGitHub { owner = "haskell"; repo = "haskell-mode"; - rev = "c46bdf129fb7ac241b84e0cfffcd3c7588dfb1af"; - sha256 = "095y6zg8frdl9z7r4xp4dysf93d947srwiylngss8fclav7fjq2y"; + rev = "00ca4d935e80707e18c17e40630ea9e36b39592c"; + sha256 = "049q8igjx4y9jancqv0bibd2jhz02llm1v6xfl9379v5p6nkfm3b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode"; @@ -30291,11 +30594,11 @@ haskell-tab-indent = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-tab-indent"; - version = "20151205.1159"; + version = "20170701.258"; src = fetchgit { url = "https://git.spwhitton.name/haskell-tab-indent"; - rev = "93ea6a3a707fc34a97ce94e0285e9569e01062c4"; - sha256 = "04698q2c75bbbcib94zdjkmm2k0zlxxzhnd34fflhzzxljcr02cj"; + rev = "b4cb851aef96c42ec7b3cc37b6fdd867fe5a0853"; + sha256 = "1ah1xagfzsbsgggva621p95qgd0bnsn733gb0ap4p4kgi5hwdqll"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/371f9f45e441cdf4e95557d1e9692619fab3024a/recipes/haskell-tab-indent"; @@ -30518,12 +30821,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20170611.701"; + version = "20170714.3"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "9f532785d43389339ed73d90357d4aea9d966020"; - sha256 = "0n23yyrvsvp0j9grgwd7fiw808kf9wr4fs3kry771pzq1fg16wg5"; + rev = "07f8f705f54506da537b1f615ee2e95e9033defb"; + sha256 = "0g7fn2aqwh0ynsridrmf8gs5bl09s7pwpwawgmbwdb7rzyvrl97c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -30686,12 +30989,12 @@ helm-backup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-backup"; - version = "20151213.1047"; + version = "20170625.328"; src = fetchFromGitHub { owner = "antham"; repo = "helm-backup"; - rev = "6f2c7648437be2a74380de8573e39b6258b3085a"; - sha256 = "16350vdjmcv8n9dmvqik1mdcc927a2wgv3b72pzfpcjj1kx72fvk"; + rev = "b6f930a370f6339988e79e0c85e9deee98c7b9f4"; + sha256 = "0cawlad5jy6kn2mg72ivjg3gs2h6g067h910xlbir01k9wlk3mfg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e6eba7b201e91211e43c39e501f6066f0afeb8b/recipes/helm-backup"; @@ -30956,22 +31259,22 @@ license = lib.licenses.free; }; }) {}; - helm-cider = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, seq }: + helm-cider = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-cider"; - version = "20170209.2316"; + version = "20170708.1525"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "helm-cider"; - rev = "8e092d0d2e9cf27195296c684b4fab831208b98a"; - sha256 = "081wkmp4mcdszyirgifdn4qzpvc9bz3qkvwnlp0c9jzimkizpgsl"; + rev = "9480e969d5387efdd5e66c6db089e02a296b2025"; + sha256 = "0ci0z1zaypbdnjxk6bhf83kx808j4xi5ikqwq4w5mlsbz8f5iqx1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-cider"; sha256 = "0ykhrvh6mix55sv4j8q6614sibksdlwaks736maamqwl3wk6826x"; name = "helm-cider"; }; - packageRequires = [ cider emacs helm-core seq ]; + packageRequires = [ cider emacs helm-core ]; meta = { homepage = "https://melpa.org/#/helm-cider"; license = lib.licenses.free; @@ -31127,12 +31430,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20170611.135"; + version = "20170717.520"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "9f532785d43389339ed73d90357d4aea9d966020"; - sha256 = "0n23yyrvsvp0j9grgwd7fiw808kf9wr4fs3kry771pzq1fg16wg5"; + rev = "07f8f705f54506da537b1f615ee2e95e9033defb"; + sha256 = "0g7fn2aqwh0ynsridrmf8gs5bl09s7pwpwawgmbwdb7rzyvrl97c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -31292,6 +31595,27 @@ license = lib.licenses.free; }; }) {}; + helm-directory = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-directory"; + version = "20170705.2102"; + src = fetchFromGitHub { + owner = "masasam"; + repo = "emacs-helm-directory"; + rev = "2c6d45404506ba744888dcdb65e9f63878f2da16"; + sha256 = "1a5j4zzn249jdm4kcri64x1dxazhhk7g5dmgnhflrnbrc2kdwm8h"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d0c066d6f285ab6d572dab4549781101547cb704/recipes/helm-directory"; + sha256 = "01c5a08v6rd867kdyrfwdvj05z4srzj9g6xy4scirlbwbff0q76n"; + name = "helm-directory"; + }; + packageRequires = [ emacs helm ]; + meta = { + homepage = "https://melpa.org/#/helm-directory"; + license = lib.licenses.free; + }; + }) {}; helm-dired-history = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-dired-history"; @@ -31355,6 +31679,27 @@ license = lib.licenses.free; }; }) {}; + helm-elscreen = callPackage ({ cl-lib ? null, elscreen, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-elscreen"; + version = "20170709.214"; + src = fetchFromGitHub { + owner = "emacs-helm"; + repo = "helm-elscreen"; + rev = "b8212866939dc4a1e1dc23ad572407b688e130e3"; + sha256 = "0gy6lbdngiwfl9vfw32clagbmv70f93slc9zkm3dz3mca37435kz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/dfe42a7fe2dc051c6c49aa75bce89bfe1b5fdbbb/recipes/helm-elscreen"; + sha256 = "186k66kf2ak2ihha39989cz1aarqrvbgp213y1fwh9qsn1kxclnd"; + name = "helm-elscreen"; + }; + packageRequires = [ cl-lib elscreen emacs helm ]; + meta = { + homepage = "https://melpa.org/#/helm-elscreen"; + license = lib.licenses.free; + }; + }) {}; helm-emmet = callPackage ({ emmet-mode, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-emmet"; @@ -31565,6 +31910,27 @@ license = lib.licenses.free; }; }) {}; + helm-frame = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "helm-frame"; + version = "20170515.1250"; + src = fetchFromGitLab { + owner = "chee"; + repo = "helm-frame"; + rev = "389e6461a423d649b7062ba99a2234bef7770059"; + sha256 = "1z7iwgl1v8nkwyz3h610l97amgq9slrfxxiicsnigc9vgsqlh987"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/febb2599e50518dadb30088bc9576aea2af092a7/recipes/helm-frame"; + sha256 = "18wbwm4r3ra9214whhdbxnjrxzra4pn12wqgq5lxli1khylihm3i"; + name = "helm-frame"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/helm-frame"; + license = lib.licenses.free; + }; + }) {}; helm-fuzzier = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-fuzzier"; @@ -31649,6 +32015,27 @@ license = lib.licenses.free; }; }) {}; + helm-ghs = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-ghs"; + version = "20170714.2241"; + src = fetchFromGitHub { + owner = "iory"; + repo = "emacs-helm-ghs"; + rev = "f9d4ab80e8a33b21cd635285289ec5779bbe629f"; + sha256 = "0f7wsln7z2dhqn334pjk6hrj36gvx39vg19g8ds9sj9dq9djlf27"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0f8d37030806905344a2ca56bfc469f5a238cd69/recipes/helm-ghs"; + sha256 = "0bzy2vr2h9c886cm4gd161n7laym952bzy5fhcibafhzm4abl4sh"; + name = "helm-ghs"; + }; + packageRequires = [ emacs helm ]; + meta = { + homepage = "https://melpa.org/#/helm-ghs"; + license = lib.licenses.free; + }; + }) {}; helm-git = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-git"; @@ -31694,12 +32081,12 @@ helm-git-grep = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-git-grep"; - version = "20170530.830"; + version = "20170614.711"; src = fetchFromGitHub { owner = "yasuyk"; repo = "helm-git-grep"; - rev = "e3ae5f60585ac0213876dca5093aca467db1ac5b"; - sha256 = "0bld5kjzgjhkjcjc7b66kg55yb7pzrbnxfqx79f5glxckbp2pxjr"; + rev = "744cea07dba6e6a5effbdba83f1b786c78fd86d3"; + sha256 = "172m7wbgx9qnv9n1slbzpd9j24p6blddik49z6bq3zdg1vlnf3dv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/338d28c3fe201a7b2f15793be6d540f44819f4d8/recipes/helm-git-grep"; @@ -31761,8 +32148,8 @@ src = fetchFromGitHub { owner = "nlamirault"; repo = "emacs-gitlab"; - rev = "730a86b770b0838c86e7080d8d502528e0c26792"; - sha256 = "11rp2il78av244ba49h243s9a5qvnw5ljqpssiws1j3xcnmbgyz1"; + rev = "67567a354a1888419331b79862f151817d9747c5"; + sha256 = "11bcl5ndwvm2nahcfdbrvxgh48s5i4i7sv74lgnskd90fnjh7gdw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d012991188956f6e06c37d504b0d06ab31487b9/recipes/helm-gitlab"; @@ -31967,12 +32354,12 @@ helm-hunks = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-hunks"; - version = "20170406.257"; + version = "20170625.1523"; src = fetchFromGitHub { owner = "torgeir"; repo = "helm-hunks.el"; - rev = "287685254002d47432f267884ac6a83de67ea07c"; - sha256 = "0gfly5wv391cw7dpixxik0nqs2f7h1n8102pijjipk3g79f1f1ic"; + rev = "56731db3968a57fbb2473529227c2998b7f404b0"; + sha256 = "1kszp6jy4r39r71jjrr8p3nfpylbqyphrsfb4dghh6kl0zxic38j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d61cbe53ad42f2405a66de9f551f5b870a60709f/recipes/helm-hunks"; @@ -32132,6 +32519,27 @@ license = lib.licenses.free; }; }) {}; + helm-kythe = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-kythe"; + version = "20170709.26"; + src = fetchFromGitHub { + owner = "MaskRay"; + repo = "emacs-helm-kythe"; + rev = "eabbef4948f8ec7c7b2fac498e9145dfdb10ca82"; + sha256 = "1ws7vl0pvznmxb7yj77kfv4l52xkzblhsl68lfkf9cdxcj9g6177"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/dd1a6d0b08ad750a0e44ebdf76109d29ab226bd3/recipes/helm-kythe"; + sha256 = "1yybpic3jzp3yy8xlfdn2jj12h087vn0lj3mqx6xxj2nxd9q4949"; + name = "helm-kythe"; + }; + packageRequires = [ dash emacs helm ]; + meta = { + homepage = "https://melpa.org/#/helm-kythe"; + license = lib.licenses.free; + }; + }) {}; helm-lobsters = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-lobsters"; @@ -32156,12 +32564,12 @@ helm-ls-git = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ls-git"; - version = "20170601.2200"; + version = "20170716.109"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-ls-git"; - rev = "1253c7615da055a95548b4f92a8a503fe249884e"; - sha256 = "1zyix2whj9j19ica9pff1hh7vgyg1h009vx5xhcqw5sligrh2dwr"; + rev = "47981a8d80e1d464a7cddde5a391b35626929f00"; + sha256 = "0z09qvb6yyz2vnxkcg6xhaawja1ynxfwzx5j2aqyiicwqbyf3kvg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b487b4c0db9092bb7e32aad9265b79a9d18c8478/recipes/helm-ls-git"; @@ -32491,12 +32899,12 @@ helm-pass = callPackage ({ auth-password-store, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, password-store }: melpaBuild { pname = "helm-pass"; - version = "20170417.1033"; + version = "20170627.1124"; src = fetchFromGitHub { owner = "jabranham"; repo = "helm-pass"; - rev = "8c4b330dad4be9df74eb44e312d72aedcbf628d4"; - sha256 = "0q2vjnfiivb778cfnbg777y4srqk117k1kc5az4qk7n3hq0rg12l"; + rev = "bf5e1ea85ca531f07372eb8e7b9a8812ff3d3a5e"; + sha256 = "1l3dbgl65rcvw7cgqfxm3kvpfj65pj8jhkp9pg4yykli5y0wsbdx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8100599d69a760cd4548004a552cc0adcdb3bed/recipes/helm-pass"; @@ -32617,12 +33025,12 @@ helm-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }: melpaBuild { pname = "helm-projectile"; - version = "20170328.2152"; + version = "20170613.14"; src = fetchFromGitHub { owner = "bbatsov"; repo = "helm-projectile"; - rev = "c987e81ededdcb69c5a7b2bb6efc32bc2398ce54"; - sha256 = "06ygcmpdpr7qzpx6l7qlbdif10vpzw009zg8z8yl1p1r30qdcbs0"; + rev = "0e9ba276b3fbc420b8cbdc1b99262ccd5c750db7"; + sha256 = "155df7jyhjgqdks3ba1ca1k8w8aqka9vv3nhzpkvgz7wj84c95pq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile"; @@ -32915,8 +33323,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "d6af2ad09c99f9c58900665e874dcf97a545c0fa"; - sha256 = "12p22b9q4rkl7jswg12gqc8751sinzgj8h75jjzrggd0vfsg439a"; + rev = "65c8f03ff0112ce5c5e11aff6867ad0eb9019e63"; + sha256 = "0xlacwjmvx5xd8m7yi8l8mqi0lqs2gr2hmjag2frvmxcn4cpb4gc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags"; @@ -33205,12 +33613,12 @@ helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-tramp"; - version = "20170419.135"; + version = "20170708.320"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-helm-tramp"; - rev = "f88715d495b7f6d65904bd05dee549404ca250d3"; - sha256 = "0sdhbk4vpq5vl9rz5dcfnjmkcvsfw9146f1bvjgfi0fqhb3pq8da"; + rev = "9480ee2d5a9cc190e48a04ffac33ca6403fd12e1"; + sha256 = "0jh9vbbsdzgxd41x5ykvb4b5ww248bc7lrzfjn4jmckgjmqq8v1y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp"; @@ -33268,12 +33676,12 @@ helm-w3m = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, w3m }: melpaBuild { pname = "helm-w3m"; - version = "20150722.824"; + version = "20170710.1238"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-w3m"; - rev = "280673470672c9fbc57fd6a91defeb9f6641fc8a"; - sha256 = "0d47mqib4zkfadq26vpy0ih7j18d6n5v4c21wvr4hhg6hg205iiz"; + rev = "0af89108183ac11dcf75be06fe23a60ae072463f"; + sha256 = "0cjnlml9k1ak26v5j7qghpk2yj4rs37jlkpbn1m5y1j8231m472j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f683fc9c7990e9ecb8a94808a7d03eb90c5569b1/recipes/helm-w3m"; @@ -33472,12 +33880,12 @@ helpful = callPackage ({ dash, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "helpful"; - version = "20170612.205"; + version = "20170625.1441"; src = fetchFromGitHub { owner = "Wilfred"; repo = "helpful"; - rev = "fdabfe7d88853e052cd5a20614585ed3cc1faeac"; - sha256 = "0x8d28s6fi8lmdyp8nyqi0dryf06703kddws079qr0l4p5jiibxr"; + rev = "da7d479c89090155996bf568bd89fa8a8859eac7"; + sha256 = "1vpfb6n1k7j8wmzsn3j2a8g2hf6lxc8jp77xgzi3kd0wwdyjmqg2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful"; @@ -33556,12 +33964,12 @@ hexo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hexo"; - version = "20170308.205"; + version = "20170702.1915"; src = fetchFromGitHub { owner = "kuanyui"; repo = "hexo.el"; - rev = "f7b8803fd81e738e25425e0eeeed4cf2adc6a5e8"; - sha256 = "0hbfgzs4kg2vqm034falm9rhhin9ii0n0rc50qli5v3a85c7ayrw"; + rev = "201c795ded01d96690ceadc1dd068744aceaeda8"; + sha256 = "0rj5lcmlghxm4d1vx8jxdhw53famzjxzp1bx38zgrqlhwakyghab"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/21de1b7db0fa4af4fc0014207d41893a0713d738/recipes/hexo"; @@ -33779,12 +34187,12 @@ hierarchy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hierarchy"; - version = "20170605.842"; + version = "20170706.552"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "hierarchy"; - rev = "d26f566d386a56e752d8ca1c813932d68b088bde"; - sha256 = "1dk5hdcjakxi91q29lbnwvbfhr834sxmsr2mrxr5mqhp3wfg3qga"; + rev = "3f5d0d932fb6d2152f4c269df10bcc435a5ac764"; + sha256 = "1qj2sf3x2bq54n0xqllis3abikjgbp18qn1i4vff5cs6n2an69cb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy"; @@ -33799,10 +34207,10 @@ }) {}; highlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight"; - version = "20170223.743"; + version = "20170702.732"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/highlight.el?revision=145"; - sha256 = "05dsa2sfciajwagm1gzl3v2r199nl1yjnb6l0v8ria3f9d72yj5j"; + url = "https://www.emacswiki.org/emacs/download/highlight.el?revision=149"; + sha256 = "0kh72fmqsha25rz0g3ff983badh20clsig7blrhvl8c4bv3sqs56"; name = "highlight.el"; }; recipeFile = fetchurl { @@ -34256,8 +34664,8 @@ src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "b858104fab63257de4b172b085b28e24ecacfed0"; - sha256 = "1yzmlflzx9gvm0dysgjwi0a5nm7w7diczwqp4zggd4bl8bb45fip"; + rev = "0721221ede01d6a3468e562fd7ea0df114de34e2"; + sha256 = "09cyzvk1ixbmnd6wl8idxn0263mgsvcnh1742flvxa5wsbqm9f08"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -34336,12 +34744,12 @@ historian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "historian"; - version = "20170416.2154"; + version = "20170715.2142"; src = fetchFromGitHub { owner = "PythonNut"; repo = "historian.el"; - rev = "d5e4283d2fc06445d2cd14d9d2e86ca41b9f718d"; - sha256 = "0am0xjvk77bvppgx90knxicq3nw1ia68gplyqw9lqw62qj4028ip"; + rev = "d42321d2af89c6f9f932b70944dd315a6bb42bfa"; + sha256 = "04lpnm56kkbs388z61sil0zmb1zxzkh1svzbhghcw3836fgm24kd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f16dacf64c52767c0c8aef653ac5d1a7a3bd0883/recipes/historian"; @@ -34501,10 +34909,10 @@ }) {}; hl-line-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-line-plus"; - version = "20170604.1526"; + version = "20170621.734"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/hl-line+.el"; - sha256 = "09dwllzhw0441fbhkw7nb4isfnll6nbpp0il4yc7wgjvg4s94hw6"; + sha256 = "03bgx651nrnwqbclbfaabkw4h2iaiswnndqgms0w6lp3jjfc10wc"; name = "hl-line+.el"; }; recipeFile = fetchurl { @@ -34582,12 +34990,12 @@ hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-todo"; - version = "20161102.1337"; + version = "20170621.1257"; src = fetchFromGitHub { owner = "tarsius"; repo = "hl-todo"; - rev = "a23312464fc6462d559462a44cd74735e9f73421"; - sha256 = "0sy0fjmh1m36ajzfmxa2j9akws5qa8a4f1qmj3wgj9vdqd043mr8"; + rev = "961db3116f1396dc4f903e3a59824a40e0bbb6a2"; + sha256 = "0w847g7lvzk9br9r73n7rf2ba6wafqrapyigp91f62jicz28lvm1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c262f6a1a10e8b3cc30151cad2e34ceb66c6ed7/recipes/hl-todo"; @@ -34603,12 +35011,12 @@ hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }: melpaBuild { pname = "hledger-mode"; - version = "20170606.644"; + version = "20170716.116"; src = fetchFromGitHub { owner = "narendraj9"; repo = "hledger-mode"; - rev = "bee9cee09d6909cf35f80582aee5a1de6c90db39"; - sha256 = "0jzl2qjyl7kbb16barh365kl5qziamgv87nx934s608498dyl4j6"; + rev = "2412435e53c4f739a7aa93c9b9d80d861a1aa764"; + sha256 = "0l5fw1c1dilsiiw82a1lwaa2xjq4dlfm51rvnkf2iay1ndr7l11x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hledger-mode"; @@ -34770,12 +35178,12 @@ hound = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "hound"; - version = "20161130.1955"; + version = "20170627.1259"; src = fetchFromGitHub { owner = "ryoung786"; repo = "hound.el"; - rev = "dd95fc10b79029142c95307e895da0bc92bba28c"; - sha256 = "0c0fjfb8l0ladxw8b2ylnrnzw8k0xffl40hnkrc4bdzbl48zn55g"; + rev = "0c5a250ef82870dca737a429b6e9b9db93874ed3"; + sha256 = "0kf2nhp5k3gk82ad1k9qi4aysqhw36x4mcdhg6kjckmcakfjw3g6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90cfc34eb4e8be7bf887533b85feba91131a435b/recipes/hound"; @@ -35021,12 +35429,12 @@ http-post-simple = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "http-post-simple"; - version = "20131010.2058"; + version = "20170715.240"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "http-post-simple"; - rev = "1c7b06cb0d6930aaaf3f319d9836786d40f1595f"; - sha256 = "1nvcqh3wwczh83k4nb7zgk1r07bsaycbds4zhpy7gic3jhxbvdns"; + rev = "f53697fca278c741051aeb668b00466b5e0fd3fe"; + sha256 = "0krdbvvvzn323vx554yw7947nddl3icfjk4wf5kfx7fim5v3mdn6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/http-post-simple"; @@ -35102,6 +35510,27 @@ license = lib.licenses.free; }; }) {}; + hugsql-ghosts = callPackage ({ cider, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "hugsql-ghosts"; + version = "20170612.1223"; + src = fetchFromGitHub { + owner = "rkaercher"; + repo = "hugsql-ghosts"; + rev = "2f3f98b644b4da35f4fb80b7c3b63f986417b415"; + sha256 = "0ng01pzxipzb3vkdn8yy5128kmnqnc4rhkszqji8lf8489jxfn8n"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/969fd5e51bf93b5eff6919956c43c041a3b24d1e/recipes/hugsql-ghosts"; + sha256 = "1v1iypis5iyimdr9796qpqw0qmhzijap0nbr0mhhyp4001kakkwz"; + name = "hugsql-ghosts"; + }; + packageRequires = [ cider dash s ]; + meta = { + homepage = "https://melpa.org/#/hugsql-ghosts"; + license = lib.licenses.free; + }; + }) {}; hungarian-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hungarian-holidays"; @@ -35147,12 +35576,12 @@ hy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hy-mode"; - version = "20151025.543"; + version = "20170621.1354"; src = fetchFromGitHub { owner = "hylang"; repo = "hy-mode"; - rev = "50d7d24a52aefd7079c3f26a90c8eaf3065884a1"; - sha256 = "0wn83n1780bvrzx9p870wln51n9rfdghsxl79dp968dxycyhyxvj"; + rev = "f34bc19e9a58c7014c1f672d0655d2edee997ad2"; + sha256 = "049f3746dfg9jh29904qnk2asym2rjqqgzn1zimk4bs3v8xnys1c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc9ab5cf16b61bb27559cd8ec5cf665a5aab2154/recipes/hy-mode"; @@ -35193,8 +35622,8 @@ src = fetchFromGitHub { owner = "hydandata"; repo = "hydandata-light-theme"; - rev = "169c0d9ab1272b0f4a1f29eb5f1cd5ffb2365e1e"; - sha256 = "19q63kg1higqxf26bhwnqwvqxpayjq2j24yi54b1wkvwbv5f28nr"; + rev = "0fbc91678ef65e1f65d7ec6792ff0b2f104d16a9"; + sha256 = "0bkj5cw173l829fkgigghs07mc2i84ngvs2y9g6kamrpg6zhq7g8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/413c617f15947782891159a240e0c9014f1f7d11/recipes/hydandata-light-theme"; @@ -35417,10 +35846,10 @@ }) {}; icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "icicles"; - version = "20170609.903"; + version = "20170707.610"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/icicles.el?revision=1087"; - sha256 = "00zsdahszs919zvklxgpm5kqhm2139cdr4acchgp9ppnyljs94jp"; + url = "https://www.emacswiki.org/emacs/download/icicles.el?revision=1088"; + sha256 = "0lckab25irgpm7y2wdg00v31514m6aw6n0wf9gz1v21zzc5ij6cz"; name = "icicles.el"; }; recipeFile = fetchurl { @@ -35624,12 +36053,12 @@ ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ido-completing-read-plus"; - version = "20170601.559"; + version = "20170708.1116"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-ubiquitous"; - rev = "595ca2ecb33a300640dc6a7b420a6f51c51a9d40"; - sha256 = "0wqag8kk4wg036sw2j5jiymadij066nz9blxm805lgzsndqg5gfm"; + rev = "7b7136532ee4af0380f667f19700b53853bbbd7a"; + sha256 = "0zswh103bynq9fxpspb3ibn9vriw1m4qnp9i44b8a27k3rvbmmjn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-completing-read+"; @@ -35897,12 +36326,12 @@ ido-sort-mtime = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ido-sort-mtime"; - version = "20131117.530"; + version = "20170705.712"; src = fetchFromGitHub { owner = "pkkm"; repo = "ido-sort-mtime"; - rev = "7b7c77f6856125a59aff99ba0ff8d2b369896b5e"; - sha256 = "0w3cr2yf8644i0g8w6r147vi9wanibn41sg7dzws51yb9q0y92vd"; + rev = "5f4ec2c562f79b7fb2d1480c88db1fa8a812d814"; + sha256 = "1fqqkpz0x3q7fqmax90vxkpn14valkb0lprqs0w641cbq8a4wqm7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/36d2f7f1bb0d0694a25c1e83340781e08bee814b/recipes/ido-sort-mtime"; @@ -35939,12 +36368,12 @@ ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: melpaBuild { pname = "ido-ubiquitous"; - version = "20170530.1839"; + version = "20170705.1656"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-ubiquitous"; - rev = "595ca2ecb33a300640dc6a7b420a6f51c51a9d40"; - sha256 = "0wqag8kk4wg036sw2j5jiymadij066nz9blxm805lgzsndqg5gfm"; + rev = "7b7136532ee4af0380f667f19700b53853bbbd7a"; + sha256 = "0zswh103bynq9fxpspb3ibn9vriw1m4qnp9i44b8a27k3rvbmmjn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-ubiquitous"; @@ -36023,12 +36452,12 @@ idris-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, prop-menu }: melpaBuild { pname = "idris-mode"; - version = "20170611.2243"; + version = "20170703.2038"; src = fetchFromGitHub { owner = "idris-hackers"; repo = "idris-mode"; - rev = "8a2711efb7e2e4cc2a9a48cee422dba848c6155c"; - sha256 = "0akp4mbsm4jmf5c652sbbb7gqf5w31ijfqdcckm28zxk2jwc1gz3"; + rev = "7de2809515cfb413a7be5fab71d6814d2699e1e3"; + sha256 = "0v6as33dpqmggmprpimv5rrm7vpfakka5hszz5f5p2k5v212yvk8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17a86efca3bdebef7c92ba6ece2de214d283c627/recipes/idris-mode"; @@ -36044,16 +36473,16 @@ ids-edit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ids-edit"; - version = "20160324.1522"; + version = "20170709.338"; src = fetchFromGitHub { owner = "kawabata"; repo = "ids-edit"; - rev = "3073f03267dd3527718e1edf1010055b6e55929e"; - sha256 = "18dca47ds5fiihijd1vv7nif44n4b4nv4za2djjfqbhbvizra1fd"; + rev = "8d46429ef1a32c69d770f8187545588549086c91"; + sha256 = "014apjzy6hgcg1mrvhkbp77baz59nafh96az2kfgixp8vwpmjyf4"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f12d49b6ece6d2ac8ecb80d881db560367ddc4ba/recipes/ids-edit"; - sha256 = "0jzmcynr6lvsr36nblqzrjwxawyqcdz972zsv4rqkihdydpqfz7m"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/a1aa957ef9ec3db055f439f1cee2994e65ee17ea/recipes/ids-edit"; + sha256 = "1n4gpcl3qj65cmaq9cdljsmrf84570z4chfvga6slsqjz5him8d1"; name = "ids-edit"; }; packageRequires = [ emacs ]; @@ -36520,12 +36949,12 @@ importmagic = callPackage ({ emacs, epc, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "importmagic"; - version = "20170601.1828"; + version = "20170702.1844"; src = fetchFromGitHub { owner = "anachronic"; repo = "importmagic.el"; - rev = "41f90782b7d5c58f53ad0187b816faeea408e4cf"; - sha256 = "1w73734n8qwhvina1y9m60b5jj5yy1csizbldyph4vcgi3x0ff6l"; + rev = "ab9e5c260a2044578597a467eff59e5598a7ef1c"; + sha256 = "1ifv6zfrknivjsgk0p8wh0n2bqqs1zfy8551216dfvigqs20wvq4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/importmagic"; @@ -36604,12 +37033,12 @@ indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "indium"; - version = "20170609.923"; + version = "20170626.312"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Indium"; - rev = "e9b0104bb36b1ce349bf048979746e0ad738d43d"; - sha256 = "14a0gpp71045j4hs5s2kmisv3466imzyag7f43r1gsg4b0gp4c8m"; + rev = "4747a94cf823deb5623368f71f2012f8c5fdc156"; + sha256 = "11hsyqiy5lcvk721xrv1ihzp9ghdgk46n3qlaviy9alapl0v55d5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium"; @@ -36646,12 +37075,12 @@ inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-clojure"; - version = "20170520.914"; + version = "20170710.708"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "inf-clojure"; - rev = "9ba23b0e8369a5dfa17e544288b366008516e6f9"; - sha256 = "079hsk05isagcnj0fbdaxkaj8zfhrvm60zbz35id4101s4053frh"; + rev = "f7ec13ab2fbc36e99df196eb863a75baf3b92fd6"; + sha256 = "01j4prrs78sq4w7cv15rdilxrqmjam2s1hrwijf6718c0s7dbpd0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure"; @@ -36709,12 +37138,12 @@ inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-ruby"; - version = "20170530.1824"; + version = "20170615.335"; src = fetchFromGitHub { owner = "nonsequitur"; repo = "inf-ruby"; - rev = "62c1c72d8e2a8e1ca8430010c19be930f54e6daa"; - sha256 = "1w9jgrvly07056f72xf4ink0i8q1xv3rnpv5kbifsjfxzz05crbb"; + rev = "c14a68d1643ac3f439234da6a8275b48cae970d3"; + sha256 = "0b6qp9xljxn4mrh1xcv6fzklq963hrchq8iab4746kvylhn1xmsk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/inf-ruby"; @@ -36959,12 +37388,12 @@ inkpot-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inkpot-theme"; - version = "20170602.1000"; + version = "20170709.1858"; src = fetchFromGitHub { owner = "ideasman42"; repo = "emacs-inkpot-theme"; - rev = "d9e97a2b95a7740c8eb72fa795fface8b1500fd0"; - sha256 = "1c8zl512c5mw126p43l6prdimfn2mi58msb0sw4csf9r1krkv8if"; + rev = "b992c0996b4a711f3d6ebb6730c6f57edbc75fc5"; + sha256 = "1ykbf5hhs7z33bca5j0vk8vdyrwghbiqgdjy064nccgxlqyysy0k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dd3e02aaf8865d8038b9c590c8545e7a1b21d620/recipes/inkpot-theme"; @@ -37147,12 +37576,12 @@ interleave = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "interleave"; - version = "20170211.807"; + version = "20170630.22"; src = fetchFromGitHub { owner = "rudolfochrist"; repo = "interleave"; - rev = "822ae2d29aaf92bcf96324442126b551e4477d6a"; - sha256 = "0nq2f6pgq4vszy3hx84qdml4i9lbqlrh9knqgwgrl819vr15srqg"; + rev = "2c0458038bf0440f271f6e000039027be411eba7"; + sha256 = "0rpw1ms80hr01s76av8cvid4gvkd3sapx0c3g3a05za0bq1jqacw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c43d4aaaf4fca17f2bc0ee90a21c51071886ae2/recipes/interleave"; @@ -37168,12 +37597,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "20170611.437"; + version = "20170711.1415"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "70c9c524b3de8dce739df7fe0fdb5128fc8adf11"; - sha256 = "1jb28d9mcnn2098lmlq4jfk64jjdfn24pmwl8gax80v4p81b54vm"; + rev = "d03b3cb0cbc8d059a223366c4f7a2be85672c22f"; + sha256 = "0zga7p2hazcwxjyzgrvq77d3j6q9mz7wz7mkqk0hzf00sdb1gpg9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -37228,6 +37657,27 @@ license = lib.licenses.free; }; }) {}; + inverse-acme-theme = callPackage ({ autothemer, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "inverse-acme-theme"; + version = "20170716.1100"; + src = fetchFromGitHub { + owner = "dcjohnson"; + repo = "inverse-acme-theme"; + rev = "361a8840469648a9b98f16cc996df5f151d3c75f"; + sha256 = "1dvaz36037wvh00m3ddqfp9w86pna3k058xw22i4xcdhp1518i03"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1c44dbc8d3ca29d8715af755b845af7236e95406/recipes/inverse-acme-theme"; + sha256 = "03g6h8dpn42qnr593ryhj22lj1h2nx4rdr1knhkvxygfv3c4lgh5"; + name = "inverse-acme-theme"; + }; + packageRequires = [ autothemer cl-lib ]; + meta = { + homepage = "https://melpa.org/#/inverse-acme-theme"; + license = lib.licenses.free; + }; + }) {}; io-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "io-mode"; @@ -37439,12 +37889,12 @@ irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "irony"; - version = "20170523.618"; + version = "20170627.1045"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "irony-mode"; - rev = "db29f5851cb75f30e0bd1840f60a9d7d0e0b6dc1"; - sha256 = "0rynn8sknyp8f9m4qf1i6c017gl1il7rsgaifm0l77zh1bplha96"; + rev = "bf21cf4c442a930e6007b3ff5bd8af094318991f"; + sha256 = "02fm2nwhglpb42qa5z2mrfkwqvwc3xvfdi0marlxbg3ramhn4s4i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony"; @@ -37501,10 +37951,10 @@ }) {}; isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "isearch-plus"; - version = "20170529.1907"; + version = "20170614.928"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/isearch+.el"; - sha256 = "1lg8gciy9i44y80v9g2h5q8mg6dhi6abx2ssg6jws3nci0y5c0bl"; + sha256 = "19jk4c39bqbqbfwmhkiwqfij556nv82syy99g07s7gz1bqkrm7pl"; name = "isearch+.el"; }; recipeFile = fetchurl { @@ -37624,12 +38074,12 @@ itail = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "itail"; - version = "20161022.1431"; + version = "20170709.1543"; src = fetchFromGitHub { owner = "re5et"; repo = "itail"; - rev = "129d7089fcf712c296706841afc5918955a83f19"; - sha256 = "0jllp27syd533raj7lqfj5ismm7g7f4av9ikgqar8048m3xkvy2q"; + rev = "a8c98583cbc4e2b761df95fd738efebb116fe6e6"; + sha256 = "001i7xn6v8j3ls50cnsazjfkpzdnr01rb98a6h0nibkj8hi21myb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6b810bf1deeb79064144d8b684fab336686018ef/recipes/itail"; @@ -37729,12 +38179,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20170609.943"; + version = "20170716.1104"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "752ba81f0db3be0568072b3d9a5db458bb647a3c"; - sha256 = "0wzhil3c6g9g7k4dq3l6rsyy9vy3rdnq3igqgw9xzgq6i06a1878"; + rev = "dc146d9f1435b79fbfbfa702f0172b9de05f631d"; + sha256 = "09cfs0rhhb72b12pic2w9chbc000pqnafrl2x0g8v5r065pzp64n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -37768,15 +38218,36 @@ license = lib.licenses.free; }; }) {}; + ivy-dired-history = callPackage ({ cl-lib ? null, counsel, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: + melpaBuild { + pname = "ivy-dired-history"; + version = "20170625.2256"; + src = fetchFromGitHub { + owner = "jixiuf"; + repo = "ivy-dired-history"; + rev = "c9c67ea1ee5e68443f0e6006ba162d6c8d868b69"; + sha256 = "1lim9zi57w011df5zppb18yjkaxkgfy796pc6i01p4dl32x0rpfv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ad37f6b04ff45fbffeadefc94db16baa27bcc2ac/recipes/ivy-dired-history"; + sha256 = "1vj073k5m0l8rx9iiisikzl053ad9mlhvbk30f5zmw9sw7b9blyl"; + name = "ivy-dired-history"; + }; + packageRequires = [ cl-lib counsel ivy ]; + meta = { + homepage = "https://melpa.org/#/ivy-dired-history"; + license = lib.licenses.free; + }; + }) {}; ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-erlang-complete"; - version = "20170605.2046"; + version = "20170709.2151"; src = fetchFromGitHub { owner = "s-kostyaev"; repo = "ivy-erlang-complete"; - rev = "117369f882f81fb9cc88459a4072a2789138c136"; - sha256 = "0cy02idvhw459a3rlw2aj8hfmxmy7hx9x5d6g3x9nkv1lxkckn9f"; + rev = "acd6322571cb0820868a6febdc5326782a29b729"; + sha256 = "158cmxhky8nng43jj0d7w8126phx6zlr6r0kf9g2in5nkmbcbd33"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete"; @@ -37796,8 +38267,8 @@ src = fetchFromGitHub { owner = "nlamirault"; repo = "emacs-gitlab"; - rev = "730a86b770b0838c86e7080d8d502528e0c26792"; - sha256 = "11rp2il78av244ba49h243s9a5qvnw5ljqpssiws1j3xcnmbgyz1"; + rev = "67567a354a1888419331b79862f151817d9747c5"; + sha256 = "11bcl5ndwvm2nahcfdbrvxgh48s5i4i7sv74lgnskd90fnjh7gdw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/35d4d4f22e4c567954287b2a1cabcb595497095a/recipes/ivy-gitlab"; @@ -37813,12 +38284,12 @@ ivy-historian = callPackage ({ emacs, fetchFromGitHub, fetchurl, flx, historian, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-historian"; - version = "20170416.2154"; + version = "20170715.2120"; src = fetchFromGitHub { owner = "PythonNut"; repo = "historian.el"; - rev = "d5e4283d2fc06445d2cd14d9d2e86ca41b9f718d"; - sha256 = "0am0xjvk77bvppgx90knxicq3nw1ia68gplyqw9lqw62qj4028ip"; + rev = "d42321d2af89c6f9f932b70944dd315a6bb42bfa"; + sha256 = "04lpnm56kkbs388z61sil0zmb1zxzkh1svzbhghcw3836fgm24kd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fb79cbc9af6cd443b9de97817d24bcc9050d5940/recipes/ivy-historian"; @@ -37834,12 +38305,12 @@ ivy-hydra = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-hydra"; - version = "20170609.938"; + version = "20170703.2350"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "752ba81f0db3be0568072b3d9a5db458bb647a3c"; - sha256 = "0wzhil3c6g9g7k4dq3l6rsyy9vy3rdnq3igqgw9xzgq6i06a1878"; + rev = "dc146d9f1435b79fbfbfa702f0172b9de05f631d"; + sha256 = "09cfs0rhhb72b12pic2w9chbc000pqnafrl2x0g8v5r065pzp64n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -37897,12 +38368,12 @@ ivy-rich = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-rich"; - version = "20170517.554"; + version = "20170716.1924"; src = fetchFromGitHub { owner = "yevgnen"; repo = "ivy-rich"; - rev = "9c36765a941b88c3aa0f4739ad2cb7207c453575"; - sha256 = "09m2m6nrgcpzyam50y3snir3dya1mif8c0miv77hkqa2w2ijxiq9"; + rev = "84964443f9a3ded1676190e9e0f91dac4557cc21"; + sha256 = "1gsf3klcrmabalfywxv5pffpbgw9nw90plc5xxq6a01f7b46rp7c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc297f4949e8040d1b0b3271c9a70c64887b960/recipes/ivy-rich"; @@ -37922,8 +38393,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "d6af2ad09c99f9c58900665e874dcf97a545c0fa"; - sha256 = "12p22b9q4rkl7jswg12gqc8751sinzgj8h75jjzrggd0vfsg439a"; + rev = "65c8f03ff0112ce5c5e11aff6867ad0eb9019e63"; + sha256 = "0xlacwjmvx5xd8m7yi8l8mqi0lqs2gr2hmjag2frvmxcn4cpb4gc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags"; @@ -38588,12 +39059,12 @@ jemdoc-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jemdoc-mode"; - version = "20170611.1536"; + version = "20170704.1327"; src = fetchFromGitHub { owner = "drdv"; repo = "jemdoc-mode"; - rev = "0b09b0368acf3b90c9b58274ff8c2a1e77d1d5e1"; - sha256 = "094smy6n30lwgldg958z387dc0nzjvghlai5xpxc5q2i1gjjqh78"; + rev = "529b4d4681e1198b9892f340fdd6c3f1592a047a"; + sha256 = "1f8nn8mv18q3x3k32i6kjis9f3g1ybdjcfaw8hywqwy6k8dr734m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/49a8c0f885df0b91d758b4d7c92bd67368da8a56/recipes/jemdoc-mode"; @@ -38609,12 +39080,12 @@ jenkins = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "jenkins"; - version = "20160903.1556"; + version = "20170713.702"; src = fetchFromGitHub { owner = "rmuslimov"; repo = "jenkins.el"; - rev = "8a3c1849fcbac379ea88ba1c14f3a63bb9dd3244"; - sha256 = "1dd7qmkdarrfm0gf115c2m2913jn7yv2ns0ic1ywq7b9v547i9cz"; + rev = "b30d4ef658963b913ca02726f99755c10736fd9d"; + sha256 = "15yl1j3lrag19vy5k5qymmf6ij0myaiwl5k7z1ij0b70y2qmfx7k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2ed2da33db5eaea1a37f86057da174a45cd37ea5/recipes/jenkins"; @@ -38880,12 +39351,12 @@ js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js-comint"; - version = "20161212.2125"; + version = "20170627.1952"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "js-comint"; - rev = "2f42249c0a18ad2e17cfb272d75aa9fd3ec5e4ec"; - sha256 = "17f99cih28lfral5iq43pjrvimlx0bnigirv44wm81n58widismy"; + rev = "2c19fafed953ea0972ff086614f86614f4d5dc13"; + sha256 = "1ljsq02g8jcv98c8zc5307g2pqvgpbgj9g0a5gzpz27m440b85sp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9d20b95e369e5a73c85a4a9385d3a8f9edd4ca/recipes/js-comint"; @@ -39006,12 +39477,12 @@ js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js2-mode"; - version = "20170516.1643"; + version = "20170716.1313"; src = fetchFromGitHub { owner = "mooz"; repo = "js2-mode"; - rev = "8a5f492c7ed427a3bdb1125e26a836e582bd2492"; - sha256 = "1kaaa3gs1wm6834b1wd3nzl58vkbk7pcs53s2d93k12l5wzps8lp"; + rev = "b176925c4d8a21e0ed375e13cf6aa04cdf3b4a0e"; + sha256 = "0ffr8wjqqs7p54hi8wgnd61dm4cs7112j56d8q9ycfmnw0fswyxk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode"; @@ -39027,12 +39498,12 @@ js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }: melpaBuild { pname = "js2-refactor"; - version = "20170525.544"; + version = "20170703.314"; src = fetchFromGitHub { owner = "magnars"; repo = "js2-refactor.el"; - rev = "6ee315825b6f0424f15a8520733dc145c85ccd83"; - sha256 = "14ykvbj5f9w5pk8l73k8niwr62slfx956px35zn51563sjs55gnd"; + rev = "17dff6480c8d0b8e4daf44d65181ebc1371d3bdf"; + sha256 = "0fs9w3110cc62a8g6dasfmxi5zsmhhvhviw8r17p63f3snga6xi7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor"; @@ -39111,12 +39582,12 @@ json-mode = callPackage ({ fetchFromGitHub, fetchurl, json-reformat, json-snatcher, lib, melpaBuild }: melpaBuild { pname = "json-mode"; - version = "20170418.1900"; + version = "20170619.1701"; src = fetchFromGitHub { owner = "joshwnj"; repo = "json-mode"; - rev = "c3a7ab350533dddf6d18b4c55423bc0d1b40f3fb"; - sha256 = "1zfzpylckna92zdx1l9ssj3xvrx5fizhypcmmpl2fsm56p97l8c5"; + rev = "39ba450ba5dcc72e317e679a0b61d8aa94383966"; + sha256 = "19qklwzad6qj27jbsms88bbnva4pvl64c89arpf66yjby3hnqbg3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/03d0ff6c8d724cf39446fa27f52aa5cc1a3cefb6/recipes/json-mode"; @@ -39136,8 +39607,8 @@ src = fetchFromGitHub { owner = "DamienCassou"; repo = "json-navigator"; - rev = "bc5634fc78d2e43ebd3c255350829877f3e4549c"; - sha256 = "1j2lic9sn00j6pzq5qslv9m2z0rvsxkvz73z8swp7vcrsgz7qvqd"; + rev = "d005a253fa73ed2c6c0b3ebbc7dc41be9270c304"; + sha256 = "1dklr166p5gx5y3nzkh758wwr6jvw50c3si05m71247kirhs0f89"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62d4d68bd473652b80988a68250e9190b886ad6e/recipes/json-navigator"; @@ -39298,12 +39769,12 @@ julia-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "julia-mode"; - version = "20170607.537"; + version = "20170710.538"; src = fetchFromGitHub { owner = "JuliaLang"; repo = "julia-emacs"; - rev = "f591c6d42e493d51f1522fd0449d6a62881adfad"; - sha256 = "1wjbvwfdish673y5qjr3r8w935dv1cz8j0sv8dmd2i6w5wf5d1qb"; + rev = "edaaff2e971a527460f838bebc0ef679f9a571b0"; + sha256 = "1sm57dq58fjbjjprl1bf7vibrvp6v5m4ipiq7r73c2bdg8rmaapm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8522d197cb1b2c139959e7189765001c5ee7e61a/recipes/julia-mode"; @@ -39316,6 +39787,27 @@ license = lib.licenses.free; }; }) {}; + julia-repl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "julia-repl"; + version = "20170708.2324"; + src = fetchFromGitHub { + owner = "tpapp"; + repo = "julia-repl"; + rev = "93b9d515e6f5fbacd42069a2ae6da3bd80b7c4d0"; + sha256 = "1xpdr343b5qa1pb92d5nz0m9lswq2s8nzg46msjnb1dvihqyb27w"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9a2a494969a9caf2f4513b12504379c9685047dc/recipes/julia-repl"; + sha256 = "1k8a54s7g64zasmmnywygr0ra3s3din5mkqb7b5van2l0d4hcmzn"; + name = "julia-repl"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/julia-repl"; + license = lib.licenses.free; + }; + }) {}; julia-shell = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "julia-shell"; @@ -39590,12 +40082,12 @@ kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-theme"; - version = "20170611.1344"; + version = "20170710.1014"; src = fetchFromGitHub { owner = "0rdy"; repo = "kaolin-theme"; - rev = "e0c14489867eaafa3ab39bb271e3e466cebb632e"; - sha256 = "0zk2crzqzrbn1051fdkpxzyr6d2rknh7nznnbqyw3k75agiq3lm9"; + rev = "f2df1b80dfef88d38c5fbf1b9fad96e2091126c3"; + sha256 = "0anfz9npizaghhvpcvplxsymvv9q3sl7bpiis281p8c7yhrl93h5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme"; @@ -39863,12 +40355,12 @@ keymap-utils = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "keymap-utils"; - version = "20161212.957"; + version = "20170614.1134"; src = fetchFromGitHub { owner = "tarsius"; repo = "keymap-utils"; - rev = "a4f6ff724eeade5612c01c6f6bf401f264687793"; - sha256 = "0jgmw8798g3ikhwnic3fbbjld0hj8fvg50q6x78pngf78ws92mkl"; + rev = "0130f32e5ade649dd2738206a80570e450906ef6"; + sha256 = "1bq7zihdj67j94yyv6655mcrxhz99szbf2zi64nwsl60bxz0znb8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03acebf1462dea36c81d4b9ab41e2e5739be3c3/recipes/keymap-utils"; @@ -40098,8 +40590,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "27e3b90eae2a0155b22a435f1b6f65c913519db6"; - sha256 = "0c6qxnhmhwsb7gqib40fgg2p7krvmxdx75xka8gh3j47zww0pylp"; + rev = "e4a8a4b17cb1ae073afc5df54d9fed9333f1cc72"; + sha256 = "09z298s699jk76i6yrflplhvdc77flb2qfkzbb55ngmx0ajcf2h6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -40178,12 +40670,12 @@ kodi-remote = callPackage ({ elnode, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, melpaBuild, request }: melpaBuild { pname = "kodi-remote"; - version = "20170512.950"; + version = "20170716.1331"; src = fetchFromGitHub { owner = "spiderbit"; repo = "kodi-remote.el"; - rev = "fe750b9f71e9970e2f1331aabc31d7b6dc8a41d2"; - sha256 = "1w05yp3qwrpdb43h4iz4mkn92bsqbx137a83qyz6vgl95rpj7b9j"; + rev = "700ea18fdc471ce351d7e2a443572746e8b93496"; + sha256 = "09qznjadbmspm8n56rk3giyxcf79sxfxpimgn3vkdv09la1mdbb2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08f06dd824e67250afafdecc25128ba794ca971f/recipes/kodi-remote"; @@ -40868,12 +41360,12 @@ ledger-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ledger-mode"; - version = "20170612.123"; + version = "20170714.1529"; src = fetchFromGitHub { owner = "ledger"; repo = "ledger-mode"; - rev = "1afc0c9a3b1a25fdf510c13bf7764f6c4867a897"; - sha256 = "1niww7czhqxn2dpnjbdghplva7l7ymrx77ka3djjln70x0gnvv2v"; + rev = "f4abac98adfe747c93abd4398dac3aafa33a816c"; + sha256 = "04gm8i663k9vgij0c9qqmicmq0dcxbnahjrx81agp2sqzixh6adx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode"; @@ -41124,8 +41616,8 @@ src = fetchFromGitHub { owner = "rvirding"; repo = "lfe"; - rev = "e231e8325765cde4ec3faa73d57bb5064a35620b"; - sha256 = "1k2s7s3wq7pgncrj1hs8vbd393kp8zmxygbci5jq4gvymmsb6qza"; + rev = "446f61280f984f17d4b923150f3b5c58f520ecaa"; + sha256 = "1vnck52yj8h0zahqgxlx70h7pqk9dnd5sy3jdl92rkj0bimhqr9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode"; @@ -41439,12 +41931,12 @@ lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "lispy"; - version = "20170515.855"; + version = "20170707.949"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "5306bb969047cb12b0fd4c6804198afb719acdb3"; - sha256 = "0lgjxaic8vwxhzm2w0prrydlz0fchk3bwvf0i9j96pi6x227b066"; + rev = "7cf7bda344f015750e89719209a49f5991bfdffa"; + sha256 = "1h4129la499b3x3bz72s5c6bc8i7nvyh2kzxg7ff1h8xnwf1rcp1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -41589,8 +42081,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "list-unicode-display"; - rev = "59770cf3572bd36c3e9ba044846dc420c0dca09b"; - sha256 = "05nn4db8s8h4mn3fxhwsa111ayvlq1raf6bifh7jciyw7a2c3aww"; + rev = "1719e7e90035c78dcc8a780c34cd18e6b3dcc6b1"; + sha256 = "1xy06vlwlhz872099xplzsz7rbyf6jsvcqyg6qpry4b2c57zjx8d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c8e2a974a56665b97d7622b0428994edadc88a0/recipes/list-unicode-display"; @@ -41774,12 +42266,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "20170528.2030"; + version = "20170716.827"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "96f22fe5892775b8a9a081898e1a4f00fbb8a674"; - sha256 = "005g84acwjns587lawgms63b9840xswpqj0ccgdaqj6g9p0ynmqa"; + rev = "d4a0708e2bac6492355c675717e458f88b7fab63"; + sha256 = "1fr8kwm6m3k57s55gfn3sjh6zb9hj57rqnygwq8klyvi5ydh9w9f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -41813,6 +42305,27 @@ license = lib.licenses.free; }; }) {}; + livereload = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, websocket }: + melpaBuild { + pname = "livereload"; + version = "20170628.2350"; + src = fetchFromGitHub { + owner = "joaotavora"; + repo = "emacs-livereload"; + rev = "1e501d7e46dbd476c2c7cc9d20b5ac9d41fb1955"; + sha256 = "1z1v2panxrqpam5ysnilx83y6b4dwxmxqhmbgjwfyd1bdmr4iya4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/330731804c442226fa2faaa3da408e9253a1c051/recipes/livereload"; + sha256 = "1z0dbg82l6znz1b03v19a8fnq6b1smikpvaplpxlgny82xrs9als"; + name = "livereload"; + }; + packageRequires = [ emacs websocket ]; + meta = { + homepage = "https://melpa.org/#/livereload"; + license = lib.licenses.free; + }; + }) {}; livescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "livescript-mode"; @@ -41861,8 +42374,8 @@ version = "20150910.644"; src = fetchgit { url = "http://llvm.org/git/llvm"; - rev = "f6d6d2b0f7ca39f7b64137c4c90241af7099ebe8"; - sha256 = "1kjyf2gj3kj9blyabri3z808krs1a7wq0ffxsz8378pl8dl8vcwc"; + rev = "325ccf1c3d92533f8bc5c48d741d3aa23a6b2542"; + sha256 = "05cz8jwkidwkzggifccl51daw6vbcy1fgnlwm27ppy933y306xyy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode"; @@ -41959,6 +42472,27 @@ license = lib.licenses.free; }; }) {}; + lockfile-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "lockfile-mode"; + version = "20170624.2207"; + src = fetchFromGitHub { + owner = "preetpalS"; + repo = "emacs-lockfile-mode"; + rev = "fcfef88460cb3cd67c4d83a1801d0326d282feac"; + sha256 = "1dh41a8dj8h3lrhjajaz886vsimflshk6bc08w71rwvjyy2k8xil"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/12a383eb6c29acb007dae9dc777ace3ba84edac9/recipes/lockfile-mode"; + sha256 = "13nr983xldja8m02a1rdnyqxc8g045hxjh6649wmqmqk4mk0m310"; + name = "lockfile-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/lockfile-mode"; + license = lib.licenses.free; + }; + }) {}; lodgeit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lodgeit"; @@ -42087,12 +42621,12 @@ logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "logview"; - version = "20170518.428"; + version = "20170705.1217"; src = fetchFromGitHub { owner = "doublep"; repo = "logview"; - rev = "c85f0527664538ac9d59bbac9bea40c207c8b9d5"; - sha256 = "1gnia7vkhdh116b7hyxnrnkjnqliqsy5zskn43wjhfw6swf0ipxn"; + rev = "134b41557ab539219d9e3a1b3c8939df93676726"; + sha256 = "1jfdm64r6rj7pl6270v084fvaga5csa4snvbfjdlhs5bshn1d0v2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview"; @@ -42234,12 +42768,12 @@ lsp-go = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-go"; - version = "20170419.605"; + version = "20170709.1021"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-go"; - rev = "3ef571cc8c534e305a3ad6831a0b244a30ca57fe"; - sha256 = "0aiyspr1wg3lwx0sy8c52h86zjs9ifycy02c2w8q2287kv61lqxk"; + rev = "d3ff1fdf5c5e735d5beebff3b0bbbdd3432fbfdf"; + sha256 = "08kasnkg7v0haqrhd2r6dn094vcdhygc1v9nx3lhlfd1sq84m7qh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-go"; @@ -42280,8 +42814,8 @@ src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-java"; - rev = "5c58fc74872e318b2894f11331bec8f699f34c77"; - sha256 = "0b6n1hlhzqqnih26f412ag77dz5bc550ma9ijcbs0n3vbd5z45hs"; + rev = "ba797f9588944ae917ccbfa15c40ee1e427ea6e5"; + sha256 = "0plccx57j85b53s8nmhkcw8h1hznm147v3ajhzx2j1adbb2j0h3f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-java"; @@ -42297,12 +42831,12 @@ lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "lsp-mode"; - version = "20170601.1101"; + version = "20170629.33"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-mode"; - rev = "6fe3246e00995ca7ebe3b3c36ea58a69de521193"; - sha256 = "1ib4ld45wfwq5c48w56k8ca5qggjmxgpn2q0vvi556awk47anhqr"; + rev = "3e93b3fd754931cfd122855659afbd070d844bac"; + sha256 = "0g45zrch41041axpi5j6jbng1dbjqhpysr38cv2f1kqdmw9ybg9a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode"; @@ -42652,12 +43186,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20170609.2322"; + version = "20170711.1307"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "622c994183294b02893ff286210bffd5255296df"; - sha256 = "1cyzf8xh6ibq9vypcdg4akqsfr1i202y14mdlr7hh2bkxymcq32i"; + rev = "33201f76c27d21e91c2137aa5f19db18b2adb2e5"; + sha256 = "0749yvycd66ddg1wzzyzv8d2z6rxhlrizn83q0gm1zbz296s7rkb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -42680,12 +43214,12 @@ magit-annex = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-annex"; - version = "20170429.756"; + version = "20170702.832"; src = fetchFromGitHub { owner = "magit"; repo = "magit-annex"; - rev = "b8f191e37d0b3136aa0b00345961b6f7cf2e5789"; - sha256 = "097x8jblz83h750syxxcra9rswmghdwbpnx2xv8wbgwg3axch7rm"; + rev = "2aa23cd169166e92be3e874c723ff224a9d42c15"; + sha256 = "1bjv8a38y75cpbxhzxsnvzpq2cvs80x8ai7pspsqf4pp3w1dj45n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex"; @@ -42848,12 +43382,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "20170609.2310"; + version = "20170709.510"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "622c994183294b02893ff286210bffd5255296df"; - sha256 = "1cyzf8xh6ibq9vypcdg4akqsfr1i202y14mdlr7hh2bkxymcq32i"; + rev = "33201f76c27d21e91c2137aa5f19db18b2adb2e5"; + sha256 = "0749yvycd66ddg1wzzyzv8d2z6rxhlrizn83q0gm1zbz296s7rkb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -42869,12 +43403,12 @@ magit-rockstar = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-rockstar"; - version = "20161013.544"; + version = "20170703.704"; src = fetchFromGitHub { owner = "tarsius"; repo = "magit-rockstar"; - rev = "bccce1ac8e012f52e29470c1c7d815f9bb1a192b"; - sha256 = "0z411x2w6ldy3b8qbavfvfgvkbjd1rl0m1plr44ynp55awrhj0k2"; + rev = "a65042e3445008b55190f1258ae54bd78e12174b"; + sha256 = "1wbbg9jr9kl69sbq9b9dgwvnplmdzjyanwfcncamw3lfcjfnw1bn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a20b539cbd38ffa546c1b56b9fac78c0b9457f6/recipes/magit-rockstar"; @@ -42929,6 +43463,27 @@ license = lib.licenses.free; }; }) {}; + magit-tbdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: + melpaBuild { + pname = "magit-tbdiff"; + version = "20170627.2023"; + src = fetchFromGitHub { + owner = "magit"; + repo = "magit-tbdiff"; + rev = "c9522a98bcdafc2d8ef3f3beb9ebe05daa42e577"; + sha256 = "1nv5a8wfrsh41rvgzi1clwjdr9nc0g5rpgcjs1rvgncn7pjd5pi9"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ad97eea866c8732e3adc17551d37a6d1ae511e6c/recipes/magit-tbdiff"; + sha256 = "1wydmw4f1072k8frk8mi8aaky7dndinq8n7kn10q583bjlxgw80r"; + name = "magit-tbdiff"; + }; + packageRequires = [ emacs magit ]; + meta = { + homepage = "https://melpa.org/#/magit-tbdiff"; + license = lib.licenses.free; + }; + }) {}; magit-topgit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-topgit"; @@ -43118,6 +43673,27 @@ license = lib.licenses.free; }; }) {}; + makefile-executor = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, s }: + melpaBuild { + pname = "makefile-executor"; + version = "20170626.533"; + src = fetchFromGitHub { + owner = "thiderman"; + repo = "makefile-executor.el"; + rev = "5502f07a13b7d6860715faf70966721a11506b22"; + sha256 = "1727i7nmm1i0cc8i2c1912irhb9vvk82xb0ac3ypjzi0s22k2fnf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/08f8b4d680e4907dbd8ea46a75d98aa0e93c2bb9/recipes/makefile-executor"; + sha256 = "0889rq2a7ks2ynyq91xsa2kpzgd72kzbjxx0b34w8faknpj3b6hi"; + name = "makefile-executor"; + }; + packageRequires = [ dash emacs f projectile s ]; + meta = { + homepage = "https://melpa.org/#/makefile-executor"; + license = lib.licenses.free; + }; + }) {}; maker-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "maker-mode"; @@ -43163,12 +43739,12 @@ malinka = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, rtags, s }: melpaBuild { pname = "malinka"; - version = "20170523.1007"; + version = "20170628.151"; src = fetchFromGitHub { owner = "LefterisJP"; repo = "malinka"; - rev = "9a546487f9de5dd7277de34756499560579c2568"; - sha256 = "06ikk9yapq5j401fql29vl3w06xwci2437narf0pjhnnzvnidiw0"; + rev = "b8ec090cb57a78265650586f71f00c4c9e054e27"; + sha256 = "0wii0ylgdci69r1zjcrk7bh68dl25ry63cfwgdii9x217lmbn9qw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/malinka"; @@ -43310,12 +43886,12 @@ mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }: melpaBuild { pname = "mandoku"; - version = "20170514.1827"; + version = "20170614.306"; src = fetchFromGitHub { owner = "mandoku"; repo = "mandoku"; - rev = "1bdcbcb42248d67029b0288c8572372fc1cafb29"; - sha256 = "1g4vgybkqn8bf95dl0gxd68lv4gw69bxms75s6k85i665fa2njal"; + rev = "01255150a80ada47bf3708daa93069ac3011831f"; + sha256 = "1djlzcg6dl29rifdss3cy0g3xmscblqvkfwzykiqs2y7vl51r60b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku"; @@ -43486,12 +44062,12 @@ markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "markdown-mode"; - version = "20170611.1532"; + version = "20170712.1703"; src = fetchFromGitHub { owner = "jrblevin"; repo = "markdown-mode"; - rev = "0fa1d523fe95a15a8cebaaba7d4af3002ddbeef5"; - sha256 = "0y6j5gdlxw9kp961sgdpnkprxdmnndcjd6s3v9jbz8py2k3pqpxx"; + rev = "ea5549233b3ce1536dae3a4793df79971a3781da"; + sha256 = "1gm76j4w0fv7194dkhky5pxrrwysi4n0n0v0dnl6wp079irc7kcj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode"; @@ -43577,12 +44153,12 @@ markdown-toc = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, s }: melpaBuild { pname = "markdown-toc"; - version = "20170224.2350"; + version = "20170711.1249"; src = fetchFromGitHub { owner = "ardumont"; repo = "markdown-toc"; - rev = "0edc303871517da67483119f2b1969055e6e0608"; - sha256 = "0fnb2qw7p5mmv9nbkjy2iw3whi40gxwxbdfwgadbypzk0yvh6a3v"; + rev = "7038f4f6d5c2bc7e4aea89699a607ac2b7dd16a8"; + sha256 = "1kvf30ib1kxp29k1xwixkq6l4jjr3q3g1wpvh9yfzk5ld97zmry1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4db1e90be8e34d5ad0c898be10dfa5cd95ccb921/recipes/markdown-toc"; @@ -43724,12 +44300,12 @@ mastodon = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mastodon"; - version = "20170518.1031"; + version = "20170619.1050"; src = fetchFromGitHub { owner = "jdenen"; repo = "mastodon.el"; - rev = "a9e595142eee69fe84f0ab06f7fde76cef27cdac"; - sha256 = "1wgx8i6ww9w99f0f62p7v626bb6pvdg04hnhqyjgsmb99wzwlpk7"; + rev = "e08bb5794762d22f90e85fd65cef7c143e6b9318"; + sha256 = "0bil0xxava04pd4acjqm3bfqm1kjdk4g0czd4zqvacsp5c9sl2qp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/809d963b69b154325faaf61e54ca87b94c1c9a90/recipes/mastodon"; @@ -44057,12 +44633,12 @@ meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "meghanada"; - version = "20170610.1806"; + version = "20170628.2045"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "f8ebc163a289532ce99134716008440a515e65ea"; - sha256 = "00z9w8nzf1adh6kic485w332dj6m53qdmb99w4aqz70ygq6i2s89"; + rev = "b507fc0e6fa4b6f1b05c46ecf563ad0af69e263a"; + sha256 = "0kiib5wchqhxm8rsxp3mfp3zdbgg57gbn8y70j5msa2sxdz26mm7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -44224,10 +44800,10 @@ }) {}; menu-bar-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "menu-bar-plus"; - version = "20170412.1036"; + version = "20170618.1417"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/menu-bar+.el"; - sha256 = "1rxy2yp1f5fi5wk8lg04dmg943131rvvqiif1k18n0gajg1x8hxx"; + sha256 = "1ah2yjagpkvwahki81ixviq9pgwnjna8z893xad31rj0qmwr8bzw"; name = "menu-bar+.el"; }; recipeFile = fetchurl { @@ -44248,8 +44824,8 @@ src = fetchFromGitHub { owner = "the-lambda-church"; repo = "merlin"; - rev = "420416f182d2ea2a2285ab4bd22e5898dfb20a83"; - sha256 = "101vk16c5wayd51s8w0mvy99bk7q3gm2gz8i8616wa1lmyszjknh"; + rev = "957e551140587f0cd83d9186a06fba10a38c6084"; + sha256 = "1df6cx7y5i35cmfi5c4b48iys21cszrvlh039cdbkmy6d0pdbvi7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin"; @@ -44389,12 +44965,12 @@ metaweblog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }: melpaBuild { pname = "metaweblog"; - version = "20141130.605"; + version = "20170626.750"; src = fetchFromGitHub { owner = "punchagan"; repo = "metaweblog"; - rev = "c8b50a6edf0fd2f396570c9a1c2ef8cd207606fb"; - sha256 = "06mbdb4zb07skq1jpv05hr45k5x96d9hgkb358jiq0kfsqlrbbb4"; + rev = "c039d1ffb618d19d160bde835fab389e9a7433a3"; + sha256 = "116m0v73v636xvsq46i3qhd4wy3x7zk3k8ffmsx36ksphn9kwx0k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/metaweblog"; @@ -44619,12 +45195,12 @@ mini-header-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mini-header-line"; - version = "20161108.137"; + version = "20170621.521"; src = fetchFromGitHub { owner = "ksjogo"; repo = "mini-header-line"; - rev = "d8c3b6e93ad631d22564c273f61463dc9ded49ba"; - sha256 = "07r231xz45k1b3pzix308jn24s0gl8vgdbcd4vdh6p154znvcbm5"; + rev = "73b6724e0a26c4528d93768191c8aa59e6bce2e5"; + sha256 = "187xynmpgkx498an246ywrqdhyyp2ag1l7yxnm0x0rbfgw67q5j1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/122db5436ff9061713c0d3d8f44c47494067843e/recipes/mini-header-line"; @@ -44770,8 +45346,8 @@ src = fetchFromGitHub { owner = "arthurnn"; repo = "minitest-emacs"; - rev = "2997ba81456f2a0f3e25b6555b491586865ebb61"; - sha256 = "10f1caszcas39g8kz0hfx1gq1jbpcnb5wwd1c262l9lwvla85nyl"; + rev = "e5c82aac7542c5648881bb612fa20fe2b99ffb15"; + sha256 = "09iqbmmvi28sn5c6iaq6r6q4a4003cy6bb4zihajq0di55zls3aa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/41b2e55c0fe48267dc4f55924c782c6f934d8ca4/recipes/minitest"; @@ -44787,12 +45363,12 @@ minizinc-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "minizinc-mode"; - version = "20170605.2342"; + version = "20170708.358"; src = fetchFromGitHub { owner = "m00nlight"; repo = "minizinc-mode"; - rev = "c33a8e23817468c2a64dcfede6dea41485fb43df"; - sha256 = "1892s4cxzxdrwj2mjav1lqbisx20zsjgnw41m6a61ds7hg035c3w"; + rev = "b621b9e106edbe094bcc8e609d9398a60c2ac8b5"; + sha256 = "15d90fsrpc7qcnblgwjcqrqyyphbfjvdnkwj6dnv79d0m4n58m1c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc86b4ba54fca6f1ebf1ae3557fe564e05c1e382/recipes/minizinc-mode"; @@ -45074,12 +45650,12 @@ mocha = callPackage ({ f, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "mocha"; - version = "20170513.1501"; + version = "20170712.907"; src = fetchFromGitHub { owner = "scottaj"; repo = "mocha.el"; - rev = "dbda778badb8f33c9ed816b927710ef6d0123cf5"; - sha256 = "1jvczadgkq2b8gxjg2pllg3qjr1ymnc9kjjgvyi7v91vb7h51yii"; + rev = "60189c67a4800059411f71ca800d911240e8d22e"; + sha256 = "1hqyy7piaara1hgba2jys923y395kpcf6i312zaw472ksixqhw7y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39c26134ba95f277a4e9400e506433d96a695aa4/recipes/mocha"; @@ -45238,12 +45814,12 @@ modern-cpp-font-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "modern-cpp-font-lock"; - version = "20170224.114"; + version = "20170625.1306"; src = fetchFromGitHub { owner = "ludwigpacifici"; repo = "modern-cpp-font-lock"; - rev = "f1a4413c40e933b8b5b380860656b1ef5663f121"; - sha256 = "0hb40cp33fpgfs4c5g8phhvv9mbykygybidh73pbrcacyiz4g6jc"; + rev = "0a5a4ae4d3115eb95ab6047faf8d1734a238ab70"; + sha256 = "1ax7kvxj8z6ldfxr9017ws1lligjaxxdrcxb651i10m7jdw3bjd4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4bfc2386049adfe7a8e20da9b69fb73d6cb71387/recipes/modern-cpp-font-lock"; @@ -45406,12 +45982,12 @@ monokai-alt-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-alt-theme"; - version = "20170529.1607"; + version = "20170630.1348"; src = fetchFromGitHub { owner = "dawidof"; repo = "emacs-monokai-theme"; - rev = "09370802ddf6010a9a83b6c38cfc055e31433a73"; - sha256 = "1dn8z2lj8kvgs0vxiiqm0wz73sgqykkbi32d6f7qa6i4ishyw341"; + rev = "f342b6afc31f929be0626eca2d696ee9fab78011"; + sha256 = "1lgsqrwf21b0rh4x8nmj08a46ld7dkq4jhwxi1fi7a9xhmi2yd4i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ff05515c2f3bd80cb8d7de9afc8fd983e62ad91/recipes/monokai-alt-theme"; @@ -45427,12 +46003,12 @@ monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-theme"; - version = "20170314.1612"; + version = "20170705.1152"; src = fetchFromGitHub { owner = "oneKelvinSmith"; repo = "monokai-emacs"; - rev = "46fe076b5943ccc6fdc9cdacc7e8ad02b64bcd36"; - sha256 = "03aw9ab54a5fljhwygg62hr2n9kk82xfwcdq17ln5z0951gqi99r"; + rev = "71bcced6da1033822ea52e4ac9f312f9d6b5e062"; + sha256 = "1kwngvpih9q7wkdv6ayisi2c22xi9jh9jffd4qzc652p26yhmzq6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme"; @@ -45448,12 +46024,12 @@ monroe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monroe"; - version = "20170522.632"; + version = "20170623.103"; src = fetchFromGitHub { owner = "sanel"; repo = "monroe"; - rev = "1705eca01924210504d4270af7dab57278194875"; - sha256 = "19yca80zghb9zmyqdq155743plzzjghkfbi9zb5z8x2fvppixvwn"; + rev = "2bb59ac84e030f7047e7443e2df25185b397a5d3"; + sha256 = "0jcyidk62djd47dv4m53k7wky92982pzz87n8zq1fijqic63iib9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/590e5e784c5a1c12a241d90c9a0794d2737a61ef/recipes/monroe"; @@ -45700,8 +46276,8 @@ src = fetchFromGitHub { owner = "retroj"; repo = "mowedline"; - rev = "832e81b7f90f6c2e753f89737c0b57a260544424"; - sha256 = "1ll0ywrzpc5ignddgri8xakf93q1rg8zf7h23hfv8jiiwv3240w5"; + rev = "bca452544b5e200034d0505a767090a975a21a28"; + sha256 = "07bjkcgy2qvnkrlb5ypgbf969ka0pchz305326r7vfswlvkvihdg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/86f7df6b8df3398ef476c0ed31722b03f16b2fec/recipes/mowedline"; @@ -46197,12 +46773,12 @@ multiple-cursors = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "multiple-cursors"; - version = "20170215.552"; + version = "20170713.1847"; src = fetchFromGitHub { owner = "magnars"; repo = "multiple-cursors.el"; - rev = "ddbe3ae932b6564c7429c3b2507510093ed1f3aa"; - sha256 = "0icaz5md2jydsp8w9fdgxj7689g8v6yq123yi7bp17g6lfnw4v7y"; + rev = "c94566597a80c07a1782a75644fe1a2ca4f29bad"; + sha256 = "0g4w3xcwazdm6f07n00jgdkv5blrd9aaqmwbx28lm1qq3v6w0xqp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f015e6b88be2a5ded363bd882a558e94d1f391/recipes/multiple-cursors"; @@ -47114,12 +47690,12 @@ neon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "neon-mode"; - version = "20170529.637"; + version = "20170711.501"; src = fetchFromGitHub { owner = "Fuco1"; repo = "neon-mode"; - rev = "69edc4b051604143db8e044606bbcc0904a3829c"; - sha256 = "09753w4psyzh583264nswk9313d9yh5s4aad3jc9qq5mg6ycb6iy"; + rev = "9c23289c0c8ed17d1596cfb95a5ade57df7db5f7"; + sha256 = "0q5niz0di1r0wl0lsq8hcsz854xdwpzw798sl42qc1r5mdpz3ghz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c6b2a4898bf21413c4d9e6714af129bbb0a23e1a/recipes/neon-mode"; @@ -47366,11 +47942,11 @@ nikola = callPackage ({ async, emacs, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nikola"; - version = "20170301.1148"; + version = "20170703.1321"; src = fetchgit { url = "https://git.daemons.cf/drymer/nikola.el/"; - rev = "6752cc70b08889ff5184ac111616863f1881d357"; - sha256 = "0cwn05q0fj6xddfc5qimryvqi5l68sqyxvw638vzmrpnzl6dfc9h"; + rev = "964715ac30943c9d6976999cad208dc60d09def0"; + sha256 = "0b0bpw9r2xi1avzq76pl58bbk1shb57d3bmzd9d53d07gj5c9399"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/89354d06dddc3be4b952e3f0b86d11824064dd97/recipes/nikola"; @@ -47386,12 +47962,12 @@ nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: melpaBuild { pname = "nim-mode"; - version = "20170409.1737"; + version = "20170716.948"; src = fetchFromGitHub { owner = "nim-lang"; repo = "nim-mode"; - rev = "58707562dd29c7a9f36e96a8e894caec90ce1e41"; - sha256 = "1r6vs77b2rsdarkvcsg6awfa4mna308m53002vxykmpj9apkjszr"; + rev = "05ac362f97874d50131ea38277cf95a5cfecb250"; + sha256 = "0phxkvi1s49grc717iprg96dalb5w2jcj1dfyrh339xny11f2hqb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode"; @@ -47432,8 +48008,8 @@ src = fetchFromGitHub { owner = "martine"; repo = "ninja"; - rev = "d6eb8baf8130ab93140395dceca363774092135d"; - sha256 = "02dwb8xv4rz08wigr6im8rdfjjlhrpf620a7faq1ka2gn41hv1qv"; + rev = "7bbc708ff08f5660f4cff4b3e8c675bec428a1f2"; + sha256 = "1iqv268yvvhs7nxf28105g3ya16js1ibzxl0is13i4hlkx9wiqw1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode"; @@ -47474,8 +48050,8 @@ src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "186571965dccf57d15b9f37c1cca92a57187b7b3"; - sha256 = "1iz48szkby5b3f4935c8pnry84f6mh4f2xklv7zdykrczdqy5b0r"; + rev = "4ec6eb1fdf513d93090d5898762d1186eb6feb0d"; + sha256 = "01vfj61rgfk0cyh1c4ai0ys0wjnjaqz6hdbg3b1dcfk4b09ydyjx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -47533,12 +48109,12 @@ nlinum-hl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, nlinum }: melpaBuild { pname = "nlinum-hl"; - version = "20170609.440"; + version = "20170613.1748"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-nlinum-hl"; - rev = "294037f5231375ac63836637651585f8b82b962d"; - sha256 = "048zm3x62wjp2ym0q8jn4ll0f11nak5i41q6mdcabq3zwg42zbqi"; + rev = "d5ca1490e0cde0605e34a6a17de8cc236c9810da"; + sha256 = "0rj2ay2x7mqnj2vpnndfzr47sldx7i6zxj4nn81yamrdxgv19ajd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b13a886535a5c33fe389a6b616988b7377249625/recipes/nlinum-hl"; @@ -47617,12 +48193,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "20170515.1945"; + version = "20170702.457"; src = fetchFromGitHub { owner = "tarsius"; repo = "no-littering"; - rev = "4bb6640ddc4c9453318133e777f09ca5c429d057"; - sha256 = "0m0grzppcnk447ysyh03dw6nz6vhdnihgf7s4rlqcy0b4qb7fmxw"; + rev = "8b689a1e16d4825d0221f4a41756b63bbc361c82"; + sha256 = "02cb5m1r5k1f6il79yv8fa5yiyz2m37awlbjjxmkv1av06kl0abn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering"; @@ -47768,8 +48344,8 @@ src = fetchFromGitHub { owner = "arcticicestudio"; repo = "nord-emacs"; - rev = "8962f7c77f2a27c0e0b649653c212fa310cce130"; - sha256 = "0az5l8y3jg6yk587wvgz1v5671d8p1vf9m0529x9axi1x7yzxry1"; + rev = "eb7929e41606776a45817946b5d6f79426767a93"; + sha256 = "1cb7la2al8124i4xfmripfzhabpnzh929qi1266p4c7jchyz2gxw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31cb60069825abe3998c8b43bc9177b39a7f3659/recipes/nord-theme"; @@ -47803,11 +48379,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "20170530.454"; + version = "20170715.511"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "1ec634461ea25d87cc16dbeb1318f8e30a07c9f1"; - sha256 = "00sqb0vl0990c5fxg0znwdfgq20q0zbx1pnhpr3dmnydqzmh7wwr"; + rev = "4c6e3d83fb2d5d3ce04710d92b97ef6a59a11051"; + sha256 = "145313a0krav6lcalbpq6skyf2iw96c97v6cd7s6bci5i93w0mp3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -47989,12 +48565,12 @@ nubox = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nubox"; - version = "20170611.725"; + version = "20170619.210"; src = fetchFromGitHub { owner = "martijnat"; repo = "nubox"; - rev = "2c6c1cae665dfc9cd000aacd84b9843eac0c74cb"; - sha256 = "13zjrql7arj0fklvajmr7xr7486i9917b9x54mxzmkwnbas4rg04"; + rev = "1ccb8035ae42727ba6bdd5c1106fbceddeeed370"; + sha256 = "02yh99rcgxdq6jn4xs8782nl6bjccmal8j78qslvpkrzrrxjajx6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/725948568b8a067762b63475bc400f089f478a36/recipes/nubox"; @@ -48049,6 +48625,27 @@ license = lib.licenses.free; }; }) {}; + numbers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "numbers"; + version = "20170712.238"; + src = fetchFromGitHub { + owner = "davep"; + repo = "numbers.el"; + rev = "74be68b94143f042ce461b2a69202f515acaf20c"; + sha256 = "0b4bgc4hkndia8zg4d23l1w78iwzj1l46ifrhz5z1p97qldalb0x"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5c77353d3a2b0d360bb28e528ef2707227081c72/recipes/numbers"; + sha256 = "02cx19fi34yvc0icajnwrmb8lr2g8y08kis08v9xxalfxz06kb3h"; + name = "numbers"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/numbers"; + license = lib.licenses.free; + }; + }) {}; nummm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nummm-mode"; @@ -48217,22 +48814,22 @@ license = lib.licenses.free; }; }) {}; - ob-async = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + ob-async = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-async"; - version = "20170216.2011"; + version = "20170705.2131"; src = fetchFromGitHub { owner = "astahlman"; repo = "ob-async"; - rev = "6bdb5b63ff4a8853d03805d7a7042213003a3dee"; - sha256 = "1n4zc4nfv7hzilnb0qng6vh19dj4kq12gwsillj6c3i89gjz73wr"; + rev = "079dbcbfa229407ae2f53689a4d045f827adabd5"; + sha256 = "0jinxwv72yypns22iv2v4ll1wkg2ca5vbx1v36pgxgmjvawfilvr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-async"; sha256 = "0k7kv71nnibp53lav774c61w9pzhq8qvch9rvpyyrwbyd67ninl8"; name = "ob-async"; }; - packageRequires = [ async org ]; + packageRequires = [ async emacs org ]; meta = { homepage = "https://melpa.org/#/ob-async"; license = lib.licenses.free; @@ -48321,6 +48918,27 @@ license = lib.licenses.free; }; }) {}; + ob-coffeescript = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ob-coffeescript"; + version = "20170713.2356"; + src = fetchFromGitHub { + owner = "brantou"; + repo = "ob-coffeescript"; + rev = "6baabf3104e32ed151b0b9555db903a93a44db54"; + sha256 = "08mmwy69h7dihi120c9agv8v5c6y6ghc94gmpb0rfxdjim1lrkmq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ba1a808c77653bac1948d6c44bd1db09301ffeff/recipes/ob-coffeescript"; + sha256 = "05q1wnabw52kd3fpcpinpxs9z6xmi4n1p19jbcz0bgjpnw05s27p"; + name = "ob-coffeescript"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ob-coffeescript"; + license = lib.licenses.free; + }; + }) {}; ob-cypher = callPackage ({ cypher-mode, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ob-cypher"; @@ -48405,6 +49023,27 @@ license = lib.licenses.free; }; }) {}; + ob-fsharp = callPackage ({ emacs, fetchFromGitHub, fetchurl, fsharp-mode, lib, melpaBuild }: + melpaBuild { + pname = "ob-fsharp"; + version = "20170618.729"; + src = fetchFromGitHub { + owner = "juergenhoetzel"; + repo = "ob-fsharp"; + rev = "65ec2b626ac55313d8a04e746940370f615fed1e"; + sha256 = "12k6z3zsh8av3avhl2a62v475bpxpcdy56v8i248bv1wgd3ma2mi"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/89bc8c5fe6db0573109e82b3d1350d33d6d8aff5/recipes/ob-fsharp"; + sha256 = "1b9052lvr03vyizkjz3qsa8cw3pjml4kb3yy13jwh09jz5q87qbf"; + name = "ob-fsharp"; + }; + packageRequires = [ emacs fsharp-mode ]; + meta = { + homepage = "https://melpa.org/#/ob-fsharp"; + license = lib.licenses.free; + }; + }) {}; ob-go = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-go"; @@ -48412,8 +49051,8 @@ src = fetchFromGitHub { owner = "pope"; repo = "ob-go"; - rev = "1f582d5c16ff032207a40d49be0727190a227912"; - sha256 = "1i0c7z1jfrd39pfdfr67qcisv578mmi6i73jnm9zliygk1mryggf"; + rev = "28183e10581fa5fe0f5b5a885cbde32cb4b053ba"; + sha256 = "1liggd9nbl90c6mc0iccchckwm1pw2lb23nn61y2p9c1hj9myhm8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3afb687d6d3d1e52336ca9a7343278a9f37c3d54/recipes/ob-go"; @@ -48450,12 +49089,12 @@ ob-ipython = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ob-ipython"; - version = "20160918.1001"; + version = "20170628.1116"; src = fetchFromGitHub { owner = "gregsexton"; repo = "ob-ipython"; - rev = "cfdd9c00e6286d31d647defdb813b7aabfadcbff"; - sha256 = "0i441jwc32fnkd8rba512z373jaind8sdb20hf2yma7ny2iawcyk"; + rev = "a0ae4add0310d131c6b4b15139b929955cec93dd"; + sha256 = "019impk95mnplwzirllrrjjq17hczcq6aarqr959ca75jix8jysf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557c36e86844c211f2d2ee097ce51ee9db92ea8b/recipes/ob-ipython"; @@ -48471,12 +49110,12 @@ ob-kotlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-kotlin"; - version = "20150312.614"; + version = "20170624.2050"; src = fetchFromGitHub { owner = "zweifisch"; repo = "ob-kotlin"; - rev = "c494f50184d25e196c009bf5cc105c4931b9464d"; - sha256 = "01cjwg27m0iqndkwwl0v5w8vvk270xvi81za3y5hyrmb7dq6bfy7"; + rev = "ebbd3fcd52a80c0579e896ad3cbb1484d0a55d00"; + sha256 = "037msvgvw42nl2wi335q4pfi8bqh3d1a5a6rdvzvpm1vh2fwywab"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7aa74d349eb55aafddfc4327b6160ae2da80d689/recipes/ob-kotlin"; @@ -48513,12 +49152,12 @@ ob-ml-marklogic = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-ml-marklogic"; - version = "20160508.932"; + version = "20170622.1133"; src = fetchFromGitHub { owner = "ndw"; repo = "ob-ml-marklogic"; - rev = "58e101a8b79d408d5c9da2fbcbc0f38e80eb7208"; - sha256 = "15mzra45jcihgvddv69yxpml34hy15yz2hxcxz6a4la8vk6mw3ky"; + rev = "f678af0f440b3030e311ed6fbc444200be04da91"; + sha256 = "1fszg6bn927bi1dx4zgiq0wr7zxrjv8sjrwgn9mansbljszbmccm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/edce412552d4798450493e0a3dbe768f38f77cc7/recipes/ob-ml-marklogic"; @@ -48657,6 +49296,27 @@ license = lib.licenses.free; }; }) {}; + ob-rust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ob-rust"; + version = "20170619.802"; + src = fetchFromGitHub { + owner = "micanzhang"; + repo = "ob-rust"; + rev = "126ee38c6f560cac2ea6bbef034f92ff948d2664"; + sha256 = "1szayb60ibihjfd5ihij0cvjdmvcays1701h5ak0wpvqirdmyc60"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/843affc2fd481647c5377bf9a96b636b39718034/recipes/ob-rust"; + sha256 = "1syzwh399wcwqhg1f3fvl12978dr574wji7cknqvll3hyh0zwd65"; + name = "ob-rust"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ob-rust"; + license = lib.licenses.free; + }; + }) {}; ob-sagemath = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, sage-shell-mode }: melpaBuild { pname = "ob-sagemath"; @@ -49329,15 +49989,15 @@ license = lib.licenses.free; }; }) {}; - omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }: + omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }: melpaBuild { pname = "omnisharp"; - version = "20170601.1329"; + version = "20170716.926"; src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "7ca20bb808dd51adbd83e0c18885c4300548d032"; - sha256 = "0p4adjpa3l6aaz7kd3474aagzfzrnra7mijw4l0himba9ldrh590"; + rev = "ab4c6bb04cda35510fe751e546b5c0bb4dc3371d"; + sha256 = "0zkd5hp5xk0wjlv6nqi38dnhrzk7jzcd8546wqfw0my10kb1ycs2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; @@ -49350,6 +50010,7 @@ csharp-mode dash emacs + f flycheck popup s @@ -49695,12 +50356,12 @@ org-alert = callPackage ({ alert, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "org-alert"; - version = "20160701.1900"; + version = "20170701.1855"; src = fetchFromGitHub { owner = "groksteve"; repo = "org-alert"; - rev = "685c18aa5ce994360c7f9e8bbf49590c412187ac"; - sha256 = "0gkv2sfl9nb64qqh5xhgq68r9kfmsny3vpcmnzk2mqjcb9nh657s"; + rev = "169acc082643b6b793aab17ab7e0de3694e74698"; + sha256 = "0khk1jyy4vxsfalf27f53d1g9w41qq6i6c9xm670pj6xrf38hxj9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2976b7f9271bc46679a5774ff5f388b81a9f0cf8/recipes/org-alert"; @@ -49842,12 +50503,12 @@ org-brain = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-brain"; - version = "20170521.1409"; + version = "20170706.447"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "org-brain"; - rev = "de138a717813a8c269c07c0d284dfd71265bbf20"; - sha256 = "1nr78r0zsn6s626knay4zybk0222ng5yn6wh8ji7gl0bq47kqq75"; + rev = "497c18f517074629394c4c30de03d985e0c5ca8c"; + sha256 = "1p1920f99ma3m2h0if3h9inlb8xgbb54mav0jn3jy8nfa9w7pch8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain"; @@ -49884,12 +50545,12 @@ org-caldav = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-caldav"; - version = "20170610.945"; + version = "20170615.724"; src = fetchFromGitHub { owner = "dengste"; repo = "org-caldav"; - rev = "57dce0b4f0f234d9f4a72e5f0b811ee399e6d989"; - sha256 = "180amsndil1y24675xbdr9l6qad7lxq1pr7nlqgspmw0nccp0al4"; + rev = "07e6ccda6756754a115d567f2ad3a760514b731d"; + sha256 = "0gaqkbdqkb7v6k2bg21c8c7c38g9rkgk8gy79s4gi6hzd4j717mp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-caldav"; @@ -50259,22 +50920,22 @@ license = lib.licenses.free; }; }) {}; - org-edit-latex = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + org-edit-latex = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-edit-latex"; - version = "20170420.1738"; + version = "20170621.758"; src = fetchFromGitHub { owner = "et2010"; repo = "org-edit-latex"; - rev = "945f4cffb501d3aa2b1c6dcaef7c18a83c090a89"; - sha256 = "1bwa4sb6yybvl2jdbxmx84s2bivqkil1dxy1y5wypv4cnib5skn3"; + rev = "323d0b39d0284cef730b706dce7c0e58ed35530f"; + sha256 = "0zcllyhx9n9vcr5w87h0hfz25v52lvh5fi717cb7mf3jh89zh842"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-edit-latex"; sha256 = "0nkiz4682qgk5dy4if3gij98738482ys8zwm8yx834za38xxbwry"; name = "org-edit-latex"; }; - packageRequires = [ emacs ]; + packageRequires = [ auctex emacs org ]; meta = { homepage = "https://melpa.org/#/org-edit-latex"; license = lib.licenses.free; @@ -50513,12 +51174,12 @@ org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-journal"; - version = "20170221.612"; + version = "20170712.657"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-journal"; - rev = "c020fa3f58cdeff51701322334daa6253a144db6"; - sha256 = "0pcymhjaybaxpghixa2gnshzqy03hafmzjdas8q087dn7b19cr8h"; + rev = "69b237d1b3c5cc0eb81fb5918df25d01e999b0f1"; + sha256 = "1ss1lxxilbr177mlp4iygg8q74qfw68v8iap9fpj6lvlm7vawins"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal"; @@ -50531,6 +51192,27 @@ license = lib.licenses.free; }; }) {}; + org-link-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "org-link-minor-mode"; + version = "20170616.516"; + src = fetchFromGitHub { + owner = "seanohalpin"; + repo = "org-link-minor-mode"; + rev = "f7d986b4c63673e0e81ad87e9109237abc667893"; + sha256 = "0i7xj6hp0mxc42y2yjv8cwgsflfyx47d63b9v4dmkjbs9fda06mj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b1d2add7baf96c9a18671766d61c8aa028756796/recipes/org-link-minor-mode"; + sha256 = "1akb670mzzhmldw2202x3k6b7vwfcn0rs55znpxsrc4iqihdgka3"; + name = "org-link-minor-mode"; + }; + packageRequires = [ org ]; + meta = { + homepage = "https://melpa.org/#/org-link-minor-mode"; + license = lib.licenses.free; + }; + }) {}; org-link-travis = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-link-travis"; @@ -50579,8 +51261,8 @@ version = "20140107.519"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "5e35bc1807e0bd9014cd6aa9374b6899f164fa86"; - sha256 = "146ygql276bhb0inbn7bri7jnaxr4d8082ca0k1sal3fcd37a9mn"; + rev = "4214211675bfa5c4dbe1dd5147eeeb9789aeb023"; + sha256 = "19v9nnlr3h9ci30az6s9fq8jkg7mnhalrifaybph6465yfd0p9iv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal"; @@ -50599,8 +51281,8 @@ version = "20170105.1723"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "5e35bc1807e0bd9014cd6aa9374b6899f164fa86"; - sha256 = "146ygql276bhb0inbn7bri7jnaxr4d8082ca0k1sal3fcd37a9mn"; + rev = "4214211675bfa5c4dbe1dd5147eeeb9789aeb023"; + sha256 = "19v9nnlr3h9ci30az6s9fq8jkg7mnhalrifaybph6465yfd0p9iv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link"; @@ -50793,11 +51475,11 @@ org-parser = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-parser"; - version = "20170528.1324"; + version = "20170703.1738"; src = fetchhg { url = "https://bitbucket.com/zck/org-parser.el"; - rev = "c4870192ea24"; - sha256 = "04s39zfa1gwn6zclgdhz3b9fbgyqlbysh6hsn7iqkwfzkpmc2n9c"; + rev = "e8c81e633595"; + sha256 = "1zwwn0xwpq8iscl0cznq3cxcr7kpwrxl6w9v2nrxjs3lffzyzl7a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/28d55005cbce276cda21021a8d9368568cb4bcc6/recipes/org-parser"; @@ -50810,21 +51492,21 @@ license = lib.licenses.free; }; }) {}; - org-password-manager = callPackage ({ fetchgit, fetchurl, lib, melpaBuild, org, s }: + org-password-manager = callPackage ({ dash, fetchgit, fetchurl, lib, melpaBuild, org, s }: melpaBuild { pname = "org-password-manager"; - version = "20170124.549"; + version = "20170701.919"; src = fetchgit { url = "https://git.leafac.com/org-password-manager"; - rev = "a982506652a2f5f4afeb338238e724d361cbc74d"; - sha256 = "0x9f0vlgawbvga56yj95pdcx1j9r51ax76xsbbyrir0iyawgh258"; + rev = "b2814d26287f2b6295a39098da9f5e2fbc5f2de2"; + sha256 = "1pzlmy5vry9q898r4chgn6qp6s1ajlkv946lhn6z7qpdspvy9kyy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02ef86ffe6923921cc1246e51ad8db87faa00ecb/recipes/org-password-manager"; sha256 = "0n07k2nng3zkrcif85f1r2g2l4vha78lmrdnj590axn7l5q5fidm"; name = "org-password-manager"; }; - packageRequires = [ org s ]; + packageRequires = [ dash org s ]; meta = { homepage = "https://melpa.org/#/org-password-manager"; license = lib.licenses.free; @@ -51007,12 +51689,12 @@ org-recent-headings = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-recent-headings"; - version = "20170604.1353"; + version = "20170703.1625"; src = fetchFromGitHub { owner = "alphapapa"; repo = "org-recent-headings"; - rev = "9b373ddafe33283ed9a41bddc65f05d6e9bfcda6"; - sha256 = "0k92z02dyzax35wx7q5s9zasmkba9vzb2y7jf55jn8d7qjdw4lnn"; + rev = "b3d6e3514b57aba7be4de676d1aa92c19e08cd42"; + sha256 = "0367kkyxnkbgk3w0qvbl9xqxn5mbwpsj7qxf4s0c4jhdw2sk3k20"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/668b79c179cbdb77c4049e7c620433255f63d808/recipes/org-recent-headings"; @@ -51032,8 +51714,8 @@ src = fetchFromGitHub { owner = "gongo"; repo = "org-redmine"; - rev = "4cdf9a2aea8420befd2d667d98f63c386f3e44f7"; - sha256 = "0fvzrc8k67di5qyzh13ly5wx6m34rg980yl2rqp5d3vvw8mbbsqw"; + rev = "e77d013bc3784947c46a5c53f03cd7d3c68552fc"; + sha256 = "06miv3mf2a39vkf6mmm5ssc47inqh7dq82khsyc03anz4d4lj822"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/017a9dd8029d083ca0c1307f2b83be187c7615e5/recipes/org-redmine"; @@ -51049,12 +51731,12 @@ org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, pdf-tools, s }: melpaBuild { pname = "org-ref"; - version = "20170611.1357"; + version = "20170714.808"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "b84634891be4323ccba938dc68b971150ae9a609"; - sha256 = "1m8g9laf2fij5vm3sqb087323gqncnww35jx8bbn888zjzxnsiy9"; + rev = "208a7beb0f8d4f7830d1d801776acd99c723e87d"; + sha256 = "0vf75sk3ik9vfqbr30yn9fn8ab7rc60y5vaiipvx9p6mgh6vhcad"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -51162,6 +51844,27 @@ license = lib.licenses.free; }; }) {}; + org-static-blog = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-static-blog"; + version = "20170706.646"; + src = fetchFromGitHub { + owner = "bastibe"; + repo = "org-static-blog"; + rev = "9dea733006ae53902e6ec91fb11ff058229afe84"; + sha256 = "0gyhhcr54myg0r4pjc5z4mkmpc2xnw3ymykz3m0sm589q1i1ym34"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e0768d41a3de625c04ac8644ef2e05f17ee99908/recipes/org-static-blog"; + sha256 = "07vh2k7cj0cs1yzfmrrz9p03x5mbfh0bigbl93s72h1wf7i05rkw"; + name = "org-static-blog"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/org-static-blog"; + license = lib.licenses.free; + }; + }) {}; org-sticky-header = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-sticky-header"; @@ -51207,12 +51910,12 @@ org-sync-snippets = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-sync-snippets"; - version = "20170319.902"; + version = "20170614.641"; src = fetchFromGitHub { owner = "abrochard"; repo = "org-sync-snippets"; - rev = "80d89985ae52c3adf445deba851b6eadc794eef3"; - sha256 = "0vgq51im5124f7qzbqbyfyv4qbhjw4z4q1ksz3p5axd9hgir6520"; + rev = "e96bc94ff8865b4d408d90c4f3e39cc7cbb6cec8"; + sha256 = "0913klrly2xb1pxh91yvvfpzpackxn7sqpsajf4q8adbnlkn0w96"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96aff3f39adfa0c68aca8ff8d3b11fbfd889327e/recipes/org-sync-snippets"; @@ -51522,12 +52225,12 @@ org2blog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, metaweblog, org, xml-rpc }: melpaBuild { pname = "org2blog"; - version = "20170611.1836"; + version = "20170627.1750"; src = fetchFromGitHub { owner = "punchagan"; repo = "org2blog"; - rev = "256c0af68004fde8cf35d4824acb938803b10e7c"; - sha256 = "17ib0rsfdw3krvvz9gmfsqsn9gagqlvwh0ydfyaqpdiq9q2nllbs"; + rev = "e266ff4296661de520b73e6e18f201fb6378ba05"; + sha256 = "030fwgwn2xsi6nnnn4k32479hhmbr4n819yarr3n367b29al2461"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org2blog"; @@ -52194,12 +52897,12 @@ ox-asciidoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-asciidoc"; - version = "20160120.523"; + version = "20170622.346"; src = fetchFromGitHub { owner = "yashi"; repo = "org-asciidoc"; - rev = "da5f66d881c79cc780290d80caa528c1dd219509"; - sha256 = "03ivnvqxc5xdcik4skk32fhr686yv2y5mj8w7v27dhyc0vdpfhvy"; + rev = "83cc8afad239bf386832e1da49fa273ab5a3e466"; + sha256 = "0slv4mp9vlazzd4c503zvqx66dxl6qwr9qrdi1grmshq0vnfxlyb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b268064f09ae5c3d15064b7d197c7af767fb278/recipes/ox-asciidoc"; @@ -52240,8 +52943,8 @@ src = fetchFromGitHub { owner = "jkitchin"; repo = "scimax"; - rev = "2080e5fcbce8147ef6931457c678309f7a679c49"; - sha256 = "0kmga1zm8zyby9yrczybrqm0gj56lk29v2nan4rhzhfnb87v9r28"; + rev = "7ae7bc8bc84ffe0351e23a8a5dc72a18874bee61"; + sha256 = "0pzpy02rffgydgbdq6khk4y2hxwx744nvi84i95h98hb1ld1ydk2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip"; @@ -52278,12 +52981,12 @@ ox-gfm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ox-gfm"; - version = "20170304.1504"; + version = "20170628.1402"; src = fetchFromGitHub { owner = "larstvei"; repo = "ox-gfm"; - rev = "47c466b660ec184af70589df1c3a26d90241cd1c"; - sha256 = "0jwk7nrdc09mrmwc6myyhlnqq4fap15s8spbzl78zsw3kf89n4vs"; + rev = "99f93011b069e02b37c9660b8fcb45dab086a07f"; + sha256 = "0drdypmgxk3238hmkqw9s3cw9wv94cyfqar5ar0bv0k69s92pxj8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/10e90430f29ce213fe57c507f06371ea0b29b66b/recipes/ox-gfm"; @@ -52464,22 +53167,22 @@ license = lib.licenses.free; }; }) {}; - ox-pandoc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, org }: + ox-pandoc = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, org }: melpaBuild { pname = "ox-pandoc"; - version = "20161125.35"; + version = "20170706.431"; src = fetchFromGitHub { owner = "kawabata"; repo = "ox-pandoc"; - rev = "d9cf410096fb27be8eb13b2207697f8530f62abf"; - sha256 = "0c8nfvh9vn850i3minfqvri2py48ycgz3sf5p1l0a3k98s4x4jl3"; + rev = "1dd4370f52b6db999f3b5edbb146c26034024ef4"; + sha256 = "0cm1a83jblrp76z5a9hmicsq2b3i5xwpyy1d08ahk0hffq0mbimq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92f89a923d877c9dea9349a5c594209cb716bf18/recipes/ox-pandoc"; sha256 = "0wy6yvwd4vyq6xalkrshnfjjxlh1p24y52z49894nz5fl63b74xc"; name = "ox-pandoc"; }; - packageRequires = [ dash emacs ht org ]; + packageRequires = [ cl-lib dash emacs ht org ]; meta = { homepage = "https://melpa.org/#/ox-pandoc"; license = lib.licenses.free; @@ -52782,12 +53485,12 @@ package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-lint"; - version = "20170608.1006"; + version = "20170709.120"; src = fetchFromGitHub { owner = "purcell"; repo = "package-lint"; - rev = "bef9e37fd8a9cb726e9b8a0e28baddc773a65912"; - sha256 = "10h6zlyhaw8waxd6g1x2xqprq0y9prl3jgndhgnmlq7zcmh7fjrd"; + rev = "4e4b34fc4f12ef2f7965fa959c5809aacdb6af63"; + sha256 = "036gvgh97ng8l8srq4jgjil6na15fy4h7w7aljxx6wkmaik7nvg7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint"; @@ -53303,12 +54006,12 @@ parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parinfer"; - version = "20170430.321"; + version = "20170710.821"; src = fetchFromGitHub { owner = "DogLooksGood"; repo = "parinfer-mode"; - rev = "f5de68ae43a93f537f6f6b2266ba3952b56ccf2f"; - sha256 = "1g8bjlw0ygwjsf9p8r48bml7zw4jybb2g3r8a7qq5k75dz81k4f7"; + rev = "23ac701e2a1a1364ca96d267437c3413986a4497"; + sha256 = "1kbwmdhv8fpw613yk8sgh3yz4rcrh2aygqkv3c46d5fr0xm04a80"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer"; @@ -53384,15 +54087,36 @@ license = lib.licenses.free; }; }) {}; + pasp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "pasp-mode"; + version = "20170711.516"; + src = fetchFromGitHub { + owner = "santifa"; + repo = "pasp-mode"; + rev = "2d7307b7483eaf6030497c83dea39207cf843638"; + sha256 = "1nxrad0mg1ywcjhh7npbnz69bxf44ih51f74m040mnvmmd15jw3q"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f3c1bbfc6b3a60f8bb4f0ee77ec4108e9d3f458b/recipes/pasp-mode"; + sha256 = "0aix8siyd5yhgxq94k1sl64a9q2xlfrz6cj9y5mcqhb6qjgmrnva"; + name = "pasp-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/pasp-mode"; + license = lib.licenses.free; + }; + }) {}; pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store }: melpaBuild { pname = "pass"; - version = "20161111.1320"; + version = "20170717.145"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "pass"; - rev = "b4c3bd9130044c4e106bac5ba73a50822865e258"; - sha256 = "0na895x91a37wmdpqp545qvjh34d0vfq4dyxji7casdrdhx3bg16"; + rev = "888bd9593f9239f28adab6d93fcdeec69bdf63ed"; + sha256 = "0z1j3cfsh8cksv6l5fbzp6f72d5874kmg7i6agmab9ixjvgg0izc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass"; @@ -53530,6 +54254,27 @@ license = lib.licenses.free; }; }) {}; + paste-of-code = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: + melpaBuild { + pname = "paste-of-code"; + version = "20170709.1655"; + src = fetchFromGitHub { + owner = "spebern"; + repo = "paste-of-code.el"; + rev = "92d258e8ec98598d847ecab82903f9224c7c2050"; + sha256 = "1bf2d0i726psjwnqdp0w4h0qk7fnwcbwf1a66q7p8vczavqygfan"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b29a5101bb6fc01b8b6e1b798ce6f73bc6d34944/recipes/paste-of-code"; + sha256 = "0wjcchpp1689arfz6s7gfq4bxn0svz6qj5azvjwwsyzais1bicdi"; + name = "paste-of-code"; + }; + packageRequires = [ emacs request ]; + meta = { + homepage = "https://melpa.org/#/paste-of-code"; + license = lib.licenses.free; + }; + }) {}; pastebin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pastebin"; @@ -54308,12 +55053,12 @@ perspeen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }: melpaBuild { pname = "perspeen"; - version = "20170312.19"; + version = "20170711.2304"; src = fetchFromGitHub { owner = "seudut"; repo = "perspeen"; - rev = "f093cfecde0e8ce0d5e390784c228831536aef72"; - sha256 = "0gb8f23ls2f5zj9a9q3i39775g3zijwdnbl7gyqi4hi5v90rb0s4"; + rev = "d69a7bb554d6eb003b7c5c222cbdbaacc7e01df0"; + sha256 = "1r3c352i4vkzqi5rcyniaa2x05jjpq9x8j43bbs4m63lczik75mz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/perspeen"; @@ -54581,12 +55326,12 @@ phi-search-migemo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, migemo, phi-search }: melpaBuild { pname = "phi-search-migemo"; - version = "20150116.506"; + version = "20170618.221"; src = fetchFromGitHub { owner = "zk-phi"; repo = "phi-search-migemo"; - rev = "57623e4b67ee766cbb299da00a212f3ebf7d6fb0"; - sha256 = "1k8hjnkinzdxy9qxldsyvj6npa2sv48m905d1cvxr8lyzpc5hikh"; + rev = "308909ebfc8003d16673f97ca9eb26a667b72969"; + sha256 = "07pi72jnd6k5xj9ypmxa0pbb03r07safpgf8vlp1m0xda5ixl0wf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b78e07146a4e954e050349a1798ac46ecba10bab/recipes/phi-search-migemo"; @@ -54749,12 +55494,12 @@ php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-mode"; - version = "20170609.1728"; + version = "20170621.2242"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "dc30cb8110f395fffbc42c6271141887a0c0ec60"; - sha256 = "1zgyy3mnn6sciy0ml2l0crfqy9mlcy1iqck5kracbbz41ygigsqy"; + rev = "3a9076b6f6146326c1314c580acddce9cbb5a290"; + sha256 = "11ily856xk6i00hqfvfxwjch77sigb5lym10dj0zj689gp8jd0wc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; @@ -55232,12 +55977,12 @@ plain-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "plain-theme"; - version = "20170505.800"; + version = "20170625.1100"; src = fetchFromGitHub { owner = "yegortimoshenko"; repo = "plain-theme"; - rev = "1e484668cf272ab1883cb3c1ad9e1e8639de395d"; - sha256 = "0qhr8mch5fvy5gck5prradlrnx84h6n8nvrcqk6ynqd1nh0pnnzd"; + rev = "7c376f5bf9d653bf12e414176284736cbdd19108"; + sha256 = "12fjas93if4dqarj5g1bjvwxv3i3b5xanq6jnnks9f7gkxkbn75a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d7ad3737f081f101500317f7e183be6b1e7e8122/recipes/plain-theme"; @@ -55341,8 +56086,8 @@ src = fetchFromGitHub { owner = "brocode"; repo = "play-routes-mode"; - rev = "ec861ab171fc5513df082d26b96a2e9d545ad64c"; - sha256 = "1yn3270d0djsi7jwxw0arrylsyxkwbwawyw2ifpn6iwzcz55cnxh"; + rev = "22d7b87e0eaf0330f2b2283872f8dc08a3258771"; + sha256 = "0j61adh2lsh2zgz1v9i2jzh56ngnrpvsblipvc472k5dxa5qdxin"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/740cef8687232eb0e2186e8df956c2d4f39575cf/recipes/play-routes-mode"; @@ -55524,8 +56269,8 @@ version = "20170419.303"; src = fetchgit { url = "https://git.savannah.gnu.org/git/gettext.git"; - rev = "a6f9caf8cc7614665d1be694485dd7bc30399e0f"; - sha256 = "0gpbixx68bfxvpx3y9fv0v4kgxwacydkwid6gmh1lgjc65ky0fy7"; + rev = "488bf1c3be5ebe66520f352bfb8d99917878ab42"; + sha256 = "1p81ljxxsxd5dp9xn46zia0sp8d095ib3aaby3yzar55nvdfpl6f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/po-mode"; @@ -55704,6 +56449,27 @@ license = lib.licenses.free; }; }) {}; + poly-ruby = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, polymode }: + melpaBuild { + pname = "poly-ruby"; + version = "20170710.220"; + src = fetchFromGitHub { + owner = "knu"; + repo = "poly-ruby.el"; + rev = "acc0c3cc8d0607edc769b35e19fcd39e8f57d903"; + sha256 = "1gq7rz9s44cf4m9bdapr7rnvincxsp16yci7g3ljq0mpiyl1l2b0"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/68213703359324d09553a2164f1f6ecca7c16854/recipes/poly-ruby"; + sha256 = "0d8s6bl5ynx0r5cwvfkd52rksiq5kdyrgbxds56r8ls6cfkwqngg"; + name = "poly-ruby"; + }; + packageRequires = [ emacs polymode ]; + meta = { + homepage = "https://melpa.org/#/poly-ruby"; + license = lib.licenses.free; + }; + }) {}; polymode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "polymode"; @@ -56127,12 +56893,12 @@ powerline = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "powerline"; - version = "20161121.2320"; + version = "20170708.1442"; src = fetchFromGitHub { owner = "milkypostman"; repo = "powerline"; - rev = "67538e4dbc2f1d2f270142481eb0b0d24e8cde36"; - sha256 = "0jjv6wszsnrdi5l5qz4d50nj6p6zzyvqmn1j31zlhypbvi05isls"; + rev = "8a246902e86a0c59015bb897a9c59be9729ef5c4"; + sha256 = "1q90y0l0vdach8irb9cigw8w5nllvzv5hg8hd8ljpb4j9jhc5y5n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f805053cd4dd9ed53ee0df17ad69429bc62325bb/recipes/powerline"; @@ -56312,12 +57078,12 @@ prettier-js = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "prettier-js"; - version = "20170606.612"; + version = "20170712.2334"; src = fetchFromGitHub { owner = "prettier"; repo = "prettier-emacs"; - rev = "f8ab2e5fb74beaf9e3023baafc118828526c5bb7"; - sha256 = "00gjzw855xa6ahghdlq6yygz6b279xbp47s6vj0rjsyghf65xkf6"; + rev = "9cac36f6b1c224e0772dc92d15a6105ec10d3f40"; + sha256 = "0iwriz14aj5ripnr2v4y96pdl092h93i8mq2qi5jdi31fgi97sjj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/968ac7bb98b385f8542dc150486982c0ded73187/recipes/prettier-js"; @@ -56812,12 +57578,12 @@ projectile-git-autofetch = callPackage ({ alert, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "projectile-git-autofetch"; - version = "20161109.1429"; + version = "20170612.1011"; src = fetchFromGitHub { owner = "andrmuel"; repo = "projectile-git-autofetch"; - rev = "3d4eae6493607b9a0461c5161d195659c268184b"; - sha256 = "1db4jq4vn9mk8c9ma7yma7q00hwhwba25w2hy8jyagyb83lk2zgj"; + rev = "51b40134000a2411c6342e865e63f74c950a9310"; + sha256 = "0g4g4sjinmigyxs1irxv0yg524iq2hy8za09ksm3wbnbfa7w35ml"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fdfdeb69fd78fc1bb2c62392f860a8c434f1762/recipes/projectile-git-autofetch"; @@ -56854,12 +57620,12 @@ projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }: melpaBuild { pname = "projectile-rails"; - version = "20170602.336"; + version = "20170704.2358"; src = fetchFromGitHub { owner = "asok"; repo = "projectile-rails"; - rev = "4e864c75bfbee4a5a1a9c76d3d2a77b2da01fa5f"; - sha256 = "1a0a3hay6ixplk0q6jd2s0hbwxm36zxd5vng3k769cjc8nrsnbix"; + rev = "c917c6e188de27331815f39511ed45a408de22d0"; + sha256 = "11f52g8r5zb34nigm68gm8hwgkw184psknd7zqya0l1ipwkhhrif"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails"; @@ -57124,6 +57890,27 @@ license = lib.licenses.free; }; }) {}; + proportional = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, use-package }: + melpaBuild { + pname = "proportional"; + version = "20170628.137"; + src = fetchFromGitHub { + owner = "ksjogo"; + repo = "proportional"; + rev = "eb2bb2b3d1ca058365049271dc341b1180009f1a"; + sha256 = "1lc3xvkvy5lcy5zralbnwqlxmar443yq735pd023z6di54xm3991"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9e0a7f061df4cce44e5fe98f6e1c31bec4a7338f/recipes/proportional"; + sha256 = "022lhbslzd67wyah8r0gl73vzxgjjwia08l3ssdd08jj3p56m3wx"; + name = "proportional"; + }; + packageRequires = [ emacs use-package ]; + meta = { + homepage = "https://melpa.org/#/proportional"; + license = lib.licenses.free; + }; + }) {}; prosjekt = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "prosjekt"; @@ -57152,8 +57939,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "96095f3a8577cd61ded2191d267cca70f221a9c9"; - sha256 = "1ia0krk66l0cl5bklprdk4bbrzv9j8lszvkakcd0fd9ikcdv68a1"; + rev = "c78dbd7c895b8c80cd2f2401d73acf890edf82c6"; + sha256 = "136l13mq0yki95lra6bvzzq602vhp48nnvw741gf7x34rd4k5kwg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -57190,12 +57977,12 @@ psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, s, seq }: melpaBuild { pname = "psc-ide"; - version = "20170607.1512"; + version = "20170711.511"; src = fetchFromGitHub { owner = "epost"; repo = "psc-ide-emacs"; - rev = "04de7bd8a14ea71eaed568127428b8a44f325b24"; - sha256 = "14dbg9cvph8b0shs49g6sfh5xrzpr9nn7c5rzxsnaaijys3z47rn"; + rev = "0a0ead9f8098afbb2f5648bfbbd5c3b7646a1b77"; + sha256 = "0xfkj9kdd7i0jcca8nhsp7bv0x7wsxi03ncln9y8d7c2g72fjkdd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8189f4e7d6742d72fb22acf61a9d7eb0bffb2d93/recipes/psc-ide"; @@ -57410,12 +58197,12 @@ puppet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "puppet-mode"; - version = "20170528.904"; + version = "20170614.2215"; src = fetchFromGitHub { owner = "voxpupuli"; repo = "puppet-mode"; - rev = "c5a0fc884d0f33c3140585c9c7699ce0bc969f63"; - sha256 = "0s9nza9v1qpjip5zig3374bn5jqw8fsn57ayqymbnp70nxdwcw6n"; + rev = "3ffc2de8416b4ea389d5800a4a05d0885d9a8608"; + sha256 = "0dlss3brh4654avq361yma4xbxsv6q5s8qlhp7v470ix88wx4v8r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1de94f0ab39ab18dfd0b050e337f502d894fb3ad/recipes/puppet-mode"; @@ -57916,8 +58703,8 @@ src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "2e820672609c489458dc2cf39d811e8c10255fe4"; - sha256 = "1nvylps33w5lbxh33qc704rvl998cniwhvwzj1x8fqlsnh1qaxfd"; + rev = "9f7797ae15bd5e4e5c4ad320afcc15eeb4cdae82"; + sha256 = "0p3zmaq0vk5z4ia2i54rjdw4a1d4s9ljb28l48xbb82jmjlgniw7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -57933,12 +58720,12 @@ pytest = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "pytest"; - version = "20161014.815"; + version = "20170614.745"; src = fetchFromGitHub { owner = "ionrock"; repo = "pytest-el"; - rev = "91d8b7fe568527f51c172d6caadaad4f49e53bdd"; - sha256 = "1s2s8bf0r1nidypmqiawj8i6jwb3y3wslgrhr8nzbz8c7lf626s3"; + rev = "013fccd684fc8f2092d6e1ec4203ec574e12051d"; + sha256 = "0yjnq2lyh6jr5xz29n6xxmp4lcy28wrcmw05j0zgcjdshri1pd43"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/33a854a27adbaf57d344340199f90d52747b8450/recipes/pytest"; @@ -58059,12 +58846,12 @@ python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-mode"; - version = "20170605.123"; + version = "20170716.1133"; src = fetchFromGitLab { owner = "python-mode-devs"; repo = "python-mode"; - rev = "17747eaca4e75e17e29fbdceab9380cd4772c4ad"; - sha256 = "0j4xq66gdwnz94wm68xzc88gbaigfxhc035whijl43yxkf9mc14y"; + rev = "4846252fb81c309eb5f7a6aa2dcc04804412c684"; + sha256 = "0zcy7afvyzqmgsn88v5m73bkglnfavhqb4b7fviz355i3waiyfx5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode"; @@ -58101,12 +58888,12 @@ python-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-test"; - version = "20170427.1549"; + version = "20170711.1155"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "python-test.el"; - rev = "7052b5ff1b599ce04800779b283bf4d293a7f223"; - sha256 = "18i0nh4qslbnj106hnxjmzgyg1gwyv2k968xwna73lzp7d4ykaq4"; + rev = "196efba6dae286e0719bc5993ee23e01db9a0912"; + sha256 = "00hbwy0cnv2v1djncijmbsdxddd48p4g0mfr4nn83203243hvbn0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0ea68b3aa9c057e81a3e90a359a38ac16cb26c2f/recipes/python-test"; @@ -58290,12 +59077,12 @@ quelpa = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build }: melpaBuild { pname = "quelpa"; - version = "20170205.2155"; + version = "20170620.2318"; src = fetchFromGitHub { owner = "quelpa"; repo = "quelpa"; - rev = "a39ab429d6544dff17e933f8d98530da4f8c636f"; - sha256 = "002r4vc2a5yjm448xsk2dsfzm9p1whiwrcb0pccyy2597ba87w55"; + rev = "dbb57da3eba3b5a04ab9b5184634ec139d68ddcd"; + sha256 = "1jszkgf9rkkjscfaijbz84kpbpw46p15zvlvfmvil30gs5vp2pk4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7dc3ba4f3efbf66142bf946d9cd31ff0c7a0b60e/recipes/quelpa"; @@ -58500,12 +59287,12 @@ racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "racket-mode"; - version = "20170607.737"; + version = "20170617.1942"; src = fetchFromGitHub { owner = "greghendershott"; repo = "racket-mode"; - rev = "02fe949875a7db935693af7d20109d29521b4276"; - sha256 = "0aqv9j36abmhd82fd443khaj3i4mww5xs4f9p3d65glg07wm2j7q"; + rev = "9c5bcb7b7db979b34c6e99ade84b443651d62ab7"; + sha256 = "1cxpjkds24afi5b9i13dkgzv0yy6cgg3r9vsrif8mfhhfrr7sx1y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode"; @@ -59064,6 +59851,27 @@ license = lib.licenses.free; }; }) {}; + rdxmk = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "rdxmk"; + version = "20170629.1834"; + src = fetchFromGitHub { + owner = "jsalzbergedu"; + repo = "rdxmk"; + rev = "e78749fb29738365ffa4d863ffabeb969ebb0bcf"; + sha256 = "0gwlqjk84ih89c2ckx0rrw07jgwd32wfwj4mibchdrn0ai891md0"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/db54339795e0519f154328e54d47a7a0c80afc71/recipes/rdxmk"; + sha256 = "14iavsgqp28y2ykgly8x69sny34r32dl4bpb47m921vk5n4y6zky"; + name = "rdxmk"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/rdxmk"; + license = lib.licenses.free; + }; + }) {}; react-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "react-snippets"; @@ -59172,12 +59980,12 @@ realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }: melpaBuild { pname = "realgud"; - version = "20170603.1430"; + version = "20170712.334"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-dbgr"; - rev = "3d0fcb80eb017ee2277440d688bf366af3bcdf6f"; - sha256 = "1i71z36hk46w50c9p4b078rqlh4bvwb3dcylhfcwnp4b8j02f31p"; + rev = "ad333ac5e95f7e0c98cb4bc4c924ca9fff97cc88"; + sha256 = "1yng0fj9zr57jwmaxk71vxlwpxahyc4iadyyj5v8c09a4ljvlfs6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud"; @@ -59510,12 +60318,12 @@ redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "redprl"; - version = "20160912.1847"; + version = "20170712.903"; src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "e0d467cfc50546d88f286383ea8ab54aa36cd5a9"; - sha256 = "1lyj4h2qpl88hwxfrk2f1vr729bdyr5vvm8ra8p73rcz40zwdamr"; + rev = "a2f8c5612a055882db5c01b8160c0ae1bd44f1e1"; + sha256 = "0glnribgqg6hg3ghb5saf26hwydmsg51aq45wj8mdf5dfncimqq8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -59778,27 +60586,6 @@ license = lib.licenses.free; }; }) {}; - relative-line-numbers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "relative-line-numbers"; - version = "20161112.2151"; - src = fetchFromGitHub { - owner = "Fanael"; - repo = "relative-line-numbers"; - rev = "38b5f9065aec008d9ad94fe5597338463aa1aa63"; - sha256 = "00ixh7siyc8m7j6hfaxnnl3ynfhzkccpjfc89v8bp3z83m4v269w"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4a2901c841d221bd782dae9059a070ae8130e1ae/recipes/relative-line-numbers"; - sha256 = "0mj1w5a4ax8hwz41vn02bacxlnifd14hvf3p288ljvwchvlf0hn3"; - name = "relative-line-numbers"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://melpa.org/#/relative-line-numbers"; - license = lib.licenses.free; - }; - }) {}; relax = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "relax"; @@ -59844,12 +60631,12 @@ remember-last-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "remember-last-theme"; - version = "20170304.29"; + version = "20170619.1433"; src = fetchFromGitHub { owner = "anler"; repo = "remember-last-theme"; - rev = "14b4b5a03bb59b4e7040da96d7c261ee8f7884e9"; - sha256 = "069bzswwaq1disnq0j49c3xq69xrz7rn6z3zc0cv2cspn2hk1x5p"; + rev = "57e8e2a475ea89316dbb5c4d2ea047f56a2cbcdf"; + sha256 = "0sb110rb6pnjnvyqn0kji19bhbn8mk4x32yps00aq2g2v9pc1jzr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/26edcdddaf8dc8c9a18d6b007e0d49d04fe4ccca/recipes/remember-last-theme"; @@ -59865,12 +60652,12 @@ repeatable-motion = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "repeatable-motion"; - version = "20150629.1112"; + version = "20170620.1148"; src = fetchFromGitHub { owner = "willghatch"; repo = "emacs-repeatable-motion"; - rev = "e664b0a4a3e39c4085378a28b5136b349a0afb22"; - sha256 = "007lqahjbig6yygqik6fgbq114784z6l40a3vrc4qs9361zqizck"; + rev = "77aa35b27c8a76dc8deef87c9f71ef7e6fd289ee"; + sha256 = "0pm9z0w402430j66167s1az37jxw89sck1b7lm9gjnc3gslh0lpm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0dd56ebaea098715b9c201f07e6196c38977f8e3/recipes/repeatable-motion"; @@ -60115,12 +60902,12 @@ resize-window = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "resize-window"; - version = "20170329.1644"; + version = "20170704.2212"; src = fetchFromGitHub { owner = "dpsutton"; repo = "resize-window"; - rev = "e4879731f3a3bc2261d6ec465bff01f88bd77d1d"; - sha256 = "0lhf1sk1gx0vpy038bdnmlqjzpg4kchlladihk36pv4hgqn5r9w7"; + rev = "dcbbd30f4f4435070a66a22c5a169b752ca9f904"; + sha256 = "0x2kkf7bdj9s3993kdz74igi80rqma0w3hi7aggf0zwllqdcnzvk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/601a8d8f9046db6c4d50af983a11fa2501304028/recipes/resize-window"; @@ -60157,12 +60944,12 @@ restclient = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "restclient"; - version = "20170516.137"; + version = "20170715.440"; src = fetchFromGitHub { owner = "pashky"; repo = "restclient.el"; - rev = "07a3888bb36d0e29608142ebe743b4362b800f40"; - sha256 = "00lmjhb5im1kgrp54yipf1h9pshxzgjlg71yf2rq5n973gvb0w0q"; + rev = "afcd8dbd6adc6f7cecea4e5489b5dfe392e7cd8c"; + sha256 = "1q3ipirc6prhgha23jy1w4kd2bmcj9qsy5d5q0q4qxmqnbzwlcpn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient"; @@ -60182,8 +60969,8 @@ src = fetchFromGitHub { owner = "pashky"; repo = "restclient.el"; - rev = "07a3888bb36d0e29608142ebe743b4362b800f40"; - sha256 = "00lmjhb5im1kgrp54yipf1h9pshxzgjlg71yf2rq5n973gvb0w0q"; + rev = "afcd8dbd6adc6f7cecea4e5489b5dfe392e7cd8c"; + sha256 = "1q3ipirc6prhgha23jy1w4kd2bmcj9qsy5d5q0q4qxmqnbzwlcpn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient-helm"; @@ -60260,12 +61047,12 @@ reverse-im = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "reverse-im"; - version = "20170611.2334"; + version = "20170623.640"; src = fetchFromGitHub { owner = "a13"; repo = "reverse-im.el"; - rev = "341e1d7955d9b25778a0e28921abc4d31704ec3b"; - sha256 = "1mcggccv75v9xrd1i1x2csjnk432ws2h93bh5y4wm3sp3ky8lg6d"; + rev = "da6a4d2fdc1019e7fcd050db6c5344fdad1e2286"; + sha256 = "1vsfxy4scknn5142mn4v1hkj2qbphmwdj175prd1aj1gk8cbzw9v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f282ebbed8ad01b63b0e708ab273db51bf65fdbb/recipes/reverse-im"; @@ -60384,12 +61171,12 @@ rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }: melpaBuild { pname = "rg"; - version = "20170603.1202"; + version = "20170622.1135"; src = fetchFromGitHub { owner = "dajva"; repo = "rg.el"; - rev = "fa63228680add9b30735fec571a3eea572345914"; - sha256 = "0bh23avfdcadfx2awkbd0mld54g6ir0bg1szbwi8m0w9pwa4w4mk"; + rev = "09a5919d8982cfdb8496f0db7deccfb510a7f000"; + sha256 = "1jvinpid3w4p6s4ni0fhg4g8xc3m0c7rd3db2al214xfcn4mbbgr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; @@ -60552,12 +61339,12 @@ rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "rjsx-mode"; - version = "20170422.832"; + version = "20170710.711"; src = fetchFromGitHub { owner = "felipeochoa"; repo = "rjsx-mode"; - rev = "b41de6c1b2f6668b674f8e5bf880f697c9ffb749"; - sha256 = "1irc26kg5f22x3g48pmb1mwchivwyn41khphpgwqfjnvasz1idw9"; + rev = "a0a9cfd532f05f9ccb42919b9105d8e902d971fd"; + sha256 = "1gbgm00arfkgvp8gihpn1zf69lp4a5glhvrawnma6kraf5ldx0fs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode"; @@ -60636,12 +61423,12 @@ rope-read-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rope-read-mode"; - version = "20170325.831"; + version = "20170620.237"; src = fetchFromGitHub { owner = "marcowahl"; repo = "rope-read-mode"; - rev = "66c02e3efab84e12c2857cb2b56d524e98b7bc87"; - sha256 = "1hmp7k17q5d5i6286x99jmfq954d9ys5347xk3aph9m5pmybvfrf"; + rev = "bbb67d54a31ce238e4a8b1aae677ef055aea27ba"; + sha256 = "1l00km1rrnybskv0rv0kqxdrqimmfwz4mmil64m2d6vl0nqickb0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14a674559aa485e92357a8b941304ae8167b9c3e/recipes/rope-read-mode"; @@ -60783,12 +61570,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "20170527.450"; + version = "20170714.1944"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "d6af2ad09c99f9c58900665e874dcf97a545c0fa"; - sha256 = "12p22b9q4rkl7jswg12gqc8751sinzgj8h75jjzrggd0vfsg439a"; + rev = "65c8f03ff0112ce5c5e11aff6867ad0eb9019e63"; + sha256 = "0xlacwjmvx5xd8m7yi8l8mqi0lqs2gr2hmjag2frvmxcn4cpb4gc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; @@ -60849,7 +61636,7 @@ version = "20161115.2259"; src = fetchsvn { url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "59070"; + rev = "59350"; sha256 = "18fkx4a8jarznczv3h36663dqprwh6pyf76s3f210cqqy8c5y5yi"; }; recipeFile = fetchurl { @@ -60930,7 +61717,7 @@ version = "20150424.752"; src = fetchsvn { url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "59070"; + rev = "59350"; sha256 = "18fkx4a8jarznczv3h36663dqprwh6pyf76s3f210cqqy8c5y5yi"; }; recipeFile = fetchurl { @@ -61112,6 +61899,27 @@ license = lib.licenses.free; }; }) {}; + rufo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "rufo"; + version = "20170712.824"; + src = fetchFromGitHub { + owner = "danielma"; + repo = "rufo.el"; + rev = "e827b44c8093715a204ed0e4a64ade34441f9355"; + sha256 = "14qf3napgx8vycr0igrr8534yymgaqh2cb09iz7gbf65cmk86pq8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/123b89e06a44ef45150ca7243afc41302dfb6c6e/recipes/rufo"; + sha256 = "0pxsifcxic3q54rqj0jbj20hq7f2s4icl57lligf9g0w23qzj239"; + name = "rufo"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/rufo"; + license = lib.licenses.free; + }; + }) {}; runner = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "runner"; @@ -61178,12 +61986,12 @@ rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rust-mode"; - version = "20170606.457"; + version = "20170712.1214"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-mode"; - rev = "ac6a45e6091c0d542b696b6e13551be7e333264a"; - sha256 = "0hba3djxzgpk13xcfz51s0qlv9415q8701pkw9qq974fxqpcrawl"; + rev = "60a1f36f4111e825d20d9c3aed561981c470806a"; + sha256 = "0p09j3y90i0ninyr3alxra17r09ps4sj9klww638l9csk2cgw80f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode"; @@ -61364,22 +62172,22 @@ license = lib.licenses.free; }; }) {}; - salt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-jinja2, mmm-mode, yaml-mode }: + salt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-jinja2, mmm-mode, yaml-mode }: melpaBuild { pname = "salt-mode"; - version = "20170611.420"; + version = "20170702.246"; src = fetchFromGitHub { owner = "glynnforrest"; repo = "salt-mode"; - rev = "bfcfa72093974f36635413a845e7a5df7c5ea974"; - sha256 = "1x974csw8xyd90xf8ns5h6c0s9fszy02hdmcdax6ywi8vxksmjsy"; + rev = "ea4980b9c9e8e7570086a2558fe7f66c62a528ad"; + sha256 = "0ygi9kzkfqzizygaqwqpymn8s7kr8ci38v61qmy4n58n9c19fdwx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9dcf1a93a06fc42581521c88cfd988b03bedc000/recipes/salt-mode"; sha256 = "1n7i9d6qpjsdcgbzmbf63y4c7ggxh5wsim8fd0casnrq9bl7ssym"; name = "salt-mode"; }; - packageRequires = [ mmm-jinja2 mmm-mode yaml-mode ]; + packageRequires = [ emacs mmm-jinja2 mmm-mode yaml-mode ]; meta = { homepage = "https://melpa.org/#/salt-mode"; license = lib.licenses.free; @@ -61556,12 +62364,12 @@ sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sbt-mode"; - version = "20170530.355"; + version = "20170708.1211"; src = fetchFromGitHub { owner = "ensime"; repo = "emacs-sbt-mode"; - rev = "736da7f466aad2b64c846ece258082c6aac647ae"; - sha256 = "0idj4p3d36yp0irp1yfbihq8mf17jc7facz5qy6kx7zj0wdx4fjw"; + rev = "cee28b5e6121e6c85bb647b709c7a8c9e3883700"; + sha256 = "1f5xkcr9kj5nwqh77hfxbs2i9zzsikbksa56lg9vw67pc78rs7vi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode"; @@ -61581,8 +62389,8 @@ src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "0b7aaa108710b2f197cbcb32fdb3ae12ff121747"; - sha256 = "1yp382s4jxbyn646mv245gm5c2h1n734r8qzrspimipr79mrbklk"; + rev = "a6e98831985be670148c527747b0e91330d0307b"; + sha256 = "0yyacg09p74r4q56kqw3km6sqwnk2hpzxqi9jvbw10x2q2c618bk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -61807,12 +62615,12 @@ scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scratch"; - version = "20170523.2046"; + version = "20170614.1401"; src = fetchFromGitHub { owner = "ieure"; repo = "scratch-el"; - rev = "3363e861cf7c135873ccf273f759d72dd0bb5854"; - sha256 = "0k4y7kqd7izaqpa0xmp7ag84vpnrgz5mi6cgh5ap1vspxg3pycz4"; + rev = "2cdf2b841ce7a0987093f65b0cc431947549f897"; + sha256 = "0wscsndynjmnliajqaz28r1ww81j8wh84zwaaswx51abhwgl0idf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b46813f928eadfa08a1d4bf94ceeb96dbc2a7c72/recipes/scratch"; @@ -62140,10 +62948,10 @@ }) {}; second-sel = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "second-sel"; - version = "20170307.946"; + version = "20170702.729"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/second-sel.el?revision=28"; - sha256 = "1sgwza2ka3iqsajnppq2vd150h1wbkzzi04rk7bzpqj32dyh7gbx"; + url = "https://www.emacswiki.org/emacs/download/second-sel.el?revision=29"; + sha256 = "1yq06a04j44r019cjv2jb3kfpfqhnxdf3b4hhz4d3fz7v1hsicwg"; name = "second-sel.el"; }; recipeFile = fetchurl { @@ -62222,12 +63030,12 @@ sekka = callPackage ({ cl-lib ? null, concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "sekka"; - version = "20170309.543"; + version = "20170618.500"; src = fetchFromGitHub { owner = "kiyoka"; repo = "sekka"; - rev = "987c1cce65c8f30b12cdb5991e1b1ad9da766916"; - sha256 = "03930cfqq97f7m6z9da2y9388iyymc56b1vdrl5a6mpggv3wifn7"; + rev = "282bb04ed524ceff2a7a13cee118ec6df55b2323"; + sha256 = "1g15lrx3ik6539vc5f8v3x0va6k02zz5l13jnqlzs1fl4inxk35v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka"; @@ -63225,12 +64033,12 @@ shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shx"; - version = "20170610.1147"; + version = "20170714.1041"; src = fetchFromGitHub { owner = "riscy"; repo = "shx-for-emacs"; - rev = "8b7de952da37f1c04fa1bdf8f54c1cfb6a7c2a8f"; - sha256 = "176rhjyh9f3scbwjkw8h64dbamfcczwjpwv3dpylmjaqzwmfsal3"; + rev = "fc98dd68f1562cf9c10a0245274c24f280f59da2"; + sha256 = "16d2l0vfrsv878w908mfi0m0raab96zxi4559a1589y7lzah2nrd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx"; @@ -63581,12 +64389,12 @@ simplenote2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred }: melpaBuild { pname = "simplenote2"; - version = "20170317.335"; + version = "20170618.644"; src = fetchFromGitHub { owner = "alpha22jp"; repo = "simplenote2.el"; - rev = "5f267d6289b103d77feb2f038baedeae39deee75"; - sha256 = "07rmwga7qd8g71km5p3g3vjmmiy8cr5snyrvhiwi9lcnai83kc50"; + rev = "78ab3d818633c0d6575cd1895c119bd690003bf6"; + sha256 = "0z9zary8apzjsx031fhy94ggqancm94mjhj335kr743s8zr3511g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ac16abd2ce075a8bed4b7b52aed71cb12b38518/recipes/simplenote2"; @@ -63623,12 +64431,12 @@ skeletor = callPackage ({ cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }: melpaBuild { pname = "skeletor"; - version = "20170413.2030"; + version = "20170616.1746"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "skeletor.el"; - rev = "376958e6e39dcf32df945c617c230dba3bcc076d"; - sha256 = "152kqsbhn1z3nf55vrrz6iv96c4jkzp2bglgp2bqb37nfh722frz"; + rev = "01c330ec115fc29bba5d9bdf6c15beb4a44e2281"; + sha256 = "0i3axni8y4s5n2s7qbqzz3sadcfhr3369q7qn8psk29qbicjw5wv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e63aefc869900c2af6f958dc138f9c72c63e2b8/recipes/skeletor"; @@ -63665,12 +64473,12 @@ skewer-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, simple-httpd }: melpaBuild { pname = "skewer-mode"; - version = "20170122.938"; + version = "20170709.939"; src = fetchFromGitHub { owner = "skeeto"; repo = "skewer-mode"; - rev = "18a90f401451f8ca0486bdaf45647ac3ccebc0ac"; - sha256 = "1y25c3mq5fzlsjjj98p75jxynk1aaj72vp1zi6jrr2g8hay1yi31"; + rev = "51f3bbeafea6701de78190a395f6376a9974f1e5"; + sha256 = "0k8yc75d7hly4qiqxvg027cwmcck63nmbyr75qyjq8kc0vk0x5mr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/10fba4f7935c78c4fc5eee7dbb161173dea884ba/recipes/skewer-mode"; @@ -63749,12 +64557,12 @@ slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }: melpaBuild { pname = "slack"; - version = "20170610.841"; + version = "20170712.2328"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "b020352573a14e452a5c8a18bbd0ab23539a52cc"; - sha256 = "1nqax756ya008glr1qffqa222hcz45grjwfnncsq48k1nj5b0dpf"; + rev = "f89362f31d8c1ee752bfd9d3cc8a6b5766c94bd6"; + sha256 = "0b2j0vvsm6psljdkyybjh5ki6drhvq98xwakifk0li220rsi3lkp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -63812,12 +64620,12 @@ slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }: melpaBuild { pname = "slime"; - version = "20170511.1221"; + version = "20170705.643"; src = fetchFromGitHub { owner = "slime"; repo = "slime"; - rev = "7ccaa81b4266d478ed92003fba097756afc6ae19"; - sha256 = "1l4idfy98qh7c3vaxiv91irhw14nz8h2mvfs3g7j4abv51102kx5"; + rev = "d0fd5c50135c20f172a0d7c69250c2d80d2f51e6"; + sha256 = "0k5s75gmgvnpz07nab55k2fi8whgjqkjr08ym0s57dghhv1qrr5v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime"; @@ -64001,12 +64809,12 @@ slstats = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "slstats"; - version = "20170602.304"; + version = "20170629.235"; src = fetchFromGitHub { owner = "davep"; repo = "slstats.el"; - rev = "07f515f835c92b6be538d2f39dda31ed281f1054"; - sha256 = "12fzcfw4fxf6g0zadzcr8mx46a8x8969shpcmkn0f8ixn014w7ax"; + rev = "3c22a8e5cf022d4eca840fefe7960d7ae6dcf167"; + sha256 = "0ay7319ijqqcan1ijycrz4006r1a50wpnss37rrbiq23nkzjmks4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe7c8c241cc6920bbedb6711db63ea28ed633327/recipes/slstats"; @@ -64355,12 +65163,12 @@ smart-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rich-minority }: melpaBuild { pname = "smart-mode-line"; - version = "20160818.508"; + version = "20170708.1317"; src = fetchFromGitHub { owner = "Malabarba"; repo = "smart-mode-line"; - rev = "3656417ec06ba448f940d65e96bddb57fdc79244"; - sha256 = "1vm96cb693mgzf7x9wl3sy3z90rq4mgbrnhy9hb746ypdpkfd3am"; + rev = "216475320fa43b3c261b8b13b7a1e3d304166a8e"; + sha256 = "1akph66w1xpjkvxpi6dgl1bi0nwx33l25cwyq08g1wbvkjqwib30"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/smart-mode-line"; @@ -64380,8 +65188,8 @@ src = fetchFromGitHub { owner = "Malabarba"; repo = "smart-mode-line"; - rev = "3656417ec06ba448f940d65e96bddb57fdc79244"; - sha256 = "1vm96cb693mgzf7x9wl3sy3z90rq4mgbrnhy9hb746ypdpkfd3am"; + rev = "216475320fa43b3c261b8b13b7a1e3d304166a8e"; + sha256 = "1akph66w1xpjkvxpi6dgl1bi0nwx33l25cwyq08g1wbvkjqwib30"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/60072b183151e519d141ec559b4902d20c87904c/recipes/smart-mode-line-powerline-theme"; @@ -64523,12 +65331,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20170606.725"; + version = "20170716.1328"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "3bc7f1d38a0b5800e62a612e16fe42d9b0c0e11e"; - sha256 = "1xghvmwx66mns3kzk1jw2g08553qqa50h1sq1jg5n2apjl4gprdh"; + rev = "d4445621b88f36a391fc8bfabbed4db08dc88f33"; + sha256 = "0rsnc5b49n3s6k9a1vr1by1iq1ns9ba2l04k3siqr0hjr8jjwa7b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -64883,8 +65691,8 @@ src = fetchFromGitHub { owner = "kyleam"; repo = "snakemake-mode"; - rev = "22b3efd741e26f59e18c9fd28691d8b84c9130ab"; - sha256 = "0hjp5ci7miggw0gs2y8q867gi7p3dq2yyfkckkh52isrp0yvz0wf"; + rev = "8a4da1125dd284e55139084d62fb29af5bcbcc20"; + sha256 = "1c85ycaqyrncp7pbax6mdnz1v91hpi1pc9jspd6irwhhs8b9jxfk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode"; @@ -65051,8 +65859,8 @@ src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-solaire-mode"; - rev = "70e3b9cc171d4d9171c652c6d255bf03dcd0ad9a"; - sha256 = "15plb1gh7wz558008653v1xskz0bby477vvs7d7a752vrd8s6jcr"; + rev = "d2744f8d2d8e1af5d5784021bcb8772e163be800"; + sha256 = "0zsm00lggvmps0krlhyb5vvs0m0kikzmamj9mq5hw3k372jv4djm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/52c69070eef3003eb53e1436c538779c74670ce6/recipes/solaire-mode"; @@ -65089,12 +65897,12 @@ solidity-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "solidity-mode"; - version = "20161017.1506"; + version = "20170712.1442"; src = fetchFromGitHub { owner = "ethereum"; repo = "emacs-solidity"; - rev = "db392f96f8e892b7788ebe25819a8ec195bb376d"; - sha256 = "1x1ljbmrn06pbdcb7kjivbh2f2m29ivwa1ifl4lgi2rh884s27ma"; + rev = "e4aa0190145d5cfad7d3f052ba44c88a1ebb6c7f"; + sha256 = "1dh2av9grij2v179vfr2pric6bxibxbg34ij3488ki9crc2zpv4y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb9df5ec0692352b6494d435d11166f4ea26c99e/recipes/solidity-mode"; @@ -65432,12 +66240,12 @@ spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }: melpaBuild { pname = "spaceline"; - version = "20170530.434"; + version = "20170630.2327"; src = fetchFromGitHub { owner = "TheBB"; repo = "spaceline"; - rev = "d86fc0353cbf1a95df261e40ec5b7292b0d557f3"; - sha256 = "1pj1rdfm2dxri6v2c1m8slpabdmbgqqr0cp23s5w4s39g0mmphvg"; + rev = "e6ccec6c80ee2bbddbad5a88cb9d2cd2db8a1a33"; + sha256 = "0ga99imh00h0bnc4m2q335y0x8zp6xs1n47rqqhxp6iwmw2fz20z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/46e4c876aeeb0bb0d0e81dcbb8363a5db9c3ff61/recipes/spaceline"; @@ -65453,12 +66261,12 @@ spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, spaceline }: melpaBuild { pname = "spaceline-all-the-icons"; - version = "20170605.838"; + version = "20170711.102"; src = fetchFromGitHub { owner = "domtronn"; repo = "spaceline-all-the-icons.el"; - rev = "bc611779a7a3c10b7367bc8c985923d26ee91443"; - sha256 = "1slnzb26fkmj01hakzbaarlmf2ng4d1zkimgb93axx0svxh03qc7"; + rev = "88661813baefece9899588cb34c633eda606f2ac"; + sha256 = "1qb26ya4f3qd3rh9cpdb02qyqqz6yhgv05b095i9fvwlcbvr4v51"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons"; @@ -65474,12 +66282,12 @@ spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spacemacs-theme"; - version = "20170611.1307"; + version = "20170713.1156"; src = fetchFromGitHub { owner = "nashamri"; repo = "spacemacs-theme"; - rev = "a7e76aeb0a62f986e0469183728407c7bcbf4993"; - sha256 = "17gbrijf62qdk5s02lish5nf6l8mfqrkly98hpkwzz3js4xkykkb"; + rev = "11d6958364271e11c920015c24d509f9bdcce6c9"; + sha256 = "1z6l85459fbfyn266qdz09c57ns8d1650ksicl3li442ffh5s75i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme"; @@ -65558,12 +66366,12 @@ sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sparql-mode"; - version = "20170418.231"; + version = "20170619.255"; src = fetchFromGitHub { owner = "ljos"; repo = "sparql-mode"; - rev = "a51d4e57974e8d06f7d49ada0fdca656b7470642"; - sha256 = "0ywhqk6n5k0l85zjwbnrivnvxjzqipqrggv06lify6yv18qmyl6s"; + rev = "c06eac2abae29ae55794e61ebd06890909edda7c"; + sha256 = "08w88wv3yd1l87zzwlrfj586hh3l2k1xq80f1mzskr7vkzi2ailx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode"; @@ -66058,10 +66866,10 @@ }) {}; sqlplus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "sqlplus"; - version = "20161110.758"; + version = "20170710.150"; src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/sqlplus.el?revision=25"; - sha256 = "04wqy4ss6499rpn0rnczmn39yi78xkqslblyq4xb700xzmzn7sg3"; + url = "https://www.emacswiki.org/emacs/download/sqlplus.el?revision=26"; + sha256 = "19lrk1a9d9ljdnsiar5cgmp68c26b6aihi3rbgf3d5bcg9iqbp7q"; name = "sqlplus.el"; }; recipeFile = fetchurl { @@ -66204,12 +67012,12 @@ ssh-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-config-mode"; - version = "20170603.251"; + version = "20170711.1433"; src = fetchFromGitHub { owner = "jhgorrell"; repo = "ssh-config-mode-el"; - rev = "ba47dd11c5be684595ffa62dbdfdc616ce3eb9d6"; - sha256 = "011n7vyhrawmymkhmr28isk5zvdljj9bhynmfr6v0mi2h7kn79p3"; + rev = "8ce61a22d07cdcb96aa31fa9e5493875f00ad516"; + sha256 = "03lpfj2gq0wl8zsjwdkwk5i6ih2cwcmya55cyw8fs8i19y3zhcyb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/750b16ee631b4c2014f2ebf767609bab4b8ee421/recipes/ssh-config-mode"; @@ -66225,12 +67033,12 @@ ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-deploy"; - version = "20170520.26"; + version = "20170711.725"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "5e86b22d14e34207bf9c0888ac5fe2e782dcf5cb"; - sha256 = "0pirqgvvl7dyhfk5c3hk419mb67qhmgz1qvp124aprdwhnmjd153"; + rev = "ec4661059109f25df41db1800cac7ffc168fdbbc"; + sha256 = "1nqf8nwwb188mlyn8xy8v9qzq3xin2pz6synldf0yr8gac8b7bll"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy"; @@ -67034,12 +67842,12 @@ suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; - version = "20170525.1254"; + version = "20170703.1433"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "13611ca0e4dfb8e6e4a314142368bfa7f0de5b9b"; - sha256 = "0svlf2kgdbhwaygydvwvhinafiwv3qrgyn5wkfpcnz1km30g92hf"; + rev = "59e140248a667127771aa7aa49ee0511c55e8817"; + sha256 = "0j0lrphg97lvyxlchgws7l0n0c76hxh6sbm0c98dvsnki6jgfj72"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; @@ -67366,12 +68174,12 @@ swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "swift-mode"; - version = "20170224.1825"; + version = "20170716.2320"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "e91e924c225b7bfb7aa6e4a84b5d379c6268014a"; - sha256 = "0nfh5a3lnrj9z1qfgdn28mk5f9cn5fzpdjvpcv44kab3dff2irnl"; + rev = "98920962adaaf42698fc847fbe7d9edcd58e50e9"; + sha256 = "0npz0izw6dwiv1kmkbnf6hklmx4w2pqddzb2ijxasrrviyyyc83s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; @@ -67412,8 +68220,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "752ba81f0db3be0568072b3d9a5db458bb647a3c"; - sha256 = "0wzhil3c6g9g7k4dq3l6rsyy9vy3rdnq3igqgw9xzgq6i06a1878"; + rev = "dc146d9f1435b79fbfbfa702f0172b9de05f631d"; + sha256 = "09cfs0rhhb72b12pic2w9chbc000pqnafrl2x0g8v5r065pzp64n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -67471,12 +68279,12 @@ switch-window = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "switch-window"; - version = "20170522.2042"; + version = "20170701.246"; src = fetchFromGitHub { owner = "dimitri"; repo = "switch-window"; - rev = "8d37f5660666516ab6c9e6ec1da748ea1669ed4b"; - sha256 = "19bszzslzz8rprch0z3h6xa6pjhrwik7j53i4kj33w306d58gi3f"; + rev = "f4e3fde4d4717b75716f287577e84b7ee4f33d8d"; + sha256 = "15ks1x62rn0q8lgy4x749mizvanzl9lkzgrsasrdx0v4ydmj3n7c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d2204e3b53ade1e400e143ac219f3c7ab63a1e9/recipes/switch-window"; @@ -67555,12 +68363,12 @@ symbol-overlay = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "symbol-overlay"; - version = "20170604.2240"; + version = "20170615.1919"; src = fetchFromGitHub { owner = "wolray"; repo = "symbol-overlay"; - rev = "3eb0864b65f9fe0e7c98fae7e9bcfd6330c471a0"; - sha256 = "178ny3cbxm2hvmh0f49hvi2m15r72f2by3k076d4rzawab0gnp1p"; + rev = "1c40cd921d573bbbd2cd9770c0bafc484b23a2ad"; + sha256 = "1npgjhjdky298n70n1lh1qi6d1km1d9vy82n2x4rjn45699gkrl8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c2a468ebe1a3e5a35ef40c59a62befbf8960bd7b/recipes/symbol-overlay"; @@ -67700,12 +68508,12 @@ synosaurus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "synosaurus"; - version = "20160812.723"; + version = "20170621.957"; src = fetchFromGitHub { owner = "hpdeifel"; repo = "synosaurus"; - rev = "24d194992d9c57df29256257b80960fdb1c4c2a7"; - sha256 = "022fj1pfbjjl6khzmns9pwigwg1cll3vlccf48i8amk4n1m1wgmc"; + rev = "acc4c634eb7c7f6dd9bce8610efa7fc900e9c47b"; + sha256 = "0q8ggyfzvclgxvma2nvkfc89870hmii9cc8022ff0n7729rfj7m0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/synosaurus"; @@ -67825,12 +68633,12 @@ system-packages = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "system-packages"; - version = "20170311.2357"; + version = "20170710.612"; src = fetchFromGitHub { owner = "jabranham"; repo = "system-packages"; - rev = "ebfb6f9eb46c006a4488c1fbf9f46de48f5a788a"; - sha256 = "199bmzxw6lrby6l9fgm01i92lvzzbz7sqpjrn9jjmpiwr718qxcf"; + rev = "ae993f994ed60a845c5752e90491cf127bb1c052"; + sha256 = "1dp8q82k7s2h3pp6qh4x2hbvq23ykn09mf6ymfy62p8jdavfvcx2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c423d8c1ff251bd34df20bdb8b425c2f55ae1b1/recipes/system-packages"; @@ -67867,12 +68675,12 @@ systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "systemd"; - version = "20170202.1844"; + version = "20170708.1534"; src = fetchFromGitHub { owner = "holomorph"; repo = "systemd-mode"; - rev = "4c1b2befd0c853dcc7bca52d9b084933c3a08254"; - sha256 = "1sdrga3mmajai2jcf4zpcii0l2b9wch8rhdsbjlzx76ia5snp23l"; + rev = "9cfd31533742859fa081b79aceafac315444a4b3"; + sha256 = "0gckwjzqlqyl740r73bh3x5x4wina0irc7krgj2xp68xh4x7nw8y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca810e512c357d1d0130aeeb9b46b38c595e3351/recipes/systemd"; @@ -68160,12 +68968,12 @@ tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tao-theme"; - version = "20170419.1308"; + version = "20170624.1300"; src = fetchFromGitHub { owner = "11111000000"; repo = "tao-theme-emacs"; - rev = "9d2973b20b414cafe6df917bbe4599310d67170b"; - sha256 = "1s5lpba1zn4f48jzbchal6wpm8jz666bmr37l0si04fi4019har1"; + rev = "bf6d718955d56b7cf824f7a60803c94a676ccb95"; + sha256 = "0hkni0dm4s7sgx7zzk88kls8qzmz47b5g1gskp3kxg88b1nbghcw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/94b70f11655944080507744fd06464607727ecef/recipes/tao-theme"; @@ -68185,8 +68993,8 @@ src = fetchFromGitHub { owner = "phillord"; repo = "tawny-owl"; - rev = "37d65c003224b88108d035732bfa729b2a14e8ab"; - sha256 = "1dva713chyv3y4d689a81zpmrk22spvx56lkdmbvq5hfp467kayq"; + rev = "f103ace956d5e7039cf0785d93c2956bd7bea4f4"; + sha256 = "0w82lzig3fy4p59rjj5dgi15mlmx6v4s6vm3z58rj65ql7qfzf88"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c/recipes/tawny-mode"; @@ -68626,8 +69434,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "a4db15583ea15cd7b62c706ea42a38bff9b418fb"; - sha256 = "150snv08wv8fyzp3qif6yvfy1b24rrbdc50vzlz640rmcd6qhk59"; + rev = "3f8a2bc7c2e9a4ac55e8c6f6c60c0634cbe71326"; + sha256 = "104s1mfn6cwi0iqq5ccaca5dzh29gfhfnif8a0mi4qy5ljsp9xng"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern"; @@ -68647,8 +69455,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "a4db15583ea15cd7b62c706ea42a38bff9b418fb"; - sha256 = "150snv08wv8fyzp3qif6yvfy1b24rrbdc50vzlz640rmcd6qhk59"; + rev = "3f8a2bc7c2e9a4ac55e8c6f6c60c0634cbe71326"; + sha256 = "104s1mfn6cwi0iqq5ccaca5dzh29gfhfnif8a0mi4qy5ljsp9xng"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete"; @@ -69144,8 +69952,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "b8ee72de5bf9318d50846852082325d0f932682b"; - sha256 = "0gaiy81zvhx6d7yfnxy0hlpb8q5crg312xhqxbx8lgw0m702k6a3"; + rev = "0dd823580c78a79ae9696eb9b3650e400fff140f"; + sha256 = "1j6pq0gxlfbcfkh9pmfgqpfvdmsd1q4jx384jib12y4g0maxnf2b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -69202,12 +70010,12 @@ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }: melpaBuild { pname = "tide"; - version = "20170609.753"; + version = "20170712.638"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "dda031ba33e1c61674c1c17861abef6b5c37fe28"; - sha256 = "17r7vjpcj4wxq8zxvm5bzm8xg0y29ybgff608s8hq6vkbj5sflm2"; + rev = "329d4541b1aa5f90689e84c925562d3bda708755"; + sha256 = "10rn2lxwir488x1d43bqvsg7la818si0w1qqsf59q79hllzjclg7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -69444,8 +70252,8 @@ src = fetchFromGitHub { owner = "aaronbieber"; repo = "tiny-menu.el"; - rev = "f1fc844f514f57fd93602ff5e00c6125b0e93254"; - sha256 = "125ckmfsvzacd5icsnldcbfl4rkxpfal6qfindy80i84vk0qw47g"; + rev = "05563b94537b6eb22aeddedef2a6e59e3f88d073"; + sha256 = "0k0djq60mwhjiwy9dpy9m9bs507b9p19pdl3g2s8sd9i2fk53rfy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82700c97ca40130e7508c151f60220d3f23bf23c/recipes/tiny-menu"; @@ -69503,12 +70311,12 @@ tldr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tldr"; - version = "20170401.2140"; + version = "20170702.1859"; src = fetchFromGitHub { owner = "kuanyui"; repo = "tldr.el"; - rev = "05da2ac1d82f9918b493e0895e98cd59666d3e28"; - sha256 = "14ni301cn6s793157k1fkz65ab1xgh94n3g12hcj1xnmbdvnlymy"; + rev = "ebdeb08950823765bf58dc2aba3559a5ad1103f1"; + sha256 = "1aigfmp4ra9qfwyk151y0cxmgd3n42rcjawklfm6ch2g49vx559q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45af2c5d1a36fcbf739812594c5cc878bf319a26/recipes/tldr"; @@ -69563,25 +70371,6 @@ license = lib.licenses.free; }; }) {}; - todochiku = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "todochiku"; - version = "20150112.1254"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/todochiku.el?revision=16"; - sha256 = "0fhlyjl0a3fd25as185j6dmch0wsrf1zc59q29lhjximg9lk3hr5"; - name = "todochiku.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/todochiku"; - sha256 = "1iq08s5ji6hd8as80qxqkbavnjbx0kcmmjjvhjchmvv93vsn1f96"; - name = "todochiku"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/todochiku"; - license = lib.licenses.free; - }; - }) {}; todotxt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "todotxt"; @@ -69958,12 +70747,12 @@ traad = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, request, request-deferred, virtualenvwrapper }: melpaBuild { pname = "traad"; - version = "20170528.2302"; + version = "20170713.2320"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-traad"; - rev = "4b84b8b4cf43e1167b3d7fcc51eb7a16b62c26f1"; - sha256 = "0mpx2wlw7fhqmgvya3vq7yfjqpab10wjbgpxyyd2ki15nwc4c0xd"; + rev = "7a443ad17643060f9b4c2897abe185bb9221e304"; + sha256 = "1n91a8bdrji0kca38bh6jzwjfsg90jqqa47vvazsqk072fjjbnkr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2b3eb31c077fcaff94b74b757c1ce17650333943/recipes/traad"; @@ -70090,12 +70879,12 @@ transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "transmission"; - version = "20170326.1044"; + version = "20170715.2304"; src = fetchFromGitHub { owner = "holomorph"; repo = "transmission"; - rev = "5b88e643e93115af3a96c8cf558eb506b34a64fc"; - sha256 = "1zcpy3628s9cm9am92imwhp31fdnd6146hz0x4qaazia4gbhp66z"; + rev = "2c033fb7a2614a21920d1cb06665f590b97694da"; + sha256 = "1ark2lcms43kk24352k1jbmgv5bcymmbfqhpbzrribagm5n9qr2h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission"; @@ -70195,12 +70984,12 @@ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "20170607.1239"; + version = "20170705.1153"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "d5878b0ed6da2a561aa795b31848e31e7c696197"; - sha256 = "04d7l0v1s5fxcnr4iqdpb1908bayysga3z0sbcx7ia39kmcnp4l3"; + rev = "bbff57809095f4fb8578ca9ee28a3bac81f203b0"; + sha256 = "12hqgxj9jfxq5wbnxpb941g4m47dyhah6kvs91x637jc8mlsdvbq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs"; @@ -70216,12 +71005,12 @@ treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }: melpaBuild { pname = "treemacs-evil"; - version = "20170604.315"; + version = "20170625.1401"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "d5878b0ed6da2a561aa795b31848e31e7c696197"; - sha256 = "04d7l0v1s5fxcnr4iqdpb1908bayysga3z0sbcx7ia39kmcnp4l3"; + rev = "bbff57809095f4fb8578ca9ee28a3bac81f203b0"; + sha256 = "12hqgxj9jfxq5wbnxpb941g4m47dyhah6kvs91x637jc8mlsdvbq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil"; @@ -70697,12 +71486,12 @@ typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "typescript-mode"; - version = "20170530.953"; + version = "20170710.427"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "typescript.el"; - rev = "9ad892fb2274decb637d12d81a8640d2c6cf11d3"; - sha256 = "0ynnh3ac6zblcg2d0nf8fwdfmp5ymzjqncl64xa43m4lw24p6xng"; + rev = "1cea84486f937946a90caacf2a7c86ca855d1c9d"; + sha256 = "0s9gnlm52rsdda0qzfn89sjawd5r5qxdc878y11cak9zz4h6d706"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode"; @@ -71003,6 +71792,27 @@ license = lib.licenses.free; }; }) {}; + underline-with-char = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "underline-with-char"; + version = "20170714.1511"; + src = fetchFromGitHub { + owner = "marcowahl"; + repo = "underline-with-char"; + rev = "f0d7fad3f5472909f52c7928192f137d2f52c255"; + sha256 = "1qpqsspvvrfmzy93gj9h5zcj1gzf2fmw2kpl457cllvrks7yb8ry"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e24888ccf61ac05eba5c30a47d35653f2badf019/recipes/underline-with-char"; + sha256 = "0la24nvyqinla40c2f3f4a63mjjsg58096hyw3pvp0mwiff7rxyd"; + name = "underline-with-char"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/underline-with-char"; + license = lib.licenses.free; + }; + }) {}; underwater-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "underwater-theme"; @@ -71027,11 +71837,11 @@ undo-tree = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "undo-tree"; - version = "20161012.701"; + version = "20170706.246"; src = fetchgit { url = "http://www.dr-qubit.org/git/undo-tree.git"; - rev = "4cba00bb049cfaa2ee6821a9e347209a88a740b5"; - sha256 = "0qawh5cr0ahdg1rks96g9fbva2nfkz8mbl82jnps6axqdf57gm38"; + rev = "e9a9102f515acd7523158f20e83f300600374989"; + sha256 = "07y1pn0dzwh1avkd3dm96lcjisvnr7p02wbhxf1m3dgaxf059mcn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/undo-tree"; @@ -71440,8 +72250,8 @@ src = fetchFromGitHub { owner = "yuyang0"; repo = "url-shortener"; - rev = "48182912d4f3a704d0b53f1664b995cfbf2ccd28"; - sha256 = "179hi6hsp2naczlcym3qxx9wbqx96bkkzvqygf3iffa0rmik4j7h"; + rev = "817ac58f6fd2190f688619a91cdc28654b211df9"; + sha256 = "1nah3vjg7966ssh2iwz8fingmcni867ksj2bjrvkgzmqbxqdxz9r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/url-shortener"; @@ -71497,12 +72307,12 @@ use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "use-package"; - version = "20170524.2245"; + version = "20170710.1234"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "726eea13a3a4d75d630aac29d6b71d74d9dc69e3"; - sha256 = "1r75ysdz6cj97vn46lj4g2a3hsab377f667a8bfs17rz007nddv4"; + rev = "7b055494e39efba8b237202b7c97f40aa19e2579"; + sha256 = "0dzvnz8s60gsrmhfrdr121ji7xw67bmfdwfd8vhffa87wyibrh2n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package"; @@ -71543,8 +72353,8 @@ src = fetchFromGitHub { owner = "diml"; repo = "utop"; - rev = "06460235d6f6ffd82dd2d973c2ad1004a4a2619b"; - sha256 = "19ffqy52r52c7kjpb54flfilgnfkmxa7pkq5w0mw6xiaw3qvha2w"; + rev = "4fcf11ae5f3ddc5ebc8f8f973fcf3f995c29c38d"; + sha256 = "1pw8h6bwjmr61l7ncl36w9lqxsq4z9pbsi93nc0sfr67ram5ri47"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop"; @@ -71942,8 +72752,8 @@ src = fetchFromGitHub { owner = "DamienCassou"; repo = "vdirel"; - rev = "a1e6ea3ed5faaf70667c62bc5591dc810331cb1a"; - sha256 = "1z8q3akm0hq7z7nqclra1wv7a6m0cbskhnd3ca4v9wf9dajiwnsb"; + rev = "72399f5e09f53aa25a068be8689cb711b8accf08"; + sha256 = "1xlzm2c6wcmrjjwl61552yaijjsiazbs2lxn1y5p7xbj9x7jrkn9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72b5ea3f4444c3de73d986a28e1d12bf47c40246/recipes/vdirel"; @@ -72064,12 +72874,12 @@ vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }: melpaBuild { pname = "vhdl-tools"; - version = "20170508.735"; + version = "20170701.1603"; src = fetchFromGitHub { owner = "csantosb"; repo = "vhdl-tools"; - rev = "282274b319f2c3598ac6bbdd27a8b7ca40b0bb0e"; - sha256 = "0va5aqij3gan3j37jjhx8a8bv0zdpid5x18jfynzizlyk68fc196"; + rev = "c08343904835cbae12f48e0758b0a6a014d76a74"; + sha256 = "1skh9p5s9nbl6jvljj9bfn19fdzjx8lvx1q6rzldld07xwaif4qb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools"; @@ -72421,12 +73231,12 @@ vlf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vlf"; - version = "20170501.932"; + version = "20170713.1652"; src = fetchFromGitHub { owner = "m00natic"; repo = "vlfi"; - rev = "55e0c404c802c4cf056a8dde94a77df2970a42c7"; - sha256 = "0v9zfav3gpw2vvmqdbp4g24jxxgprzql5z82i7rx6ma0in42kvz2"; + rev = "b62bc046128df83c816a9b199ab5b4a7fcf93837"; + sha256 = "1gbl08dh172fv8xc0b737cybm3bac5hlm37f50qp0xk4kdbfv2sh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9116b11eb513dd9e1dc9542d274dd60f183b24c4/recipes/vlf"; @@ -72566,12 +73376,12 @@ vue-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, ssass-mode, vue-html-mode }: melpaBuild { pname = "vue-mode"; - version = "20170514.2341"; + version = "20170712.930"; src = fetchFromGitHub { owner = "CodeFalling"; repo = "vue-mode"; - rev = "35d803b19a302e7206d1a54db47b6dcbb674ce88"; - sha256 = "1j7qvj653gf7dwimwl26zvz5ki04bp7vlkwcxqkc9fshcjm5py1q"; + rev = "e256f432b9cec9a0294fe3edf1c4965e1de28570"; + sha256 = "11nrzdqwzd7ib8gv52vplcafiwmv5nm6ql3ahw512zkkb2w3bkza"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode"; @@ -72772,12 +73582,12 @@ wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }: melpaBuild { pname = "wanderlust"; - version = "20170325.357"; + version = "20170627.2306"; src = fetchFromGitHub { owner = "wanderlust"; repo = "wanderlust"; - rev = "0a324086eb9cf2d357d3c8a431e80cd45fce016a"; - sha256 = "0hcyy44xxg6f7c10db6xf8944wiaijxln3kgrl49kc0m3icilxyy"; + rev = "770d54fafb1a0a140b449e6132db22e70b4d6aa9"; + sha256 = "1f6h5n42fwwby880wikh8fdlk2zqimkl7wdb8wvr5kq1nqfqpz3f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust"; @@ -73003,12 +73813,12 @@ web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "20170603.632"; + version = "20170709.922"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "290f0ecb43dc6a636e45f55cf95c0d8fbda3fdc2"; - sha256 = "00i697brchwdz3hviq2khhxcih7zi90dym1s5m9vk5azi2qly8ys"; + rev = "e4304bcfa0c5121522ba2a5db75af8a2e4e81246"; + sha256 = "1pyhipazvhqflpxxdaqjyp7l5vpcp3cbc4qqb5fy1zxnlb5yj62l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -73108,12 +73918,12 @@ webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "webpaste"; - version = "20170611.345"; + version = "20170612.1352"; src = fetchFromGitHub { owner = "etu"; repo = "webpaste.el"; - rev = "90a96d21fc3c7edc7c339b343462696bfc6d21ff"; - sha256 = "0q2fdxdlyfggrlgyfbq63n5k7qfjyr08cjy0k4i74sjphdss1bcl"; + rev = "655a364fb1a6c9f3d49a0bbaf338bbf492b5b4d1"; + sha256 = "11dqcch0fcxkqnnfzk9hxmimxckimpj74fz7rx3b7bvkmrh9snyy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste"; @@ -73572,8 +74382,8 @@ src = fetchFromGitHub { owner = "foretagsplatsen"; repo = "emacs-js"; - rev = "74daf284e32bf84d29377d1d7a638b640ebf8f76"; - sha256 = "0rx05is17g255gymyp6lvsskg5i6c4s28q89kbspdyfwx3rr42qa"; + rev = "2b3ba6dcc3e99cea75d4bf2b4e6cf0898d9a2615"; + sha256 = "0yga1vf54lf35my64ixw5ssq6jr6ph914afqv5r2gri007bi2zvw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs"; @@ -73983,12 +74793,12 @@ with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "20170517.1242"; + version = "20170707.1401"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "3385ffdc6faed5a283e26a7ebf89825c700dd395"; - sha256 = "1kznr0zv1y6lwsllpksqjzq2f4bc5a99lg19fmifn7w0dhv6fn0m"; + rev = "791f985f63abe7f10de3fbd6fd49f9efac05a285"; + sha256 = "0nh12j3bf247q1ikb2apcpbx8nxvvi9rpj4fbsjbnrs0v65n0v4v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -74319,12 +75129,12 @@ writeroom-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, visual-fill-column }: melpaBuild { pname = "writeroom-mode"; - version = "20170528.639"; + version = "20170623.327"; src = fetchFromGitHub { owner = "joostkremers"; repo = "writeroom-mode"; - rev = "d3252f54c8f9f37a19d6a21fb2291c3da7a7121a"; - sha256 = "13nbls5qxz5z8firjxaip8m9vzfbbpxmwrmr01njbk4axpwrpj0z"; + rev = "9e924dd7dd83f10b026c89cddef7e1646f1a3869"; + sha256 = "1v7hbmi9dqdqyr3png1xwhg3k05jr2q6jdjmj48bxiixl9zhcq9p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/writeroom-mode"; @@ -74382,12 +75192,12 @@ wttrin = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, xterm-color }: melpaBuild { pname = "wttrin"; - version = "20170322.2041"; + version = "20170614.506"; src = fetchFromGitHub { owner = "bcbcarl"; repo = "emacs-wttrin"; - rev = "00ae9ee54056b16bb20c5b35e6bd262e6bda7eb5"; - sha256 = "09vxi1vm5vsh7q9dqjbya8qrrclwid8r2hq9ycc46mbhx5blyz45"; + rev = "df5427ce2a5ad4dab652dbb1c4a1834d7ddc2abc"; + sha256 = "1ai655f10iayb4vw0ass2j3x83f4vsv90326mnywkzfl3sxd432z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b2b6876562f1fadd4af1ea9b279ac4dc1b21660/recipes/wttrin"; @@ -74508,12 +75318,12 @@ xah-css-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-css-mode"; - version = "20170517.1634"; + version = "20170713.629"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-css-mode"; - rev = "a5a19ee45b54eff7eeccd81b65ba42a0e9c7ba4c"; - sha256 = "1x3vwqpbz06xg2wazg7skgsvgq36cs0445nrk2ahzvqknxh638vr"; + rev = "df1906547f51f50c7e61ffa6c518a6ffb23d4770"; + sha256 = "0q93nz5z4awasllnnqs6pzi83mrx8nl7d3mi13ppqhd50sjm0166"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57c2e2112c4eb50ee6ebddef9c3d219cc5ced804/recipes/xah-css-mode"; @@ -74529,12 +75339,12 @@ xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-elisp-mode"; - version = "20170511.2126"; + version = "20170713.629"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-elisp-mode"; - rev = "7cd242de67d9567c343d5f530134759c2a8115d2"; - sha256 = "10z2c1hbprgi2hil72g4w109namgns4mibgd4v8j9wggphjy8v6y"; + rev = "e28f16121619f1a929803ef1274d2853d1b43656"; + sha256 = "1l7yf3k5gdz7flm8qqzkcdpj3cx9q1kklbl2znkxiyb6rvgh7qf2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e996dd5b0061371662490e0b21d3c5bb506550/recipes/xah-elisp-mode"; @@ -74550,12 +75360,12 @@ xah-find = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-find"; - version = "20170407.251"; + version = "20170713.624"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-find"; - rev = "a83fd078b9b475edc5fd29e0c7d4f02f203e0390"; - sha256 = "166f4yjz1s6bbjz4cw2n8hgv98ambhjy9qs7hkq9d7jjpcjgyzwr"; + rev = "d5f12b6185af9674d236a758df16649bfafadf2c"; + sha256 = "19cg18gh18pp1z862aykfhn44vhnbggr32rrs7smy33nq2h6q512"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d94ffd9c3380cd56770f253e43d566a95083e37/recipes/xah-find"; @@ -74571,12 +75381,12 @@ xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20170531.554"; + version = "20170713.626"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "4d871873024520168572babd174adc203776c71c"; - sha256 = "0xiyh9qam40c2by0qp26x8ki090z2yv0319qrn5d4lsz69ivnpy0"; + rev = "23dae1d6d14d238227e1ee0afeef6ef1561b0c31"; + sha256 = "1mlqhmk9qpa34p30f8m0ylfajzyvq49qvl3hklgrzqgc9xx4yhxd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys"; @@ -74592,12 +75402,12 @@ xah-get-thing = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-get-thing"; - version = "20170527.1806"; + version = "20170713.628"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-get-thing-or-selection"; - rev = "5adaf02b8a7464ffb81ae185edb48902a4c3a4d4"; - sha256 = "16cxk55haln36m57pszxbbyx2h0dzdxagsj2zvm6i2nn0jhyy4v7"; + rev = "29a82b1a291ad6625b0da152ff1de10455d1831a"; + sha256 = "1si443vicgq7swr79lc9jv7fxm8x273xajrm6xqahkxzyly2751q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9e8dc32a5317f0ff0e72fa87220243dd742eb1ef/recipes/xah-get-thing"; @@ -74613,12 +75423,12 @@ xah-lookup = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-lookup"; - version = "20170517.1459"; + version = "20170713.615"; src = fetchFromGitHub { owner = "xahlee"; repo = "lookup-word-on-internet"; - rev = "3872d3273b472202052dfd63a7d8e388f9517830"; - sha256 = "0krmxp55gbmbxmzkj293v7i9c9lfxji47g0cmfjiyhzzamz1kdgw"; + rev = "91645ba91772bf4a1a20765722b72f7e374feacc"; + sha256 = "0hrs77qllpa77964bwjdmq4bzr47bgc0n57jsaagcdbs7wc6bmc0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38e6609a846a3c7781e0f03730b79bbf8d0355a9/recipes/xah-lookup"; @@ -74634,12 +75444,12 @@ xah-math-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-math-input"; - version = "20170210.2128"; + version = "20170707.2324"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-math-input"; - rev = "a4b8aa833f65c028f7f94b9c3b5b8993b8961736"; - sha256 = "02xin68nrzlg6qaniincj5dk1aw5fbqfb8cj00yjyyjnv55jrbpn"; + rev = "b944092474e5c9194860dbb6d007a8f2ce98c94c"; + sha256 = "04ffknah3gmnjkk4wzhbzwj40mxzgwzxqq7cxrg4k86l9wq50pjb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/95d57e33e6d60dc20d6452b407ea1486604ba23a/recipes/xah-math-input"; @@ -74655,12 +75465,12 @@ xah-reformat-code = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-reformat-code"; - version = "20170111.812"; + version = "20170706.339"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-reformat-code"; - rev = "7e5bbd09be8035a482a76417d900cb5d3a70e1cd"; - sha256 = "04xwf9jxk4805bl7xj05kjfgl7m71zp94qdvw4g37s6q8v25j73d"; + rev = "655cc8820118737db7b758ab72ad107d7fff091a"; + sha256 = "12zrgp76nq18anp7vc7pj0w9a688i7xylplqh55jv9q24xgmpyhs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45e731ccee5ccbf97169e32a16300b5fb78e1155/recipes/xah-reformat-code"; @@ -74676,12 +75486,12 @@ xah-replace-pairs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-replace-pairs"; - version = "20170221.2112"; + version = "20170713.628"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-replace-pairs"; - rev = "b5bd1ff843063f6eba32ab71f33f0ebde57d5e41"; - sha256 = "1m5yd9kwsjy37f2czqhjpj5dkqf62pgj40a4ziy65mch4niw0slz"; + rev = "62ac5be31f6b2e2ce10f695122e9cb7a9411e1ba"; + sha256 = "1j3qq54v68nal60zxnc89a7cy5bbsnn1bp97n3giwdk03rla4yk6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0e7de2fe0e55b1a546f105aa1aac44fde46c8f44/recipes/xah-replace-pairs"; @@ -75222,12 +76032,12 @@ yahtzee = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yahtzee"; - version = "20170608.836"; + version = "20170617.20"; src = fetchFromGitHub { owner = "drdv"; repo = "yahtzee"; - rev = "0a4c06ce68868133498e0ce1ab5efdf296fa4862"; - sha256 = "12vmgn118bwrrjpp1a1s47zk1q80gx7pakjhll03vpsyw08yvg13"; + rev = "1b6d6cc5651a02547415cd571658efcafd9d36fa"; + sha256 = "0xzw5inzpd2djqx8q276vhiw5j19irkaygnmjn5m5kh2xpzb6aah"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee"; @@ -75409,12 +76219,12 @@ yara-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yara-mode"; - version = "20160821.724"; + version = "20170713.2206"; src = fetchFromGitHub { owner = "binjo"; repo = "yara-mode"; - rev = "3ad06bc419329ec9c872fe3292da214b3aa9a1f1"; - sha256 = "12xdhmxilqfrsqkx8dv5g78c0dcarsfjf3gy928rqjfhgslafbq6"; + rev = "e3eb352a2e295a8a0955bc3e853f1edfd93cbf81"; + sha256 = "1dn2ssshwj94nmhd2pnvqdwj0za3iri9ky4kd4w50kj9jz18d1wz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef22d2dad1bae62721710bbff4b7228204d7c425/recipes/yara-mode"; @@ -75469,6 +76279,27 @@ license = lib.licenses.free; }; }) {}; + yarn-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "yarn-mode"; + version = "20170709.1237"; + src = fetchFromGitHub { + owner = "anachronic"; + repo = "yarn-mode"; + rev = "99891000efe31214b065fa9446cd5e68c5c42ed8"; + sha256 = "0cg06ba9yfgjzprq78cvhvvl06av0p2vhnmynddzbpgjgjnwskfy"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/860fa2a8fdb22be374fa64a5277af3ab484a047a/recipes/yarn-mode"; + sha256 = "08a3lrz670jsf531mn1hwhh7fg5dby6i749cscd6d4dyvkzpz5dg"; + name = "yarn-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/yarn-mode"; + license = lib.licenses.free; + }; + }) {}; yascroll = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yascroll"; @@ -75493,12 +76324,12 @@ yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yasnippet"; - version = "20170605.1940"; + version = "20170716.1223"; src = fetchFromGitHub { owner = "joaotavora"; repo = "yasnippet"; - rev = "e8ed276e2cba90126f694a90df28b5f5eca66376"; - sha256 = "0ripg5bvj4hj0y7qb35fdfg38fkqsvcxa977d24wbswmgcj08bjs"; + rev = "2a3a0cd2b18c21fc5f391273045f466c41da743c"; + sha256 = "09s7ad3wl4rrmdyi0cxmn6vnpkcf97x0g0csy8a8lijsjnrvk4r9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet"; @@ -75534,11 +76365,11 @@ }) {}; yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yatex"; - version = "20170603.725"; + version = "20170611.1642"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "c996fbcc2e79"; - sha256 = "1ibj0dhpgxa143azr07wkmz86fip247cbk2s5fwj4nrj96z6cw9y"; + rev = "e9299b77df1f"; + sha256 = "0nnpzcj23q964v4rfxzdll1r95zd6zzqvzcgxh7h603a41r3w1wm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex"; @@ -75596,12 +76427,12 @@ ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }: melpaBuild { pname = "ycmd"; - version = "20170515.2255"; + version = "20170710.103"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "29aba538be5e44da81ad76a6078bb65c1c5e1aa6"; - sha256 = "0fpccpiwwsxg0asdzg0m5hlwdv6jyr7khywnd1rb6kvr8m2qm0hf"; + rev = "35e8a31e32d0de890547612db8373d7333db8d8a"; + sha256 = "023bkmviaqb85kwwlpmzfc5gycf4i7w8a43zhbmvasfjjb962yzd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; @@ -75856,12 +76687,12 @@ zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }: melpaBuild { pname = "zerodark-theme"; - version = "20170607.1301"; + version = "20170709.1248"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "ab406749083a41e5ca7fe518949a09853f23e5d5"; - sha256 = "0kanprhczqx14gn87wjwi9x4fg6dn7i64awbwsls4r5nkqf4ykn0"; + rev = "379df55b3ea6f217e0187fb8cb6df70d02236cec"; + sha256 = "0nj7qvr0z3gq31db8r3jsdljj93r0cijssbwxgqscvm945jpxc6x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme"; @@ -76252,11 +77083,11 @@ zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser }: melpaBuild { pname = "zpresent"; - version = "20170608.2201"; + version = "20170710.2029"; src = fetchhg { url = "https://bitbucket.com/zck/zpresent.el"; - rev = "66d2f665daa1"; - sha256 = "1fgggwivp405qm0nvbqk8vrnprimg336mcv3am37yavi9da48fi8"; + rev = "96131375ac74"; + sha256 = "1p19yy0xyf962rc0j3k4jxl9vyjjyd1ar61wmp6mf6jplj7sxyfl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index f156494b83f..8f1bf8ff38d 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -216,8 +216,8 @@ src = fetchFromGitHub { owner = "yaruopooner"; repo = "ac-clang"; - rev = "8fdfbbebf096017ab45cedcff2c43a0a5d8b9686"; - sha256 = "0ik1hh8qs5yjb034zc93fyd6la84mgp6y5gzvpz6rfbjfxy6vf3y"; + rev = "ee692f7cde535f317e440a132b8e60b7c5e34dfd"; + sha256 = "0zg39brrpgdakb6hbylala6ajja09nhbzqf4xl9nzwc7gzpgfl57"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ffe0485048b85825f5e8ba95917d8c9dc64fe5de/recipes/ac-clang"; @@ -527,12 +527,12 @@ ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "ac-php"; - version = "1.7.8"; + version = "1.7.9"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "36e37b21ebcd3d178da4e23a440759bc6b049c7d"; - sha256 = "1rs7v5n5rb6gdyxxadg2p8zabh0qxvdmyq9356qk6drx8mnsvq8k"; + rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6"; + sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -548,12 +548,12 @@ ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: melpaBuild { pname = "ac-php-core"; - version = "1.7.8"; + version = "1.7.9"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "36e37b21ebcd3d178da4e23a440759bc6b049c7d"; - sha256 = "1rs7v5n5rb6gdyxxadg2p8zabh0qxvdmyq9356qk6drx8mnsvq8k"; + rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6"; + sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -884,12 +884,12 @@ add-hooks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "add-hooks"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "nickmccurdy"; repo = "add-hooks"; - rev = "9b1bdb91c59ea9c2cc0aba48262c49069273d856"; - sha256 = "1jzgyfcr6m64q79qibnbqa41sbpivslwk2hygbk9yp46l5vgj1hc"; + rev = "edd4cb032a509b576d88f4cc0521ebfe66a9e6c7"; + sha256 = "1qg1ifkds84xv07ibz4sqp34ks60w4c7dvrq9dch4gvg040hal82"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/901f846aef46d512dc0a1770bab7f07c0ae330cd/recipes/add-hooks"; @@ -1052,12 +1052,12 @@ ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ahungry-theme"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "ahungry"; repo = "color-theme-ahungry"; - rev = "3ce72cf77cf5958d91b65bc4867cbacff968da74"; - sha256 = "0wiwxh6k2s48gpklhd9abbsr0ll73jzggwgq1lvm7gha203ji5v4"; + rev = "e3d7e22cb10582a443b0e245be68aca936cd6abf"; + sha256 = "0fsip64bxs55kkqmpfcg4nr391b6wsd8hiq4fxvwww7n52lwsn5s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme"; @@ -1178,12 +1178,12 @@ all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild, memoize }: melpaBuild { pname = "all-the-icons"; - version = "2.6.4"; + version = "3.1.1"; src = fetchFromGitHub { owner = "domtronn"; repo = "all-the-icons.el"; - rev = "7134b7467a7061b57c8cda3503e9644d4ed92a2a"; - sha256 = "0xwj8wyj0ywpy4rcqxz15hkr8jnffn7nrp5fnq56j360v8858q8x"; + rev = "bb69345ead914345faad582723a2b61618f13289"; + sha256 = "0h8a2jvn2wfi3bqd35scmhm8wh20mlk09sy68m1whi9binzkm8rf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons"; @@ -1606,12 +1606,12 @@ anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anything-tramp"; - version = "0.4.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-anything-tramp"; - rev = "c4629201a63047f9094be0d9150f201dd5be18ad"; - sha256 = "0fr4brysc7sk89jp1ggl68r3r6ikrhipb2h5kc1b2a8vz7i05bq9"; + rev = "c6d0e9bfa0f71c7c0bb75f6df0c82dd81c486f43"; + sha256 = "08ffw4y14c99jypl1nhiq2k3lbmv3lgw2dgmhkb8lpc1szkjg57m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/anything-tramp"; @@ -1648,12 +1648,12 @@ apache-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apache-mode"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "zonuexe"; repo = "apache-mode"; - rev = "7e79a6602da77b5c3a11dab93d46fef26abc860d"; - sha256 = "0i4kmw0qbnnfbfih7iwfpihv5d6kh1l9k2b062dvc5mx1vvlr8k8"; + rev = "0906559e0cb2997405d98ea6b2195954e3935d3b"; + sha256 = "0vfyi34qcwkz9975cq5hin1p2zyy3h05fni4f93xyrcs31zvmk22"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b5216c40e60c5a69a6235c15b432b5e9bdda6fd3/recipes/apache-mode"; @@ -1750,6 +1750,27 @@ license = lib.licenses.free; }; }) {}; + apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "apropospriate-theme"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "waymondo"; + repo = "apropospriate-theme"; + rev = "0d918da74a7a225fe5a586e26f5d834e579c5323"; + sha256 = "0hqsq7y89crcmqcfbgn885dlvj7f7b0zd9q6adbhyscphk7kasjw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme"; + sha256 = "10bj2bsi7b104m686z8mgvbh493liidsvivxfvfxzbndc8wyjsw9"; + name = "apropospriate-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/apropospriate-theme"; + license = lib.licenses.free; + }; + }) {}; artbollocks-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "artbollocks-mode"; @@ -1837,12 +1858,12 @@ async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "async"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "jwiegley"; repo = "emacs-async"; - rev = "666066d30a420d86801d8380f5991f2b82471107"; - sha256 = "1hjyac7dm0yvg5y32fii6508wwhl5q493i8ikf3fszafz03nc6sc"; + rev = "d6222c2959caaca5c4980038756097da8a51e505"; + sha256 = "1w7crkgi2k97zxdqv2k6a88kmz75s5v7p7n8bw8v18dvxx9sfisn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/async"; @@ -1900,12 +1921,12 @@ auctex-latexmk = callPackage ({ auctex, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auctex-latexmk"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "tom-tan"; repo = "auctex-latexmk"; - rev = "b7053f71f578ffb0d247f8a9e8d5152efd86e096"; - sha256 = "0slihygr74vyijnyzssckapscxmdd7zlgrs0wvmpw9hnjzwwzzql"; + rev = "4d353522650d7685acbf1d38f7dbc504f734bd84"; + sha256 = "0qvscgffmzqk8lkcg3yk91vciim5ygk2m4crk02qn72ipkw5q13m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f48af615c56f093dff417a5d3b705f9993c518f/recipes/auctex-latexmk"; @@ -2170,6 +2191,27 @@ license = lib.licenses.free; }; }) {}; + auto-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "auto-minor-mode"; + version = "20170716"; + src = fetchFromGitHub { + owner = "joewreschnig"; + repo = "auto-minor-mode"; + rev = "06fa6975a9fb171b91a8b8234d65ef72374d64e2"; + sha256 = "19r71hdgz367f6cgyqfdpilwlmhrjw5drmijpq8m0fxgysnmz2qd"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b3ab5f048034777551e344101d8415cac92362c8/recipes/auto-minor-mode"; + sha256 = "1dpdylrpw1pvlmhh229b3lqs07drx9kdhw4vcv5a48qah14dz6qa"; + name = "auto-minor-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/auto-minor-mode"; + license = lib.licenses.free; + }; + }) {}; auto-package-update = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-package-update"; @@ -2641,12 +2683,12 @@ beginend = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "beginend"; - version = "1.1.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "beginend"; - rev = "9c6ad190ecc71373f6ac7485c924f1ef3dce6fc4"; - sha256 = "05z23amn1s1692y3wzwmbzpnm5m6qskq53aqp47wiyyxn3dq2kdj"; + rev = "a06a479c2279da9e852cf42628b6dfa466fff0bd"; + sha256 = "1jbhg73g1rrkbwql5vi2b0ys9avfazmwzwgd90gkzwavw0ch9cvl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31c1157d4fd9e47a780bbd91075252acdc7899dd/recipes/beginend"; @@ -2743,6 +2785,27 @@ license = lib.licenses.free; }; }) {}; + bifocal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "bifocal"; + version = "0.0.1"; + src = fetchFromGitHub { + owner = "riscy"; + repo = "bifocal-mode"; + rev = "19b54d1de8938448c88afd495d749fc7b6f6d281"; + sha256 = "0mym4wqhfh58sr82z0w1z7kvj2p6s54b3j9davwpkj850j378x52"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/79e71995bd8452bad2e717884f148ec74c9735fc/recipes/bifocal"; + sha256 = "07qrxsby611l3cwsmw3d53h1n7cd1vg53j4vlc2isg56l2m4qks5"; + name = "bifocal"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/bifocal"; + license = lib.licenses.free; + }; + }) {}; binclock = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "binclock"; @@ -3415,27 +3478,111 @@ license = lib.licenses.free; }; }) {}; - calfw = callPackage ({ fetchFromGitHub, fetchurl, google-maps, lib, melpaBuild }: + calfw = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "calfw"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-calfw"; - rev = "50e0e0261568f84f31fe7f87c9f863e21d30132f"; - sha256 = "1rv6slk3a7ca2q16isjlkmgxbxmbqx4lx2ip7z33fvnq10r5h60n"; + rev = "c538d3746449b4f0e16b16aad3073d4f7379d805"; + sha256 = "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1d1aaab9844413a5fff992509935b399b5154c3d/recipes/calfw"; - sha256 = "1lyb0jzpx19mx50d8xjv9sx201518vkvskxbglykaqpjm9ik2ai8"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw"; + sha256 = "0am1nafc16zax8082gjlz0pi85lryjhrx0v80nzgr23iybj5mfx4"; name = "calfw"; }; - packageRequires = [ google-maps ]; + packageRequires = []; meta = { homepage = "https://melpa.org/#/calfw"; license = lib.licenses.free; }; }) {}; + calfw-cal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "calfw-cal"; + version = "1.6"; + src = fetchFromGitHub { + owner = "kiwanami"; + repo = "emacs-calfw"; + rev = "c538d3746449b4f0e16b16aad3073d4f7379d805"; + sha256 = "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-cal"; + sha256 = "1wylkd7jl1ifq56jj04l5b9wfrjkhwncxzrjgnbgg1cl2klf6v4m"; + name = "calfw-cal"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/calfw-cal"; + license = lib.licenses.free; + }; + }) {}; + calfw-howm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "calfw-howm"; + version = "1.6"; + src = fetchFromGitHub { + owner = "kiwanami"; + repo = "emacs-calfw"; + rev = "c538d3746449b4f0e16b16aad3073d4f7379d805"; + sha256 = "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-howm"; + sha256 = "08cv16cq211sy2v1i0gk7d81f0gyywv0i9szmamnrbjif3rrv2m0"; + name = "calfw-howm"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/calfw-howm"; + license = lib.licenses.free; + }; + }) {}; + calfw-ical = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "calfw-ical"; + version = "1.6"; + src = fetchFromGitHub { + owner = "kiwanami"; + repo = "emacs-calfw"; + rev = "c538d3746449b4f0e16b16aad3073d4f7379d805"; + sha256 = "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-ical"; + sha256 = "1bh9ahwp9b5knjxph79kl19fgs48x3w7dga299l0xvbxq2jhs95q"; + name = "calfw-ical"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/calfw-ical"; + license = lib.licenses.free; + }; + }) {}; + calfw-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "calfw-org"; + version = "1.6"; + src = fetchFromGitHub { + owner = "kiwanami"; + repo = "emacs-calfw"; + rev = "c538d3746449b4f0e16b16aad3073d4f7379d805"; + sha256 = "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-org"; + sha256 = "1cfpjh08djz3k067w3580yb15p1csks3gzch9c4cbrbcjvg8inh5"; + name = "calfw-org"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/calfw-org"; + license = lib.licenses.free; + }; + }) {}; camcorder = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }: melpaBuild { pname = "camcorder"; @@ -3460,12 +3607,12 @@ cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }: melpaBuild { pname = "cargo"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "kwrooijen"; repo = "cargo.el"; - rev = "25ca2fcbd6b664cc7a20b0cccca3adc19e79917a"; - sha256 = "1fzrczx1aq0q130qrvzq8dssc1qm5qc9pclsyd3zn27xbn5lsag3"; + rev = "b0487f95a7de7a1d6f03cdd05220f633977d65a2"; + sha256 = "0r9v7q7hkdw2q3iifyrb6n9jrssz2rcv2xcc7n1nmg1v40av3ijd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo"; @@ -3817,12 +3964,12 @@ cheat-sh = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cheat-sh"; - version = "1.3"; + version = "1.7"; src = fetchFromGitHub { owner = "davep"; repo = "cheat-sh.el"; - rev = "760cff945839a8397d44ac95aeec94cc28a51691"; - sha256 = "10rr4bnhq2rjd6bx2r0d3cxa7ixk4la58agg5a83y3z52a673rqv"; + rev = "6409bb66241255cc9a0362f2acdcb0b34344f9f2"; + sha256 = "1nmsja1s45fs93v2vbalfralixvzp88rgv47vf9p80i7x6w2149m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ebac62fb3828d81e30145b9948d60e781e20eda2/recipes/cheat-sh"; @@ -4459,12 +4606,12 @@ cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-mode"; - version = "3.9.0pre2"; + version = "3.9.0pre6"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "010b50fda71feaff3abec4d13910f4a4bd1f13b0"; - sha256 = "0b77hm5l18fbzphg3wcdzrblbhh65wx7c1b98driky1634kn9j10"; + rev = "25b72e9097260d1faf254155a1199886c808a58f"; + sha256 = "0rzy8fpagsqfln1x27mq89dh819jc8h2dlf7axmxq63g830c029q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -4711,12 +4858,12 @@ company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "f1499404163d8148e7a6303a8598f9c0f696d1cb"; - sha256 = "1ncfvf6ndqnn95m02ij66l7674h7chzgwg2r9biymqadzxjxim9i"; + rev = "a197b072dc93dbad238f1dc70da01e3775ebfb56"; + sha256 = "0is65adahvfgfjamnr8dmnh5xnijcwzhbzsvvi6ixkkfm2xvs5aa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; @@ -5089,12 +5236,12 @@ company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-php"; - version = "1.7.8"; + version = "1.7.9"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "36e37b21ebcd3d178da4e23a440759bc6b049c7d"; - sha256 = "1rs7v5n5rb6gdyxxadg2p8zabh0qxvdmyq9356qk6drx8mnsvq8k"; + rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6"; + sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -5284,12 +5431,12 @@ company-ycmd = callPackage ({ company, dash, deferred, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, ycmd }: melpaBuild { pname = "company-ycmd"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "9f5ad4a20e6bf893491635108adfff71f3c6b590"; - sha256 = "08kvbvhx5y3239bzdb1xpr81lfrhjy9xka4kn9dpa5bdxs0xx92w"; + rev = "d042a673b4d717c3ca9d641f120bfe16c994c740"; + sha256 = "0rxw86xi9xgr0fp6wmd6hgqgqr9flk7p4lcr0052jhlwknj1nrx0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd"; @@ -5827,6 +5974,27 @@ license = lib.licenses.free; }; }) {}; + csound-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi, shut-up }: + melpaBuild { + pname = "csound-mode"; + version = "0.1"; + src = fetchFromGitHub { + owner = "hlolli"; + repo = "csound-mode"; + rev = "b0e74f149a15118e8d85bf073b2ff5e0dd3cba7f"; + sha256 = "0c73xjhqgp1f7bplm47cgpssm8kpj3vda9n0fqcyq5i38ncfqwva"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/34dc8853f5978789212cb7983615202c498d4d25/recipes/csound-mode"; + sha256 = "0k4p9w19yxhfccr9zgg51ppl9jf3m4pwwnqiq25yv6qsxmh9q24l"; + name = "csound-mode"; + }; + packageRequires = [ emacs multi shut-up ]; + meta = { + homepage = "https://melpa.org/#/csound-mode"; + license = lib.licenses.free; + }; + }) {}; csv = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "csv"; @@ -5998,12 +6166,12 @@ cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cython-mode"; - version = "0.25.2"; + version = "0.26pre1"; src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "c9bcf1bed3acf367d6deb0c273cf22db0f18dab2"; - sha256 = "16yd296n0nh96pnkjpdbdz4i7ga4j961pkzm3cbnika26xwndx03"; + rev = "85a2dfe76a2bc28d4c8c1a760ef04e614f61be73"; + sha256 = "0gcdwzw952kddvxxgzsj93rqlvh2gs8bghz605zgm97baadvrizy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -6037,6 +6205,27 @@ license = lib.licenses.free; }; }) {}; + dad-joke = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "dad-joke"; + version = "1.2"; + src = fetchFromGitHub { + owner = "davep"; + repo = "dad-joke.el"; + rev = "98e5e5ed4c57f6076afb55d75af66e787867d9f9"; + sha256 = "017fdcbggnmnj9ri1a7id29l20pingw6mr1sk55xzkwgwf3v30fr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/484d571b2737f7c613816333afdde6460c64e635/recipes/dad-joke"; + sha256 = "1cg8iaq79w5zx1s3dirdl7ymcp162mmsy5c4vly90v20yrijblad"; + name = "dad-joke"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/dad-joke"; + license = lib.licenses.free; + }; + }) {}; dante = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "dante"; @@ -6078,15 +6267,16 @@ homepage = "https://melpa.org/#/darcula-theme"; license = lib.licenses.free; }; + }) {}; darktooth-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darktooth-theme"; - version = "0.3.5"; + version = "0.3.7"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-theme-darktooth"; - rev = "dde50661210d8610cd03526a6c9a922bb0e494a6"; - sha256 = "1mab28rm175ylg17ziha2kndcqb9a23f8wrpydypa8k7iirhadp6"; + rev = "fb66992286c009e594eb7bb9ee2f1cdc3bebb555"; + sha256 = "0n7qgnyl4rdvgwjb7gz6m1c22mxwg8bp08r7lz27z0b1bcyw94sc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme"; @@ -6099,7 +6289,6 @@ license = lib.licenses.free; }; }) {}; - }) {}; dart-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "dart-mode"; @@ -6271,12 +6460,12 @@ decide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "decide"; - version = "0.5"; + version = "0.7"; src = fetchFromGitHub { owner = "lifelike"; repo = "decide-mode"; - rev = "ce0cd15e8e42d458d86cbf4c1effd03cefec33bd"; - sha256 = "0wm24ndiyhrayg1gz456s0s1ddlpcvg4vp555g4zzl3zcpsy94bg"; + rev = "90133687118c236142b8110571c463304b3192f9"; + sha256 = "04yakjnh9c165ssmcwkkm03lnlhgfx5bnk0v3cm73kmwdmfd2q7s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6adcd300e2ac2c718989cf855fd7b3eef654df00/recipes/decide"; @@ -6878,12 +7067,12 @@ direnv = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "direnv"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "wbolster"; repo = "emacs-direnv"; - rev = "2cdf87ea96f9a08dee98762b18b5f8a5198ecf63"; - sha256 = "172jyl8v4zy9bbha8nndq63x8svn9xqkafkj3q17z289na8iaylh"; + rev = "3c632dd1fdf0ad1edb6d9b0a4a09cdbb420c27aa"; + sha256 = "0jajqf7ad0x6ca7i051svrc37mr3ww8pvd1832i0k7nf3i8cv867"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv"; @@ -7365,6 +7554,27 @@ license = lib.licenses.free; }; }) {}; + dtrt-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "dtrt-indent"; + version = "0.2.1"; + src = fetchFromGitHub { + owner = "jscheid"; + repo = "dtrt-indent"; + rev = "a54871bedadabede505b3913ee1039f5ab36cad2"; + sha256 = "0ylch7q8lh2r10qzrb41bnrpnznvj5fjszazmxfcvj6ss8yrxjzi"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/61bcbcfa6c0f38a1d87f5b6913b8be6c50ef2994/recipes/dtrt-indent"; + sha256 = "1npn2jngy1wq0jpwmg1hkn8lx6ncbqsi587jl38lyp2xwchshfk5"; + name = "dtrt-indent"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/dtrt-indent"; + license = lib.licenses.free; + }; + }) {}; ducpel = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ducpel"; @@ -7598,12 +7808,12 @@ easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-hugo"; - version = "0.9.9"; + version = "1.0.0"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "451a37fb2e1f36d85a85973d4c41c7a249263f62"; - sha256 = "1s89qs13bnyqmsm7rfzk69hvnh170v2hpbh5adjiicwg3my05dis"; + rev = "226fa5c661391c7f8317a24c9f757396e1900371"; + sha256 = "0g63ajpxr2a42nw5ri14icvwwdc9hs8al91plcjxjs7q7rbkhwp6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; @@ -7724,12 +7934,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }: melpaBuild { pname = "ebib"; - version = "2.11.3"; + version = "2.11.6"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "ee28c043492a550c68ca2f465042cd51ef150b9e"; - sha256 = "0jzw313hn7srr9mhwygl56iibx0wxra4php6pk9isbl338cw3gv0"; + rev = "9e5f3377a5e9c6956300de3872c89cd902c2cfc6"; + sha256 = "0rklwdz3d2b065yhhiz7bhyfb3fsg9rcqi6d4rhk7wb8w849vf20"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -8100,12 +8310,12 @@ ein = callPackage ({ cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }: melpaBuild { pname = "ein"; - version = "0.12.7"; + version = "0.12.8"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "334bb4600051d96d5eb82655e6e2c2ef926e701e"; - sha256 = "07h3za6cwznmgwm5854yyc3paidbjlpwsj71ii7qlga7j00b7ak2"; + rev = "2dcec6a2c4d3258a92f77a35de1899cc00d2f537"; + sha256 = "0n8qvdj88d679ijjqs04cnnhz8prk8s3whijbp3lhlr5n034n8xa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -8247,12 +8457,12 @@ el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-patch"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "raxod502"; repo = "el-patch"; - rev = "0cbcbc0ddf2f65ce02a4b0b027990d7131828a9b"; - sha256 = "1nzzjb5q58f5p0jpa3rg9mmnkmnlbs19ws993sn5fcb1161hhg7r"; + rev = "ad6a64e9f24f6b58f0a08e11f76b5152da46c74c"; + sha256 = "0n0zrjij9mcbv08x1m5hjbz6hcwy0c0j2d03swywnhl4c00pwfkp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch"; @@ -8373,12 +8583,12 @@ elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "67c4f07f5b0f942f030848f5d657909a1424b597"; - sha256 = "1dc7csmj8w2k5056dz4lm86qhzgwpmr08s2hj216cpgg7cjxnwc0"; + rev = "79077efc34aad25bb43cf46a28a69a308196c972"; + sha256 = "1xsy7qr9k9ad5ig9vvf9bbxc5ik5xi1kpmq87q9iq3g321idcwnl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -8394,12 +8604,12 @@ elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }: melpaBuild { pname = "elfeed-web"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "67c4f07f5b0f942f030848f5d657909a1424b597"; - sha256 = "1dc7csmj8w2k5056dz4lm86qhzgwpmr08s2hj216cpgg7cjxnwc0"; + rev = "79077efc34aad25bb43cf46a28a69a308196c972"; + sha256 = "1xsy7qr9k9ad5ig9vvf9bbxc5ik5xi1kpmq87q9iq3g321idcwnl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -8737,12 +8947,12 @@ elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elx"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "tarsius"; repo = "elx"; - rev = "84c9cd5721be9594de743330e7abcec092d2838c"; - sha256 = "0z2xgy8n3gwh71129pk53nrm13h2x51n61vz7xjqmhm6c11vgrq4"; + rev = "6ce9a2f14ecf7263e71a699e058293f0343bfe4d"; + sha256 = "1i250nv416jmknb39a390bxvdsf0dlgwfjn67n5gn6sia99lgjhq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/91430562ecea439af020e96405ec3f21d768cf9f/recipes/elx"; @@ -9029,12 +9239,12 @@ emms-player-mpv = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms-player-mpv"; - version = "0.0.11"; + version = "0.0.12"; src = fetchFromGitHub { owner = "dochang"; repo = "emms-player-mpv"; - rev = "ce142304d1fe6b096b9b984e40e55c8cc54217c1"; - sha256 = "1s8jmkcr11fp93hmyxq7c781lx7krc5xsk99ar0h50v2hpnmzgbb"; + rev = "8c72282c98f9b10601e9a6901277040cda4b33aa"; + sha256 = "1h37kqhsi1x5xgxfp1i72vfdx5c2klblzmphf6mih3fvw3pcyxi6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9679cb8d4b3b9dce1e0bff16647ea3f3e02c4189/recipes/emms-player-mpv"; @@ -9571,12 +9781,12 @@ erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "20.0pre2"; + version = "20.0.1"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "d106c5fffb3832fffbdf99cca905390fe15d489f"; - sha256 = "14hgl356fjkbx056fqhjif4kjs05ih08r9mi9qj58k0hxpva2l8c"; + rev = "a01de6873844ba510084090abec734c4166d71fa"; + sha256 = "0bni9rchblp3n7lh07wq3rpf5xykh79jm6bl6f2dk2j24wwrhjqs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -9683,8 +9893,8 @@ sha256 = "1qhfnd5anp5qrmravv7ks5ix763xnki2f5jwcyj70qyxwr0l60cg"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/85445b59329bfd81a3fd913d7d6fe7784c31744c/recipes/es-mode"; - sha256 = "1541c7d8gbi4mgxwk886hgsxhq7bfx8is7hjjg80sfn40z6kdwcp"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/9912193f73c4beae03b295822bf41cb2298756e2/recipes/es-mode"; + sha256 = "0zp84k5idqkrvc9qci49ains0b86kpk97lk1jcwyj75s4xsfyp1y"; name = "es-mode"; }; packageRequires = [ cl-lib dash spark ]; @@ -9735,6 +9945,27 @@ license = lib.licenses.free; }; }) {}; + esh-help = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "esh-help"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "tom-tan"; + repo = "esh-help"; + rev = "03bf6fc7ef9ac46304e37524fdaf7ebfee317695"; + sha256 = "049nvd63jns3fawimwx9l7cbqw2gw84f8f9swpwd0a8z449mlj2m"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ab94c66d1ed7cfdbc437ee239984ba70408fd28a/recipes/esh-help"; + sha256 = "1k925wmn8jy9rxxsxxawasxq6r4yzwl116digdx314gd3i04sh3w"; + name = "esh-help"; + }; + packageRequires = [ dash ]; + meta = { + homepage = "https://melpa.org/#/esh-help"; + license = lib.licenses.free; + }; + }) {}; eshell-autojump = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-autojump"; @@ -10124,8 +10355,8 @@ sha256 = "1z7ysn0h62i674pw47k905713m4ch7hrisk4834rf53zq3c9sabn"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/514964d788f250e1e7893142bc094c63131bc6a5/recipes/evil"; - sha256 = "044k9p32y4cys3zwdfanr1zddgkxz16ahqspfz7vfszyw8yml1jb"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil"; + sha256 = "1d36r6mi5nvrwnk4a9338wmhr72fcbrwj0r8gmvivpjdngjy4k39"; name = "evil"; }; packageRequires = [ goto-chg undo-tree ]; @@ -10368,12 +10599,12 @@ evil-matchit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-matchit"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-matchit"; - rev = "e9f77f7d6a14434a8ca3280d721b96c0984fa7eb"; - sha256 = "11mhgw0xa8kn73svgvzpmvvnkj2ja4mxs030vlzkh4scvlfa98dl"; + rev = "0b0e6d61a6462fc6fff7000b739ce5b31acd0d4c"; + sha256 = "13qxsbvmi0dkzmf59j0xyjwwcspyhymm6swsagqy4b57ypis5hxh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit"; @@ -10410,12 +10641,12 @@ evil-multiedit = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, iedit, lib, melpaBuild }: melpaBuild { pname = "evil-multiedit"; - version = "1.3.3"; + version = "1.3.8"; src = fetchFromGitHub { owner = "hlissner"; repo = "evil-multiedit"; - rev = "5f263a9388dd3593b5acefe9f523c819bd3b338f"; - sha256 = "0bsdyy5jw8adj26p85831n4f34d0sv4rrv9xlhjqkzx9gsr4h7d1"; + rev = "c0cb6858399863e51935dae62c7c61ebc68f92eb"; + sha256 = "010y4vxj7rr5kr4csbh72s60ndqzqxdrvgkyb65vxb5vskr1n1wm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/997f5a6999d1add57fae33ba8eb3e3bc60d7bb56/recipes/evil-multiedit"; @@ -10596,22 +10827,22 @@ license = lib.licenses.free; }; }) {}; - evil-snipe = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: + evil-snipe = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-snipe"; - version = "2.0.3"; + version = "2.0.8"; src = fetchFromGitHub { owner = "hlissner"; repo = "evil-snipe"; - rev = "c37aa6bcac8d78aa4115d5bc48e219a6ec8a8261"; - sha256 = "0r6nna21w9hcwwhi6ij9lrmlhvgp6c67zl3pbc2iwwfw7bvca4xb"; + rev = "dc62ac317fd29f018e9785c1b3b7dd7ad57b3938"; + sha256 = "18j33smlajj7ynigfgm64z3kfys5idbxin2gd93civ2564n85r33"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe"; sha256 = "0gcmpjw3iw7rjk86b2k6clfigp48vakfjd1a9n8qramhnc85rgkn"; name = "evil-snipe"; }; - packageRequires = [ cl-lib evil ]; + packageRequires = [ cl-lib emacs evil ]; meta = { homepage = "https://melpa.org/#/evil-snipe"; license = lib.licenses.free; @@ -10851,11 +11082,11 @@ exiftool = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "exiftool"; - version = "0.2"; + version = "0.3"; src = fetchgit { url = "https://git.systemreboot.net/exiftool.el/"; - rev = "799076ae62d96e9d502f1189217b04ffdda2dc1a"; - sha256 = "0yfa6w0518179v8hzzwrs6swrc1ak1nkyy0a7lkryrw310107j5n"; + rev = "8dd70ba5214a73960361a0c6220bb4aa72b9e478"; + sha256 = "0sb71bj8djppzac02bpl3v7fy0jlidd4aagg8bmmgyp7zx84xws8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4835a76909d020781021e747fbc341111a94dbfa/recipes/exiftool"; @@ -10952,22 +11183,22 @@ license = lib.licenses.free; }; }) {}; - exwm-x = callPackage ({ cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }: + exwm-x = callPackage ({ bind-key, cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }: melpaBuild { pname = "exwm-x"; - version = "1.0"; + version = "1.7.2"; src = fetchFromGitHub { owner = "tumashu"; repo = "exwm-x"; - rev = "47952c09e74fc0da3135e7ba0d4fef0eb88f98dc"; - sha256 = "14mf388iygirlv7j5db2x5avn70b54mm34kd3y851n6i6yzgz7jw"; + rev = "e50edd9e4174b729fdbc5750221c5e49b772e9c5"; + sha256 = "0kx4db5mdm295d4gyx88xjgivhsnl6f5p24smvwi1wf3jv35rnds"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x"; sha256 = "1d9q57vz63sk3h1g5gvp9xnmqkpa73wppmiy2bv8mxk11whl6xa3"; name = "exwm-x"; }; - packageRequires = [ cl-lib exwm swiper switch-window ]; + packageRequires = [ bind-key cl-lib exwm swiper switch-window ]; meta = { homepage = "https://melpa.org/#/exwm-x"; license = lib.licenses.free; @@ -11904,6 +12135,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-julia = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-julia"; + version = "0.0.3"; + src = fetchFromGitHub { + owner = "gdkrmr"; + repo = "flycheck-julia"; + rev = "67cdef277741f06c884525636a1cf1349efebbb4"; + sha256 = "1qn2i643nbvb94vgdwc94himwh3z984cmg2fklvmlw8xyyxm7ny2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4e964e3c6f737d0102b4fd7440fa9d434e6382bf/recipes/flycheck-julia"; + sha256 = "0340bv0lifs8pajk7gh7rngdjg62vaggn5biyysng642dlg5fwqs"; + name = "flycheck-julia"; + }; + packageRequires = [ emacs flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-julia"; + license = lib.licenses.free; + }; + }) {}; flycheck-kotlin = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-kotlin"; @@ -12243,12 +12495,12 @@ flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, ycmd }: melpaBuild { pname = "flycheck-ycmd"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "9f5ad4a20e6bf893491635108adfff71f3c6b590"; - sha256 = "08kvbvhx5y3239bzdb1xpr81lfrhjy9xka4kn9dpa5bdxs0xx92w"; + rev = "d042a673b4d717c3ca9d641f120bfe16c994c740"; + sha256 = "0rxw86xi9xgr0fp6wmd6hgqgqr9flk7p4lcr0052jhlwknj1nrx0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd"; @@ -13083,12 +13335,12 @@ fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }: melpaBuild { pname = "fsharp-mode"; - version = "1.9.7"; + version = "1.9.8"; src = fetchFromGitHub { owner = "rneatherway"; repo = "emacs-fsharp-mode-bin"; - rev = "1020b6ccb5bf7d3eccd9e84b7ab293c87528265e"; - sha256 = "0qbhl4yzn5q156w1gyapj430sxj4iyzgdwh2f5zyl8q791vad9k3"; + rev = "9766952bd7830cb0d319736961af8e42e67d42fe"; + sha256 = "1krncbzdhp6kpypaqdn6fhvxhhc1pvy2ayn4w4ljmsd7wx6zazyi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode"; @@ -13362,12 +13614,12 @@ geben = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geben"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "ahungry"; repo = "geben"; - rev = "1308c93c1eb6c96c0e322f09fcb784f5df208a04"; - sha256 = "0fva9xmwh887d0fdm8id67azs5rjbqk7qpjlwh7nlhrwgxsnzr7d"; + rev = "003abd23a7468daa133dfbc7ef85d0d61a0410dc"; + sha256 = "15ck23xv3dz9i4w5xd9lkg0c6rlsyxdz465xrpkr77fq9qw0c4dg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f8648609e160f7dcefe4a963e8b00475f2fff78/recipes/geben"; @@ -14220,6 +14472,27 @@ license = lib.licenses.free; }; }) {}; + gl-conf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "gl-conf-mode"; + version = "0.3"; + src = fetchFromGitHub { + owner = "llloret"; + repo = "gitolite-emacs"; + rev = "1a53e548277eb9c669bbeda4bee9be32be7a82ec"; + sha256 = "059m30vvp71y630pcam6qfv5bxc35ygj26wcg28p56pccxxyj3q9"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e3117e62d429e44506f7d82fc64252d41bc1a4b6/recipes/gl-conf-mode"; + sha256 = "0lf8xmq309aqyf16ymqlr8gj2qawlsqagbdndj0kgj72dnnw4cfm"; + name = "gl-conf-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/gl-conf-mode"; + license = lib.licenses.free; + }; + }) {}; glab = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "glab"; @@ -14706,12 +14979,12 @@ google-translate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "google-translate"; - version = "0.11.13"; + version = "0.11.14"; src = fetchFromGitHub { owner = "atykhonov"; repo = "google-translate"; - rev = "c859592c3fda01594b270e388414a79373b5587b"; - sha256 = "1arwq4nld3capjj2b3ask1pwy89fz25f550fb7cnhiv5rhqr51iw"; + rev = "486c63bbfa0338589589f628703c38112035a5b2"; + sha256 = "08b4lxnwy9iqxacbjjljybvvdkl9g2dy6vga6hw7h7h32qra8w2j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e3c275e59cbfe6e40f9cd4c470fc66544c9a6d21/recipes/google-translate"; @@ -14811,12 +15084,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "9bfdc5ce62c0585b48b154cc460f8664dcd124c3"; - sha256 = "0p00s08fjwh106dag9wyhikzrh0vqd4pzb852b2zrmb7zlhigx65"; + rev = "b63044e5f833781eb7b305bc035392480ee06a82"; + sha256 = "1p0xnhcm7kx4g9wvy18nnij2wfirp0fccv24jz6v1i9bc64n7zka"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -15261,12 +15534,12 @@ gscholar-bibtex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gscholar-bibtex"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "gscholar-bibtex"; - rev = "00b32521de3aa689bc58516ae10ba7f3ef1b6c92"; - sha256 = "1dfd22629gz0c8r4wplvbn0n7bm20549mg5chq289s826ca0kxqk"; + rev = "655bccf0b12c9d95ec992ee4bfb5c7c9a4d0c99b"; + sha256 = "1ivdq3mgym14v5hpv938248vifw1xk9z16d2f38d9xj01icik522"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9fa546d3dce59b07a623ee83e3befe139dc10481/recipes/gscholar-bibtex"; @@ -15324,12 +15597,12 @@ guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: melpaBuild { pname = "guix"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "alezost"; repo = "guix.el"; - rev = "35c1506bec0cb43629d30cae8be6cd7f793fff8b"; - sha256 = "1dlh4ppnbliv2ipfysdrnpix5kg6nwjc0468whi3w758nwpkamzc"; + rev = "6d4ccb3f7376d6326b58b25f3c94ab546418a030"; + sha256 = "13n8k5ak3y1x6i27x47sji49kdbqhnc3ywqkn4xwmxcnrs28kr25"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; @@ -15743,12 +16016,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "2.7.1"; + version = "2.8.1"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "05a297dda6fe9dc42e04220275b0bf2a37b56582"; - sha256 = "04l3sjvy5y7ph9h02y4jlasd98bihqn19ngpf2yhc0k5mdhkww1s"; + rev = "c695a697461a48840f567bd5339909d4a80fa99f"; + sha256 = "02lmjv96l1nmjfmyn82fzlrcx3wq4xp9hjynqbb8b69xn60xnlv1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -15827,12 +16100,12 @@ helm-backup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-backup"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "antham"; repo = "helm-backup"; - rev = "184026b9fe454aab8e7730106b4ca494fe307769"; - sha256 = "0d6h4gbb69abxxgm85pdi5rsaf9h72yryg72ykd5633i1g4s8a76"; + rev = "b6f930a370f6339988e79e0c85e9deee98c7b9f4"; + sha256 = "0cawlad5jy6kn2mg72ivjg3gs2h6g067h910xlbir01k9wlk3mfg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e6eba7b201e91211e43c39e501f6066f0afeb8b/recipes/helm-backup"; @@ -16079,12 +16352,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "2.7.1"; + version = "2.8.1"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "05a297dda6fe9dc42e04220275b0bf2a37b56582"; - sha256 = "04l3sjvy5y7ph9h02y4jlasd98bihqn19ngpf2yhc0k5mdhkww1s"; + rev = "c695a697461a48840f567bd5339909d4a80fa99f"; + sha256 = "02lmjv96l1nmjfmyn82fzlrcx3wq4xp9hjynqbb8b69xn60xnlv1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -16160,6 +16433,27 @@ license = lib.licenses.free; }; }) {}; + helm-directory = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-directory"; + version = "0.6.4"; + src = fetchFromGitHub { + owner = "masasam"; + repo = "emacs-helm-directory"; + rev = "2c6d45404506ba744888dcdb65e9f63878f2da16"; + sha256 = "1a5j4zzn249jdm4kcri64x1dxazhhk7g5dmgnhflrnbrc2kdwm8h"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d0c066d6f285ab6d572dab4549781101547cb704/recipes/helm-directory"; + sha256 = "01c5a08v6rd867kdyrfwdvj05z4srzj9g6xy4scirlbwbff0q76n"; + name = "helm-directory"; + }; + packageRequires = [ emacs helm ]; + meta = { + homepage = "https://melpa.org/#/helm-directory"; + license = lib.licenses.free; + }; + }) {}; helm-dired-history = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-dired-history"; @@ -16331,12 +16625,12 @@ helm-git-grep = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-git-grep"; - version = "0.9.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "yasuyk"; repo = "helm-git-grep"; - rev = "6ca2fcd44510305cf019815d61bf65eca200c238"; - sha256 = "0qmxccwpv7l5lbhv9n7ylikzcggdr99qzci868ghf33p4zhqyrj5"; + rev = "744cea07dba6e6a5effbdba83f1b786c78fd86d3"; + sha256 = "172m7wbgx9qnv9n1slbzpd9j24p6blddik49z6bq3zdg1vlnf3dv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/338d28c3fe201a7b2f15793be6d540f44819f4d8/recipes/helm-git-grep"; @@ -17192,12 +17486,12 @@ helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-tramp"; - version = "0.4.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-helm-tramp"; - rev = "0885339369b65bc5d06829d82af734560dc45555"; - sha256 = "088bpikbnsaxsjfq896fcg7y9qgvfbq7iwxsh391yc6h46zgarkk"; + rev = "9480ee2d5a9cc190e48a04ffac33ca6403fd12e1"; + sha256 = "0jh9vbbsdzgxd41x5ykvb4b5ww248bc7lrzfjn4jmckgjmqq8v1y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp"; @@ -17696,12 +17990,12 @@ hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-todo"; - version = "1.7.4"; + version = "1.8.0"; src = fetchFromGitHub { owner = "tarsius"; repo = "hl-todo"; - rev = "a23312464fc6462d559462a44cd74735e9f73421"; - sha256 = "0sy0fjmh1m36ajzfmxa2j9akws5qa8a4f1qmj3wgj9vdqd043mr8"; + rev = "961db3116f1396dc4f903e3a59824a40e0bbb6a2"; + sha256 = "0w847g7lvzk9br9r73n7rf2ba6wafqrapyigp91f62jicz28lvm1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c262f6a1a10e8b3cc30151cad2e34ceb66c6ed7/recipes/hl-todo"; @@ -17903,6 +18197,27 @@ license = lib.licenses.free; }; }) {}; + hugsql-ghosts = callPackage ({ cider, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "hugsql-ghosts"; + version = "0.1.1"; + src = fetchFromGitHub { + owner = "rkaercher"; + repo = "hugsql-ghosts"; + rev = "9d76acb41333c6377c7fe79e936008d10fe55420"; + sha256 = "18wkqvmfr5v3mf3si0mwmwlc5gms82jzb5p3q3kpbmsayzg3xi8n"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/969fd5e51bf93b5eff6919956c43c041a3b24d1e/recipes/hugsql-ghosts"; + sha256 = "1v1iypis5iyimdr9796qpqw0qmhzijap0nbr0mhhyp4001kakkwz"; + name = "hugsql-ghosts"; + }; + packageRequires = [ cider dash s ]; + meta = { + homepage = "https://melpa.org/#/hugsql-ghosts"; + license = lib.licenses.free; + }; + }) {}; hungry-delete = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hungry-delete"; @@ -19036,6 +19351,27 @@ license = lib.licenses.free; }; }) {}; + inverse-acme-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "inverse-acme-theme"; + version = "1.12.0"; + src = fetchFromGitHub { + owner = "dcjohnson"; + repo = "inverse-acme-theme"; + rev = "e57f494fd94e49321a6396f530b8a13bae8b57df"; + sha256 = "16f9vszl0f1dkjvqk5hxi570gf4l8p6fk27p0d7j11grsck0yzly"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1c44dbc8d3ca29d8715af755b845af7236e95406/recipes/inverse-acme-theme"; + sha256 = "03g6h8dpn42qnr593ryhj22lj1h2nx4rdr1knhkvxygfv3c4lgh5"; + name = "inverse-acme-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/inverse-acme-theme"; + license = lib.licenses.free; + }; + }) {}; iplayer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iplayer"; @@ -19162,15 +19498,36 @@ license = lib.licenses.free; }; }) {}; + ivy-dired-history = callPackage ({ cl-lib ? null, counsel, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: + melpaBuild { + pname = "ivy-dired-history"; + version = "1.0"; + src = fetchFromGitHub { + owner = "jixiuf"; + repo = "ivy-dired-history"; + rev = "3604840f85e4ff2d7ecab6233e820cb2ec5c8733"; + sha256 = "0slisbnfcdx8jv0p67ag6s4l0m0jmrwcpm5a2jm6sai9x67ayn4l"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ad37f6b04ff45fbffeadefc94db16baa27bcc2ac/recipes/ivy-dired-history"; + sha256 = "1vj073k5m0l8rx9iiisikzl053ad9mlhvbk30f5zmw9sw7b9blyl"; + name = "ivy-dired-history"; + }; + packageRequires = [ cl-lib counsel ivy ]; + meta = { + homepage = "https://melpa.org/#/ivy-dired-history"; + license = lib.licenses.free; + }; + }) {}; ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-erlang-complete"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "s-kostyaev"; repo = "ivy-erlang-complete"; - rev = "2d93b1b0ec1705e449f2e0f43073aacc8f1e3242"; - sha256 = "0lrnd5r9ycy2qqggqd0sr6b2w7s28yfm15pgyh0r0rjdxky4a5vm"; + rev = "117369f882f81fb9cc88459a4072a2789138c136"; + sha256 = "0cy02idvhw459a3rlw2aj8hfmxmy7hx9x5d6g3x9nkv1lxkckn9f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete"; @@ -19622,22 +19979,22 @@ license = lib.licenses.free; }; }) {}; - js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, nvm }: + js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js-comint"; - version = "0.0.5"; + version = "1.1.0"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "js-comint"; - rev = "83978912073d554f3dc1185a8a46222317a90539"; - sha256 = "0h0dfq2rrnlvdbm39l2wqmhzrps6z6ha65j26bnblwa03jr608l9"; + rev = "2c19fafed953ea0972ff086614f86614f4d5dc13"; + sha256 = "1ljsq02g8jcv98c8zc5307g2pqvgpbgj9g0a5gzpz27m440b85sp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9d20b95e369e5a73c85a4a9385d3a8f9edd4ca/recipes/js-comint"; sha256 = "0jvkjb0rmh87mf20v6rjapi2j6qv8klixy0y0kmh3shylkni3an1"; name = "js-comint"; }; - packageRequires = [ nvm ]; + packageRequires = []; meta = { homepage = "https://melpa.org/#/js-comint"; license = lib.licenses.free; @@ -19790,6 +20147,27 @@ license = lib.licenses.free; }; }) {}; + json-navigator = callPackage ({ emacs, fetchFromGitHub, fetchurl, hierarchy, lib, melpaBuild }: + melpaBuild { + pname = "json-navigator"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "DamienCassou"; + repo = "json-navigator"; + rev = "bc5634fc78d2e43ebd3c255350829877f3e4549c"; + sha256 = "1j2lic9sn00j6pzq5qslv9m2z0rvsxkvz73z8swp7vcrsgz7qvqd"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/62d4d68bd473652b80988a68250e9190b886ad6e/recipes/json-navigator"; + sha256 = "0yfl31cg0mkgsbpgx00m9h2cxnhsavcf7zlspb0qr4g2zq6ya1wx"; + name = "json-navigator"; + }; + packageRequires = [ emacs hierarchy ]; + meta = { + homepage = "https://melpa.org/#/json-navigator"; + license = lib.licenses.free; + }; + }) {}; json-reformat = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "json-reformat"; @@ -20171,12 +20549,12 @@ keymap-utils = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "keymap-utils"; - version = "2.1.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "tarsius"; repo = "keymap-utils"; - rev = "a4f6ff724eeade5612c01c6f6bf401f264687793"; - sha256 = "0jgmw8798g3ikhwnic3fbbjld0hj8fvg50q6x78pngf78ws92mkl"; + rev = "0130f32e5ade649dd2738206a80570e450906ef6"; + sha256 = "1bq7zihdj67j94yyv6655mcrxhz99szbf2zi64nwsl60bxz0znb8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03acebf1462dea36c81d4b9ab41e2e5739be3c3/recipes/keymap-utils"; @@ -20465,12 +20843,12 @@ langtool = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "langtool"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-langtool"; - rev = "708799b021d4f4a765c312e33737e343d7e3c9bf"; - sha256 = "1i8wbhc6i88plpq48ccka0avdj2x5rcxm81j93dmwp70ld0zws8p"; + rev = "d976e4f0cadb2309b798540429558936f8f45889"; + sha256 = "1qlgd5i8jngsq754jm44gb46p5y6j2cccacg72aklvwajay0adyh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/503845e79e67c921f1fde31447f3dd4da2b6f993/recipes/langtool"; @@ -21123,12 +21501,12 @@ logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "logview"; - version = "0.8"; + version = "0.8.1"; src = fetchFromGitHub { owner = "doublep"; repo = "logview"; - rev = "b5cafd1145f22e7beff8ef8ed742bf10af1e6e1c"; - sha256 = "08is4fg94a6am7c2j0d5qd1nkrnik5vpzg3pqkimyxgy5czj764b"; + rev = "134b41557ab539219d9e3a1b3c8939df93676726"; + sha256 = "1jfdm64r6rj7pl6270v084fvaga5csa4snvbfjdlhs5bshn1d0v2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview"; @@ -21526,6 +21904,27 @@ license = lib.licenses.free; }; }) {}; + magit-tbdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: + melpaBuild { + pname = "magit-tbdiff"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "magit"; + repo = "magit-tbdiff"; + rev = "2e7d54d290260e5834cca06863d78fc563d7373c"; + sha256 = "07i0bnjkflgrrg246z996slzy28b2kjhhv13z0lcb72w46l935yr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ad97eea866c8732e3adc17551d37a6d1ae511e6c/recipes/magit-tbdiff"; + sha256 = "1wydmw4f1072k8frk8mi8aaky7dndinq8n7kn10q583bjlxgw80r"; + name = "magit-tbdiff"; + }; + packageRequires = [ emacs magit ]; + meta = { + homepage = "https://melpa.org/#/magit-tbdiff"; + license = lib.licenses.free; + }; + }) {}; magit-topgit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-topgit"; @@ -22082,12 +22481,12 @@ meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "meghanada"; - version = "0.7.12"; + version = "0.8.2"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "31c68839bd1de8e79fe7bce6bdeade4bacdbc737"; - sha256 = "1hm8w04d0cyy21dnciblz4gg15k5axfvaxx788hfz2pmbp435yni"; + rev = "b507fc0e6fa4b6f1b05c46ecf563ad0af69e263a"; + sha256 = "0kiib5wchqhxm8rsxp3mfp3zdbgg57gbn8y70j5msa2sxdz26mm7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -22145,12 +22544,12 @@ merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "merlin"; - version = "2.5.4"; + version = "2.5.5"; src = fetchFromGitHub { owner = "the-lambda-church"; repo = "merlin"; - rev = "420416f182d2ea2a2285ab4bd22e5898dfb20a83"; - sha256 = "101vk16c5wayd51s8w0mvy99bk7q3gm2gz8i8616wa1lmyszjknh"; + rev = "957e551140587f0cd83d9186a06fba10a38c6084"; + sha256 = "1df6cx7y5i35cmfi5c4b48iys21cszrvlh039cdbkmy6d0pdbvi7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin"; @@ -22187,12 +22586,12 @@ metaweblog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }: melpaBuild { pname = "metaweblog"; - version = "0.1.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "punchagan"; repo = "metaweblog"; - rev = "c8b50a6edf0fd2f396570c9a1c2ef8cd207606fb"; - sha256 = "06mbdb4zb07skq1jpv05hr45k5x96d9hgkb358jiq0kfsqlrbbb4"; + rev = "2200eacde17edb66bbdde9c0b6b65481f40d498b"; + sha256 = "116m0v73v636xvsq46i3qhd4wy3x7zk3k8ffmsx36ksphn9kwx0k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/metaweblog"; @@ -23446,12 +23845,12 @@ neon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "neon-mode"; - version = "1.1.0"; + version = "1.2.2"; src = fetchFromGitHub { owner = "Fuco1"; repo = "neon-mode"; - rev = "0822d6f42ef497e28e320a2fa924b8496bcac3df"; - sha256 = "134i42cjyy33bdqprhk7ziy8iz8y3j6bw0vw5x8izmf9y1hnwyyh"; + rev = "044040df9e83a015ddfe58940b503b6197fc29ce"; + sha256 = "0cxfn1v3jww8ih4yn77jw4lp8kjlc19m2vffwm8jli0dg8fzrfqa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c6b2a4898bf21413c4d9e6714af129bbb0a23e1a/recipes/neon-mode"; @@ -23572,12 +23971,12 @@ nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-mode"; - version = "1.11.9"; + version = "1.11.12"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "5d59ec86d4cf07a705407a9e538869dd25ec7d9d"; - sha256 = "0ankhmx4raaims2q0q1yffq5z6hqil01zpj6vynrqi1n7z4rjr90"; + rev = "04e071a5e4cdf7f5396a0e36874e0a023b7af232"; + sha256 = "1hzp70sm4bwlbqnd7mmzan10wsgb03a1zfiqmwxnc61jgjxd5jva"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -23614,12 +24013,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "0.5.7"; + version = "0.5.9"; src = fetchFromGitHub { owner = "tarsius"; repo = "no-littering"; - rev = "e041942cb0f4f02d00cf30afb956208496562ba4"; - sha256 = "00d6fz5kg2k6py5mj2h9rzbqa4gkiv02h9ba55psfgbnmak6ip0v"; + rev = "8b689a1e16d4825d0221f4a41756b63bbc361c82"; + sha256 = "02cb5m1r5k1f6il79yv8fa5yiyz2m37awlbjjxmkv1av06kl0abn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering"; @@ -23716,11 +24115,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "0.24.2"; + version = "0.25pre0"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "2e86a4da55c29e0751d950839cdcbe40234ca8ba"; - sha256 = "1g75k365cdl0670bs38bvf391hsiv7rwxbmwz53x03fyz4gl58by"; + rev = "952a0f0cda7d1a12432d1c9ad71b41401cb1615c"; + sha256 = "1mj3946sg2lxamcz16jkys88scx1fyhky3amwxnl5iszd15lhvxz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -23859,6 +24258,27 @@ license = lib.licenses.free; }; }) {}; + numbers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "numbers"; + version = "1.4"; + src = fetchFromGitHub { + owner = "davep"; + repo = "numbers.el"; + rev = "74be68b94143f042ce461b2a69202f515acaf20c"; + sha256 = "0b4bgc4hkndia8zg4d23l1w78iwzj1l46ifrhz5z1p97qldalb0x"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5c77353d3a2b0d360bb28e528ef2707227081c72/recipes/numbers"; + sha256 = "02cx19fi34yvc0icajnwrmb8lr2g8y08kis08v9xxalfxz06kb3h"; + name = "numbers"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/numbers"; + license = lib.licenses.free; + }; + }) {}; nvm = callPackage ({ dash, dash-functional, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "nvm"; @@ -24342,15 +24762,15 @@ license = lib.licenses.free; }; }) {}; - omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }: + omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }: melpaBuild { pname = "omnisharp"; version = "4.0"; src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "7ca20bb808dd51adbd83e0c18885c4300548d032"; - sha256 = "0p4adjpa3l6aaz7kd3474aagzfzrnra7mijw4l0himba9ldrh590"; + rev = "ab4c6bb04cda35510fe751e546b5c0bb4dc3371d"; + sha256 = "0zkd5hp5xk0wjlv6nqi38dnhrzk7jzcd8546wqfw0my10kb1ycs2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; @@ -24363,6 +24783,7 @@ csharp-mode dash emacs + f flycheck popup s @@ -24730,6 +25151,27 @@ license = lib.licenses.free; }; }) {}; + org-edit-latex = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "org-edit-latex"; + version = "0.8.0"; + src = fetchFromGitHub { + owner = "et2010"; + repo = "org-edit-latex"; + rev = "323d0b39d0284cef730b706dce7c0e58ed35530f"; + sha256 = "0zcllyhx9n9vcr5w87h0hfz25v52lvh5fi717cb7mf3jh89zh842"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-edit-latex"; + sha256 = "0nkiz4682qgk5dy4if3gij98738482ys8zwm8yx834za38xxbwry"; + name = "org-edit-latex"; + }; + packageRequires = [ auctex emacs org ]; + meta = { + homepage = "https://melpa.org/#/org-edit-latex"; + license = lib.licenses.free; + }; + }) {}; org-elisp-help = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-elisp-help"; @@ -24838,12 +25280,12 @@ org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-journal"; - version = "1.12.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-journal"; - rev = "24313870fa682a53e7f3f916b0e853a731868886"; - sha256 = "0nc3jl7sgqc8swi89rdk1yapmqxp8vaxm7390iqxy7a1sng4jydh"; + rev = "d9b5512994c54ebcbc0dcccbf1c779fbb8a89d3d"; + sha256 = "0s1b6lgr841iifznbwqn8r0chbfd0vph5v8n6cc0grak8n6nqgxr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal"; @@ -25151,12 +25593,12 @@ org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, pdf-tools, s }: melpaBuild { pname = "org-ref"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "785765d575ef4c28581f6790e9814d75eaeec4ab"; - sha256 = "18f5fppipandbirhhs5jlrk4gl7jxyrswfwr36859433x2wkfj70"; + rev = "db6c52f41faba686a378a8c57356a563f5cef496"; + sha256 = "0kx6w3zz5gmlmr9bx1mdq1k8ykkbnll6m91z90p6f2xm96j627j6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -25201,6 +25643,27 @@ license = lib.licenses.free; }; }) {}; + org-static-blog = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-static-blog"; + version = "1.0.3"; + src = fetchFromGitHub { + owner = "bastibe"; + repo = "org-static-blog"; + rev = "1a63f7eb0682a73126b534458b403ad0858273e8"; + sha256 = "13k8rqh8r48hhdn8z580g379m6mgyc3jnh8a2kk0b22vlx6c3zap"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e0768d41a3de625c04ac8644ef2e05f17ee99908/recipes/org-static-blog"; + sha256 = "07vh2k7cj0cs1yzfmrrz9p03x5mbfh0bigbl93s72h1wf7i05rkw"; + name = "org-static-blog"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/org-static-blog"; + license = lib.licenses.free; + }; + }) {}; org-sync = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-sync"; @@ -25456,12 +25919,12 @@ org2blog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, metaweblog, org, xml-rpc }: melpaBuild { pname = "org2blog"; - version = "0.9.3"; + version = "1.0.0"; src = fetchFromGitHub { owner = "punchagan"; repo = "org2blog"; - rev = "9313bbce85cda3150a797d05c223ad6df79c275c"; - sha256 = "1facdvgqwvv8pv96wx5hdh5x8q9yjwvxa07i69125fgw2sgrckk8"; + rev = "e266ff4296661de520b73e6e18f201fb6378ba05"; + sha256 = "030fwgwn2xsi6nnnn4k32479hhmbr4n819yarr3n367b29al2461"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org2blog"; @@ -26294,12 +26757,12 @@ parsebib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parsebib"; - version = "2.2"; + version = "2.3.1"; src = fetchFromGitHub { owner = "joostkremers"; repo = "parsebib"; - rev = "621a87d444d9b9c479221fffcd8f7cb5ce2f7717"; - sha256 = "14rvqjd24xwp2pvl4r00jvhvq7p2wndpz3yy1ml9yymkkn1p1hnh"; + rev = "bc31b627c666df576aa37e21c27a2223b3cb91a3"; + sha256 = "1bnqnxkb9dnl0fjrrjx0xn9jsqki2h8ygw3d5dm4bl79smah3qkh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c39633957475dcd6a033760ba20a957716cce59c/recipes/parsebib"; @@ -26336,12 +26799,12 @@ pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store }: melpaBuild { pname = "pass"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "pass"; - rev = "b4c3bd9130044c4e106bac5ba73a50822865e258"; - sha256 = "0na895x91a37wmdpqp545qvjh34d0vfq4dyxji7casdrdhx3bg16"; + rev = "2ccf4f68fa4d2aab7efbdc26ebdc45ac1ef1819c"; + sha256 = "11b8c0qihgkl46hjqx6g1p1ifd7lc3q7jhqds3gr41zsrnlyi3p8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass"; @@ -26793,6 +27256,27 @@ license = lib.licenses.free; }; }) {}; + pfuture = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "pfuture"; + version = "1.1"; + src = fetchFromGitHub { + owner = "Alexander-Miller"; + repo = "pfuture"; + rev = "a6c32c69abdb9b91baf8036b88cc4f477f611bd5"; + sha256 = "0ly38dzg754n4s2xs09kaisxs14ikm42d9sjhw9p9xirzqm7zd5j"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5fb70c9f56a58b5c7a2e8b69b191aa2fc7c9bcc8/recipes/pfuture"; + sha256 = "15fr9wkpv8v1p22wz7hsyihq7f807ck105c2crfs8y7capfvs53s"; + name = "pfuture"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/pfuture"; + license = lib.licenses.free; + }; + }) {}; ph = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ph"; @@ -27132,12 +27616,12 @@ plain-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "plain-theme"; - version = "5"; + version = "7"; src = fetchFromGitHub { owner = "yegortimoshenko"; repo = "plain-theme"; - rev = "1e484668cf272ab1883cb3c1ad9e1e8639de395d"; - sha256 = "0qhr8mch5fvy5gck5prradlrnx84h6n8nvrcqk6ynqd1nh0pnnzd"; + rev = "7c376f5bf9d653bf12e414176284736cbdd19108"; + sha256 = "12fjas93if4dqarj5g1bjvwxv3i3b5xanq6jnnks9f7gkxkbn75a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d7ad3737f081f101500317f7e183be6b1e7e8122/recipes/plain-theme"; @@ -27948,12 +28432,12 @@ protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "protobuf-mode"; - version = "3.3.1"; + version = "3.3.2"; src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "49a56da93ff3ab7d9a2252639344ad28db8cdff6"; - sha256 = "0rq8q7viyy2nfmk2b0pik4amdndi6z51fww3m0p8a7l4yfkn14wb"; + rev = "5532abc15b97f3489183b266b41844306052a3fa"; + sha256 = "1a2s66i3ampwa0yc2mj3b743hcryixqhk1vvskzgyzvglv048cn4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -28491,6 +28975,27 @@ license = lib.licenses.free; }; }) {}; + qt-pro-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "qt-pro-mode"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "EricCrosson"; + repo = "qt-pro-mode"; + rev = "66601441cc728a609765b149ee0d7dcfb74dc8bf"; + sha256 = "0azx8a7kwgn5byijgwar2rib9xv2p9w7w3yyb5bk19g3id2f8gdw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e9af710be77ccde8ffa5f22168d2c8a06b73dd6a/recipes/qt-pro-mode"; + sha256 = "1k3ph9bqvvg6i6n623qrwdpsffs8w9rv9nihmlggb4w30dwqc9nf"; + name = "qt-pro-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/qt-pro-mode"; + license = lib.licenses.free; + }; + }) {}; quasi-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "quasi-monochrome-theme"; @@ -29058,27 +29563,6 @@ license = lib.licenses.free; }; }) {}; - relative-line-numbers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "relative-line-numbers"; - version = "0.3.3"; - src = fetchFromGitHub { - owner = "Fanael"; - repo = "relative-line-numbers"; - rev = "38b5f9065aec008d9ad94fe5597338463aa1aa63"; - sha256 = "00ixh7siyc8m7j6hfaxnnl3ynfhzkccpjfc89v8bp3z83m4v269w"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4a2901c841d221bd782dae9059a070ae8130e1ae/recipes/relative-line-numbers"; - sha256 = "0mj1w5a4ax8hwz41vn02bacxlnifd14hvf3p288ljvwchvlf0hn3"; - name = "relative-line-numbers"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://melpa.org/#/relative-line-numbers"; - license = lib.licenses.free; - }; - }) {}; relax = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "relax"; @@ -29271,12 +29755,12 @@ resize-window = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "resize-window"; - version = "0.5"; + version = "0.7"; src = fetchFromGitHub { owner = "dpsutton"; repo = "resize-window"; - rev = "e4879731f3a3bc2261d6ec465bff01f88bd77d1d"; - sha256 = "0lhf1sk1gx0vpy038bdnmlqjzpg4kchlladihk36pv4hgqn5r9w7"; + rev = "dcbbd30f4f4435070a66a22c5a169b752ca9f904"; + sha256 = "0x2kkf7bdj9s3993kdz74igi80rqma0w3hi7aggf0zwllqdcnzvk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/601a8d8f9046db6c4d50af983a11fa2501304028/recipes/resize-window"; @@ -29376,12 +29860,12 @@ rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }: melpaBuild { pname = "rg"; - version = "1.2.2"; + version = "1.3.0"; src = fetchFromGitHub { owner = "dajva"; repo = "rg.el"; - rev = "261ed756377285f0f8941b7a33866ef538465d74"; - sha256 = "1fs367w5695v8kvwka1w9kykgpq3qp1209cxkxs096rlkxhbdvv5"; + rev = "09a5919d8982cfdb8496f0db7deccfb510a7f000"; + sha256 = "1jvinpid3w4p6s4ni0fhg4g8xc3m0c7rd3db2al214xfcn4mbbgr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; @@ -29481,7 +29965,7 @@ rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "rjsx-mode"; - version = "0.1.2"; + version = "0.1.4"; src = fetchFromGitHub { owner = "felipeochoa"; repo = "rjsx-mode"; @@ -29772,6 +30256,27 @@ license = lib.licenses.free; }; }) {}; + rufo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "rufo"; + version = "0.3.0"; + src = fetchFromGitHub { + owner = "danielma"; + repo = "rufo.el"; + rev = "4e7413fafd0320f30190ae9835ab021cf7a9ebdc"; + sha256 = "10gwr479q4kd6ndp9r2nzj7rzap21q3f0l3icrviah9l5xzdx2x0"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/123b89e06a44ef45150ca7243afc41302dfb6c6e/recipes/rufo"; + sha256 = "0pxsifcxic3q54rqj0jbj20hq7f2s4icl57lligf9g0w23qzj239"; + name = "rufo"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/rufo"; + license = lib.licenses.free; + }; + }) {}; runner = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "runner"; @@ -30760,12 +31265,12 @@ shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shx"; - version = "0.0.4"; + version = "0.0.8"; src = fetchFromGitHub { owner = "riscy"; repo = "shx-for-emacs"; - rev = "8b7de952da37f1c04fa1bdf8f54c1cfb6a7c2a8f"; - sha256 = "176rhjyh9f3scbwjkw8h64dbamfcczwjpwv3dpylmjaqzwmfsal3"; + rev = "fc98dd68f1562cf9c10a0245274c24f280f59da2"; + sha256 = "16d2l0vfrsv878w908mfi0m0raab96zxi4559a1589y7lzah2nrd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx"; @@ -30799,6 +31304,27 @@ license = lib.licenses.free; }; }) {}; + silkworm-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "silkworm-theme"; + version = "0.1"; + src = fetchFromGitHub { + owner = "mswift42"; + repo = "silkworm-theme"; + rev = "7951b53e5caf9daf6a5a15a57ae3a668cb78bd7b"; + sha256 = "1q21886qsam8y3s60zlfh48w0jl67q14qg9pzda7j2jcbj1q6r91"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9451d247693c3e991f79315868c73808c0a664d4/recipes/silkworm-theme"; + sha256 = "1zbrjqmhf80qs3i910sixirrv42rxkqdrg2z03gnz1g885gpcn13"; + name = "silkworm-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/silkworm-theme"; + license = lib.licenses.free; + }; + }) {}; simple-bookmarks = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simple-bookmarks"; @@ -30949,12 +31475,12 @@ skewer-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, simple-httpd }: melpaBuild { pname = "skewer-mode"; - version = "1.6.2"; + version = "1.7.0"; src = fetchFromGitHub { owner = "skeeto"; repo = "skewer-mode"; - rev = "8a3a22ef4fe4d9d0831e82fde08c6355d0b19ed4"; - sha256 = "05jndz0c26q60s416vqgvr66axdmxb7qsr2g70fvl5iqavnayhpv"; + rev = "51f3bbeafea6701de78190a395f6376a9974f1e5"; + sha256 = "0k8yc75d7hly4qiqxvg027cwmcck63nmbyr75qyjq8kc0vk0x5mr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/10fba4f7935c78c4fc5eee7dbb161173dea884ba/recipes/skewer-mode"; @@ -31138,12 +31664,12 @@ slstats = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "slstats"; - version = "1.7"; + version = "1.9"; src = fetchFromGitHub { owner = "davep"; repo = "slstats.el"; - rev = "a2f640f724fee7ecbd1cf28fc78297180cd959bc"; - sha256 = "0gzpwcrmlbd7fphgyv6g04wjavd9i3vgn3y1fnh178iswmpsxj62"; + rev = "3c22a8e5cf022d4eca840fefe7960d7ae6dcf167"; + sha256 = "0ay7319ijqqcan1ijycrz4006r1a50wpnss37rrbiq23nkzjmks4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fe7c8c241cc6920bbedb6711db63ea28ed633327/recipes/slstats"; @@ -31705,12 +32231,12 @@ spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, spaceline }: melpaBuild { pname = "spaceline-all-the-icons"; - version = "1.3.3"; + version = "1.3.5"; src = fetchFromGitHub { owner = "domtronn"; repo = "spaceline-all-the-icons.el"; - rev = "d5750c0aa40a66c6d76c74540587b8cbb0142350"; - sha256 = "1rjb7jpbizafxixqrwzzxgbah0b8b8wsmqxzvqdv867i5w6682p2"; + rev = "255e89303bb706b42057504e72caeb2764f3d413"; + sha256 = "0y3gv664crng4vibbh0pfh9w0ys9m5gny2b1mrqb7ma6xa78xiv2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons"; @@ -32395,12 +32921,12 @@ suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "588ec8b9476c8d7f5f16018a7aaf90ee828fb4f5"; - sha256 = "1ckvsckqlbdcw6nbsrh9xizbpkr7r88ks39av8dhn5n412c5jm4g"; + rev = "26e8b0615def4f0531682b8a849f55d330616ac1"; + sha256 = "0ql9ab6wnpww033jnfa3iwvz73h4szbwyfjvfavjlllzwk0f38np"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; @@ -32542,12 +33068,12 @@ swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "swift-mode"; - version = "2.2.4"; + version = "2.3.0"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "e91e924c225b7bfb7aa6e4a84b5d379c6268014a"; - sha256 = "0nfh5a3lnrj9z1qfgdn28mk5f9cn5fzpdjvpcv44kab3dff2irnl"; + rev = "98920962adaaf42698fc847fbe7d9edcd58e50e9"; + sha256 = "0npz0izw6dwiv1kmkbnf6hklmx4w2pqddzb2ijxasrrviyyyc83s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; @@ -32644,22 +33170,22 @@ license = lib.licenses.free; }; }) {}; - switch-window = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + switch-window = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "switch-window"; - version = "1.0.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "dimitri"; repo = "switch-window"; - rev = "cd4b06121aa5bac4c4b13b63526a99008def5f2b"; - sha256 = "1zpfilcaycj0l2q3zyvpjbwp5j3d9rrkacd5swzlr1n1klvbji48"; + rev = "f4e3fde4d4717b75716f287577e84b7ee4f33d8d"; + sha256 = "15ks1x62rn0q8lgy4x749mizvanzl9lkzgrsasrdx0v4ydmj3n7c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d2204e3b53ade1e400e143ac219f3c7ab63a1e9/recipes/switch-window"; sha256 = "02f0zjvlzms66w1ryhk1cbr4rqwklzvgcjfiicj0lcnqqx61m2k2"; name = "switch-window"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://melpa.org/#/switch-window"; license = lib.licenses.free; @@ -33695,12 +34221,12 @@ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "1.7"; + version = "1.7.6"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "d5878b0ed6da2a561aa795b31848e31e7c696197"; - sha256 = "04d7l0v1s5fxcnr4iqdpb1908bayysga3z0sbcx7ia39kmcnp4l3"; + rev = "53f0e0c562ba28b9738d05cd730728e983d2917f"; + sha256 = "13v8pydbyzl4h53xad93sfqa3aa4p8k4b8k53cqjv7mgd87pdvcw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs"; @@ -33716,12 +34242,12 @@ treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }: melpaBuild { pname = "treemacs-evil"; - version = "1.7"; + version = "1.7.6"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "d5878b0ed6da2a561aa795b31848e31e7c696197"; - sha256 = "04d7l0v1s5fxcnr4iqdpb1908bayysga3z0sbcx7ia39kmcnp4l3"; + rev = "53f0e0c562ba28b9738d05cd730728e983d2917f"; + sha256 = "13v8pydbyzl4h53xad93sfqa3aa4p8k4b8k53cqjv7mgd87pdvcw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil"; @@ -33776,6 +34302,27 @@ license = lib.licenses.free; }; }) {}; + try = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "try"; + version = "0.0.1"; + src = fetchFromGitHub { + owner = "larstvei"; + repo = "Try"; + rev = "271b0a362cadf44d0694628b9e213f54516ef913"; + sha256 = "1fvpi02c6awyrwg2yqjapvcv4132qvmvd9bkbwpjmndxpicsann3"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/13c0ed40ad02fa0893cbf4dd9617dccb624f064b/recipes/try"; + sha256 = "0dv0i77agva215bf1gj1x1k7f7g3pvccyyd7vslapf9z8brccn7n"; + name = "try"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/try"; + license = lib.licenses.free; + }; + }) {}; tss = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, json-mode, lib, log4e, melpaBuild, yaxception }: melpaBuild { pname = "tss"; @@ -34070,6 +34617,27 @@ license = lib.licenses.free; }; }) {}; + underline-with-char = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "underline-with-char"; + version = "3.0.0"; + src = fetchFromGitHub { + owner = "marcowahl"; + repo = "underline-with-char"; + rev = "c2f4870aff70efe70a8d1b089e56d3a2d6d048b9"; + sha256 = "0i6jfr4l7mr8gpavmfblr5d41ck8aqzaf4iv1qk5fyzsb6yi0nla"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e24888ccf61ac05eba5c30a47d35653f2badf019/recipes/underline-with-char"; + sha256 = "0la24nvyqinla40c2f3f4a63mjjsg58096hyw3pvp0mwiff7rxyd"; + name = "underline-with-char"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/underline-with-char"; + license = lib.licenses.free; + }; + }) {}; underwater-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "underwater-theme"; @@ -34541,12 +35109,12 @@ vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }: melpaBuild { pname = "vhdl-tools"; - version = "5.5"; + version = "5.6"; src = fetchFromGitHub { owner = "csantosb"; repo = "vhdl-tools"; - rev = "af4ff24ae4489e0a3bfbbddf6bc934f66b0af527"; - sha256 = "1z88wy7m6rj028dqxzyyyf67gw4jqd72dgsvlr8inwimds2iplbv"; + rev = "c08343904835cbae12f48e0758b0a6a014d76a74"; + sha256 = "1skh9p5s9nbl6jvljj9bfn19fdzjx8lvx1q6rzldld07xwaif4qb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools"; @@ -35527,12 +36095,12 @@ with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "2.5.10"; + version = "2.5.11"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "8ae3c7aed92842f5988671c1b3350c65c58857e0"; - sha256 = "1jy5jxkr99a9qp7abmncaphp0xd3y6m3fflvj3fq1wp33i3f7cfn"; + rev = "3385ffdc6faed5a283e26a7ebf89825c700dd395"; + sha256 = "1kznr0zv1y6lwsllpksqjzq2f4bc5a99lg19fmifn7w0dhv6fn0m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -36159,8 +36727,8 @@ version = "1.78"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "c996fbcc2e79"; - sha256 = "1ibj0dhpgxa143azr07wkmz86fip247cbk2s5fwj4nrj96z6cw9y"; + rev = "e9299b77df1f"; + sha256 = "0nnpzcj23q964v4rfxzdll1r95zd6zzqvzcgxh7h603a41r3w1wm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex"; @@ -36197,12 +36765,12 @@ ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }: melpaBuild { pname = "ycmd"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "9f5ad4a20e6bf893491635108adfff71f3c6b590"; - sha256 = "08kvbvhx5y3239bzdb1xpr81lfrhjy9xka4kn9dpa5bdxs0xx92w"; + rev = "d042a673b4d717c3ca9d641f120bfe16c994c740"; + sha256 = "0rxw86xi9xgr0fp6wmd6hgqgqr9flk7p4lcr0052jhlwknj1nrx0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; @@ -36333,12 +36901,12 @@ zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }: melpaBuild { pname = "zerodark-theme"; - version = "4.4"; + version = "4.5"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "60615d101769694038b17a2c75bb31c26f36a042"; - sha256 = "09fpyhprmavv1fa97wa7lf182nhiw0797rh73xbhf7xhn1c22gbj"; + rev = "ceb46240636865e86f3fe26906957943ba7bd73c"; + sha256 = "0nnlxzsmhsbszqigcyxak9i1a0digrd13gv6v18ck4h760mihh1m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme"; diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index 31d116fa2cb..29b793825c4 100644 --- a/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -1,10 +1,10 @@ { callPackage }: { org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20170606"; + version = "20170717"; src = fetchurl { - url = "http://orgmode.org/elpa/org-20170606.tar"; - sha256 = "11x6s30j6k0y3jfzcp16qyqn48mki9j18iblnpl5dr1bk8kyvd0x"; + url = "http://orgmode.org/elpa/org-20170717.tar"; + sha256 = "1cbk01awnyan1jap184v2bxsk97k0p2qn19z7gnid6wiblybgs89"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20170606"; + version = "20170717"; src = fetchurl { - url = "http://orgmode.org/elpa/org-plus-contrib-20170606.tar"; - sha256 = "0r6a5spzdbx6qdz5aziycmhjxm392v7iifv7mnln4s5lgnsswb1h"; + url = "http://orgmode.org/elpa/org-plus-contrib-20170717.tar"; + sha256 = "0710ba6gq04cg8d87b5wi7bz9gq9yqvqmkmgscawfm2ynfw2q8sa"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 216c04afd72..c51227bbc6f 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -5,7 +5,7 @@ , withX ? !stdenv.isDarwin , withGTK2 ? false, gtk2 ? null , withGTK3 ? true, gtk3 ? null, gsettings_desktop_schemas ? null -, withXwidgets ? false, webkitgtk24x ? null, wrapGAppsHook ? null, glib_networking ? null +, withXwidgets ? false, webkitgtk24x-gtk3 ? null, wrapGAppsHook ? null, glib_networking ? null , withCsrc ? true , srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null }: @@ -16,7 +16,7 @@ assert withGTK2 -> withX || stdenv.isDarwin; assert withGTK3 -> withX || stdenv.isDarwin; assert withGTK2 -> !withGTK3 && gtk2 != null; assert withGTK3 -> !withGTK2 && gtk3 != null; -assert withXwidgets -> withGTK3 && webkitgtk24x != null; +assert withXwidgets -> withGTK3 && webkitgtk24x-gtk3 != null; let toolkit = @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ++ lib.optional (withX && withGTK2) gtk2 ++ lib.optionals (withX && withGTK3) [ gtk3 gsettings_desktop_schemas ] ++ lib.optional (stdenv.isDarwin && withX) cairo - ++ lib.optionals (withX && withXwidgets) [ webkitgtk24x glib_networking ]; + ++ lib.optionals (withX && withXwidgets) [ webkitgtk24x-gtk3 glib_networking ]; propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ]; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index d599bc12315..28a75befba8 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -12,7 +12,7 @@ let # Sorted alphabetically - buildClion = { name, version, src, license, description, wmClass }: + buildClion = { name, version, src, license, description, wmClass, update-channel }: lib.overrideDerivation (mkJetBrainsProduct rec { inherit name version src wmClass jdk; product = "CLion"; @@ -50,11 +50,14 @@ let patchelf --set-interpreter $interp bin/gdb/bin/gdb patchelf --set-interpreter $interp bin/gdb/bin/gdbserver + patchelf --set-interpreter $interp \ + --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib zlib ]}:$lldbLibPath" \ + bin/clang/clang-tidy ) ''; }); - buildDataGrip = { name, version, src, license, description, wmClass }: + buildDataGrip = { name, version, src, license, description, wmClass, update-channel }: (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "DataGrip"; @@ -71,7 +74,7 @@ let }; }); - buildGogland = { name, version, src, license, description, wmClass }: + buildGogland = { name, version, src, license, description, wmClass, update-channel }: (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "Gogland"; @@ -89,7 +92,7 @@ let }; }); - buildIdea = { name, version, src, license, description, wmClass }: + buildIdea = { name, version, src, license, description, wmClass, update-channel }: (mkJetBrainsProduct rec { inherit name version src wmClass jdk; product = "IDEA"; @@ -106,7 +109,7 @@ let }; }); - buildPhpStorm = { name, version, src, license, description, wmClass }: + buildPhpStorm = { name, version, src, license, description, wmClass, update-channel }: (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "PhpStorm"; @@ -123,7 +126,7 @@ let }; }); - buildPycharm = { name, version, src, license, description, wmClass }: + buildPycharm = { name, version, src, license, description, wmClass, update-channel }: (mkJetBrainsProduct rec { inherit name version src wmClass jdk; product = "PyCharm"; @@ -150,7 +153,7 @@ let propagatedUserEnvPkgs = [ python ]; }; - buildRider = { name, version, src, license, description, wmClass }: + buildRider = { name, version, src, license, description, wmClass, update-channel }: lib.overrideDerivation (mkJetBrainsProduct rec { inherit name version src wmClass jdk; product = "Rider"; @@ -176,7 +179,7 @@ let ''; }); - buildRubyMine = { name, version, src, license, description, wmClass }: + buildRubyMine = { name, version, src, license, description, wmClass, update-channel }: (mkJetBrainsProduct rec { inherit name version src wmClass jdk; product = "RubyMine"; @@ -189,7 +192,7 @@ let }; }); - buildWebStorm = { name, version, src, license, description, wmClass }: + buildWebStorm = { name, version, src, license, description, wmClass, update-channel }: (mkJetBrainsProduct { inherit name version src wmClass jdk; product = "WebStorm"; @@ -213,38 +216,41 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2017.1.3"; + version = "2017.2"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "045pkbbf4ypk9qkhldz08i7hbc6vaq68a8v9axnpndnvcrf0vf7g"; + sha256 = "de7f47ec959be9653aa4d2028fb27f8327800d8370daa0ab2d1093f3469f4b49"; /* updated by script */ }; wmClass = "jetbrains-clion"; + update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml }; datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2017.1"; + version = "2017.1.5"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "91ee6a1e43d75a45ae51829835e457da85262410d89e617324d0239ba5625dfa"; + sha256 = "8847c35761fcf6fc7a1d3f2bed0fa3971fbf28721c144f41d21feb473bb212dc"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; + update-channel = "datagrip_2017_1"; }; gogland = buildGogland rec { name = "gogland-${version}"; - version = "171.4694.35"; + version = "171.4694.61"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "0q2f8bi2i49j0xcpn824sihz2015jhn338cjaqy0jd988nxik6jk"; + sha256 = "8e9462fc7c5cc7dc110ea2257b920a55d7d52ea874a53567e5d19381a1fcb269"; /* updated by script */ }; wmClass = "jetbrains-gogland"; + update-channel = "gogland_1.0_EAP"; }; idea14-community = buildIdea rec { @@ -257,18 +263,20 @@ in sha256 = "1i4mdjm9dd6zvxlpdgd3bqg45ir0cfc9hl55cdc0hg5qwbz683fz"; }; wmClass = "jetbrains-idea-ce"; + update-channel = "IDEA14.1"; }; idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2017.1.4"; + version = "2017.2"; description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "1w1knq969dl8rxlkhr9mw8cr2vszn384acwhspimrd3zs9825r45"; + sha256 = "0z5abj41f5l9ilznr34lm4fsivrl2yjdxb2kdcis5abij6zl0g3f"; }; wmClass = "jetbrains-idea-ce"; + update-channel = "IDEA_Release"; }; idea14-ultimate = buildIdea rec { @@ -281,6 +289,7 @@ in sha256 = "1hhga1i2zbsipgq283gn19kv9n94inhr1bxh2yx19gz7yr4r49d2"; }; wmClass = "jetbrains-idea"; + update-channel = "IDEA14.1"; }; idea15-ultimate = buildIdea rec { @@ -293,30 +302,33 @@ in sha256 = "012aap2qn0jx4x34bdv9ivrsr86vvf683srb5vpj27hc4l6rw6ll"; }; wmClass = "jetbrains-idea"; + update-channel = null; }; idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2017.1.4"; + version = "2017.1.5"; description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz"; - sha256 = "0byrsbsscpzb0syamzpavny879src5dlclnissa7173rh8hgkna4"; + sha256 = "0gjj2g9fcrbbbp3v4clg0kj48qdw0gqcn9im4h8p3z2zscpg16ag"; }; wmClass = "jetbrains-idea"; + update-channel = "IDEA_Release"; }; phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2017.1"; + version = "2017.1.4"; description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "1ynffm5x8fqq2r71rr9rbvdifbwbvbhqb2x1hkyy4az38gxal1bm"; + sha256 = "0zrbcziznz6dwh56snr27752xcsnl2gsxzi6jiraplkd92f2xlaf"; }; wmClass = "jetbrains-phpstorm"; + update-channel = "PS2017.1"; }; phpstorm10 = buildPhpStorm rec { @@ -329,54 +341,59 @@ in sha256 = "0fi042zvjpg5pn2mnhj3bbrdkl1b9vmhpf2l6ca4nr0rhjjv7dsm"; }; wmClass = "jetbrains-phpstorm"; + update-channel = "WI10"; }; pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2017.1.3"; + version = "2017.1.5"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "06sai589zli5xaggfk4g0j0grbw9mya9qlwabmxh9414qq3bzvbd"; + sha256 = "1a0bbf0d881527e08aad7a5adaa3ad44e8754c3eb2c3a8ed5ab113491549679b"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; + update-channel = "PyCharm_Release"; }; pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2017.1.3"; + version = "2017.1.5"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1wzgh83504px7q93h9xkarih2qjchiavgysy4di82q7377s6xd0c"; + sha256 = "52519dfd0e913b5ccb8767155cd4d1fd413967d5010e8474cdc9a1fa688016ce"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; + update-channel = "PyCharm_Release"; }; rider = buildRider rec { name = "rider-${version}"; - version = "171.3655.1246"; + version = "171.4456.1432"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = stdenv.lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/resharper/riderRS-${version}.tar.gz"; - sha256 = "90f9f8f1919e0f1dad42387f1a308483448323b089c13c409f3dd4d52992266b"; + url = "https://download.jetbrains.com/resharper/Rider-RC-${version}.tar.gz"; + sha256 = "37bad69cdfcc4f297b2500a7bb673af7ef8f1fd45baa4eb2fa388d2c4bcb41ee"; /* updated by script */ }; wmClass = "jetbrains-rider"; + update-channel = "rider_2017_1_eap"; }; ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2017.1"; + version = "2017.1.5"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "6c27f43ddc385ffba2cb2f011b80ab46d9b128d0fccf3b4ea43272fe36401a3a"; + sha256 = "198eb3d7914529ce3a6857e038167e194fb838c4b94242048ae45e8413458d66"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; + update-channel = "rm2017.1"; }; ruby-mine7 = buildRubyMine rec { @@ -389,6 +406,7 @@ in sha256 = "04fcxj1xlap9mxmwf051s926p2darlj5kwl4lms2gy5d8b2lhd5l"; }; wmClass = "jetbrains-rubymine"; + update-channel = null; }; ruby-mine8 = buildRubyMine rec { @@ -401,18 +419,20 @@ in sha256 = "0hipxib7377232w1jbf8h98bmh0djkllsrq3lq0w3fdxqglma43a"; }; wmClass = "jetbrains-rubymine"; + update-channel = null; }; webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2017.1.3"; + version = "2017.1.4"; description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "0g4b0x910231ljdj18lnj2mlzmzyl12lv3fsbsz6v45i1kwpwnvc"; + sha256 = "0aw2728wknss5vn2fkgz8rkm5vwk031305f32dirfrh51bvmq2zm"; }; wmClass = "jetbrains-webstorm"; + update-channel = "WS_Release"; }; webstorm10 = buildWebStorm rec { @@ -425,6 +445,7 @@ in sha256 = "0a5s6f99wyql5pgjl94pf4ljdbviik3b8dbr1s6b7c6jn1gk62ic"; }; wmClass = "jetbrains-webstorm"; + update-channel = null; }; webstorm11 = buildWebStorm rec { @@ -437,5 +458,6 @@ in sha256 = "17agyqdyz6naxyx6p0y240ar93gja0ypw01nm2qmfzvh7ch03r24"; }; wmClass = "jetbrains-webstorm"; + update-channel = null; }; } diff --git a/pkgs/applications/editors/jetbrains/update.pl b/pkgs/applications/editors/jetbrains/update.pl new file mode 100755 index 00000000000..fecdeb0cae8 --- /dev/null +++ b/pkgs/applications/editors/jetbrains/update.pl @@ -0,0 +1,74 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i perl -p perl perlPackages.LWPProtocolhttps perlPackages.FileSlurp + +use strict; +use List::Util qw(reduce); +use File::Slurp; +use LWP::Simple; + +sub semantic_less { + my ($a, $b) = @_; + $a =~ s/\b(\d+)\b/sprintf("%010s", $1)/eg; + $b =~ s/\b(\d+)\b/sprintf("%010s", $1)/eg; + return $a lt $b; +} + +sub get_latest_versions { + my @channels = get("http://www.jetbrains.com/updates/updates.xml") =~ /()/gs; + my %h = {}; + for my $ch (@channels) { + my ($id) = $ch =~ /^)/gs; + my $latest_build = reduce { + my ($aversion) = $a =~ /^]*version="([^"]+)"/; die "no version in $a" unless $aversion; + my ($bversion) = $b =~ /^]*version="([^"]+)"/; die "no version in $b" unless $bversion; + semantic_less($aversion, $bversion) ? $b : $a; + } @builds; + next unless $latest_build; + + # version as in download url + my ($latest_version) = $latest_build =~ /^]*version="([^"]+)"/; + ($latest_version) = $latest_build =~ /^]*fullNumber="([^"]+)"/ if $latest_version =~ / /; + + $h{$id} = $latest_version; + } + return %h; +} + +my %latest_versions = get_latest_versions(); +#for my $ch (sort keys %latest_versions) { +# print("$ch $latest_versions{$ch}\n"); +#} + +sub update_nix_block { + my ($block) = @_; + my ($channel) = $block =~ /update-channel\s*=\s*"([^"]+)"/; + if ($channel) { + die "unknown update-channel $channel" unless $latest_versions{$channel}; + my ($version) = $block =~ /version\s*=\s*"([^"]+)"/; + die "no version in $block" unless $version; + if ($version eq $latest_versions{$channel}) { + print("$channel is up to date at $version\n"); + } else { + print("updating $channel: $version -> $latest_versions{$channel}\n"); + my ($url) = $block =~ /url\s*=\s*"([^"]+)"/; + # try to interpret some nix + my ($name) = $block =~ /name\s*=\s*"([^"]+)"/; + $name =~ s/\$\{version\}/$latest_versions{$channel}/; + $url =~ s/\$\{name\}/$name/; + $url =~ s/\$\{version\}/$latest_versions{$channel}/; + die "$url still has some interpolation" if $url =~ /\$/; + + my ($sha256) = get("$url.sha256") =~ /^([0-9a-f]{64})/; + die "invalid sha256 in $url.sha256" unless $sha256; + + $block =~ s#version\s*=\s*"([^"]+)".+$#version = "$latest_versions{$channel}"; /* updated by script */#m; + $block =~ s#sha256\s*=\s*"([^"]+)".+$#sha256 = "$sha256"; /* updated by script */#m; + } + } + return $block; +} + +my $nix = read_file 'default.nix'; +$nix =~ s/(= build\w+ rec \{.+?\n \};\n)/update_nix_block($1)/gse; +write_file 'default.nix', $nix; diff --git a/pkgs/applications/editors/kdevelop5/kdevplatform.nix b/pkgs/applications/editors/kdevelop5/kdevplatform.nix index 3efc1335c07..b7c0d0cf855 100644 --- a/pkgs/applications/editors/kdevelop5/kdevplatform.nix +++ b/pkgs/applications/editors/kdevelop5/kdevplatform.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, cmake, gettext, pkgconfig, extra-cmake-modules -, boost, subversion, apr, aprutil +, boost, subversion, apr, aprutil, kwindowsystem , qtscript, qtwebkit, grantlee, karchive, kconfig, kcoreaddons, kguiaddons, kiconthemes, ki18n , kitemmodels, kitemviews, kio, kparts, sonnet, kcmutils, knewstuff, knotifications , knotifyconfig, ktexteditor, threadweaver, kdeclarative, libkomparediff2 }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules ]; buildInputs = [ - boost subversion apr aprutil + boost subversion apr aprutil kwindowsystem qtscript qtwebkit grantlee karchive kconfig kcoreaddons kguiaddons kiconthemes ki18n kitemmodels kitemviews kio kparts sonnet kcmutils knewstuff knotifications knotifyconfig ktexteditor threadweaver kdeclarative diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index 81f9ddd96d2..b05bbd053c1 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { mkdir -p $out/share/leo-editor mv * $out/share/leo-editor - makeWrapper ${python3Packages.python}/bin/python3.5m $out/bin/leo \ + makeWrapper ${python3Packages.python.interpreter} $out/bin/leo \ --set PYTHONPATH "$PYTHONPATH:$out/share/leo-editor" \ --add-flags "-O $out/share/leo-editor/launchLeo.py" ''; diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 29e76f7d23a..f3527d85fd7 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation rec { name = "nano-${version}"; - version = "2.8.4"; + version = "2.8.5"; src = fetchurl { url = "mirror://gnu/nano/${name}.tar.xz"; - sha256 = "04bvmimrw40cbcnm3xm5l5lir0qy7cncfkmwrlzg8jiy1x7jdky7"; + sha256 = "1hl9gni3qmblr062a7w6vz16gvxbswgc5c19c923ja0bk48vyhyb"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; diff --git a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock index 88100b2e8f8..327edca0ed2 100644 --- a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock +++ b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock @@ -1,8 +1,8 @@ GEM remote: https://rubygems.org/ specs: - msgpack (1.0.2) - neovim (0.3.1) + msgpack (1.1.0) + neovim (0.5.0) msgpack (~> 1.0) PLATFORMS @@ -12,4 +12,4 @@ DEPENDENCIES neovim BUNDLED WITH - 1.12.5 + 1.15.1 diff --git a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix index c3ed45a7848..fbb9c63a1cf 100644 --- a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix +++ b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix @@ -2,18 +2,18 @@ msgpack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1fb2my91j08plsbbry5kilsrh7slmzgbbf6f55zy6xk28p9036lg"; + sha256 = "0ck7w17d6b4jbb8inh1q57bghi9cjkiaxql1d3glmj1yavbpmlh7"; type = "gem"; }; - version = "1.0.2"; + version = "1.1.0"; }; neovim = { dependencies = ["msgpack"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "018mk4vqaxzbk4anq558h2rgj8prbn2rmi777iwrg3n0v8k5nxqw"; + sha256 = "1da0ha3mz63iyihldp7185b87wx86jg07023xjhbng6i28y1ksn7"; type = "gem"; }; - version = "0.3.1"; + version = "0.5.0"; }; } \ No newline at end of file diff --git a/pkgs/applications/editors/scite/default.nix b/pkgs/applications/editors/scite/default.nix index d02a08a0a59..05cf21fcc53 100644 --- a/pkgs/applications/editors/scite/default.nix +++ b/pkgs/applications/editors/scite/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "scite-${version}"; - version = "3.7.3"; + version = "3.7.5"; src = fetchurl { - url = "mirror://sourceforge/project/scintilla/SciTE/${version}/scite373.tgz"; - sha256 = "05d81h1fqhjlw9apvrni3x2q4a562cd5ra1071qpna8h4ml0an9m"; + url = http://www.scintilla.org/scite375.tgz; + sha256 = "11pg9bifyyqpblqsrl1b9f8shb3fa6fgzclvjba6hwh7hh98drji"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 9bfa3998926..7e8a85cf48a 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -5,13 +5,13 @@ let # qtEnv = with qt5; env "qt-${qtbase.version}" [ qtbase qttools ]; in stdenv.mkDerivation rec { name = "tiled-${version}"; - version = "0.18.2"; + version = "1.0.1"; src = fetchFromGitHub { owner = "bjorn"; repo = "tiled"; rev = "v${version}"; - sha256 = "087jl36g6w2g5l70gz573iwyvx3r7i8fijl3y4mmmf8pyqdyq1n2"; + sha256 = "062ja3j84v5s4qslp01gqif8c6i1klkkxpxyyrrvjhxmbyn6nmgd"; }; nativeBuildInputs = [ pkgconfig qmake ]; diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index 98e9a47a760..4eefb207fd7 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -6,7 +6,9 @@ sha256 = "18ifhv5q9prd175q3vxbqf6qyvkk6bc7d2lhqdk0q78i68kv9y0c"; } # apple frameworks -, Carbon, Cocoa }: +, Carbon, Cocoa +, buildPlatform, hostPlatform +}: let common = callPackage ./common.nix {}; @@ -17,12 +19,23 @@ stdenv.mkDerivation rec { inherit (common) version src postPatch hardeningDisable enableParallelBuilding meta; buildInputs = [ ncurses pkgconfig ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; + ++ stdenv.lib.optionals hostPlatform.isDarwin [ Carbon Cocoa ]; nativeBuildInputs = [ gettext ]; configureFlags = [ "--enable-multibyte" "--enable-nls" + ] ++ stdenv.lib.optionals (hostPlatform != buildPlatform) [ + "vim_cv_toupper_broken=no" + "--with-tlib=ncurses" + "vim_cv_terminfo=yes" + "vim_cv_tty_group=tty" + "vim_cv_tty_mode=0660" + "vim_cv_getcwd_broken=no" + "vim_cv_stat_ignores_slash=yes" + "ac_cv_sizeof_int=4" + "vim_cv_memmove_handles_overlap=yes" + "vim_cv_memmove_handles_overlap=yes" ]; postInstall = '' @@ -31,22 +44,6 @@ stdenv.mkDerivation rec { cp "${vimrc}" $out/share/vim/vimrc ''; - crossAttrs = { - configureFlags = [ - "vim_cv_toupper_broken=no" - "--with-tlib=ncurses" - "vim_cv_terminfo=yes" - "vim_cv_tty_group=tty" - "vim_cv_tty_mode=0660" - "vim_cv_getcwd_broken=no" - "vim_cv_stat_ignores_slash=yes" - "ac_cv_sizeof_int=4" - "vim_cv_memmove_handles_overlap=yes" - "vim_cv_memmove_handles_overlap=yes" - "STRIP=${stdenv.cross.config}-strip" - ]; - }; - __impureHostDeps = [ "/dev/ptmx" ]; # To fix the trouble in vim73, that it cannot cross-build with this patch diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 50103de4d05..e5b7d1c65ee 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,7 +2,7 @@ makeWrapper, libXScrnSaver, libxkbfile }: let - version = "1.13.0"; + version = "1.14.0"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "069pv0w8yhsv50glpcxzypsjc7mxmrcrv25c75rnv43yiyamjvyi"; - "x86_64-linux" = "0cjkkvd5rs82yji0kpnbvzgwz5qvh9x6bmjd51rrvjz84dbwhgzq"; - "x86_64-darwin" = "1qbxv5drqrx9k835a6zj3kkbh4sga5r9y0gf9bq16g3gf0dd9bwq"; + "i686-linux" = "04xv9fr11j7k0yfb7aa2sdmq74hh43aarlvx8nxppzbn2k18dgb3"; + "x86_64-linux" = "1m252cpj4pck40rxnrbp1wapn5d4grn15x7d3s059xb965kga4k7"; + "x86_64-darwin" = "1hwjdrnrhvrmwbq935k4scgw68x817ms89gy471afbhpl65xmp8n"; }.${stdenv.system}; archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index b8c9d171814..10c2ab9ebf9 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -5,24 +5,15 @@ }: stdenv.mkDerivation rec { - name = "qgis-2.18.4"; + name = "qgis-2.18.10"; buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags ] ++ (stdenv.lib.optional withGrass grass) ++ - (with python2Packages; [ numpy psycopg2 requests python2Packages.qscintilla sip ]); + (with python2Packages; [ jinja2 numpy psycopg2 pygments requests python2Packages.qscintilla sip ]); nativeBuildInputs = [ cmake makeWrapper ]; - patches = [ - # See https://hub.qgis.org/issues/16071 - (fetchpatch { - name = "fix-build-against-recent-sip"; - url = "https://github.com/qgis/QGIS/commit/85a0db24f32351f6096cd8282f03ad5c2f4e6ef5.patch"; - sha256 = "0snspzdrpawd7j5b69i8kk7pmmy6ij8bn02bzg94qznfpf9ihf30"; - }) - ]; - # fatal error: ui_qgsdelimitedtextsourceselectbase.h: No such file or directory #enableParallelBuilding = true; @@ -34,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://qgis.org/downloads/${name}.tar.bz2"; - sha256 = "1s264pahxpn0215xmzm8q2khr5xspipd7bbvxah5kj339kyjfy3k"; + sha256 = "1vrzxhnpzd75iia4xmhbxy90x0wlvj2w4210f0r8203hd2m4sxdj"; }; cmakeFlags = stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}"; diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index bcad077b38c..1a854a82bf0 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -2,6 +2,7 @@ , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp , ApplicationServices +, buildPlatform, hostPlatform }: let @@ -12,8 +13,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.6-0"; - sha256 = "1vl9mkdp5pskl4lxd1p79ayv1k3gxpa8iz992d302qyllhm7wn1i"; + version = "7.0.6-1"; + sha256 = "1i3gsc0ps7cbvfmnk6fbi5hng18jwh4x4dqbz90a45x85023w9vs"; patches = []; }; in @@ -47,7 +48,7 @@ stdenv.mkDerivation rec { [ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts" "--with-gslib" ] - ++ lib.optionals (stdenv.cross.libc or null == "msvcrt") + ++ lib.optionals hostPlatform.isMinGW [ "--enable-static" "--disable-shared" ] # due to libxml2 being without DLLs ATM ; @@ -57,13 +58,13 @@ stdenv.mkDerivation rec { [ zlib fontconfig freetype ghostscript libpng libtiff libxml2 ] - ++ lib.optionals (stdenv.cross.libc or null != "msvcrt") + ++ lib.optionals (!hostPlatform.isMinGW) [ openexr librsvg openjpeg ] ++ lib.optional stdenv.isDarwin ApplicationServices; propagatedBuildInputs = [ bzip2 freetype libjpeg lcms2 ] - ++ lib.optionals (stdenv.cross.libc or null != "msvcrt") + ++ lib.optionals (!hostPlatform.isMinGW) [ libX11 libXext libXt libwebp ] ; diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 8f4d44932f5..a9223749f39 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -2,6 +2,7 @@ , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp , ApplicationServices +, buildPlatform, hostPlatform }: let @@ -12,13 +13,13 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "6.9.8-10"; - sha256 = "040qs7nwcm84bjd9wryvd58zqfykbmn3y3qfc90lnldww7v6ihlg"; + version = "6.9.9-0"; + sha256 = "02xnvgjnmz2d4yv4iy1kh7an5w631p1s319jw23c8zpmqhfhk2ha"; patches = []; } # Freeze version on mingw so we don't need to port the patch too often. # FIXME: This version has multiple security vulnerabilities - // lib.optionalAttrs (stdenv.cross.libc or null == "msvcrt") { + // lib.optionalAttrs (hostPlatform.isMinGW) { version = "6.9.2-0"; sha256 = "17ir8bw1j7g7srqmsz3rx780sgnc21zfn0kwyj78iazrywldx8h7"; patches = [(fetchpatch { @@ -59,7 +60,7 @@ stdenv.mkDerivation rec { [ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts" "--with-gslib" ] - ++ lib.optionals (stdenv.cross.libc or null == "msvcrt") + ++ lib.optionals (hostPlatform.isMinGW) [ "--enable-static" "--disable-shared" ] # due to libxml2 being without DLLs ATM ; @@ -69,13 +70,13 @@ stdenv.mkDerivation rec { [ zlib fontconfig freetype ghostscript libpng libtiff libxml2 ] - ++ lib.optionals (stdenv.cross.libc or null != "msvcrt") + ++ lib.optionals (!hostPlatform.isMinGW) [ openexr librsvg openjpeg ] ++ lib.optional stdenv.isDarwin ApplicationServices; propagatedBuildInputs = [ bzip2 freetype libjpeg lcms2 ] - ++ lib.optionals (stdenv.cross.libc or null != "msvcrt") + ++ lib.optionals (!hostPlatform.isMinGW) [ libX11 libXext libXt libwebp ] ; diff --git a/pkgs/applications/graphics/PythonMagick/default.nix b/pkgs/applications/graphics/PythonMagick/default.nix index 332bb8794e7..b1f64afd9ae 100644 --- a/pkgs/applications/graphics/PythonMagick/default.nix +++ b/pkgs/applications/graphics/PythonMagick/default.nix @@ -1,3 +1,5 @@ +# This expression provides Python bindings to ImageMagick. Python libraries are supposed to be called via `python-packages.nix`. + {stdenv, fetchurl, python, boost, pkgconfig, imagemagick}: stdenv.mkDerivation rec { diff --git a/pkgs/applications/graphics/autotrace/autofig.nix b/pkgs/applications/graphics/autotrace/autofig.nix new file mode 100644 index 00000000000..31ee0ff0d07 --- /dev/null +++ b/pkgs/applications/graphics/autotrace/autofig.nix @@ -0,0 +1,10 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "autofig-0.1"; + + src = fetchurl { + url = "http://autotrace.sourceforge.net/tools/autofig.tar.gz"; + sha256 = "11cs9hdbgcl3aamcs3149i8kvyyldmnjf6yq81kbcf8fdmfk2zdq"; + }; +} diff --git a/pkgs/applications/graphics/autotrace/default.nix b/pkgs/applications/graphics/autotrace/default.nix new file mode 100644 index 00000000000..2131589339c --- /dev/null +++ b/pkgs/applications/graphics/autotrace/default.nix @@ -0,0 +1,70 @@ +{ stdenv, fetchurl, callPackage, libpng12, imagemagick, + autoreconfHook, glib, pstoedit, pkgconfig, gettext, darwin }: + +# TODO: Figure out why the resultant binary is somehow linked against +# libpng16.so.16 rather than libpng12. + +stdenv.mkDerivation rec { + name = "autotrace-${version}"; + version = "0.31.1"; + + src = fetchurl { + url = "mirror://sourceforge/autotrace/AutoTrace/0.31.1/${name}.tar.gz"; + sha256 = "1xmgja5fv48mdbsa51inf7ksz36nqd6bsaybrk5xgprm6cy946js"; + }; + + # The below commented out part is for an identically-named project + # on GitHub which appears to derive somehow from the Sourceforge + # version, but I have no idea what the lineage is of this project. + # It will build, but it segfaults when I attempt to run -centerline. + # Someone may need this for some reason, so I've left it here. + # + #src = fetchFromGitHub { + # owner = "autotrace"; + # repo = "autotrace"; + # rev = "b3ac8818d86943102cb4f13734e0b527c42dc45a"; + # sha256 = "0z5h2mvxwckk2msi361zk1nc9fdcvxyimyc2hlyqd6h8k3p7zdi4"; + #}; + #postConfigure = '' + # sed -i -e "s/at_string/gchar */g" *.c + # sed -i -e "s/at_address/gpointer/g" *.c + # sed -i -e "s/at_bitmap_type/struct _at_bitmap/g" *.c + # sed -i -e "s/AT_BITMAP_BITS(bitmap)/AT_BITMAP_BITS(\&bitmap)/g" input-magick.c + #''; + + autofig = callPackage ./autofig.nix {}; + nativeBuildInputs = [ autoreconfHook glib autofig pkgconfig gettext ]; + buildInputs = [ libpng12 imagemagick pstoedit ] + ++ stdenv.lib.optionals stdenv.isDarwin + (with darwin.apple_sdk.frameworks; [ApplicationServices]); + + postUnpack = '' + pushd $sourceRoot + autofig autotrace-config.af + popd + ''; + + # This complains about various m4 files, but it appears to not be an + # actual error. + preConfigure = '' + glib-gettextize --copy --force + # pstoedit-config no longer exists, it was replaced with pkg-config + mkdir wrappers + cat >wrappers/pstoedit-config <<'EOF' + #!${stdenv.shell} + # replace --version with --modversion for pkg-config + args=''${@/--version/--modversion} + exec pkg-config pstoedit "''${args[@]}" + EOF + chmod +x wrappers/pstoedit-config + export PATH="$PATH:$PWD/wrappers" + ''; + + meta = with stdenv.lib; { + homepage = http://autotrace.sourceforge.net/; + description = "Utility for converting bitmap into vector graphics"; + platforms = platforms.unix; + maintainers = with maintainers; [ hodapp ]; + license = licenses.gpl2; + }; +} diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 68ab287f1a6..8c1db9c039e 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -11,12 +11,12 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { - version = "2.2.4"; + version = "2.2.5"; name = "darktable-${version}"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "1n7rddkxwcifc3kcdlnar9w562xv4h78fqkkn27jihqzp3b4am5x"; + sha256 = "10gjzd4irxhladh4jyss9kgp627k8vgx2divipsb33pp6cms80z3"; }; buildInputs = diff --git a/pkgs/applications/graphics/draftsight/default.nix b/pkgs/applications/graphics/draftsight/default.nix new file mode 100644 index 00000000000..a1cf91989eb --- /dev/null +++ b/pkgs/applications/graphics/draftsight/default.nix @@ -0,0 +1,76 @@ +{ stdenv, requireFile, dpkg, makeWrapper, gcc, mesa, xdg_utils, + dbus_tools, alsaLib, cups, fontconfig, glib, icu, libpng12, + xkeyboard_config, gstreamer, zlib, libxslt, libxml2, sqlite, orc, + libX11, libXcursor, libXrandr, libxcb, libXi, libSM, libICE, + libXrender, libXcomposite }: + +assert stdenv.system == "x86_64-linux"; + +let version = "2017-SP1"; in +stdenv.mkDerivation { + name = "draftsight-${version}"; + + nativeBuildInputs = [ dpkg makeWrapper ]; + + unpackPhase = '' + mkdir $out + mkdir $out/draftsight + dpkg -x $src $out/draftsight + ''; + + # Both executables and bundled libraries need patching to find their + # dependencies. The makeWrapper & QT_XKB_CONFIG_ROOT is to + # alleviate "xkbcommon: ERROR: failed to add default include path + # /usr/share/X11/xkb" and "Qt: Failed to create XKB context!". + installPhase = '' + mkdir $out/bin + for exe in DraftSight dsHttpApiController dsHttpApiService FxCrashRptApp HelpGuide; do + echo "Patching $exe..." + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath $libPath:\$ORIGIN/../Libraries \ + $out/draftsight/opt/dassault-systemes/DraftSight/Linux/$exe + makeWrapper $out/draftsight/opt/dassault-systemes/DraftSight/Linux/$exe \ + $out/bin/$exe \ + --prefix "QT_XKB_CONFIG_ROOT" ":" "${xkeyboard_config}/share/X11/xkb" + done + for lib in $out/draftsight/opt/dassault-systemes/DraftSight/Libraries/*.so; do + # DraftSight ships with broken symlinks for some reason + if [ -f $(readlink -f $lib) ] + then + echo "Patching $lib..." + patchelf --set-rpath $libPath:\$ORIGIN/../Libraries $lib + else + echo "Ignoring broken link $lib" + fi + done + ''; + + # TODO: Figure out why HelpGuide segfaults at startup. + + # This must be here for main window graphics to appear (without it + # it also gives the error: "QXcbIntegration: Cannot create platform + # OpenGL context, neither GLX nor EGL are enabled"). My guess is + # that it dlopen()'s libraries in paths removed by shrinking RPATH. + dontPatchELF = true; + + src = requireFile { + name = "draftSight.deb"; + url = "https://www.3ds.com/?eID=3ds_brand_download&uid=41&pidDown=13426&L=0"; + sha256 = "0s7b74685r0961kd59hxpdp9s5yhvzx8307imsxm66f99s8rswdv"; + }; + + libPath = stdenv.lib.makeLibraryPath [ gcc.cc mesa xdg_utils + dbus_tools alsaLib cups.lib fontconfig glib icu libpng12 + xkeyboard_config gstreamer zlib libxslt libxml2 sqlite orc libX11 + libXcursor libXrandr libxcb libXi libSM libICE libXrender + libXcomposite ]; + + meta = with stdenv.lib; { + description = "2D design & drafting application, meant to be similar to AutoCAD"; + longDescription = "Professional-grade 2D design and drafting solution from Dassault Systèmes that lets you create, edit, view and mark up any kind of 2D CAD drawing."; + homepage = https://www.3ds.com/products-services/draftsight-cad-software/; + license = stdenv.lib.licenses.unfree; + maintainers = with maintainers; [ hodapp ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix index 5f0605bbf87..d06c3eb5ec1 100644 --- a/pkgs/applications/graphics/fbida/default.nix +++ b/pkgs/applications/graphics/fbida/default.nix @@ -21,10 +21,6 @@ stdenv.mkDerivation rec { sed -e 's@ cpp\>@ gcc -E -@' -i GNUmakefile ''; - crossAttrs = { - makeFlags = makeFlags ++ [ "CC=${stdenv.cross.config}-gcc" "STRIP=" ]; - }; - meta = with stdenv.lib; { description = "Image viewing and manipulation programs"; homepage = https://www.kraxel.org/blog/linux/fbida/; diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index b7949b4d4f9..5de8e7892ab 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "feh-${version}"; - version = "2.18.2"; + version = "2.19"; src = fetchurl { url = "http://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "09f5rfzls4h5jcrp7ylwbiljp5qzc2nbw9p2csv0pnlaixj69gil"; + sha256 = "1sfhr6628xpj9p6bqihdq35y139x2gmrpydjlrwsl1rs77c2bgnf"; }; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/applications/graphics/graphicsmagick/cmyka-bounds.patch b/pkgs/applications/graphics/graphicsmagick/cmyka-bounds.patch deleted file mode 100644 index dd375143277..00000000000 --- a/pkgs/applications/graphics/graphicsmagick/cmyka-bounds.patch +++ /dev/null @@ -1,36 +0,0 @@ -# HG changeset patch -# User Bob Friesenhahn -# Date 1487905610 21600 -# Node ID 6156b4c2992d855ece6079653b3b93c3229fc4b8 -# Parent 0392c4305a4369984ec8069055acc470c0a73647 -Fix out of bounds access when reading CMYKA tiff which claims wrong samples/pixel. - -diff -r 0392c4305a43 -r 6156b4c2992d coders/tiff.c ---- a/coders/tiff.c Sun Jan 29 10:04:57 2017 -0600 -+++ b/coders/tiff.c Thu Feb 23 21:06:50 2017 -0600 -@@ -1230,8 +1230,8 @@ - case 0: - if (samples_per_pixel == 1) - *quantum_type=GrayQuantum; -- else -- *quantum_type=RedQuantum; -+ else -+ *quantum_type=RedQuantum; - break; - case 1: - *quantum_type=GreenQuantum; -@@ -1411,12 +1411,12 @@ - } - else - { -- if (image->matte) -+ if (image->matte && samples_per_pixel >= 5) - { - *quantum_type=CMYKAQuantum; - *quantum_samples=5; - } -- else -+ else if (samples_per_pixel >= 4) - { - *quantum_type=CMYKQuantum; - *quantum_samples=4; diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index 0858dfba8b4..c8c9ac8f26e 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -2,47 +2,18 @@ , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11 , libwebp, quantumdepth ? 8, fixDarwinDylibNames }: -let version = "1.3.25"; in +let version = "1.3.26"; in stdenv.mkDerivation { name = "graphicsmagick-${version}"; src = fetchurl { url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz"; - sha256 = "17xcc7pfcmiwpfr1g8ys5a7bdnvqzka53vg3kkzhwwz0s99gljyn"; + sha256 = "122zgs96dqrys62mnh8x5yvfff6km4d3yrnvaxzg3mg5sprib87v"; }; patches = [ ./disable-popen.patch - (fetchpatch { - url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-7996_CVE-2016-7997.patch"; - sha256 = "0xsby2z8n7cnnln7szjznq7iaabq323wymvdjra59yb41aix74r2"; - }) - (fetchpatch { - url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-7800_part1.patch"; - sha256 = "02s0x9bkbnm5wrd0d2x9ld4d9z5xqpfk310lyylyr5zlnhqxmwgn"; - }) - (fetchpatch { - url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-7800_part2.patch"; - sha256 = "1h4xv3i1aq5avsd584rwa5sa7ca8f7w9ggmh7j2llqq5kymwsv5f"; - }) - (fetchpatch { - url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-8682.patch"; - sha256 = "1wfirw2yi5y72657kvnbgjs0f9b3rs9nvk8gjbwhb9a03z9ws0y5"; - }) - (fetchpatch { - url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-8683.patch"; - sha256 = "102252zb34nj6alk1nhh1wbn3apd2v9rzk7clmm237332yj72vif"; - }) - (fetchpatch { - url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-8684.patch"; - sha256 = "1p36gpz904wnmbz1n64x4pdpg8lp9zs3gx0awklxqdvgl8m82vvy"; - }) - (fetchpatch { - url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-7/debian/patches/CVE-2016-9830.patch"; - sha256 = "0qh15sd7nx7vf9sld4453iml951bwsx2fx84hxc7plhds2k3gjpa"; - }) - ./cmyka-bounds.patch ]; configureFlags = [ diff --git a/pkgs/applications/graphics/guetzli/default.nix b/pkgs/applications/graphics/guetzli/default.nix new file mode 100644 index 00000000000..c96ddc98795 --- /dev/null +++ b/pkgs/applications/graphics/guetzli/default.nix @@ -0,0 +1,29 @@ +{ stdenv, libpng, fetchFromGitHub, pkgconfig }: +let + version = "1.0.1"; +in +stdenv.mkDerivation { + name = "guetzli-${version}"; + src = fetchFromGitHub { + owner = "google"; + repo = "guetzli"; + rev = "v${version}"; + sha256 = "1wy9wfvyradp0aigfv8yijvj0dgb5kpq2yf2xki15f605jc1r5dm"; + }; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libpng ]; + + installPhase = '' + mkdir -p $out/bin + install bin/Release/guetzli $out/bin/ + ''; + + meta = { + description = "Perceptual JPEG encoder"; + longDescription = "Guetzli is a JPEG encoder that aims for excellent compression density at high visual quality."; + homepage = "https://github.com/google/guetzli"; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.x86_64; + maintainers = [ stdenv.lib.maintainers.seppeljordan ]; + }; +} diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 121afdf2084..ccac9dd0ed1 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -1,19 +1,19 @@ -{ mkDerivation, lib, fetchurl, cmake, extra-cmake-modules +{ mkDerivation, lib, fetchurl, fetchpatch, cmake, extra-cmake-modules , karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons , kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem , kio, kcrash , boost, libraw, fftw, eigen, exiv2, lcms2, gsl, openexr , openjpeg, opencolorio, vc, poppler_qt5, curl, ilmbase +, qtmultimedia, qtx11extras }: mkDerivation rec { name = "krita-${version}"; - ver_min = "3.1.3"; - version = "${ver_min}"; + version = "3.1.4"; src = fetchurl { - url = "http://download.kde.org/stable/krita/${ver_min}/${name}.tar.gz"; - sha256 = "125js6c8aw4bqhs28pwnl3rbgqx5yx4zsklw7bfdhy3vf6lrysw1"; + url = "http://download.kde.org/stable/krita/${version}/${name}.tar.gz"; + sha256 = "1al27v17s70hihk2mcmz3l2g6rl9qzpxaifapdfpkyias6q3f63l"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; @@ -23,6 +23,14 @@ mkDerivation rec { ki18n kitemmodels kitemviews kwindowsystem kio kcrash boost libraw fftw eigen exiv2 lcms2 gsl openexr openjpeg opencolorio vc poppler_qt5 curl ilmbase + qtmultimedia qtx11extras + ]; + + patches = [ + (fetchpatch { + url = "https://github.com/KDE/krita/commit/2f59d0d1.patch"; + sha256 = "0sdlcjn6i3faln3c0aczw3pg4pvmccgszmy8n914mgsccrqrazlr"; + }) ]; NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ]; diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix index db5e6e1a7e3..630834fc9e9 100644 --- a/pkgs/applications/graphics/mypaint/default.nix +++ b/pkgs/applications/graphics/mypaint/default.nix @@ -1,41 +1,42 @@ -{ stdenv, fetchurl, gettext, glib, gtk2, hicolor_icon_theme, json_c -, lcms2, libpng , makeWrapper, pkgconfig, python2Packages -, scons, swig -}: +{ stdenv, fetchFromGitHub, gtk3, intltool, json_c, lcms2, libpng, librsvg, + pkgconfig, python2Packages, scons, swig, wrapGAppsHook }: let - inherit (python2Packages) python pygtk numpy; + inherit (python2Packages) python pycairo pygobject3 numpy; in stdenv.mkDerivation rec { name = "mypaint-${version}"; - version = "1.1.0"; + version = "1.2.1"; - src = fetchurl { - url = "http://download.gna.org/mypaint/${name}.tar.bz2"; - sha256 = "0f7848hr65h909c0jkcx616flc0r4qh53g3kd1cgs2nr1pjmf3bq"; + src = fetchFromGitHub { + owner = "mypaint"; + repo = "mypaint"; + rev = "bcf5a28d38bbd586cc9d4cee223f849fa303864f"; + sha256 = "1zwx7n629vz1jcrqjqmw6vl6sxdf81fq6a5jzqiga8167gg8s9pf"; + fetchSubmodules = true; }; - buildInputs = [ - gettext glib gtk2 json_c lcms2 libpng makeWrapper pkgconfig pygtk - python scons swig - ]; + nativeBuildInputs = [ intltool pkgconfig scons swig wrapGAppsHook ]; - propagatedBuildInputs = [ hicolor_icon_theme numpy ]; + buildInputs = [ gtk3 json_c lcms2 libpng librsvg pycairo pygobject3 python ]; + + propagatedBuildInputs = [ numpy ]; buildPhase = "scons prefix=$out"; installPhase = '' scons prefix=$out install sed -i -e 's|/usr/bin/env python2.7|${python}/bin/python|' $out/bin/mypaint - wrapProgram $out/bin/mypaint \ - --prefix PYTHONPATH : $PYTHONPATH \ - --prefix XDG_DATA_DIRS ":" "${hicolor_icon_theme}/share" + ''; + + preFixup = '' + gappsWrapperArgs+=(--prefix PYTHONPATH : $PYTHONPATH) ''; meta = with stdenv.lib; { description = "A graphics application for digital painters"; - homepage = http://mypaint.intilinux.com; + homepage = http://mypaint.org/; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu jtojnar ]; }; } diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix index 2023d9486bd..7e375367a2d 100644 --- a/pkgs/applications/graphics/pqiv/default.nix +++ b/pkgs/applications/graphics/pqiv/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (rec { name = "pqiv-${version}"; - version = "2.8.3"; + version = "2.9"; src = fetchFromGitHub { owner = "phillipberndt"; repo = "pqiv"; rev = version; - sha256 = "0fhmqa1q1y5y0ivrgx9xv864zqvd5dk4fiqi4bgi1ybdfx7vv2fy"; + sha256 = "1xncf6aq52zpxpmz3ikmlkinz7y3nmbpgfxjb7q40sqs00n0mfsd"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix index a55b19dc5b6..9026fc5d7cb 100644 --- a/pkgs/applications/graphics/solvespace/default.nix +++ b/pkgs/applications/graphics/solvespace/default.nix @@ -32,6 +32,11 @@ stdenv.mkDerivation rec { EOF ''; + postInstall = '' + substituteInPlace $out/share/applications/solvespace.desktop \ + --replace /usr/bin/ $out/bin/ \ + ''; + meta = { description = "A parametric 3d CAD program"; license = stdenv.lib.licenses.gpl3; diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix index e2d5357f814..843352b2791 100644 --- a/pkgs/applications/graphics/sxiv/default.nix +++ b/pkgs/applications/graphics/sxiv/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub, libX11, imlib2, giflib, libexif }: +{ stdenv, fetchFromGitHub, libX11, imlib2, giflib, libexif, conf ? null }: + +with stdenv.lib; stdenv.mkDerivation rec { name = "sxiv-${version}"; @@ -16,12 +18,16 @@ stdenv.mkDerivation rec { --replace /usr/local $out ''; + configFile = optionalString (conf!=null) (builtins.toFile "config.def.h" conf); + preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; + buildInputs = [ libX11 imlib2 giflib libexif ]; + meta = { description = "Simple X Image Viewer"; homepage = "https://github.com/muennich/sxiv"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + maintainers = with maintainers; [ jfrankenau fuuzetsu ]; }; } diff --git a/pkgs/applications/kde/akonadi-mime.nix b/pkgs/applications/kde/akonadi-mime.nix index 1fb50756665..98a341da6b6 100644 --- a/pkgs/applications/kde/akonadi-mime.nix +++ b/pkgs/applications/kde/akonadi-mime.nix @@ -1,7 +1,8 @@ { mkDerivation, lib, extra-cmake-modules, - akonadi, kdbusaddons, ki18n, kio, kitemmodels, kmime + akonadi, kdbusaddons, ki18n, kio, kitemmodels, kmime, + shared_mime_info }: mkDerivation { @@ -11,6 +12,7 @@ mkDerivation { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ akonadi kdbusaddons ki18n kio kitemmodels kmime ]; + buildInputs = [ akonadi shared_mime_info + kdbusaddons ki18n kio kitemmodels kmime ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix index a264ebc9f09..c2e34428474 100644 --- a/pkgs/applications/kde/akonadi/default.nix +++ b/pkgs/applications/kde/akonadi/default.nix @@ -2,8 +2,8 @@ mkDerivation, copyPathsToStore, lib, extra-cmake-modules, kcompletion, kconfigwidgets, kdbusaddons, kdesignerplugin, kiconthemes, - kio, - boost, kitemmodels, + kwindowsystem, kcrash, kio, + boost, kitemmodels, shared_mime_info, mysql }: @@ -17,6 +17,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcompletion kconfigwidgets kdbusaddons kdesignerplugin kiconthemes kio + kwindowsystem kcrash shared_mime_info ]; propagatedBuildInputs = [ boost kitemmodels ]; cmakeFlags = [ diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix index e1f1132a08f..79806dc93fb 100644 --- a/pkgs/applications/kde/k3b.nix +++ b/pkgs/applications/kde/k3b.nix @@ -1,11 +1,11 @@ { mkDerivation, lib , extra-cmake-modules, kdoctools, makeWrapper , qtwebkit -, libkcddb, kcmutils, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui +, libkcddb, karchive, kcmutils, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui , flac, lame, libmad, libmpcdec, libvorbis , libsamplerate, libsndfile, taglib , cdparanoia, cdrdao, cdrtools, dvdplusrwtools, libburn, libdvdcss, libdvdread, vcdimager -, ffmpeg, libmusicbrainz2, normalize, sox, transcode +, ffmpeg, libmusicbrainz2, normalize, sox, transcode, shared_mime_info }: mkDerivation { @@ -20,7 +20,7 @@ mkDerivation { # qt qtwebkit # kde - libkcddb kcmutils kfilemetadata knewstuff knotifyconfig solid kxmlgui + libkcddb karchive kcmutils kfilemetadata knewstuff knotifyconfig solid kxmlgui # formats flac lame libmad libmpcdec libvorbis # sound utilities @@ -28,7 +28,7 @@ mkDerivation { # cd/dvd cdparanoia libdvdcss libdvdread # others - ffmpeg libmusicbrainz2 + ffmpeg libmusicbrainz2 shared_mime_info ]; postFixup = let k3bPath = lib.makeBinPath [ diff --git a/pkgs/applications/kde/kcachegrind.nix b/pkgs/applications/kde/kcachegrind.nix index a8833cfbf59..19e01aeebe9 100644 --- a/pkgs/applications/kde/kcachegrind.nix +++ b/pkgs/applications/kde/kcachegrind.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, - kio, ki18n, + kio, ki18n, karchive, qttools, perl, python, php }: @@ -13,5 +13,5 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ kio ]; - buildInputs = [ perl python php ki18n ]; + buildInputs = [ perl python php ki18n karchive qttools ]; } diff --git a/pkgs/applications/kde/kig.nix b/pkgs/applications/kde/kig.nix index f2a1d275f6e..34b32896209 100644 --- a/pkgs/applications/kde/kig.nix +++ b/pkgs/applications/kde/kig.nix @@ -1,7 +1,8 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, - kparts, qtsvg, qtxmlpatterns, ktexteditor, boost + kparts, qtsvg, qtxmlpatterns, ktexteditor, boost, + karchive, kcrash }: mkDerivation { @@ -13,7 +14,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ boost ]; propagatedBuildInputs = [ - kparts qtsvg qtxmlpatterns ktexteditor + kparts qtsvg qtxmlpatterns ktexteditor karchive kcrash ]; } diff --git a/pkgs/applications/kde/krfb.nix b/pkgs/applications/kde/krfb.nix index 0f4aecb83d4..d6de2521533 100644 --- a/pkgs/applications/kde/krfb.nix +++ b/pkgs/applications/kde/krfb.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, - kdelibs4support, kdnssd, libvncserver, libXtst + kdelibs4support, kdnssd, libvncserver, libXtst, qtx11extras }: mkDerivation { @@ -11,6 +11,6 @@ mkDerivation { maintainers = with lib.maintainers; [ jerith666 ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ libvncserver libXtst ]; + buildInputs = [ libvncserver libXtst qtx11extras ]; propagatedBuildInputs = [ kdelibs4support kdnssd ]; } diff --git a/pkgs/applications/kde/okteta.nix b/pkgs/applications/kde/okteta.nix index deeffa3207b..1d44bb27fa3 100644 --- a/pkgs/applications/kde/okteta.nix +++ b/pkgs/applications/kde/okteta.nix @@ -1,8 +1,9 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, - kconfig, kinit, - kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5 + qtscript, kconfig, kinit, karchive, + kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5, + shared_mime_info }: mkDerivation { @@ -11,8 +12,10 @@ mkDerivation { license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ peterhoeg ]; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ]; + buildInputs = [ shared_mime_info ]; propagatedBuildInputs = [ kconfig kinit kcmutils kconfigwidgets knewstuff kparts qca-qt5 + karchive ]; } diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 0fa168e0a23..66498b0d280 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -2054,7 +2054,7 @@ version = "17.04.2"; src = fetchurl { url = "${mirror}/stable/applications/17.04.2/src/marble-17.04.2.tar.xz"; - sha256 = "1z24infjp65d2s2zlcvr0v9425a6wxwkaz262mvqqvx64qmhd6ca"; + sha256 = "1c6xmpkqilxd9zxz8kz7g47hwsa4hw27qcy96wxcg24hg8b5zr09"; name = "marble-17.04.2.tar.xz"; }; }; diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix new file mode 100644 index 00000000000..3dda61d95ae --- /dev/null +++ b/pkgs/applications/misc/alacritty/default.nix @@ -0,0 +1,61 @@ +{ stdenv, + fetchFromGitHub, + rustPlatform, + cmake, + makeWrapper, + expat, + pkgconfig, + freetype, + fontconfig, + libX11, + gperf, + libXcursor, + libXxf86vm, + libXi, + xclip }: + +with rustPlatform; + +buildRustPackage rec { + name = "alacritty-unstable-2017-07-08"; + + src = fetchFromGitHub { + owner = "jwilm"; + repo = "alacritty"; + rev = "94849c4f2a19bd49337f5cf090f94ac6a940c414"; + sha256 = "0cawrq0787pcfifn5awccq29a1ag85wfbmx1ccz7m33prk3ry9jp"; + }; + + depsSha256 = "0lb83aan6lgdsdcrd6zdrxhz5bi96cw4ygqqlpm43w42chwzz0xj"; + + buildInputs = [ + cmake + makeWrapper + freetype + fontconfig + xclip + pkgconfig + expat + libX11 + libXcursor + libXxf86vm + libXi + ]; + + installPhase = '' + mkdir -p $out/bin + for f in $(find target/release -maxdepth 1 -type f); do + cp $f $out/bin + done; + wrapProgram $out/bin/alacritty --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath buildInputs}" + ''; + + + meta = with stdenv.lib; { + description = "GPU-accelerated terminal emulator"; + homepage = https://github.com/jwilm/alacritty; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ mic92 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/misc/bashSnippets/default.nix b/pkgs/applications/misc/bashSnippets/default.nix new file mode 100644 index 00000000000..542450080fe --- /dev/null +++ b/pkgs/applications/misc/bashSnippets/default.nix @@ -0,0 +1,49 @@ +{ stdenv, lib, fetchFromGitHub, makeWrapper +, curl, netcat, mpv, python, bind, iproute, bc, gitMinimal }: +let + version = "1.12.0"; + deps = lib.makeBinPath [ + curl + mpv + python + bind.dnsutils + iproute + bc + gitMinimal + ]; +in +stdenv.mkDerivation { + name = "bashSnippets-${version}"; + + src = fetchFromGitHub { + owner = "alexanderepstein"; + repo = "Bash-Snippets"; + rev = "v${version}"; + sha256 = "0kx2a8z3jbmmardw9z8fpghbw5mrbz4knb3wdihq35iarcbrddrg"; + }; + + buildInputs = [ makeWrapper ]; + + patchPhase = '' + patchShebangs install.sh + substituteInPlace install.sh --replace /usr/local "$out" + ''; + + dontBuild = true; + + installPhase = '' + mkdir -p "$out"/bin "$out"/man/man1 + ./install.sh all + for file in "$out"/bin/*; do + wrapProgram "$file" --prefix PATH : "${deps}" + done + ''; + + meta = with lib; { + description = "A collection of small bash scripts for heavy terminal users"; + homepage = https://github.com/alexanderepstein/Bash-Snippets; + license = licenses.mit; + maintainers = with maintainers; [ infinisil ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index 117313a3266..ea3ca107d24 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -1,17 +1,23 @@ -{ stdenv, pythonPackages, fetchFromGitHub, -}: +{ stdenv, pythonPackages, fetchFromGitHub }: with pythonPackages; buildPythonApplication rec { - version = "2.9"; + version = "3.0"; # When updating to 3.1, make sure to remove the marked line in preCheck name = "buku-${version}"; src = fetchFromGitHub { owner = "jarun"; repo = "buku"; rev = "v${version}"; - sha256 = "0ylq0j5w8jvzys4bj9m08bfr1sgf8h2b4fiax6hs6lcwn2882jbr"; + sha256 = "1a33x3197vi5s8rq5fvhy021jdlsc8ww8zc4kysss6r9mvdlk7ax"; }; + nativeBuildInputs = [ + pytestcov + pytest-catchlog + hypothesis + pytest + ]; + propagatedBuildInputs = [ cryptography beautifulsoup4 @@ -19,13 +25,28 @@ with pythonPackages; buildPythonApplication rec { urllib3 ]; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + preCheck = '' + # Fixes two tests for wrong encoding + export PYTHONIOENCODING=utf-8 + + ### Remove this for 3.1 ### + # See https://github.com/jarun/Buku/pull/167 (merged) + substituteInPlace setup.py \ + --replace "hypothesis==3.7.0" "hypothesis>=3.7.0" + + # Disables a test which requires internet + substituteInPlace tests/test_bukuDb.py \ + --replace "@pytest.mark.slowtest" "@unittest.skip('skipping')" + ''; installPhase = '' make install PREFIX=$out - ''; - doCheck = false; + mkdir -p $out/share/zsh/site-functions $out/share/bash-completion/completions $out/share/fish/vendor_completions.d + cp auto-completion/zsh/* $out/share/zsh/site-functions + cp auto-completion/bash/* $out/share/bash-completion/completions + cp auto-completion/fish/* $out/share/fish/vendor_completions.d + ''; meta = with stdenv.lib; { description = "Private cmdline bookmark manager"; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 5845fe85ccb..8341898fa23 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,29 +5,23 @@ }: stdenv.mkDerivation rec { - version = "2.84.0"; + version = "3.3.0"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "1kvnmb6hsby4bdnx70bcy32f4dz1axzlr310dr6mkvnc8bqw59km"; + sha256 = "1zq3aihnyxdczdz8b0w02xfw4b0l9i23f6ljpmsmm69jyh4j3m0c"; }; patches = [ # Patches from Debian that: # - disable plugin installation (very insecure) - # - disables loading of web bug for privacy # - switches the version update from enabled to disabled by default (fetchpatch { name = "disable_plugins.patch"; url = "http://bazaar.launchpad.net/~calibre-packagers/calibre/debian/download/head:/disable_plugins.py-20111220183043-dcl08ccfagjxt1dv-1/disable_plugins.py"; sha256 = "19spdx52dhbrfn9lm084yl3cfwm6f90imd51k97sf7flmpl569pk"; }) - (fetchpatch { - name = "links_privacy.patch"; - url = "http://bazaar.launchpad.net/~calibre-packagers/calibre/debian/download/head:/linksprivacy.patch-20160417214308-6hvive72pc0r4awc-1/links-privacy.patch"; - sha256 = "0f6pq2b7q56pxrq2j8yqd7bksc623q2zgq29qcli30f13vga1w60"; - }) (fetchpatch { name = "no_updates_dialog.patch"; url = "http://bazaar.launchpad.net/~calibre-packagers/calibre/debian/download/head:/no_updates_dialog.pa-20081231120426-rzzufl0zo66t3mtc-16/no_updates_dialog.patch"; @@ -55,10 +49,12 @@ stdenv.mkDerivation rec { poppler_utils libpng imagemagick libjpeg fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils wrapGAppsHook ] ++ (with python2Packages; [ + html5lib_0_9999999 # needs to be before mechanize ? apsw cssselect cssutils dateutil lxml mechanize netifaces pillow python pyqt5 sip + regex msgpack # the following are distributed with calibre, but we use upstream instead - chardet cherrypy html5lib_0_9999999 odfpy routes + chardet cherrypy odfpy routes ]); installPhase = '' diff --git a/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch b/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch index 71cc688f7da..45e27984ed5 100644 --- a/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch +++ b/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch @@ -1,34 +1,12 @@ -diff --git a/setup/extensions.json b/setup/extensions.json -index 1f6d1fb..1273904 100644 ---- a/setup/extensions.json -+++ b/setup/extensions.json -@@ -211,16 +211,5 @@ - "sources": "calibre/devices/mtp/unix/devices.c calibre/devices/mtp/unix/libmtp.c", - "headers": "calibre/devices/mtp/unix/devices.h calibre/devices/mtp/unix/upstream/music-players.h calibre/devices/mtp/unix/upstream/device-flags.h", - "libraries": "mtp" -- }, -- { -- "name": "unrar", -- "sources": "unrar/rar.cpp unrar/strlist.cpp unrar/strfn.cpp unrar/pathfn.cpp unrar/savepos.cpp unrar/smallfn.cpp unrar/global.cpp unrar/file.cpp unrar/filefn.cpp unrar/filcreat.cpp unrar/archive.cpp unrar/arcread.cpp unrar/unicode.cpp unrar/system.cpp unrar/isnt.cpp unrar/crypt.cpp unrar/crc.cpp unrar/rawread.cpp unrar/encname.cpp unrar/resource.cpp unrar/match.cpp unrar/timefn.cpp unrar/rdwrfn.cpp unrar/consio.cpp unrar/options.cpp unrar/ulinks.cpp unrar/errhnd.cpp unrar/rarvm.cpp unrar/secpassword.cpp unrar/rijndael.cpp unrar/getbits.cpp unrar/sha1.cpp unrar/extinfo.cpp unrar/extract.cpp unrar/volume.cpp unrar/list.cpp unrar/find.cpp unrar/unpack.cpp unrar/cmddata.cpp unrar/filestr.cpp unrar/scantree.cpp calibre/utils/unrar.cpp", -- "inc_dirs": "unrar", -- "defines": "SILENT RARDLL UNRAR _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE", -- "windows_defines": "SILENT RARDLL UNRAR", -- "haiku_defines": "LITTLE_ENDIAN SILENT RARDLL UNRAR _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE _BSD_SOURCE", -- "haiku_libraries": "bsd", -- "optimize_level": 2, -- "windows_libraries": "User32 Advapi32 kernel32 Shell32" - } - ] diff --git a/src/calibre/ebooks/metadata/archive.py b/src/calibre/ebooks/metadata/archive.py index 938ab24..1e095f8 100644 --- a/src/calibre/ebooks/metadata/archive.py +++ b/src/calibre/ebooks/metadata/archive.py -@@ -44,7 +44,7 @@ class ArchiveExtract(FileTypePlugin): - description = _('Extract common e-book formats from archives ' - '(zip/rar) files. Also try to autodetect if they are actually ' - 'cbz/cbr files.') +@@ -44,7 +44,7 @@ + description = _('Extract common e-book formats from archive files ' + '(ZIP/RAR). Also try to autodetect if they are actually ' + 'CBZ/CBR files.') - file_types = set(['zip', 'rar']) + file_types = set(['zip']) supported_platforms = ['windows', 'osx', 'linux'] on_import = True - diff --git a/pkgs/applications/misc/dmensamenu/default.nix b/pkgs/applications/misc/dmensamenu/default.nix new file mode 100644 index 00000000000..0c9fa5ea2d2 --- /dev/null +++ b/pkgs/applications/misc/dmensamenu/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonApplication, fetchFromGitHub, requests, dmenu }: + +buildPythonApplication rec { + name = "dmensamenu-${version}"; + version = "1.0.0"; + + propagatedBuildInputs = [ + requests + dmenu + ]; + + src = fetchFromGitHub { + owner = "dotlambda"; + repo = "dmensamenu"; + rev = "v${version}"; + sha256 = "05wbpmgjpm0ik9pcydj7r9w7i7bfpcij24bc4jljdwl9ilw62ixp"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/dotlambda/dmensamenu; + description = "Print German canteen menus using dmenu and OpenMensa"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index 221bd3c4bf5..919ad10fa70 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -1,32 +1,25 @@ { stdenv, fetchFromGitHub, fetchpatch -, pkgconfig, which, perl -, cairo, dbus, freetype, gdk_pixbuf, glib, libX11, libXScrnSaver -, libXext, libXinerama, libnotify, libxdg_basedir, pango, xproto -, librsvg +, pkgconfig, which, perl, gtk2, xrandr +, cairo, dbus, gdk_pixbuf, glib, libX11, libXScrnSaver +, libXinerama, libnotify, libxdg_basedir, pango, xproto, librsvg }: stdenv.mkDerivation rec { name = "dunst-${version}"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { - owner = "knopwob"; + owner = "dunst-project"; repo = "dunst"; rev = "v${version}"; - sha256 = "102s0rkcdz22hnacsi3dhm7kj3lsw9gnikmh3a7wk862nkvvwjmk"; + sha256 = "0jncnb4z4hg92ws08bkf52jswsd4vqlzyznwbynhh2jh6q0sl18b"; }; - patches = [(fetchpatch { - name = "add-svg-support.patch"; - url = "https://github.com/knopwob/dunst/commit/63b11141185d1d07a6d12212257a543e182d250a.patch"; - sha256 = "0giiaj5zjim7xqcav5ij5gn4x6nnchkllwcx0ln16j0p3vbi4y4x"; - })]; - nativeBuildInputs = [ perl pkgconfig which ]; buildInputs = [ - cairo dbus freetype gdk_pixbuf glib libX11 libXScrnSaver libXext - libXinerama libnotify libxdg_basedir pango xproto librsvg + cairo dbus gdk_pixbuf glib libX11 libXScrnSaver + libXinerama libnotify libxdg_basedir pango xproto librsvg gtk2 xrandr ]; outputs = [ "out" "man" ]; diff --git a/pkgs/applications/misc/electrum-dash/default.nix b/pkgs/applications/misc/electrum-dash/default.nix index 917d32e74af..8752bafbe73 100644 --- a/pkgs/applications/misc/electrum-dash/default.nix +++ b/pkgs/applications/misc/electrum-dash/default.nix @@ -13,7 +13,7 @@ python2Packages.buildPythonApplication rec { dns ecdsa pbkdf2 - protobuf3_0 + protobuf3_2 pyasn1 pyasn1-modules pycrypto diff --git a/pkgs/applications/misc/electrum-ltc/default.nix b/pkgs/applications/misc/electrum-ltc/default.nix index 50cc434f631..25c96322378 100644 --- a/pkgs/applications/misc/electrum-ltc/default.nix +++ b/pkgs/applications/misc/electrum-ltc/default.nix @@ -20,7 +20,7 @@ python2Packages.buildPythonApplication rec { requests qrcode ltc_scrypt - protobuf3_0 + protobuf3_2 dns jsonrpclib ]; diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 14c6c18f91c..34f403fda89 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -14,7 +14,7 @@ python2Packages.buildPythonApplication rec { ecdsa jsonrpclib pbkdf2 - protobuf3_0 + protobuf3_2 pyaes pycrypto pyqt4 diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix new file mode 100644 index 00000000000..4e40230108b --- /dev/null +++ b/pkgs/applications/misc/houdini/default.nix @@ -0,0 +1,15 @@ +{ zsh, stdenv, callPackage, buildFHSUserEnv, undaemonize }: + +let + version = "16.0.633"; + houdini-runtime = callPackage ./runtime.nix { }; +in buildFHSUserEnv rec { + name = "houdini-${version}"; + + extraBuildCommands = '' + mkdir -p $out/usr/lib/sesi + ''; + + runScript = "${undaemonize}/bin/undaemonize ${houdini-runtime}/bin/houdini"; +} + diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix new file mode 100644 index 00000000000..bfd53ef835d --- /dev/null +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -0,0 +1,76 @@ +{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, mesa_glu, bc }: + +let + ld_library_path = builtins.concatStringsSep ":" [ + "${stdenv.cc.cc.lib}/lib64" + "/run/opengl-driver/lib" + (stdenv.lib.makeLibraryPath [ + mesa_glu + xorg.libXmu + xorg.libXi + xorg.libXext + xorg.libX11 + xorg.libXrender + fontconfig + libSM + libICE + zlib + libpng + ]) + ]; + license_dir = "~/.config/houdini"; +in +stdenv.mkDerivation rec { + version = "16.0.633"; + name = "houdini-runtime-${version}"; + src = requireFile rec { + name = "houdini-16.0.633-linux_x86_64_gcc4.8.tar.gz"; + sha256 = "1laxncwgsr4hj53bn4pn9ibv3pkrpliwxlx0558wgnhq42js3wvl"; + message = '' + This nix expression requires that ${name} is already part of the store. + Download it from https://sidefx.com and add it to the nix store with: + + nix-prefetch-url + + This can't be done automatically because you need to create an account on + their website and agree to their license terms before you can download + it. That's what you get for using proprietary software. + ''; + }; + + buildInputs = [ bc ]; + installPhase = '' + patchShebangs houdini.install + mkdir -p $out + sed -i "s|/usr/lib/sesi|${license_dir}|g" houdini.install + ./houdini.install --install-houdini \ + --no-install-menus \ + --no-install-bin-symlink \ + --auto-install \ + --no-root-check \ + --accept-EULA \ + $out + sed -i "s|/usr/lib/sesi|${license_dir}|g" $out/houdini/Licensing.opt + sed -i "s|/usr/lib/sesi|${license_dir}|g" $out/houdini/sbin/sesinetd_safe + sed -i "s|/usr/lib/sesi|${license_dir}|g" $out/houdini/sbin/sesinetd.startup + echo "export LD_LIBRARY_PATH=${ld_library_path}" >> $out/bin/app_init.sh + echo "export LD_LIBRARY_PATH=${ld_library_path}" >> $out/houdini/sbin/app_init.sh + ''; + postFixup = '' + INTERPRETER="$(cat "$NIX_CC"/nix-support/dynamic-linker)" + for BIN in $(find $out/bin -type f -executable); do + if patchelf $BIN 2>/dev/null ; then + echo "Patching ELF $BIN" + patchelf --set-interpreter "$INTERPRETER" "$BIN" + fi + done + ''; + meta = { + description = "3D animation application software"; + homepage = "https://sidefx.com"; + license = stdenv.lib.licenses.unfree; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.canndrew ]; + }; +} + diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 4fe62179b25..27757e4e31a 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "hugo-${version}"; - version = "0.23"; + version = "0.25.1"; goPackagePath = "github.com/gohugoio/hugo"; src = fetchFromGitHub { - owner = "spf13"; + owner = "gohugoio"; repo = "hugo"; rev = "v${version}"; - sha256 = "0phw5pcmrmryxb83jzifhqh3vx20qiwh4dkk802v38fw07z1hvki"; + sha256 = "09cyms74y9dw58npvj89bfhwc23phs1wqbzajjgl72rfgh83a1bz"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix index 2b844943865..ff832d4961f 100644 --- a/pkgs/applications/misc/hugo/deps.nix +++ b/pkgs/applications/misc/hugo/deps.nix @@ -4,8 +4,8 @@ fetch = { type = "git"; url = "https://github.com/BurntSushi/toml"; - rev = "b26d9c308763d68093482582cea63d69be07a0f0"; - sha256 = "0k7v2i1d2d6si8gswn83qb84czhhia53v2wdy33yz9ppdidxk0ry"; + rev = "8fb9fdc4f82fd3495b9086c911b86cc3d50cb7ab"; + sha256 = "0igg0cwc0cihsxrii203h1r5y2lmaclc164cjhyv2hpfsvb11zlg"; }; } { @@ -58,8 +58,8 @@ fetch = { type = "git"; url = "https://github.com/cpuguy83/go-md2man"; - rev = "bcc0a711c5e6bbe72c7cb13d81c7109b45267fd2"; - sha256 = "097l5ln1b08x5hc41qhiybzlyjfcm6kjllgv6pgsgxlx8irz459j"; + rev = "23709d0847197db6021a51fdb193e66e9222d4e7"; + sha256 = "1a87v4cnd5y5whcdkjcqjpg1s5pxqhrspdxrsk2af49zsw9fsj9f"; }; } { @@ -76,8 +76,8 @@ fetch = { type = "git"; url = "https://github.com/eknkc/amber"; - rev = "f0d8fdb67f9f4a2c0d02fb6ce4830b8b6754de10"; - sha256 = "148q8ng5kzv1n8wz5dx9fjhz7kz1l34n8vmksnfwhnqg82b77vsy"; + rev = "5fa7895500976542b0e28bb266f42ff1c7ce07f5"; + sha256 = "1mviw7ivw5yj1w6f8mfwaxpmbdl8c7n2wrpxnqkbcs8snpi0f6wq"; }; } { @@ -220,8 +220,8 @@ fetch = { type = "git"; url = "https://github.com/pelletier/go-toml"; - rev = "26ae43fdeeea7db6778850f76cc828b232da1e13"; - sha256 = "06gz20ywqbsy4sfsjjay60y7km9m07l9qvmarr7fldqfi8xgl1f4"; + rev = "fe7536c3dee2596cdd23ee9976a17c22bdaae286"; + sha256 = "0h5ri6sj755v1vrgcb7wdp6c15vdgq8wydpzgphggz4pl535b0h6"; }; } { @@ -283,8 +283,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/cobra"; - rev = "ca57f0f5dba473a8a58765d16d7e811fb8027add"; - sha256 = "1lycnfkby5c7aamvwgxwq6ivzyvd8r761zkdignww1rmnqmiwd2h"; + rev = "b4dbd37a01839e0653eec12aa4bbb2a2ce7b2a37"; + sha256 = "1bgdjikafz58403qpdrqhmi3p99gc5gipibmhfw0hj2xzijb01kx"; }; } { @@ -328,8 +328,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/viper"; - rev = "0967fc9aceab2ce9da34061253ac10fb99bba5b2"; - sha256 = "016syis0rvccp2indjqi1vnz3wk7c9dhkvkgam0j79sb019kl80f"; + rev = "c1de95864d73a5465492829d7cb2dd422b19ac96"; + sha256 = "0fvx40qhzzfw5nq4hl3sxqik6qdd8l9jcmzm6f9r9p605n2dakqm"; }; } { @@ -337,8 +337,8 @@ fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "4d4bfba8f1d1027c4fdbe371823030df51419987"; - sha256 = "1d3yz1d2s88byjzmn60jbi1m9s552f7ghzbzik97fbph37i8yjhp"; + rev = "f6abca593680b2315d2075e0f5e2a9751e3f431a"; + sha256 = "0n2vidr9zyf6k296grnc6d3rk9hd6qw7mwvnfixlxm8g5y46rzl9"; }; } { @@ -355,8 +355,17 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "7e9105388ebff089b3f99f0ef676ea55a6da3a7e"; - sha256 = "0q3nx9px0bddpfnh2d5h56hsvbfx483jz93j6vanxqnysizgfc1n"; + rev = "850760c427c516be930bc91280636328f1a62286"; + sha256 = "0kyf8km2pz259jmfqk5xcd7gnj9l98kjz12zrvq26n1c4043bmkz"; + }; + } + { + goPackagePath = "golang.org/x/image"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/image"; + rev = "426cfd8eeb6e08ab1932954e09e3c2cb2bc6e36d"; + sha256 = "0zbqvkn7amq9bnq38pxjqyn1xggphrisaw98x7diw3i0a5phk93r"; }; } { @@ -364,8 +373,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "5961165da77ad3a2abf3a77ea904c13a76b0b073"; - sha256 = "0r4zb2pafrjyjb0alfnxbxkfc27iikkfdqhpklrm790j2x9xrp89"; + rev = "ddf80d0970594e2e4cccf5a98861cad3d9eaa4cd"; + sha256 = "1ipggkh5rwqcmb8zwf2i7dbnyz6r205c5glkg2cpw4hykr5w0id8"; }; } { @@ -373,8 +382,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "dbc2be9168a660ef302e04b6ff6406de6f967473"; - sha256 = "1hz9d7wnxwlvhlgmqrxjdx9fihx30f9ww6ir2l74l8ping1g6w1j"; + rev = "fb4cac33e3196ff7f507ab9b2d2a44b0142f5b5a"; + sha256 = "1y5lx3f7rawfxrqg0s2ndgbjjjaml3rn3f27h9w9c5mw3xk7lrgj"; }; } { @@ -382,8 +391,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "19e51611da83d6be54ddafce4a4af510cb3e9ea4"; - sha256 = "09pcfzx7nrma0gjv93jx57c28farf8m1qm4x07vk5505wlcgvvfl"; + rev = "9e2f80a6ba7ed4ba13e0cd4b1f094bf916875735"; + sha256 = "02nahm6a4s3f1p76qdcgcwczp8662bqpii0r67p9cm9gp8x1lxqh"; }; } { diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix index 743a20b6bfc..0d8db33bc17 100644 --- a/pkgs/applications/misc/kdeconnect/default.nix +++ b/pkgs/applications/misc/kdeconnect/default.nix @@ -11,6 +11,7 @@ , qca-qt5 , libfakekey , libXtst +, qtx11extras }: stdenv.mkDerivation rec { @@ -32,6 +33,7 @@ stdenv.mkDerivation rec { knotifications libfakekey libXtst + qtx11extras ]; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix b/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix index 5e43486b075..e64632d529b 100644 --- a/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix +++ b/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix @@ -1,14 +1,17 @@ { stdenv, buildEnv, fetchFromGitHub, mono }: let - version = "1.8.4.1"; + version = "1.8.4.2"; drv = stdenv.mkDerivation { name = "keepasshttp-${version}"; src = fetchFromGitHub { owner = "pfn"; repo = "keepasshttp"; - rev = "${version}"; - sha256 = "1074yv0pmzdwfwkx9fh7n2igdqwsyxypv55khkyng6synbv2p2fd"; + #rev = "${version}"; + # for 1.8.4.2 the tag is at the wrong commit (they fixed stuff + # afterwards and didn't move the tag), hence reference by commitid + rev = "c2c4eb5388a02169400cba7a67be325caabdcc37"; + sha256 = "0bkzxggbqx7sql3sp46bqham6r457in0vrgh3ai3lw2jrw79pwmh"; }; meta = { diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index 57f6cfc4c4b..e36fbfa0f3f 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -8,11 +8,11 @@ # plugin derivations in the Nix store and nowhere else. with builtins; buildDotnetPackage rec { baseName = "keepass"; - version = "2.35"; + version = "2.36"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; - sha256 = "1pv3x1lr2kymjpm6z26fqx997jivzy0diqsysq4diygj38wdkajz"; + sha256 = "1j6qhy8h3z6higbpq3q9v04amvgbn90yj3kbsvj17azdkffkwzny"; }; sourceRoot = "."; diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index e103f62fd3c..6ae86486b47 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, - cmake, libgcrypt, zlib, libmicrohttpd, libXtst, qtbase, qttools, libgpgerror +{ stdenv, fetchFromGitHub, fetchpatch, + cmake, libgcrypt, zlib, libmicrohttpd, libXtst, qtbase, qttools, libgpgerror, glibcLocales, libyubikey, yubikey-personalization, libXi, qtx11extras , withKeePassHTTP ? true }: @@ -7,18 +7,28 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "keepassx-community-${version}"; - version = "2.1.4"; + version = "2.2.0"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = "${version}"; - sha256 = "1znnw2xpv58x0rbpmm4y662377mbmcilhf8mhhjsz8vhahms33a8"; + sha256 = "0gg75mjy2p7lyh8nnivmyn7bjp1zyx26zm8s1fak7d2di2r0mnjc"; }; - cmakeFlags = optional (withKeePassHTTP) [ "-DWITH_XC_HTTP=ON" ]; + cmakeFlags = [ + "-DWITH_GUI_TESTS=ON" + "-DWITH_XC_AUTOTYPE=ON" + "-DWITH_XC_YUBIKEY=ON" + ] ++ (optional withKeePassHTTP "-DWITH_XC_HTTP=ON"); - buildInputs = [ cmake libgcrypt zlib qtbase qttools libXtst libmicrohttpd libgpgerror ]; + doCheck = true; + checkPhase = '' + export LC_ALL="en_US.UTF-8" + make test ARGS+="-E testgui --output-on-failure" + ''; + + buildInputs = [ cmake libgcrypt zlib qtbase qttools libXtst libmicrohttpd libgpgerror glibcLocales libyubikey yubikey-personalization libXi qtx11extras ]; meta = { description = "Fork of the keepassX password-manager with additional http-interface to allow browser-integration an use with plugins such as PasslFox (https://github.com/pfn/passifox). See also keepassX2."; diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix index 22cd14c1952..e686ec94a4a 100644 --- a/pkgs/applications/misc/krename/default.nix +++ b/pkgs/applications/misc/krename/default.nix @@ -1,7 +1,8 @@ { mkDerivation, fetchFromGitHub, lib, extra-cmake-modules, kdoctools, wrapGAppsHook, - kconfig, kinit, kjsembed, taglib, exiv2, podofo + kconfig, kinit, kjsembed, taglib, exiv2, podofo, + kcrash }: let @@ -26,5 +27,5 @@ in mkDerivation rec { buildInputs = [ taglib exiv2 podofo ]; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; - propagatedBuildInputs = [ kconfig kinit kjsembed ]; + propagatedBuildInputs = [ kconfig kcrash kinit kjsembed ]; } diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix index 7f5dad62d26..bcf351ff46a 100644 --- a/pkgs/applications/misc/krusader/default.nix +++ b/pkgs/applications/misc/krusader/default.nix @@ -1,7 +1,7 @@ { mkDerivation, fetchurl, lib, extra-cmake-modules, kdoctools, wrapGAppsHook, - kconfig, kinit, kparts + karchive, kconfig, kcrash, kguiaddons, kinit, kparts, kwindowsystem }: let @@ -23,5 +23,5 @@ in mkDerivation rec { }; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; - propagatedBuildInputs = [ kconfig kinit kparts ]; + propagatedBuildInputs = [ karchive kconfig kcrash kguiaddons kinit kparts kwindowsystem ]; } diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix new file mode 100644 index 00000000000..1005006c402 --- /dev/null +++ b/pkgs/applications/misc/nnn/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, pkgconfig, ncurses, readline, conf ? null }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "nnn-${version}"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "jarun"; + repo = "nnn"; + rev = "v${version}"; + sha256 = "1idrwm02218q7qd2pg2m8ld76bg32wbzl8y1h8ch7gzxihgn4559"; + }; + + configFile = optionalString (conf!=null) (builtins.toFile "config.def.h" conf); + preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ncurses readline ]; + + installFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; + + meta = { + description = "Small ncurses-based file browser forked from noice"; + homepage = https://github.com/jarun/nnn; + license = licenses.bsd2; + platforms = platforms.all; + maintainers = with maintainers; [ jfrankenau ]; + }; +} diff --git a/pkgs/applications/misc/noice/default.nix b/pkgs/applications/misc/noice/default.nix new file mode 100644 index 00000000000..bcf2edd8f2f --- /dev/null +++ b/pkgs/applications/misc/noice/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchgit, ncurses, conf ? null }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "noice-${version}"; + version = "0.6"; + + src = fetchgit { + url = "git://git.2f30.org/noice.git"; + rev = "refs/tags/v${version}"; + sha256 = "03rwglcy47fh6rb630vws10m95bxpcfv47nxrlws2li2ljam8prw"; + }; + + configFile = optionalString (conf!=null) (builtins.toFile "config.def.h" conf); + preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; + + buildInputs = [ ncurses ]; + + buildFlags = [ "LDLIBS=-lncurses" ]; + + installFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; + + meta = { + description = "Small ncurses-based file browser"; + homepage = https://git.2f30.org/noice/; + license = licenses.bsd2; + platforms = platforms.all; + maintainers = with maintainers; [ jfrankenau ]; + }; +} diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index 3c42e8d8fcc..8e0fc613721 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "pdfpc"; - version = "4.0.6"; + version = "4.0.7"; src = fetchFromGitHub { repo = "pdfpc"; owner = "pdfpc"; rev = "v${version}"; - sha256 = "05cfx45i0xnwvclrbwlmqsjj2sk1galk62dc0mrkhr6293mbp1mx"; + sha256 = "00qfmmk8h762p53z46g976z7j4fbxyi16w5axzsv1ymvdq95ds8c"; }; nativeBuildInputs = [ cmake pkgconfig vala ]; diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix index fba7b6371f6..968071e454e 100644 --- a/pkgs/applications/misc/pgadmin/default.nix +++ b/pkgs/applications/misc/pgadmin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, postgresql, wxGTK, libxml2, libxslt, openssl, zlib }: +{ stdenv, fetchurl, postgresql, wxGTK, libxml2, libxslt, openssl, zlib, makeDesktopItem }: stdenv.mkDerivation rec { name = "pgadmin3-${version}"; @@ -29,4 +29,21 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ domenkozar wmertens ]; platforms = platforms.unix; }; + + postFixup = let + desktopItem = makeDesktopItem { + name = "pgAdmin"; + desktopName = "pgAdmin III"; + genericName = "SQL Administration"; + exec = "pgadmin3"; + icon = "pgAdmin3"; + type = "Application"; + categories = "Application;Development;"; + mimeType = "text/html"; + }; + in '' + mkdir -p $out/share/pixmaps; + cp pgadmin/include/images/pgAdmin3.png $out/share/pixmaps/; + cp -rv ${desktopItem}/share/applications $out/share/ + ''; } diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix index 671370252a7..e8ab85121da 100644 --- a/pkgs/applications/misc/qsyncthingtray/default.nix +++ b/pkgs/applications/misc/qsyncthingtray/default.nix @@ -5,14 +5,14 @@ , preferQWebView ? false }: mkDerivation rec { - version = "0.5.7"; + version = "0.5.8"; name = "qsyncthingtray-${version}"; src = fetchFromGitHub { owner = "sieren"; repo = "QSyncthingTray"; rev = "${version}"; - sha256 = "0crrdpdmlc4ahkvp5znzc4zhfwsdih655q1kfjf0g231mmynxhvq"; + sha256 = "1n9g4j7qznvg9zl6x163pi9f7wsc3x6q76i33psnm7x2v1i22x5w"; }; buildInputs = [ qtbase qtwebengine ] ++ lib.optional preferQWebView qtwebkit; diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index 1371646be27..f378c352936 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -1,4 +1,9 @@ -{ stdenv, fetchurl, pythonPackages, w3m, file, less }: +{ stdenv, fetchurl, pythonPackages, file, less +, imagePreviewSupport ? true, w3m ? null}: + +with stdenv.lib; + +assert imagePreviewSupport -> w3m != null; pythonPackages.buildPythonApplication rec { name = "ranger-1.8.1"; @@ -23,14 +28,26 @@ pythonPackages.buildPythonApplication rec { ''; preConfigure = '' - substituteInPlace ranger/ext/img_display.py \ - --replace /usr/lib/w3m ${w3m}/libexec/w3m + substituteInPlace ranger/data/scope.sh \ + --replace "/bin/echo" "echo" + substituteInPlace ranger/__init__.py \ --replace "DEFAULT_PAGER = 'less'" "DEFAULT_PAGER = '${stdenv.lib.getBin less}/bin/less'" for i in ranger/config/rc.conf doc/config/rc.conf ; do substituteInPlace $i --replace /usr/share $out/share done + + # give file previews out of the box + substituteInPlace ranger/config/rc.conf \ + --replace "set preview_script ~/.config/ranger/scope.sh" "set preview_script $out/share/doc/ranger/config/scope.sh" + '' + optionalString imagePreviewSupport '' + substituteInPlace ranger/ext/img_display.py \ + --replace /usr/lib/w3m ${w3m}/libexec/w3m + + # give image previews out of the box when building with w3m + substituteInPlace ranger/config/rc.conf \ + --replace "set preview_images false" "set preview_images true" \ ''; } diff --git a/pkgs/applications/misc/redshift-plasma-applet/default.nix b/pkgs/applications/misc/redshift-plasma-applet/default.nix index fe09f7ff16e..18e49176edc 100644 --- a/pkgs/applications/misc/redshift-plasma-applet/default.nix +++ b/pkgs/applications/misc/redshift-plasma-applet/default.nix @@ -1,6 +1,6 @@ -{ stdenv, cmake, plasma-framework, redshift, fetchFromGitHub, }: +{ stdenv, cmake, extra-cmake-modules, plasma-framework, redshift, fetchFromGitHub, }: -let version = "1.0.17"; in +let version = "1.0.18"; in stdenv.mkDerivation { name = "redshift-plasma-applet-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { owner = "kotelnik"; repo = "plasma-applet-redshift-control"; rev = "v${version}"; - sha256 = "1lp1rb7i6c18lrgqxsglbvyvzh71qbm591abrbhw675ii0ca9hgj"; + sha256 = "122nnbafa596rxdxlfshxk45lzch8c9342bzj7kzrsjkjg0xr9pq"; }; patchPhase = '' @@ -24,17 +24,18 @@ stdenv.mkDerivation { "'${redshift}/bin/redshift -V'" ''; - buildInputs = [ + nativeBuildInputs = [ cmake - plasma-framework + extra-cmake-modules ]; + buildInputs = [ plasma-framework ]; meta = with stdenv.lib; { description = "KDE Plasma 5 widget for controlling Redshift"; homepage = https://github.com/kotelnik/plasma-applet-redshift-control; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ benley ]; + maintainers = with maintainers; [ benley zraexy ]; }; } diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index 9b3dc84bcbd..16d6ca2e26f 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; -let patches' = if isNull patches then [] else patches; +let patches' = if patches == null then [] else patches; in stdenv.mkDerivation rec { name = "st-0.7"; @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { meta = { homepage = http://st.suckless.org/; - license = stdenv.lib.licenses.mit; + license = licenses.mit; maintainers = with maintainers; [viric andsild]; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/st/wayland.nix b/pkgs/applications/misc/st/wayland.nix index 4d9f0ef3f8d..ab890c8db71 100644 --- a/pkgs/applications/misc/st/wayland.nix +++ b/pkgs/applications/misc/st/wayland.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://st.suckless.org/; - license = stdenv.lib.licenses.mit; + license = licenses.mit; maintainers = with maintainers; [ ]; platforms = with platforms; linux; }; diff --git a/pkgs/applications/misc/st/xst.nix b/pkgs/applications/misc/st/xst.nix new file mode 100644 index 00000000000..5aaf04bbfd8 --- /dev/null +++ b/pkgs/applications/misc/st/xst.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, pkgconfig, libX11, ncurses, libXext, libXft, fontconfig }: + +with stdenv.lib; + +let + version = "0.7.1"; + name = "xst-${version}"; +in stdenv.mkDerivation { + inherit name; + + src = fetchFromGitHub { + owner = "neeasade"; + repo = "xst"; + rev = "v${version}"; + sha256 = "1fh4y2w0icaij99kihl3w8j5d5b38d72afp17c81pi57f43ss6pc"; + }; + + buildInputs = [ pkgconfig libX11 ncurses libXext libXft fontconfig ]; + + installPhase = '' + TERMINFO=$out/share/terminfo make install PREFIX=$out + ''; + + meta = { + homepage = "https://github.com/neeasade/xst"; + description = "Simple terminal fork that can load config from Xresources"; + license = licenses.mit; + maintainers = maintainers.vyp; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/terminal-notifier/default.nix b/pkgs/applications/misc/terminal-notifier/default.nix index d9046c55e12..47cea34d4a5 100644 --- a/pkgs/applications/misc/terminal-notifier/default.nix +++ b/pkgs/applications/misc/terminal-notifier/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp -r terminal-notifier.app $out/Applications cat >$out/bin/terminal-notifier < +Date: 2017-06-25 +Initial Package Version: 57.0.2987.110 +Upstream Status: Not submitted +Origin: Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/chromium-system-ffmpeg-r4.patch +Description: Allows building with system provided ffmpeg. Rediffed + for chromium-59.0.3071.109. + +diff -Naurp chromium-59.0.3071.109-orig/media/ffmpeg/ffmpeg_common.h chromium-59.0.3071.109/media/ffmpeg/ffmpeg_common.h +--- chromium-59.0.3071.109-orig/media/ffmpeg/ffmpeg_common.h 2017-06-20 17:03:19.000000000 -0500 ++++ chromium-59.0.3071.109/media/ffmpeg/ffmpeg_common.h 2017-06-23 00:21:10.551912699 -0500 +@@ -23,10 +23,6 @@ + + // Include FFmpeg header files. + extern "C" { +-// Disable deprecated features which result in spammy compile warnings. This +-// list of defines must mirror those in the 'defines' section of FFmpeg's +-// BUILD.gn file or the headers below will generate different structures! +-#define FF_API_CONVERGENCE_DURATION 0 + // Upstream libavcodec/utils.c still uses the deprecated + // av_dup_packet(), causing deprecation warnings. + // The normal fix for such things is to disable the feature as below, +@@ -40,7 +36,6 @@ extern "C" { + MSVC_PUSH_DISABLE_WARNING(4244); + #include + #include +-#include + #include + #include + #include +diff -Naurp chromium-59.0.3071.109-orig/media/filters/ffmpeg_demuxer.cc chromium-59.0.3071.109/media/filters/ffmpeg_demuxer.cc +--- chromium-59.0.3071.109-orig/media/filters/ffmpeg_demuxer.cc 2017-06-20 17:03:19.000000000 -0500 ++++ chromium-59.0.3071.109/media/filters/ffmpeg_demuxer.cc 2017-06-23 00:22:56.289311692 -0500 +@@ -1223,29 +1223,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone + // If no estimate is found, the stream entry will be kInfiniteDuration. + std::vector start_time_estimates(format_context->nb_streams, + kInfiniteDuration); +- const AVFormatInternal* internal = format_context->internal; +- if (internal && internal->packet_buffer && +- format_context->start_time != static_cast(AV_NOPTS_VALUE)) { +- struct AVPacketList* packet_buffer = internal->packet_buffer; +- while (packet_buffer != internal->packet_buffer_end) { +- DCHECK_LT(static_cast(packet_buffer->pkt.stream_index), +- start_time_estimates.size()); +- const AVStream* stream = +- format_context->streams[packet_buffer->pkt.stream_index]; +- if (packet_buffer->pkt.pts != static_cast(AV_NOPTS_VALUE)) { +- const base::TimeDelta packet_pts = +- ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts); +- // We ignore kNoTimestamp here since -int64_t::min() is possible; see +- // https://crbug.com/700501. Technically this is a valid value, but in +- // practice shouldn't occur, so just ignore it when estimating. +- if (packet_pts != kNoTimestamp && packet_pts != kInfiniteDuration && +- packet_pts < start_time_estimates[stream->index]) { +- start_time_estimates[stream->index] = packet_pts; +- } +- } +- packet_buffer = packet_buffer->next; +- } +- } + + std::unique_ptr media_tracks(new MediaTracks()); + diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 4e2a2f84b96..be9aa16e151 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -94,12 +94,12 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "26.0.0.131"; + version = "26.0.0.137"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/" + "${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "1cw5pmzfyaaxxd3kf90nz8zn5r06qmkh8l793j3db4n0ffxg5c1s"; + sha256 = "0zmslmy7i7ywb2frckg5afkmfqb2lm2mahq0qs8msjzcx9jk4pyx"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 0cc53a0c31e..708320e92a2 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "151a7w2gqrv1svabhzmalrjr2pdbb9ys8zhrfz02779rjhzfz916"; - sha256bin64 = "1957q2wdkymibxqzpcq71fj3q6gca888r7gr621z0c03p0izlb7z"; - version = "60.0.3112.24"; + sha256 = "086j8s8wjwk26gfb7hdqn1lsmwgr9mmw93yfi6s4wia9ra0ccwj2"; + sha256bin64 = "0z1dshxzyn5zhr4xg5mvrq70jxsfkwv50achq802322y4jz52f7n"; + version = "60.0.3112.66"; }; dev = { - sha256 = "15642f0nalx3zqdlr5ldcbrpxnadav3z6sl3imvzj2ssv3nbh25m"; - sha256bin64 = "0lbma509m3ppy3hg34r10ijhw3m92qxm147qhw0k4lpwdcmm6fnm"; - version = "60.0.3112.20"; + sha256 = "1hbf7hv4934686dp0dbqy06vbwb2kq4wz5hjfdxrgafrzqac2j7g"; + sha256bin64 = "1gg1a3k80qncr7dpw9gycndv52396cqyq9zfmzf6c4njpn2khjfv"; + version = "61.0.3153.4"; }; stable = { - sha256 = "1rxc555l3bxczg9vigr2p0y7j1gswy99gs5yhkbj3raakym32563"; - sha256bin64 = "1bvkibhvxdcszbh44x77cynnaqhrm5ngf79fp7rdljfhlflvsnw9"; - version = "59.0.3071.86"; + sha256 = "0w1i4q7w5lcajc18jrchrhhm00x0jzm846l5x7a5rcp3baawkjrp"; + sha256bin64 = "1naq20508qjm9hlwlpj686a0lawca58rnr35ws2gh2gsyxrxnmx1"; + version = "59.0.3071.115"; }; } diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix index 60935b9605f..bd5f757738d 100644 --- a/pkgs/applications/networking/browsers/dwb/default.nix +++ b/pkgs/applications/networking/browsers/dwb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, makeWrapper, libsoup, webkitgtk2, gtk2, gnutls +{ stdenv, fetchgit, pkgconfig, makeWrapper, libsoup, webkitgtk24x-gtk2, gtk2, gnutls , json_c, m4, glib_networking, gsettings_desktop_schemas, dconf }: stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; buildInputs = [ pkgconfig makeWrapper gsettings_desktop_schemas libsoup - webkitgtk2 gtk2 gnutls json_c m4 ]; + webkitgtk24x-gtk2 gtk2 gnutls json_c m4 ]; # There are Xlib and gtk warnings therefore I have set Wno-error makeFlags = ''PREFIX=$(out) GTK=2 CPPFLAGS="-Wno-error"''; diff --git a/pkgs/applications/networking/browsers/firefox-bin/firefox.key b/pkgs/applications/networking/browsers/firefox-bin/firefox.key index 9169c4f9c44..bd27ce85c94 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/firefox.key +++ b/pkgs/applications/networking/browsers/firefox-bin/firefox.key @@ -1,63 +1,254 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1 - -mQINBFWpQAQBEAC+9wVlwGLy8ILCybLesuB3KkHHK+Yt1F1PJaI30X448ttGzxCz -PQpH6BoA73uzcTReVjfCFGvM4ij6qVV2SNaTxmNBrL1uVeEUsCuGduDUQMQYRGxR -tWq5rCH48LnltKPamPiEBzrgFL3i5bYEUHO7M0lATEknG7Iaz697K/ssHREZfuuc -B4GNxXMgswZ7GTZO3VBDVEw5GwU3sUvww93TwMC29lIPCux445AxZPKr5sOVEsEn -dUB2oDMsSAoS/dZcl8F4otqfR1pXg618cU06omvq5yguWLDRV327BLmezYK0prD3 -P+7qwEp8MTVmxlbkrClS5j5pR47FrJGdyupNKqLzK+7hok5kBxhsdMsdTZLd4tVR -jXf04isVO3iFFf/GKuwscOi1+ZYeB3l3sAqgFUWnjbpbHxfslTmo7BgvmjZvAH5Z -asaewF3wA06biCDJdcSkC9GmFPmN5DS5/Dkjwfj8+dZAttuSKfmQQnypUPaJ2sBu -blnJ6INpvYgsEZjV6CFG1EiDJDPu2Zxap8ep0iRMbBBZnpfZTn7SKAcurDJptxin -CRclTcdOdi1iSZ35LZW0R2FKNnGL33u1IhxU9HRLw3XuljXCOZ84RLn6M+PBc1eZ -suv1TA+Mn111yD3uDv/u/edZ/xeJccF6bYcMvUgRRZh0sgZ0ZT4b0Q6YcQARAQAB -tC9Nb3ppbGxhIFNvZnR3YXJlIFJlbGVhc2VzIDxyZWxlYXNlQG1vemlsbGEuY29t -PokCOAQTAQIAIgUCValABAIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQ -Ybe1JtmPA1NQqg//Rr6/V7uLqrIwx0UFknyNJasRJZhUkYxdGsLD18zO0Na8Ve3Q -sYpOC3ojpqaFUzpqm6KNv8eXfd/Ku7j3WGr9kPkbjZNghvy6V5Lva4JkxO6LMxKk -JYqiqF2o1Gfda8NfcK08GFy4C0L8zNwlADvmdMo4382tmHNGbTTft7BeVaRrE9xW -9eGmGQ2jYOsjxb5MsadAdZUuK8IC95ZHlUDR3gH9KqhfbQWp5Bo924Kiv+f2JUzN -rrG98eOm1Qb8F9rePzZ2DOYRJyOe4p8Gpl+kojCXNntkJgcwJ1a1yRE6wy9RzpeB -lCeoQuLS92MNne+deQZUskTZFoYXUadf6vbdfqL0nuPCKdl9lhef1QNwE30IRymt -6fhJCFffFQjGdeMfSiCHgcI8ichQbrzhBCGGR3bAHan9c2EbQ+puqG3Aa0YjX6Db -GJjWOI6A61bqSPepLCMVaXqV2mZEIaZWdZkOHjnRrU6CJdXG/+D4m1YBZwYM60eJ -kNu4eMMwMFnRsHiWf7bhqKptwuk8HyIGp2o4j8iqrFRVJEbK/ctdhA3H1AlKug9f -NrfwCfqhNCSBju97V03U26j04JMn9nrZ2UEGbpty+8ONTb38WX5/oC61BgwV8Ki4 -6Lwyb7fImUzz8jE83pjh7s3+NCKvvbH+VfT12f+V/fsphN3EwGwJPTC3fX25Ag0E -ValA9AEQAK/z677fpoVUj4zQz0g60wVWf+1y2lGb8iFYICmvrJyaEra5SRkyihYA -1WmEzhN4T//tHw3UIfe646+GkY3eIQW2jY9DM2XaElmMN8k/v54nbn5oD7rNEyCT -FTvCOq5d74HH1vw96Lzay1vy45E7jPWvqfg9Se8KAnzElohTJjizyhU+0QbmPHnQ -lY8gOkT/SvRo9bFEUnqjWh0fRq+K1tdLPhcFB1scc25iFqh9IAKUGDur8jQ+SDHC -jgQlkFOg3rbqtaUOnVHPohfrBM90ZNwuneFgQY7ZFSUidCimp/EN4CXnzgjDYXUU -A42S8G86+G4KAJC22gRQo4mcVmehwHTH0glfLmUK7TEu29A1KWNL3R/R7Zdyajjp -CvUaK2A0Abj3ZE2BSDbJrVlbBVfy5kfPdZjhd3wUWqFaDHiVcImcjZRWPncllhcy -6fhqEy3ELZrkezpJjnARsVkij3GXz6oX+HVULne2w0dkTXydR6muZI/GeNtrLHmA -8B3/0/TllmLy8ChmYZVIKZ8zt1ghq3f+hFTXgtZil7eBewZgA6L+EXXK6dZj14lb -e6CMS2kungTX9stU1s42I+WRbiqiLpAxCX6qcLBOWrJwsOep2nvu5bhrPHptSfRh -F4Vs1xteVFckCWhcLgdYi/Je1XBEM+AAVa0k1FiywCg7MqlG6toLABEBAAGJBEQE -GAECAA8FAlWpQPQCGwIFCQPCZwACKQkQYbe1JtmPA1PBXSAEGQECAAYFAlWpQPQA -CgkQHGnE5V6ZBdsvxQ/6A62ZteN0b/TVfSJ51SdG66amwe2rpRX4UdSw7ifxo3qh -gEICQmXR5c09qXwl17MFJWM3FhGrbxnA5KGgeWGtqrPup4QZPKU+l2Ea2QLSJSiB -q5QqqEgZvR14Lhr/hCGhBAq9s/xbp8fbKNJj/uWiZ+uTPbt5T5rgKJ4+g3B6DNO1 -rH7F70OLrd32mxZs4pSxngHRAyiMPB59yQVDsVMha0JTqC+P96itUzvnInc/9mwE -0EMiBtpDTkoBwbJVPnuv+7FjkOLn5s5u3RLH9fe8z1xnV0fPC0/ndrlNiuBpAn3z -VCsWasvW18Vz8K+CQY8Sw0Jw75edBgFoz2QMFxHfDpMJefvMadB7mdte1lKk/Im9 -KFFH8Idh9b6zD0a/+Ooujukx6QpFfAVhe2sT2CIm2nmMAuAZI2cCt7SC+REn9n9M -SuIWxN8YTE3qgAUB6F3ea0O0hGlLl+z5UOfX0bNAs+ebx/P6PczJtDzeqpmRb0QX -qo55JWXLvmXT/fgjF7fNTTLsyCtV+xH6ZFKGpvGJGJMHApEbz2a0hy12RZH58eI1 -ueN3Tzn8nI57+oYSsqFw/QgcdGXDonLGJsPVzIpQRg92/GXSukWF+MsCjVOilHRS -Y1wfPPmJ7+kMQ4rdXpjAhwNYJc1ff5N+omCxCKoFgYsCXlFCHFKs4JwRbTdd3Mku -qBAAlBlIjym8NyJIBltfWckuhQTX4BiBltGPNga9CpQsml519EePuLtoe5H0fTUp -4UYbL0ZzyJImQE2uw/hMNZ36bA057YtHOoP4FcPUwv6wsl5JC87UR1XFhAXb5xSU -0qdi3hWh0hm772X6CBlM8lM6GtT/fDZkSGNXMQaIs1X/O9vf8wGg+HwLJcaCvybI -4w7w1K0R7WjWZlJXutCZf8hRc0d88W/qSZYooKD9q2S7foqaJhySIaF11sH5ETvV -P3oCfGVIVhKWb0Tp2jXPXlXLeRAQA8S+4B1o5XHiM+J3SNXhPQHRGQ3VGcDn45it -g3F4xQX2Qvo4SV42NMYd6TykM/dIfQyJDOVg3CT3+nqfjCknf94SNvyZprHEPmpc -DeseoPMw8kjKNwDwPXFLxBRntPgnqVXDcNN41OH2kqx4jF7FLlRmwNpB2mFVH8xe -VuRm7h2WZRsaEoqvivhzRtESVA2um5Eg763CVTcNYlK6MD/iy8JzbMuZBrlOHr58 -HKDdcOy1W0z2quESGoqrwA995IgPav/1DSpyuJPNc/oUTWlhpYshqYKoflezAyKj -30+UzC3R/mY03ri6zUvCgXHNgZlKUsM3VEXk6h5oDuaXniHLLzuxjTBVrILnGYgH -SFRP80L/knz+o4Uvq4wj7NHnruc5fP1foFxRNsMt40yRJfU= -=D+jC ------END PGP PUBLIC KEY BLOCK----- \ No newline at end of file +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: SKS 1.1.5 +Comment: Hostname: keyserver.mozilla.org + +mQINBFWpQAQBEAC+9wVlwGLy8ILCybLesuB3KkHHK+Yt1F1PJaI30X448ttGzxCzPQpH6BoA +73uzcTReVjfCFGvM4ij6qVV2SNaTxmNBrL1uVeEUsCuGduDUQMQYRGxRtWq5rCH48LnltKPa +mPiEBzrgFL3i5bYEUHO7M0lATEknG7Iaz697K/ssHREZfuucB4GNxXMgswZ7GTZO3VBDVEw5 +GwU3sUvww93TwMC29lIPCux445AxZPKr5sOVEsEndUB2oDMsSAoS/dZcl8F4otqfR1pXg618 +cU06omvq5yguWLDRV327BLmezYK0prD3P+7qwEp8MTVmxlbkrClS5j5pR47FrJGdyupNKqLz +K+7hok5kBxhsdMsdTZLd4tVRjXf04isVO3iFFf/GKuwscOi1+ZYeB3l3sAqgFUWnjbpbHxfs +lTmo7BgvmjZvAH5ZasaewF3wA06biCDJdcSkC9GmFPmN5DS5/Dkjwfj8+dZAttuSKfmQQnyp +UPaJ2sBublnJ6INpvYgsEZjV6CFG1EiDJDPu2Zxap8ep0iRMbBBZnpfZTn7SKAcurDJptxin +CRclTcdOdi1iSZ35LZW0R2FKNnGL33u1IhxU9HRLw3XuljXCOZ84RLn6M+PBc1eZsuv1TA+M +n111yD3uDv/u/edZ/xeJccF6bYcMvUgRRZh0sgZ0ZT4b0Q6YcQARAQABtC9Nb3ppbGxhIFNv +ZnR3YXJlIFJlbGVhc2VzIDxyZWxlYXNlQG1vemlsbGEuY29tPohGBBARAgAGBQJVrP9LAAoJ +EHYlQD1/DRWxU2QAoOOFRbkbIU1zKP2i3jy/6VKHkYEgAJ9N6f9Gmjm1/vtSrvjjlxWzzQQr +kIhGBBARAgAGBQJVrTrjAAoJEMNOV0fiPdZ3BbkAoJUNHEqNv9dioaGMEIpiFtDjEm44AJ9U +inMTfAYsL9yb15SdJWe/56VCcoheBBARCAAGBQJWBldjAAoJEAJasBBrF+oerNYA/13MQehk +3AfkljGi252/cU6i1VOFpCuOeT7lK2c5unGcAP0WZjIDJgaHijtrF4MKCZbUnz37Vxm0OcU8 +qcGkYUwHi4heBBARCgAGBQJVrSz+AAoJEPCp59zTnkUulAYA/31nYhIpb7sVigone8OvFO19 +xtkR9/vy5+iKeYCVlvZtAP9rZ85ymuNYNqX06t+ruDqG2RfdUhJ6aD5IND+KD5ve7IkBHAQQ +AQIABgUCVaz9fgAKCRCzxalYUIpD8muMB/sH58bMSzzF9zTXRropldw7Vbj9VrRD7NyoX4Ol +DArtvdLqgPm0JUoP2gXINeSuVPpOfC676yVnBEMjIfqEjq09vcbwayS+Ncx4vQh2BmzDUNLE +3SlnRn2bEWr9SQL/pOYUDUgmY5a0UIf/WKtBapsPE+Zan51ezYSEfxDNfUpA4T2/9iWwJ2ZO +y0yIfLdHyvumuyiekJrfrMaF4L9Q0OnJwp1PwkvN4IVwhZeYDtIJN4nRcJK5LrwU7B97uef2 +hqBBll7/qCHl5y4Khb0csFanIg+pQLPUJdIiYtzoFtlgykB61pxqtU9rqGKW02JzEUT8DdPU +XxmMBy6A8oGeBRH/iQEcBBABAgAGBQJVrRdcAAoJEGVzgtv/JREKQJgH/3nD/3/SumL7nG2g +7Y1HQqWphUbn40XWvjZcHq3uBUn1QYXeZ5X56SANLM2t+uirGnNaZXW3cxEl5IyZVLbmcLWE +BlVAcp2Bf3FXFbdJK59f+M+y2+jZT9feTyrw+EtLoiGTxgkLdJyMyI0xGmQhMx5V1ex1CxhZ +K2JPjzCVYriBI0wIbmKi90YNMQoSsdMhYmX9bHl6XWS9TCDWsqj25FLYJL+WeVXpjO0NjRwE +E6pc/qldeJYG5Vbf0snGxIerXe+l5D8Yd4PEAnpj58+5pXeoGYZn3WjX8eTFMAEU+QhLKWQ+ +j/Y8Kijge7fUxnSNBZ2KEnuDN/4Hv/DrCFLv14CJARwEEAECAAYFAlWtZVoACgkQ5DJ8bD4C +mcBzsAf/RMqDdVHggQHc0/YLt1f/vY9Y7QQ6HwnDrtcNxxErSVcMguD8K6Oxir0TMSh+/YuZ +AW8K4KSgEURwZqz4na8/eOxj8bluNmlcAseQDHswqU6CyB95Woy3BocihH7L0eDXZOMzsa33 +vRQHBMioLxIbpnVtVbFR1z7tmyfjcOrzP32xo5QoPoczKX26luMBjAvbw1FC0is2INnmUSYM +4uH7iFZuXGPFYxcAqODqy5ys3MoPa4oZ71d0HoiRil1+s0Y+2ByddZ19pE2TXp4ZXNYNUj/2 +aRj8b4sTjR4rqhHIx/vfoK+VCNy/skFUZOyPdbbymE0stTRSJ1gr9CZLcBWYF4kBHAQQAQIA +BgUCVcFZcAAKCRCJFz+VfFX5XqApB/938p+CJiDRnh2o7eDWnjSyAu7FWmWGkOQnjI/kraKx +1vojsYnKRXD6mjq1QJ8Hsp4taJnLQjcokNTUiST4m/e4ZJExPWuJKkwlralWGH6NpqYcgWPa +jSYb0eYQC4YqS0kfyzolrHdKI8Y4NGEU7yy5zsHwWkHt/mpNQMrYnXwyWdIrc03X/OXo51dJ +yshJDRw3InREyBblFJcLvArNHz219wMrXAicPytw4wfPpVrmDx6GrZcI8q8ECWCjwSXXv7hR +pEuFLSy5XPhMc+wYBJjNlUoiFBAF/7zENd3rMn9SCQLiIFYe0ubmO+bpeGy7TizbxOaCIfgU +ouyy0BQXNuJBiQEcBBABAgAGBQJV0hrqAAoJEK18uZ+CSLoPzEIH/1D6sJMNAJtZCRGhJXvv +6SYhv4pUVNyDF9FnUvRsovliojoe4IkuBTWKhPGrxbiD5IO/izr38shqNhhm9JE2/SQZHObY +Pi+lyfDKbJgImTNxmS4F7JHnRLr37VxK1sVvuNkynJnqvCcp1g5xwNIx1rKcka3iuqJj6toM +8XQfgsTHH1rUkWHbUV3QwNzXm+yhFm2s6QzxBooPzmFn8AY7CXD4pvcMR+M0Zy+e42nngd8l +zRnmTBVig4pRq0GCMulFG+XjeVQZFpoIIxo2k1lczbRmGttONdGWSjxBUxReoTbSwM3C/50N +robycGQgY0gd6LGtWtU8/uEfklEy2NluxYWJARwEEAEIAAYFAlWtAUYACgkQVu5xjc4OFUs0 +OAf+LM0dyyvUFGdXfJDpP2xMknXzsHAXWFEtH5jein58mv6dD3fTVcCouo1vMQH3WFFSLYZv +wtNnHGrSBqFbNKqZ0ATQ5tcYaWsSZ+MVJJMXJDXFG/Oihg1nNOM33VdfV0RGPKP1I4cEROxm +s3TUFkHW3cSCgMzs8I1OxfSoLrm6da8EN+2ct2InqzdQL2yisyTyrdmXoNpwXDxApKYkvVHQ +4+9eJI5m0ZAr0mBjIeJdATcw4/lIVKTrV7UhrChxiffYJcz4SSC1crmr+2Fzw53CyAsAmYal +UHep3Yr05oQ4oJRX9X3VrY/yELHwwxXaxCAdwwHbbXAMhZsPk9Mc20J6BokBHAQQAQgABgUC +Va0isQAKCRCj1lIXO3Y+j6ZeB/91Q9/qr5oMWgOMsix8kflBLw2f/t+tRR0SWDw90bG1npJB +6nq5Hl+Bz4/A4SWFTFrrrlZi1Enjn1FYBiZuHaSQ/+loYF/2dbQDbBKShfIk3J0lxqfKPAfK +opRsEuxckC8YW1thGxt5eQQ8zkJoqBFTBzwiXOj3/ncJkX9q9krgUlfTSVmrT9nx0hjyNQQX +rghsmBtpR7WCS7G7vNRGCNUorhtviUvL+ze1F7TTSGspVsVxo2ghmz5WT/cD9MV1gcVjojYm +ksh5JIl39jCHr9hl8aRId/OfzsN+TKuBcpAxDkm9BCAps7oY8FlLKDFZTtHa000AkodKHT88 +nwnvKuqPiQEcBBABCAAGBQJVrTkDAAoJEPbQ92HczOykK9YH/0MARo3HlYXeS2bDqM/lwK/r +QcPCCyYke6wbICjncbCOjgXHqG/lBhClNs7hp/7gqkUaR7H5tmeI4lalP40mSHHnnFvMD3Tc +yhn350igK0bgrjWQDaYxhKlHT3vIXd/C24/vRSAxmqIKbP+IoXOyt2GMTQq8GOm2dgYRaTkw +yHnGWnMaibctX8D4oCYR0/D4YJqPkfqobf8+1ZfP5GaMbSxE/Jwdo0kJa4vPjEzFXbygAbnc +apzdwN6zgel2zh885rz7B7vIpMr/Y7eV85Q68qdyyhLe8cL8Y18YPzpFf+/PZNbgYxouafvn +FwBhPQwg0gUF/+1eM3UE2ua+saSTGduJARwEEAEKAAYFAlWtCVsACgkQM0LhtmejiGMovwf8 +CfYJHNbwiwSMUoP4n7FrmElhBtxvlbnCMZKz08v+lFsfS3wU1LUN69GqirfF0vkQRSlSBp7n +iCLHQCfSoqHMLgxF0P2xgXLjaYM/t/rxXDawJmW18G04dqFrtCPZTbwMT2PsPHTiWQdaN0e5 +0lXk9Vo+l6VbwQMg4zH7icZadeJgQooxFalHYFVXUVeex9t8/YdanFVrHFa3tao6azBTSUkJ +vZtIu14SfxigDWIIwsx0xpVfJf3a/xC6HY3Q1a3NeBz3i6DwaK5wYqijZKl0WVdULKyqU98o +F6y0mUv3d2o/p07Cqgeo6xxMkHqu83OLa2a0C7tYPLgL4EFc2FtikYkCHAQQAQIABgUCVaz7 +KAAKCRCWO3gxCjexfKxrD/4npm1rB7+pPlotbqK37Mur7egPbVSAzVNU/zUKPAuGUeP3C64Y +N77ETx1kDuS+meAqMDHFc9Bf8HivPbtj6QcK96U5KstbmSh1Ow9YiQtxJgxGjg/CzREgZAFc +jy0MhoklyPsFhv07s6MLOJMSM/krEN5nqjifQ0WdmTk02FLoHVWcLdjfgMiPiSjGbU3k7luv +jPyRNzk831szE5mfa74rEYh4TBklse+2uB4DFQ/3oHZ1Sj6OBK6ujmNKQjIP7Cl+jmjr7+QK +0OJcRaj/8AckDA5qXTZACh1S2syCDDMnX0V+dTxGCIoWOK+tt9mLohMzpEeD4NIX4qdpbbCR +zeYZMHSomyBIsbA6B+/ftDE7W1N0/FtJ9adkkCynKULvh2CH5c5hgOOL22M+2spnywRoeJRU +WU7hBM5OUH3JjA4Tu4j/cwp7dD7QzZrzmC9f5LQJ3OelejvVowWPQd3/tky4o1q6wlmFqAcA +gtu97UwgBOSR9sJPGDlt1iC91UYAiBQQAA7ya8uXUS84mCQwTlr8j+YrowvEHK4IxpPREytT +1LzzV/4Am4ndDFtujy83QjL0qaIIim1xIwoEosd4yidhpczw7f3b9dQpuBIFeQuhM7JsxP4t +mE7S6k6GlEmqa3INPVaPGnsUGS7+xSMlcJXLtimPCSQvFma9YiGV5vtLy4kCHAQQAQIABgUC +Vaz8uAAKCRASy06X4H5n0dg0D/9QoxIh9LRt1jor7OHG4xKUjKiXxn/KeQNlJnxI55dlWIvJ +EJGheFjaDomzKBYuxmm2Ejx+eV5CHDLUYsLFYwWf8+JGOP75Ueglgr8A0/bdsL63KX6NP2DC +g8XR4Z1aeei3WMY7p/qMWpqbQoAv9c3p49Ss2jSNuthWsRR6vbQ9iwze2oaUaA44WKQyhhbC +wBU4SHYjlKCLqIBh/HXZFhZ4rDfuWgPBKvYU1nnOPF0jJRCco3Vgx3T9F+LZ3zo5UPt1Xapr +3hMVS9iaJyl1w4z2miApUaZuHPuWKuO4CJ1GF1mS5T6vG8gB3Ts5zdtBF2xQIkCz+SM7vW/2 +i/82oq6P8EuLHEhrQPR4oTjXIvXdEJ9kgbjqcj8Xk+8teEOnuwh6iEhay9i/bf0D3Jd+roFN +5dnWPxhOVjzrI3fwlK1/ylsZYqUYBEzt7Wj0MdhjeKssI5YICcqYXXjBttMw4B7DZXPFXzz3 +kHB56jZ/II4YUjpLO85Jo5A9SV+aIqa0mvCt6DvVWy/rhfxfoUdqNlhX11gkVLaA7xxgn/Nq +POf+h5hVO2mwWkmart9YHKMZ3ukCdke65ITL/nsYSm2ZhG7OYjaCfu9jPWtkBstOEWyT9q4J +TdViR7wN3eMefEG6rb49rxOYvGJu+cTVkp3SCpl0w1j+tPj4tkj7ENzPMXdnuYkCHAQQAQIA +BgUCVa0s4gAKCRCKsTKWOgZTeuMyEACKOySKAd/xDcPcHg7Prvdws04Z8DIR0dY2qUlbRVx2 +jTmIXyry63CqbOJFbDg9uk5x0+lSotvrWtZ+NKSrg9VM6vyV4cc2P9rhqIBi3wO2elzAmpOa +S2KKOjQ+2fS/xqh91ElJUu09xXQXJ0vMrqgui+zN1YBDiJV0WOmm90Mm2NPiihcWZmBmDorO +qMQabwbjBLi0yUVHgAlkilY3mAB4tmEKDeN+4pYSAAhXAll9U+nyoVMgwMJscZyazOp4MqMb +mFjyr4p5AGzv+OOJtjtCNKT6oW9Y+URLY0YKeOsPk0v5PlbQCVBlLeSBsNZudKav/Gvo7Mvz +5uLTcneBFb+haYIiXO/FQm4uBHkzdNFLgaph81Wzh62AhbtBlfBOj/lbzN3k/xRwo64QU+2Z +9GOhFlhjfROquY70FCQcspwNuqCdZybnkdpF2Qrr6Pi0qKR/Xb9Vd7PW0/gKQdwwlYTiDemg +A21mYeJrYw873/7U/+kLFRvmPAEX4IOIOEN6XVjxvu78REi6CmXxOoYnH4aRSXDRyi1nsGjB +43AtfAMMNCUigDgFP4sUsZAG1RAoxBhOsO/g9S5wx8H3rKITCXDjQh2SYeBwHFcU03EMcyzE +QhbZNighN+aRKGIibteRxISiKU+kcWaHolemeo6wGF87QXEpJaQ2OwIoIxQYvDDmQokCHAQQ +AQgABgUCVaz/8QAKCRA/8xuvEEv54t06D/9n1Nyn2QSUN1mXd7pomoaka+I2ogDbQpu9iuFq +bkqfcH3UuG8yTKlPp9lYDBs0IEfG85Js6iVxJIultocrcDmOyDkyEsnYbdel/tn3X4yqD8eI +6ImRoCE+gnQ3LoEIHuODfJoosM/jAHANs4fsla4/u5CZDXaaq7pYXGiTt7ndsfmLiCa7dAg7 +bVFfJagsnL/VjlfeWM9nW01rDL9LPxSN4tq7ZKXWZDonFZYJ4unsK/Cn6Pqco4Wb+FUOWCcW +t8in1pgeNHZ9WnAgXG999/3iCbbQTLB6uVwY4Ax5P7VApnLVXV6QFVf7bN1DxE8kZk+pfLGc +uD1LJSF0skE80M17kAt+iV+fam8EYzeGdG6cY6w+srndaMaq9ddiHIiQkR35SjJAGnrNRj8o +oUr/vKOBnFfuwJLA2MOUVPZ8HWB+WXW8qhihw9CXa38Hdt4o5knMGRIyTWEF0TQDtRGQ6his +VBN3OxJRXBj7/QgCG/GoYpweGKcsMU43p57TzbnXVVUytJsLFyexOGNzrUIxgDVPEvTUnNvd +AihNZPdbW3YdFkP9pdwOyDpQwebXELUx1kp4ql0laueex4L1v+0a6rDYQeK1gOq5UGY+THRS +gB2xsHl5zeryfgnjlUkUlxKuumz+9FI2fRtSpxmWllJkRF2oFMGRuLPGAWe8nHvfgkuGVokC +HAQQAQgABgUCVa0bowAKCRCVY0f2+/OkFWKREACZ9TOmzvY6mrfWVEdldcYPj8cU/1LJhGdb +No5YYMx+A72nchxGXepHA65OEK+f6rFMeZFPwpQPy6Sj3MhT623H/PECfeG87WcLOyJbfc3i +9T5jvxS+ztG6abYI2J/50oMvjUWdWkDX3VvdPc0ZZ+KC+oHvx9a/9Yki48m4CEKglgVsrRW/ +b9AXZQCj07bB0GjQQtkqY/m1Z8m4ttzxfO7OBo/jHNF2An4/4gUDirXNDj0UdB5FYFJaTEUC +neIj2x0fk1r4u6na8tINhiZ0M7IgjnDlBD5jwzvwG+3kYE6TnYp9Mfeg2MPC13tp7jrJatLL +utrOzvmSVLGLXbkh9w+v+vx7qO3TxZUNlFqTmYs+vI2V/9j7KYV7Ttoind6Io7X9ImnYrvd8 +JOyVcO3867MplKnrnqHJvFStE+JcHEcw5aRw+WVmoFd/obGc34V3K62T977QQGOkrTYDEdje +KADfjXXZkZMZc0IvzLBOJ1XB45+PKqJYCcJJS8Xr55+NGCDaaUPWDpkNGIqmX2n9kYROMKG6 +uWkZIqG0JlZkga3THSJIvLiy6uoOvDC4GoQ9JnTwpGv6r1Hwcg+4DCOrYKOoPKMMU24vHx2F +tRRUgCXtr2cmi2ymHlUrtz8EXS4tblic8lixcbvPUqLEvbJ2gfWQvjXNd1whYE/wfvI9WBTE +IokCHAQQAQgABgUCVa0b3wAKCRC8FzAbSRs/IQhXEADiKbCnsN/+Plllxn6SQHACEU75ackx ++Q02XiD/u+wUptYUGmJi4aaW9f6mgzedOxYK4S+/dCiFtkcYlL+FjaR0C7G6tMjrDgW+8nQC +TPUNQA0gX2B8n06a7Zmdv3EbV/PIJJwTNSBp/dqKbvPKnRquOOpH+ayZ3awKOq/LlWBErbW1 +gB+FabN0lCe0iUIQTF9OH3GC4QsMtIrePueBmVrVPcHATV2Vw9UPqX1uX/tlXm5eai06oVT7 +V0FwUbg0o1eacblNXvHciHpe33zZIKkGBWwSjDVcU9/SN+U8GfoMYmyCma4iN3KaCklpzBkJ +iQZtNKPAB5KJti8LDUxFi2sJd3sqWaZDGFhO+/PKhBKpqIhAzx1ppd11zLgh0eg6gQlXN8D8 +ELISRvQqGGNNZdChEFdzGElg5SMfmeEd37OaX4wceLLV0v7EA0doHMVo0enFhSwU3Ywtwxbi +ukKc7H/ylG7+jvntjY+z7KktRsY/FkklrbrNhddMBQMMSAQUUz1GJ+6NUKmzXjqxFuuh3OAh +qNzhJyABZWQcNMph+rogEslkenwoHV9gWRWtS3CMybJkKkbsWpYhMZNY6hFtgCwida7NPs83 +69v+yTTE6TU/NIlXUKYIf2LMqtOpEBTjaN3jKpUi5DeE3zBeh6iVKUrfCXbt8O0rYQPNWGSW ++MZ2t4kCHAQQAQgABgUCVvA4GwAKCRBE9G4UbQI5XfS9D/9XPK7jg0lmsNZ2sDIyeAw5n6oh +SR5F20ocTMAVeXqN7VkvJdNpIqHJa13EP408DgTy9BsSptym/OQGE6B82BU7FZTEL6eMHnGG +Dg+5ktx9+b73xLedzK75ti6ED+QuA4kDYcvW8hASht0zRcmFUzwbtuEopJ1Lk1R3oFLwCAov +lhduC45nANWrTK5U+D1U2obl5PAvx+9mEfgvojlGH/C/WD74W+cQZFH7t4+muRzamckLyPft +nTxjNF/lpYIm7z0QOwvzBYj+PJ09wYueK00RE5+i9Ff8DrjtVSXsziQvSjJuUlv0kVvM8r3t +h4zBBNRhA4cinwqxhgqO4G+r2r9Gv0M2nKKOnWmyF+MSIRnhgONOQZe5a7kQxKVWkLicS2IG +UpPeQyTWaqZzYXsD+Dm6DXD57vYTURtUkwO0CDONzT5XiS1HG1MZrw+V/Jai4HAvpF5WkTJX +Pc1Lv75BxJj3wOAw4MzEWCCdr/N/dt5/+ULpEaSQfIg4L4iEj6rvabQyN0KbOxIDx+pPQ81i +zfj36wIrDqhyCNIdmVH/yARltkL4XDEl/pt7Y3t6jqFhy057lektowClWcPeq3DoL0LFYnjN +PpYvIjRIAXdhaYiAu2ViF8WdGzQ5tFeI7u3PQUG5NcPe+WOPOru3wMMrUhLgLHkCdNkjivP7 +9qIPSTkCGYkCHAQQAQgABgUCVvA48gAKCRC3hu8lqKOJoLRMEACmlyePsyE5CH7JALOWPDjT +f+ERbn+JUTKF+QS0XyWclA/BIK8qmGWfgH38T9nocFnkw17D3GP8msv8ll+T4TzW9Kz9+GCU +JcHzdsWj99npyeqG5tw+VfJctIBjsnX3mf4N0idvNrkAG5olbpR5UdsYYz62HstLqxibOg4z +WhTyYvO6CjnszZrRJk0TYZON4cXN14WYq2OTrMaElx0My8o1qVBnK58pIRzv72PmvQqUk5Zj +hUyp9gxjqqCJDz0hVK61ZuGP6iKK8KCLTfSxeat05LAbz8aC58qlg5DVktevHOjBgnTa8B7B +gJ7bQ9PLMa3lF4H1eSiR9+8ecpzEfGHILoeIDIYH7z7J/S0mTgV3u5brOMYO+mE9CEfps85t +VVoyJrIR8mGEdtE2YmdQpdFzYIYvRfq9tnXZjVsAAsC20Smw0LnjhYzAt9QJwZ9pFMXUTg6l +C5xT+6LNrEY+JR3wC16q36bcbCNj0cBv1A3x6OI5OQfpexhLPDgoDiI+qozJIdj8MzJ8W6KU +1Z3yb3dqACk77yv37rGO6uduSHnSti26c/cUIy6XZBbXBdobE9O3tr8hwvTQ1FXBmYnBrdiz +U6tgxEA5czRC9HOkdk6y6ocbjmONpF6MxkpJAvTMk7IqC2/hisbV9x4utla+7tmNZU137QGc +aK2AGQablVAy4YkCHAQQAQgABgUCVvCMigAKCRCkhaDtUbi3xAU7D/9gUPZSJ8pbZV9TLaKD +57Bc7B78HNV/B438ib4dI33iihMTBHnCB1giPE9X54QoV8ASxrO/xveS1kkj78jERqUcED6Z +HhMLb9SWs6CxUKdMdgovnIlFUc+t05D5mb6STi+zNihwO0JI+n79qhETy73WLpC7RR0aMx7z +Ycbqp3NWPptcf1kVGJZGx+QbEHfVye98T5pkH5Wp+7LSlup6AldQT/oifxdGxLXbECTnwozR +vyMpAaphoEHrET1YOmKnmw/Jyi6DLpTb3XvSf5Tntzr7HklCEcL9FvYCoHxiXWawLhuPhSyr +FYeYtF1ypmzTgaJWyuTZ8sN9J+y7Tbchk/I6FpX+3YoTgPCcC7hv1Krs803N/3KuyBEvhzg7 +NYRikzO3fxXlBG0RMm+662E7KlERU24izbWhGiYwl34+MaxrIO4oDvF79LEN7y0+SjL4V0B9 +689d+HI1ZfS9O1xkOlW6y0QyagOzsTOUF12s2mWydFmipbYnIwsSsu6Nzk3yO4M+qYABJXJ3 +tIFQPTd7xqmPNlJ8mFtmzHDhb3Pv6sRNFLLujYM9cJpuNMbAHWdohz1bjBT9pZQ3zWpll5wo +tUvGmJd6hTAXdUgmZ7lh7Uq6axClMmiLe1WYntcNpb04PyyEm2+GU5x123UTiSX2LGKa4t+H +NSM8nJL8BJiGk80xVIkCHAQQAQoABgUCVa0OAwAKCRDDvTXkbdRdpVR+D/4/37e8WqKOHNPt +eQu42sj0ZOfcqyVMA9TQ578F0s9MwoQuqfVhXGSWevOctuMv2qTBjBfFjkdPrKR5L4LNAgMs +u1epHU0DPcRZUCbh1P7GpolmZ8KgnjT5Wpl1AcuOCaP08VMrt/e/JndTHp6btn6HsLVtryNh +lL7oaeYbDr6/ovHNGHVIVSZgGP9f4Y8FiDpyfKav71vYLBMxtzM7lc3eFT1S10XhSW6k+8S5 +XldYWkLDriRXDE85C+9QndpOoQaIICp3ye3JVnUxa1qhvsYj9uPt1M6hKiBSoXdplrB+hQc+ +nqLNN3jxpGdmGmwrjtjqMhocMIguEqgARJOek3XKOppEhu+IcnJgU4edARJNLsBauiVBWY/6 +mZOFlZq6H48tVyziS2n/oIpi+aCc/fQeGs9zMTtFUohPfYtTcy9PecXMOYpSu4p4tQ07oucn +xfBkRUgTdM5VwX7YwTcRwp9XhHACUEGBhrwMH8Iz+sK2jLF3FhJGkef1vFs0vqSf4I8DBFkY +AKF848YyEcGHeINQloi3v0Kr2PpBxlRh+GPWwi++QPKXQFzlTiyVtMzoo/lpmAWUJwj0dbAb +H/mohtvWtA1WPHC2JRZ52JLThhpDrK3t//Jdt2WHE91cMx7/2B0PK4O8/j7UVlsOJXpVPsGX +5SFCeTB/iS4JtIwWN275zIkCMwQQAQgAHRYhBFnKni0qMx3iUaokJ18Dx2fCR6TVBQJZDvZC +AAoJEF8Dx2fCR6TVoGkQAIjqaQ7tpdhDJ6ORNtLIt0TsWg0jg2rpoq+9Au36+UYBMuBJ3Py/ +tAsZ3cqQlig7lJiQqOuQZkbg1vcY4Kdad7AGa8Kq3sLn8h2XUlNU90X0KAwdCTA/YXxODlfU +CD2hl4vJEoH/FZtfUsaLNHLmz0brKGrWvChq00j5bPfp90KYKqamGb3a4/LG4DHL4lmEBtP+ ++YA0YqUQ3laOvKune2YwSGe4nKRarZnFiIn2OnH9w0vKN/x9IMGEtc5MbQVgGtmT5km3DUuX +MDforshue6c7ao4nMOC96ajkWYZhybqHJgLOrEGPVUkOaEe7s1kx4ye9Ph3w/LXEE8Y8VFiZ +orkA/8PTtx0M9hrCVkDp0w8YTzFJ9DFutrImuPT6+mNIk+0NQeuDsv492m/JXGLw/LRl97Tm +HpKME+vDd5NBLo4OShlDKHwPszYcpSJTG9+5++csR95al3tWnuGX9V0/dO1s7Mv0f/z07nLB +/tL+hEpqqA5aRiGzdx/KOrPZuhCTyfA3b2wvOblwf4A/E1yO7uzPTuSWnx1E14iZuaCPyZPX +Eh3XSYCLEnQ05jy50uGXCDVR+xiE/5i/L3IxyhJk6zn5GOW5b8Taq5s/dFS3zWiFS6l0zQ1V +QmJH8jdGLoBFvdVLZoAa1bihLo+nJVPR2RauWnxWoWk1NQoT3l02Lk6DiQI4BBMBAgAiBQJV +qUAEAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRBht7Um2Y8DU1CqD/9Gvr9Xu4uq +sjDHRQWSfI0lqxElmFSRjF0awsPXzM7Q1rxV7dCxik4LeiOmpoVTOmqboo2/x5d938q7uPdY +av2Q+RuNk2CG/LpXku9rgmTE7oszEqQliqKoXajUZ91rw19wrTwYXLgLQvzM3CUAO+Z0yjjf +za2Yc0ZtNN+3sF5VpGsT3Fb14aYZDaNg6yPFvkyxp0B1lS4rwgL3lkeVQNHeAf0qqF9tBank +Gj3bgqK/5/YlTM2usb3x46bVBvwX2t4/NnYM5hEnI57inwamX6SiMJc2e2QmBzAnVrXJETrD +L1HOl4GUJ6hC4tL3Yw2d7515BlSyRNkWhhdRp1/q9t1+ovSe48Ip2X2WF5/VA3ATfQhHKa3p ++EkIV98VCMZ14x9KIIeBwjyJyFBuvOEEIYZHdsAdqf1zYRtD6m6obcBrRiNfoNsYmNY4joDr +VupI96ksIxVpepXaZkQhplZ1mQ4eOdGtToIl1cb/4PibVgFnBgzrR4mQ27h4wzAwWdGweJZ/ +tuGoqm3C6TwfIganajiPyKqsVFUkRsr9y12EDcfUCUq6D182t/AJ+qE0JIGO73tXTdTbqPTg +kyf2etnZQQZum3L7w41NvfxZfn+gLrUGDBXwqLjovDJvt8iZTPPyMTzemOHuzf40Iq+9sf5V +9PXZ/5X9+ymE3cTAbAk9MLd9fbkCDQRVqUD0ARAAr/Prvt+mhVSPjNDPSDrTBVZ/7XLaUZvy +IVggKa+snJoStrlJGTKKFgDVaYTOE3hP/+0fDdQh97rjr4aRjd4hBbaNj0MzZdoSWYw3yT+/ +nidufmgPus0TIJMVO8I6rl3vgcfW/D3ovNrLW/LjkTuM9a+p+D1J7woCfMSWiFMmOLPKFT7R +BuY8edCVjyA6RP9K9Gj1sURSeqNaHR9Gr4rW10s+FwUHWxxzbmIWqH0gApQYO6vyND5IMcKO +BCWQU6Detuq1pQ6dUc+iF+sEz3Rk3C6d4WBBjtkVJSJ0KKan8Q3gJefOCMNhdRQDjZLwbzr4 +bgoAkLbaBFCjiZxWZ6HAdMfSCV8uZQrtMS7b0DUpY0vdH9Htl3JqOOkK9RorYDQBuPdkTYFI +NsmtWVsFV/LmR891mOF3fBRaoVoMeJVwiZyNlFY+dyWWFzLp+GoTLcQtmuR7OkmOcBGxWSKP +cZfPqhf4dVQud7bDR2RNfJ1Hqa5kj8Z422sseYDwHf/T9OWWYvLwKGZhlUgpnzO3WCGrd/6E +VNeC1mKXt4F7BmADov4Rdcrp1mPXiVt7oIxLaS6eBNf2y1TWzjYj5ZFuKqIukDEJfqpwsE5a +snCw56nae+7luGs8em1J9GEXhWzXG15UVyQJaFwuB1iL8l7VcEQz4ABVrSTUWLLAKDsyqUbq +2gsAEQEAAYkERAQYAQIADwUCValA9AIbAgUJA8JnAAIpCRBht7Um2Y8DU8FdIAQZAQIABgUC +ValA9AAKCRAcacTlXpkF2y/FD/oDrZm143Rv9NV9InnVJ0brpqbB7aulFfhR1LDuJ/GjeqGA +QgJCZdHlzT2pfCXXswUlYzcWEatvGcDkoaB5Ya2qs+6nhBk8pT6XYRrZAtIlKIGrlCqoSBm9 +HXguGv+EIaEECr2z/Funx9so0mP+5aJn65M9u3lPmuAonj6DcHoM07WsfsXvQ4ut3fabFmzi +lLGeAdEDKIw8Hn3JBUOxUyFrQlOoL4/3qK1TO+cidz/2bATQQyIG2kNOSgHBslU+e6/7sWOQ +4ufmzm7dEsf197zPXGdXR88LT+d2uU2K4GkCffNUKxZqy9bXxXPwr4JBjxLDQnDvl50GAWjP +ZAwXEd8Okwl5+8xp0HuZ217WUqT8ib0oUUfwh2H1vrMPRr/46i6O6THpCkV8BWF7axPYIiba +eYwC4BkjZwK3tIL5ESf2f0xK4hbE3xhMTeqABQHoXd5rQ7SEaUuX7PlQ59fRs0Cz55vH8/o9 +zMm0PN6qmZFvRBeqjnklZcu+ZdP9+CMXt81NMuzIK1X7EfpkUoam8YkYkwcCkRvPZrSHLXZF +kfnx4jW543dPOfycjnv6hhKyoXD9CBx0ZcOicsYmw9XMilBGD3b8ZdK6RYX4ywKNU6KUdFJj +XB88+Ynv6QxDit1emMCHA1glzV9/k36iYLEIqgWBiwJeUUIcUqzgnBFtN13cyS6oEACUGUiP +Kbw3IkgGW19ZyS6FBNfgGIGW0Y82Br0KlCyaXnX0R4+4u2h7kfR9NSnhRhsvRnPIkiZATa7D ++Ew1nfpsDTnti0c6g/gVw9TC/rCyXkkLztRHVcWEBdvnFJTSp2LeFaHSGbvvZfoIGUzyUzoa +1P98NmRIY1cxBoizVf8729/zAaD4fAslxoK/JsjjDvDUrRHtaNZmUle60Jl/yFFzR3zxb+pJ +liigoP2rZLt+ipomHJIhoXXWwfkRO9U/egJ8ZUhWEpZvROnaNc9eVct5EBADxL7gHWjlceIz +4ndI1eE9AdEZDdUZwOfjmK2DcXjFBfZC+jhJXjY0xh3pPKQz90h9DIkM5WDcJPf6ep+MKSd/ +3hI2/JmmscQ+alwN6x6g8zDySMo3APA9cUvEFGe0+CepVcNw03jU4faSrHiMXsUuVGbA2kHa +YVUfzF5W5GbuHZZlGxoSiq+K+HNG0RJUDa6bkSDvrcJVNw1iUrowP+LLwnNsy5kGuU4evnwc +oN1w7LVbTPaq4RIaiqvAD33kiA9q//UNKnK4k81z+hRNaWGliyGpgqh+V7MDIqPfT5TMLdH+ +ZjTeuLrNS8KBcc2BmUpSwzdUReTqHmgO5peeIcsvO7GNMFWsgucZiAdIVE/zQv+SfP6jhS+r +jCPs0eeu5zl8/V+gXFE2wy3jTJEl9bkCDQRZS9m1ARAAvh1Nh4GgjpTFZy7uQRFz5PPXdZTB +I+Y4hTpF2heoFzZDI6SLyz64Ooglum3ZglQ9ac+ChTSsO36aw4b22kCM9WDmkcl7wf21fG9o +8gJDVjFjDWbwTWREaKjgS6s/Yb8f9gje/BGySojxynTi3zyTUN94q9dhVjfiQ79UzXZdN9Fy +yIx2YO5tOo09hTWSZg16oxP47Mj1ATaS6UIrQMcMnOp0kuc6SufXPSWsUA+g2lW0dmHgPvIH +wUfcjWqT2elF01e9KOFe7im29G6zOS2MRx8cr6KRg/eNWpHh5aI4quRUhYk4Kw4ohQTbs9ed +0YttS4PMK+sq6xHpb28X6ZgrWnelPY9hfwcR4m7Ot3VQUG8JY9/aTlFCoeTgkhop+MCUI+dJ +eY8depIa0PTzdEmEWRvPhTTv+CUdZ6v4z5LD6FhP+/5c6FCbcIb89Rp5fa53oYV5/KZf+0DU +VgmpXFU7J7ZrGgDeU7vIzmwr8kcx0vtsVm1dVwYLACpTaaQPbISQUDM8sEcqKAqD7hWKaxNs +b2M85L6q2/rnHq4g46yJzdR3b8EH+V9u+mUi9DIljDwcpvw7ReRQ9wPdDWLynnglIeGImbjY +fr324yaIl4vNORAkbsoCkS/qc5v6MvKvYNle5fzb9S9kCbNZmD9c5/bHPjj9ENeQvzrl2pFh +6dc1o5cAEQEAAYkEcgQYAQgAJhYhBBTyZoLQkWzdgeN7bWG3tSbZjwNTBQJZS9m1AhsCBQkD +wmcAAkAJEGG3tSbZjwNTwXQgBBkBCAAdFiEE3OrF2WE1uRxOpnKru769uyTG81UFAllL2bUA +CgkQu769uyTG81UFUw//bW5T7w2k8ukGfpIcm0gB98VgxKenSCmU6N+Ii0DwcNtzW+pmVWl2 +TbHIXDpvuD69ODWBDMXu6gBkrVzNEsK3uhzGe0tWA+5I7Vke3iEkbll7VRQlIOrw+n5NMvje +uDqKsMt1gMEEdgRKddYApEAi49vV7XnqkB2lLKfAnf6o/KqPm8MuQ+u0xYanupZCldwdpcx5 +rybj79Es0iO9Gh/+3qOtR6ubOz3Vn78Lc3y6AP9pmtdOI2QX8foGK4hNmgHSP6uPLh/ERC9N +ir0Lc2hoEhHEkQ8CnEaccp70r03VkEQuMJQJPUyRsGZ/gIm0SAm9JJxWHXJk2/5NUN83pHAX +0LA4zxtWs4fVW5f8v9eIhFFPTZ4au+/cS9D4GFx4mlY34awcpAzrny2tntGEejY9HSJv4PuF +ZCmtyS2q61N9EU8yuBwVM9cp5HntzG+OT4HYugtI6ibehM0S1Roy4ETwT+Ns41ffhCwdYMp8 +tzdeksQ35s7rkB9OJHj+q2dkGaV0FQb3FutbSpxbP4zk/dLqyxuivdUPHGtf4W/qklxzCWBg +0VDFA7PwatmEXRxTjx77RelTY0V7K54dDyVv3Jh2+FzuaQZzzuIhv4gtqHntaqLnYl3h/QNL +bOTE3ppvn9RUSR983Bd+M3QhbbwZrgG1m+hdUZUmji+wbK0wV0xHNEH+4BAAjbVzdNOs7hMv +jY1wVDRFjvICVorNdNdU3ELy/9BAoiwOs2+zjDXmsX+3YtdzwKvdpQ24O0TvH4Vo3BkvKkJ7 +5EU7LroAbYQ2423m1MY3eaBslmX7TUJ3XE+k7OZF8AmcftgP4nhC4IQSCtoBc9+ncyGN4da1 +BpYO7b19tO0/HST8GHSrEcU9bGGdimS2eNkSgybA8wF6K0K9yvrpTNSZ7OBVlzQfEn8s70Gy +zs/d6C/rTA+defnv3AMaciuINSEdFyfYq4wjt5PikvgceMAAkH/z69xTNg+6q3FQt/lyK7xX +5qPMe2oFyDA1H+Cb/uL7ioo+jXh9gF+0fk8OP2IPzxYhBfulpVtgclmOuaekzaKeIv8NFW7G +oA9OghziExePxg95OpL/VyQ7PJiAUj1pFovFk5HS6ejVZNEGJ/A5zLc1PBIcr/phu0luqhXA +hImsZS6858GWQllWULNWw8bX5Blo8AvcfFVdq9iAK7aHN7g45ZR7Ze6qKHDyFv4XWuE/rj9C +2mM/GAstvU0gGmbo6B1mNGMJuX3Gd3dG8fqFjE77OB2feJyfZ8UeF1nvG1hxlmuD1A5e6/os +O9V7kjhXKzM2zSO11zHQ/5PlUisoUBjJ/QIK4v9RBNGtbRKso5X9Fke692lVgrdggDJ3j2Qq +MuTo71rAVDLtxerc+GNq0GI= +=YjV6 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 7bc97b093a4..33591b5365a 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,945 +1,945 @@ { - version = "54.0"; + version = "54.0.1"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ach/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ach/firefox-54.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "d6ba946848d9e771def1a4cf28a7a43c3dca0d6f1bed0a51c6ebeaef59fc8df808c8cc9bd8d016c2ce9e21e8dee35989ed6575f6047735a7ebe62e75f68fbefe"; + sha512 = "60057e48d8bda98dc63597aa795899ca1fa856f8a9f9380a8de91d0ca0641dd291a3fb27bd1f69b1effebc5288575c0a0661199e8e8e95ef8d924fad25831678"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/af/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/af/firefox-54.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "23564ab7f741ed5eccc2178a5fa3f72941bc843dbd0ad4f265467cf6fe6fb3afe65238d9026a5dc036e91aa0fcc32c8aa8a56d9d514df9c02642fa61c00360ab"; + sha512 = "08a2cb7ee7bfdd4a5c205a38e1d966bbf8c67a3a5abf52bdfc73dcb527cf0dbe361bec4996d52e33321180f5c1778e8304f1b377bce04e62fca7457df8ee69b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/an/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/an/firefox-54.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "22c2ff25acc8b573fa975ad0a002cc1babda188c60635c75a618d8ec008a14c79d62bec4a432a3b18b11cf38836a70c62156aa7f6991fac50f744ab5141ad52b"; + sha512 = "200f10de4f714afb10a9c6d1b4ac8488d5bdc18673b8db9aae51b8d0e8b14fc3f5f6211447abd10e13704b07499fc1a273d9ee060329d8337cc413d7ed6d19b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ar/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ar/firefox-54.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "8ebb9385e8a988c5c1215030833b694300df4f6415b592059fc286fd2b8ddc5e2b7b3e0ed09514c4b97cbeb96d6b463a1105b70f9a7a18833ff4142b4de01661"; + sha512 = "564c72c485c593342c7056bec7dfa7a0cafbfb26eff278e08b0938194b311633b3e3275fd0eeaabc63eace36712efb194ecb700f61957bf0553b79a71977132f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/as/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/as/firefox-54.0.1.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "2c51fed49a6be6f8162a8b67a851d8ce5ddc438a7c10dbb77cd3ab3d839d7737839ee0104d8a11dad8ed98923346d7658305ab291b8843e87a653f33fe342a60"; + sha512 = "84d14f6152bbc17caaf4ac8d421835032da45dfbb34dd198ea5ec65d972e10a774aeba830eba5256933f3df395b5aef71aede2e334fb35aee8f9f27771d65dce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ast/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ast/firefox-54.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "a2d9c266dadc87aa7c3a0d57b31b4dc28ae674fb19a6ceafbf936f6fcb7ee86eda5f2ff2ad52b1567376aaf637c77bbcfcae62b8c526c62c2d7ebc87c8a2501b"; + sha512 = "f5851e28972b5e87b48e8498a01c685790e4ace5e3d0f4c286953d6fe417495a9fb26ca3bd962d1f798a178115d2bb60367c48057c55b2e601dcf208ad146cb4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/az/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/az/firefox-54.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "af5617504e53c360a9b1a2d40dc9231d3518115f3d8149e9e7aff8eabed4d1c86467d3634c8c2278e7e10039952feca0513a62934e52645410aa85069123efaf"; + sha512 = "6ed4bb73da6362ed4598d5c6de8b072e919894778ecdec49b2e8e406d0c68b88c32f0b208a546834cba7ebbbee9a09595a67473e29a5c11bc2390d3a1721aa42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/bg/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/bg/firefox-54.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "2f13be1e976b02769e1c47ea1dfee7e8bc940c524c4881daeffe10500d7fcc662f00273156699ba37d82fe4f52dded2e2b34cba1caa22fa6fb9184d4ed7d2ea5"; + sha512 = "bbcd618c9bf86c7ee49a3ee1a3aa799c72ffb048d694ba0e97ca8c4a9341d1ee109265529aeb23f578aaf66d34ef3a81a7031033421933c0f6d5d0ce136c3d68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/bn-BD/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/bn-BD/firefox-54.0.1.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "c4f9f249788df7e10fc226cd10ba8d4638743b65b46cc87b97460e7e551cff8d814a93ba41da294f409b032fdc05b19ab9774a09d6b62458a1ab695805757dd4"; + sha512 = "9c3114291cac3b6df9bb92b398ed644f4851baaf99b6db9959e5fa841dd535da39cd3aae343226ae5fd713ab872efb4d4902f4a4f85e836372c67a416134c03c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/bn-IN/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/bn-IN/firefox-54.0.1.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "bb6d4dfe207bd7fb018a6a473ac1c3c63d13e4c4aeb152174579c85a29b503d382c02df420028f1b98335fbef5ccb1a712e72cf0eca889f841e3b45a30d98db3"; + sha512 = "5662dc48972153cc67034b148d96e120c802ade4d7ef532fb2964f8ffcbec30878489c81d758e729135488d39123bd404ab53e1ae1389b0c4e22303096c7e3cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/br/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/br/firefox-54.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "1c8c98dded57330c5008cff959da2fb23808aec2397b0b5d2b9dd2b190c73e113d9b599ab243e500dcf94aa81f3497f91b205067de2d0f766a1d801bc2f9fb76"; + sha512 = "166dca485d947bb42b1b5ac9781d48104d876f952cd8ceb4006f7e0f79773aa2f285413088cc535610e6209538c03bbeb63f91255712466a50a12cddf747f0bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/bs/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/bs/firefox-54.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "89e51b99c1386567a09a78927945f1a7157064d34b3b0f8972893be491fe04033da92a68690a9d81ee9578f1b35af34eb57cea29a403b1d399f8dd50934bb24b"; + sha512 = "81226d4550310d61d2198298bbc859406ee7f14e98ccab326b83bd51c8c33305771e9353d0609477eb381083f1e0f1a8bc0c0bbd085a738cfe00697877051516"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ca/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ca/firefox-54.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "650f81422fa74dee6d12db5e3e66056ffdad669c110633b796e59c7fddbac96e042f4e4eb11c2146f3f4f9625ce9e283aa4309aa8e6f814567be8c5a3bece3e6"; + sha512 = "833096d35ca517d21b45e78d895bd4f535a55fff7a9990e22c684fba8549d2207317a715e2a42b7ecebf1ab474df262f2c25c9e44863cf167dad70f191ad39c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/cak/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/cak/firefox-54.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "9b76e8827814e487b4d240a77b2c5bf9900bc0476073bbe9e7d0f7f90120906021b33e74ee92677deb33c84a5eb11c4fd4cc81a330140b8f5f0002795ca6ef81"; + sha512 = "5b05bf2b0a256e135e7d687520b901caaedd66593ca3cb458c01f8ddf85149144f75c24f8b0fd4bbe2d9cbeafedbb569f080970601c40895db96e7a14aa3c5d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/cs/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/cs/firefox-54.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "9c450275e7b8abad2e2cd96a4cc4b97deab479d30540687227802084890e33b69dad96a0389f43fc49dccf86269b3830f35ec810cc87d92b3e0642c71bf3b6f6"; + sha512 = "63ea3c524c3e91504fe1b0d5cd1b74fbfe9b22cbfb18d9aec73569452a2766b90f29e2793f6bd235d68854d16b8862f46bf3ead132cd693866bd70502e0b8b39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/cy/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/cy/firefox-54.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "aa6f96cc78054703f474a2a386fa4d76604e9f38c682647d27f987013225244e0e62e23523132fbad2ec021c5795f23c3fdccd76c43f560882581a2847205705"; + sha512 = "c804908472ab1a59b6a24e448b9bf37ded669dbf2d0a4fe0993ff2dba666e804b0fb846efe6c7f1923e4472a3735f9f33876dc015826b03790f4c445ab6215e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/da/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/da/firefox-54.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "c4270c94ea2a9d864ec7b19b94279c9f260afb99c3c70d6b5a2cd24d3cf05a709dcf5b14f977a197f0460a33ba5f0f70311a4d581f1e21dce863182e8213d961"; + sha512 = "c289354eb5443b9f5e3027e80974af9aa9a5da045034ee147cf75d52de16a1e35328027fdcde149f2ef1d3a72213e3837668fdab4b610949b36e180aaa1dac56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/de/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/de/firefox-54.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "e254eaa1fce2385fc7fb564b8342529b23b9004156104e35da963fe166cbdf89f1079a966e818bd57386def6436c4894fca4de7876e31452763e66ea7aa74968"; + sha512 = "99f214b83822243530a8194edbf50284bb703ba07695c1c5f7bd3cfe87fce64477806cbff852af92ad6eef16c85329c1b04608490fda12bac27300daef23778a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/dsb/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/dsb/firefox-54.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "f1c13a53ee4a86d3e88020babd3cbabc4be84595f51d7060be531d3f02a4eadd0db398b17539b877dd1de3c9b29bbec21a810c42bd430421c66d1e9d4e17b346"; + sha512 = "96682d6d27e4d2c57930059a6cabe2649d4a52e006eddcfd4f940ed816f448e3d476488ab23de6a1106c66007268aaaea21ce3f621ce7e21aabca1ec00a5f0bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/el/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/el/firefox-54.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "3449ea6101a16f78e0f36a4fe85b993f70b5e77e6e7bf2a30dd2a2f1dec85af5627681825d0ee2cc47feae1b22d979257b77b59d61371c5cac7a27b90f9cd1ed"; + sha512 = "122c72046a3cc621da62432fbaea9ef690a5e1930e8ca3214333fd05cc397419eeb8e7f46e7998fd12f2fa17fa780d7a0df0cebd50ab81a677a363855f4dd818"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/en-GB/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/en-GB/firefox-54.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "01f521f407cceefe3f8ea432fb66f8f554791c9f5ba5bedc9eff08039c02c637af5e725e3cf9e9b74b7c071d8479472a4abf7e9ecae8cc85188dfa5fced9a1d8"; + sha512 = "bfcde5aefcfbbf6021f6c3085f27a5c9b88cb11b33a132d0a05c6b6f39a32aae8e140b3e73d2e09d6719d00fbb9c9998a27cd6897bb7e2e5c01f37190522320f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/en-US/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/en-US/firefox-54.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "96e4f085134296203e4c42db570e9b38e61e08766966d71ef6863bb695ff80f37c1839f44a1bb1257ba35fe9fcec9f403c1e259e93147d54cf2b8a4561c0cfae"; + sha512 = "59416ec212626d225db0f12037eb68c98f564252c5f62743ec884af259d705a9310d9758bfd37bfb33c792eebb37d07824a197aff1261aa0496896482f6539cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/en-ZA/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/en-ZA/firefox-54.0.1.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "5789e07d2b90f63aafcce9ba8ef8469a420ac03fb4b98f3bab19d7bf51a37b7796215f0cb5614e3dc490d3724dd01f3dbfa26030659b66ea9390fb452d3dac49"; + sha512 = "a03e96de441a3f390c96b1bf2484dde6d423fe1f0b9d7e518d8d6d99a6e61d6e44dca2cdd212a74f935c8e94aee00c3bd48b7fba9624ff17cfbcceea70802637"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/eo/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/eo/firefox-54.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "c76ecdce017ffe7688383295155687a30034461affaa405ad37e477ef634f7c6dd0f9e07594aeae3f9a61fa5698346f9970fa8effdfec55d9fdc95e5ed67d66b"; + sha512 = "e54744f4d412f2db9f78f518479cd457953f9a29c6ce0fd32aead8c04951337b72c6fb149c0d90ec3dd1e93bb6dbfff57d46c29dd526e1b9c406a3018677a65e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/es-AR/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/es-AR/firefox-54.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "f993cbbdeb2a8a065f827a4eb4152b3537af84fb95d0876dd363b1c04cd57634c2b24466e2a03432ee29e1615e7b5d1bd13ba20f844b347f0f9efe504d48efa9"; + sha512 = "d9d3cdd8c38605f0738ff95f5f2cd2188f1058709fc63f21d06c14f6e593150918b793c8f3c291c8d208afb398efbfc7ffc2509f5f47091abcb804fc7b47df5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/es-CL/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/es-CL/firefox-54.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "75557b6731be41d435a0e962117a01c078f36a1d385816a05e15dc3c0148d89c7901af7471da64ded327972d9e73a50e49668b7b3b30c89e2b6aea2068b35ed7"; + sha512 = "ceaa8bc10238996fdbc0552e4eda3edbfbb5e89b70166393e638cf4267d8077df0179213e1e692cb5798e6fb77f590f151535d2e40b4c278cccee9df8a776057"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/es-ES/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/es-ES/firefox-54.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "1aadd468b2328379b7958a5ede8f9658f4521ab877ca86e7e2bb7ff04a13294b5e0f6be510068fecb94603d4f81c5f51584db308711043f0bde36ce72723417c"; + sha512 = "a75745381f0ff97fb298923a6c2c83a734ae1ab7b873e22e9d840cd5854ab8af01269214b844d0fbe1cb1ae4cd083c2c4e02779088280e82310535d9359a83de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/es-MX/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/es-MX/firefox-54.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "de5e95e50b7f04572f7812bd4cff5a724dd32b9ccc389eb61eb258fde4dff651df7ad0fcee78f78692413e73381b1711cfd80200be66d4b1c5e87a5cbe19da42"; + sha512 = "381ae266297cfc6fd0d05785b2a6c945da20d368754521cf358ae4c4e7dda3a473086bf9a2679716f2b15b01413574ed413fd7f610a795a3536baadaabc926d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/et/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/et/firefox-54.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "0889d3884a01e6e69f67197f1b86bae4fc506064fdb40c082e9b9892e4b42d9f13f61d41cc55063b9d4fa51f45b96f5ed7c8a50070b9af4b8e9be94e7aea73ec"; + sha512 = "7c0151ada40b55e96ea2c36a98ef6de954287e2ee808e0387080816fec1329313e0e8ae5b613300c806c17f6b31752443e7f1f4ca6782b96826af23d3173abe7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/eu/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/eu/firefox-54.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "353e2230c1bedea7b805a2ada15ab863591b92c9a8bfa0e47464fb0d0f2f2601d086a71679dc5c1f560bfa6ae9bc428026eeb88a0d8a2b04318d38c8183ccb9b"; + sha512 = "a080119cbd5c60499c7e9fcd55275f37d771ac4a352ef48088352b59bf86858b3cf70a5f6ef5b1b0e9e90ad9058e548393e9739cbfadbce1eaa95b39240c0a76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/fa/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/fa/firefox-54.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "e09d1adfba848d46e55102c0e5c366237d9e273646a82a03609fe70c13e38ae28f5029515e8656d1a0634574dddd557f9427bc26b8d5b2fce1d873a3cb2a69c3"; + sha512 = "aa537898df126eb699dd91146e579afceaa9283c15d7b4d436f2078363a7b9b7dd63e0278d197d8efe004ea81fb0401653395f8d7550da884d0af80c32baa981"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ff/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ff/firefox-54.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "cc998af1b778a4c9688001ac139f1018d723bea35cb6149ef16516998f46f0f9addec295d2b377ff1f47d26bef27722b9300b28d5dd5f1eb860816b279c7cba9"; + sha512 = "2998dcbead43b03d7e1b2cb9e6318aef185425de3401f89c875736fb124af2d126d482bdabb81535e5b5a46d68213574515d55410a6c6d9a60fe71afff64efe3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/fi/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/fi/firefox-54.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "e976095a009d5a51439d6fbdf81e84679c1a1d7ad2db4fc027cf52b4a8c9fa188fe337d0d08cb42d415a2132b8a38dd03698e3fa53605db221c781025c1a0437"; + sha512 = "9ab8eeceb5f22e138550ef149cbd8c46e0c09bbf32e07ebc0b5abd3e5a460bf5f58608fa8e92401f68e915de7e83bfc592b5e3680f779a5b514fe4c71be56cfb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/fr/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/fr/firefox-54.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "7d3346a00e4ea36d438f4ac42bb840ae070cae87a68a773d63319b06308a25650c3a69d97631f30552ff53ba992389ef1d5e62781bf5eb257a9286eb66f15afb"; + sha512 = "bddc6e30f0d210009aa5d2d76ea15d9dd429c1b027f1d6104a51a69f364c8d9e985c33816daacaf2712c34c6743ea14197ea28934eb37340ccda21e2c3bfcf4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/fy-NL/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/fy-NL/firefox-54.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "39e670e2f5e6956bce1ca4c8b4fcef4893e47c102988880ba546b91e5055fe9438c6c8cedf69aae922d64af0ce427f6fa66456bcbd907a75be7e4360cd86d2f5"; + sha512 = "9fbc84c8aa485f55319138518eba1bd020870193432cafd0ed01e08663298ec29b21a571b808fcb90d73ed052554defb11796d1fb1dec016472ebb79afd78e17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ga-IE/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ga-IE/firefox-54.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "a6815ecf3c1660aa7fe9c32ef3335ed4227649545bf5316aefaf1767559604b282412d2541a0be266121a75fea770790ea419d91359a97e25d9fd31334fe8532"; + sha512 = "4188f5c0eb666cccccb3e343cd3e4921bb168107e63727d67aa040b002f544724fba25a17d787cf8e1377f5947ba8fc124512e651ef3acf8157c072f5f02a4fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/gd/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/gd/firefox-54.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "9d7a273e3717d21eb2316fc073f4270ec904a9182fc4a2b8b5fb01b90bda20f63a9886b427ae7fe5b3ac0107c7a1316578f42b2ff85fc3b9baa3721d1616e11c"; + sha512 = "2e3407d0d1c22f4b451b1c56a871f94deee43d0d4aed22ad90dd0643dd75b7d512c58a6245b51dde6a19330ee154304e6b577b82f01869d222bf89fb8cd6b9b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/gl/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/gl/firefox-54.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "bbcf4690ed439d3214ccd2387b4fde5b5252b2039dad168b67f5103ec0407fe040bf263185e54b360e0c9875b972827937a6a634cd928d817e09b10c7cc50103"; + sha512 = "5fc10425d2f8bb1d53d2e5f9b9d65f0ffb01609c018a06b850195f01f8feb200e15ac36fb2e03031bc776453220fd2af200ce26a21c9a30eb4b4f54caaa6de34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/gn/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/gn/firefox-54.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "cf82a08458e6182ec8c320e5dab4e1629b86efc6f68c26b967fc646d91bc8f3a394849de50c4f960df75bdc88b884c8b59181238302262e864eeca60181c285f"; + sha512 = "92f46e7931cbc8a7d4786800838fa9f4af9baae2d8a4aecef82034a9875b8f16fc813781146dabd7c31ea1e0a3505bf3b2040ed305bee17a3dac9a00eb3560ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/gu-IN/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/gu-IN/firefox-54.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "3b1c8246364405574c4ce064969b69704141cb8fda339d1064c3e1499563f5ea2fd5b3749077aaa6fae1cc98c610ac0fafc1e0129e49f064f3603e2e6097f81e"; + sha512 = "e1e41c981d4f690c0b239917e06b1405a796e43d5ea419287cd353ee2bb0f8bbe04f0f7c94ea4b3a600e362577dfeefb12f286c311becbaef1ff840b20fd766b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/he/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/he/firefox-54.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "3171dd501918aad9a612a679d9f0ca2c682b5e4f49b5249ac74890df6e8e98520afb724791f9c610c90135623c414e8da667e1e4777c1fb6a6e4b52495a9d905"; + sha512 = "11545bc832cec83171a00c7500a220fb64815e514cce017fb6e60e549e43472aff8914e19818401aca20730fd8d063a05051fd53ecaffc790b982ac9bd63463e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/hi-IN/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/hi-IN/firefox-54.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "cb72f0f30d029968a80ea775661dddd255d7c3520895c3241e5f309c6fe52399fef4f7b904009237ee047ad16fe6e893fd008fdfde852b39dff2878de454df45"; + sha512 = "63507d0994eb52893daedfa3fadcdc9ae1ca27608149d51132fda86616a45aaf4d114936fb6305ce12d75a9aa5ee5779db6def3866a8037c18e055734b0ddda6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/hr/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/hr/firefox-54.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "7a4a9989416fb270a861b2ca5738ddecae4fd28d050cae482f096b9b8d497e4109687eb3f1f7f5bec52fc5255a11c9248564677896e803dafc260d2460573618"; + sha512 = "8274ba4fd8bb881bbb788cd402a3fa49cdbec8d777e003c63dd425ba8693fd8e26a88533dc7c839f0bfbc47d16a72105e4099e67c0473e6b8c6aa29ce75a6b83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/hsb/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/hsb/firefox-54.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "33e1ac831c8aa44675b76259ee90836db8c6dc22c012a1235aa3b4f8715b59a47a5afe73f7f2cd0d160f4026799d2ed8635a289c17fd8424edbc8e3f7e4aae2b"; + sha512 = "c956043fdde6ff492a687447c01ab15e874756d6c249c7751d4255f99ad60b21bb898c1472eaea73c91a1467e6a6b239ff60a36333da1fee21bb3dc5d2da1a37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/hu/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/hu/firefox-54.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "357c9ef51cf8c55b0b651f6208afe47caa3972e59183d4cbd9173c4825f6b1a1a831bd148455078bc2899732e094eeb6997954465311a04ffdd52a1add5d90c4"; + sha512 = "28efaf842c1afd6ccd7882dd257ee9234015e641091c39c1b954d458a543fd9e0d6ac472d23953948fca69f5a62583b5120093f7186d1cc36a345adb166b4d17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/hy-AM/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/hy-AM/firefox-54.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "0baf66276422e646dc0085ace17b0ce6c9da5ce690d78388c2d8658cf79837658bbba045d2fc98a50c8d0f3b8f6895889687605c458fae1f1f7894e880dae2dd"; + sha512 = "2aba8bced1431caee4d9d70d515027e3d08a7175b1d28b9f743e63d25983a52a8934e7e3155a5b220d0cbfdd61c76438bde56ed2c29ff2eaa46afcef6db75117"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/id/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/id/firefox-54.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "658bef583f93bbc91c2a1f4106987e0099089f88d6537c23f6cf53757cba8886b2b59175a6b99b4abeeb6462b59951cd4fe15feaa69d73e9948e91246f3c1119"; + sha512 = "e2925f40f632aa14ba25bc40246a9c06b833062bf30d5e9666c87c22db436229f2b36730f6330a77fad58ec05a1589efd8353c2000cae45c7b322b32d1823559"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/is/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/is/firefox-54.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "63eba83cc9c8d601c8916d1fe5ad2fc08f9177334df66f299deaa1a25bd15c61656e7f22c68db4717928c75d6e2efb9127e818da631c24432a106e255afcd695"; + sha512 = "0e56ab6054de54804a1f094f81c9180c58116e6786de47306f000e69f656e039aacd447d74f2119836c0f4d4d65e6841f94e527f8524ab7529461ab35b0e55c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/it/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/it/firefox-54.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "0adbc77efaaf4f666f650bfaaa0371aaed517c172086e9c6977b4e44a7eb359f460cbdf52293151cb7aa44461cd1f0867e35b30845d544279b95c93911f3082c"; + sha512 = "449bdbc26af56503bc1a480baa7a98d4de9f745e85c443d2d0726bed16a676f4ba8bcf738c94aab42d4e79c96f1dc9de7b1117d72a953bafa9bb24f87fcef25c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ja/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ja/firefox-54.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "3b4b6a3428c2eb5a733807e659c5de44f4731a39c5e18845851b9d5f5b812ca86ef9bb0100218fa6a158f0da5094b1035ceba9c54011b7bf2af0f168e3242069"; + sha512 = "47b417a6683be3329218c0b0894086acf588eb15a979e65f7102540d51e59b744878d2b5802036f5bc4534f8b253e26b6a947fa49a18e6f659122f2f193e18e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ka/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ka/firefox-54.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "bf978f673c00f0f56d99291e2ab47581bfc5373b95831ea097b96866705517eb126853e14b74f677b887016cdbe7120a0b2cc57f4dd2f1ccb892022d1acd5f14"; + sha512 = "4796dacf4b8d180e0995b1b743d8d076d68c23031407f8d475107bc79c7773734e80c37d870c38f60de4115873fb872bbcf7e7862526aa5101c3b1a6d8e720f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/kab/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/kab/firefox-54.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "3bd525ac91d472f6b9001a9074963cb3fe3ca6ed6b9a8fa48c90425b1305302f0ac8ff3155282025fbcb0df65ae63864bb86c23ad6506d0f34ad49b9feeb1664"; + sha512 = "674b955f5f474c2d76efae044d1ff95069315447d370cad182e09b0a2b5360efaa1eeeb33e59adfc7754619538ec6acac661f61c805e04b94c5092999f68edd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/kk/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/kk/firefox-54.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "590e66e973f822f4823f2b0a333c955555080a0dde0e3931d93c398fe2121156d93e0b779fdc71fa952261d3fcec75899c127854f62ac68ed88867fc6591b8c2"; + sha512 = "a647e65b76c203a42a8edd47c67b849877f2ea4cee467ee3203554cf02de5787b72cc245e4f83ba0bc8011b26bfc6991326c2593973b746cdb69762e35fcd5da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/km/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/km/firefox-54.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "1e88844f2164de5725d9ed694b25c702feea980cb3cb3a1750ec0876296da4687b56f167fb9dc89bb2cc84a1439b22db5fa40ff42a506426e71cb4016fb04b38"; + sha512 = "c644399b50b16ecc3b021fcd8325a18f7fe293155187d59ed99768756f9e493c51e54e5b77ab38485f4479b09af396355340ebb2e597cda9d9780532b7a5ebd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/kn/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/kn/firefox-54.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "29d306c15e87feb3740a146614a01d113cde8621930ca4b97c64c42fe761409f50d8d05e7953dbf3e8b3f971479b2bb6826cc9d7ae83d87ab9d3cf8959ad4fee"; + sha512 = "7991b8118e773c1adc0473ed2b08ae50fcac57c9ca3b5bee67779f64c8034bca64500db90efa052547a05866d5f5f6f5156db18d3ee84a54cf8562187bb3fbc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ko/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ko/firefox-54.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "79aed8d95b7680a8ba634cb2016c7aafc9cdac723bfa291bde7d3a9929ed6716376b02db523e544842862782ab0c6157edd2e747d461bcfe10495eb09d2cf85d"; + sha512 = "98bc9ef98c94c9e4c7746fcbb8f45c5e24bd01280c2573e2a0019ccbfcadb4689b93c183abd8afdecd97f490342295c278282beb0b2d3fb2bc14d988fc5048a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/lij/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/lij/firefox-54.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "d0c57332f12b617e8a0f819b6aac170f0a253a13f1bf9ca2e43435c8edfd6c6d16a3bb4746349cd92097dd4b94aa131b4fc3d01a4b088444881284c7bb355f12"; + sha512 = "f7e82f1ea02935eabf2b9f525f89d14bace88069bc5f3572202c2795cfda4bff25d2edc89c31ae0edce7d16ec127941a64f362f8899bbabadd5a7d871447bd47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/lt/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/lt/firefox-54.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "7e4f74337824f52bafaae0b72c4d250bd5d6b023dfb13724af63f27e43db082a9a46d30654944124379553545d2bdd7c345685fe91a249ec6fc837a54e1681f9"; + sha512 = "8b19b7e8134772186a14f0880f96f4af407dd6c081f9995d032c66cf1c9776529b5d5a08cd3a0f2a42f63cedb5b2ef94da0414fd194c19d6976f3ac4e22d0470"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/lv/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/lv/firefox-54.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "e1a794ffdefb6f05d4c8c775f1352396ae66bf4f09ef10cfec166cddc98808b35a286997f5dc7df9515cd31c9012801c749c79b07c50091218159fce38caf5c4"; + sha512 = "3e4f978cb253014cf3a46747c11606a2be484f5e4866ce26a979329a4c5f9256135d40e0596d1a9c23bd6fe51a27019d23599a8535c71a1e0ec3e9a26eee95e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/mai/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/mai/firefox-54.0.1.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "af68ec14dbe6136d40e43f408fffb2e1fd481231ee2fc0925ccc63abc59c2c737446b34342b90b71e740ff3de4431e0c39c3f6e626e0b5bb196c92a865bd0414"; + sha512 = "9a1205743ad46b39e6e05860d6152004fe6c5995d2817416020574b706ce194ff44414c7e5ea5c3c2b39f62fcc6d17b2bd2f85b249aea9803b1a1722b9d91c2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/mk/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/mk/firefox-54.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "7a898ea167773d30af253bffd3806ebf65ac65622f9da5bbca7b4f39eb6b98e728a06bb19894fd8f6306a830755b0947956be34dda96af4e1a14b96f5948c758"; + sha512 = "96bae83111abc01ac9a20a1f55a990f3c856fdc5f4302215e861457e737e2ba5de40af76a2024fa6878c129a3864b0c689fbdf5e6c2c67c0a1e06fb594997f96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ml/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ml/firefox-54.0.1.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "cbb924b17d93794d2c1b457fae63f75a77f70d42b95d55288f34f232d50323ae49b19689b71254e8c94f02c6347745ba99b847ebdffda99cf645e2ab38db058b"; + sha512 = "b55f6b4eae279811e461a84cbd32c78827090f8950af4327c0fa31056c04b7105757f6cbd70034c6c12887a0e60a326ae6635179c289ee0890446dd8404136a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/mr/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/mr/firefox-54.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "0d92711677ade6316b06cf6ba2a5f0eac11d3e31c852204e12c4b9b77de0d1e3cb29be798bdcc2eeafe9201a6b59dbd7b9c12cd30331fcd031230acde54e4fe4"; + sha512 = "3b3f98606d66e68a4d45f5029eae89d7a1e838c6f0bfdef5a551d11b9fc28c64455b28d742705bdce8748844cb869fab21c5b2164bd441a78998bdd1efe9d6fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ms/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ms/firefox-54.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "a5eaa800c71d623aaab224cf61e97565f49382d382c05a097c19eba4ae4f0f655f268237a8bb2e42ffe01ba82045fe50a13c94ee45912c80351c883502280be6"; + sha512 = "6619ffd4aa274511a7b10c6c3d869045f1b394b286001cad53f3f8f7fbf797a1d0d3e1c099e9cd95edf678c4e2f49251a5eecb94b6c0821d84ba075f04d1574b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/my/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/my/firefox-54.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "9e2e6b85fe3d6ecdea000fe87c1060d7ab954cceea3b6b93386c77012e108b8bdb7aeed18506964e58297a0c513b734462982047b1d3afc1ef4945beae76f574"; + sha512 = "ee500522c7fcbf4b8e9b86162c869c6238978b0b9e68b3588d79f1030f304c5d56a37db0775b9aa5edc40e1571d10245ee805bb8a90fff2dab436742676dd4f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/nb-NO/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/nb-NO/firefox-54.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "1885b3d94e505d68cf84cafb86b72a5fbe8b787ed2b274ab607fda3320daabf096793e16b330262110c606d3aa9802cee01e8529a3f7387b8923f44f9afa85fe"; + sha512 = "780dcdee5c19295e367d659820e59a9f60fc712c00214f9d8caa64647cf399411cb74460b88ac521a1c23738357770cad1def1c1bf840a3676db5819272ed8c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/nl/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/nl/firefox-54.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "769939416b77471e735533c562767ad2234bd3700c766cbaf3c365d49c55f4f84c426050d8c19a59d0cef9ea6d4456830d73ed201611e960c21e3d4ac8511b5c"; + sha512 = "487685f711257e285bf1f8a508d4167e6bdfd081ea30f560a5700b9ca487e110463ae6d8d607cfdff9349d7c1f2dd3c8e57e8fb30b49200e17754a596d2716f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/nn-NO/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/nn-NO/firefox-54.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "fecf58250fc95780305e2424e15b1b792fd319418ab378974ed2f1fe2d12d66ec2237db278aacd32201f04164ba77364effa5b83832859f599f494a1bf19dfef"; + sha512 = "5db13d9e1db3331943c19be06849dee993726e99e519e1c03f8e3db9e44f9a4d2d8ef7c82e77c814654e66991352c94979754ef4f8b18295fe9c4ef0bf965bbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/or/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/or/firefox-54.0.1.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "4f5c95899185a2836f51bb1e46581a6c3a983935d2a51a2877caa6e275b94d576e2d09c1ad5ef1c586d5b862b7318d013160e21a466ad122b147a06e118791d0"; + sha512 = "98c90abd9abb1d34816fcd98ba96bb9f4fdec070d9a37b536bca1f7fbd75f95c7b0e58b7a02725e4f8b3a1b545e6da54cb7ff0b716319bb25e4ca64da616fe6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/pa-IN/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/pa-IN/firefox-54.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "f67051953287c794eee5223739d637557b287dc0edc91b24a4cebac84e106d9a1c1b670c763da7a4b15a3204fb7292e8c436b51d8b45af22f4c4c726f45aea05"; + sha512 = "01e67b60bf6d2b7a8ab6dbba92678af6102173443ee938ca3f236403169b90d00aa3696af2ae445d0a21f25695e768968bd4f7769c9b63dd5c2ec06b7320459c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/pl/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/pl/firefox-54.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "ac3e10595201713e06a80554732a7ec53334f288b223fe04ab388b83d3190bd4046c82ce60d934b15245964de68ac2a1d1923362025209e5c0ac683dcaa0b6e6"; + sha512 = "af44cadc8a4032c5ec6e6cb2d502e59f11d43a474806c4f7b98259023ceac8d196633f4a6f6c6f247a042eabcf204ac4310b885d0d47a42e58cf91d81626f3b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/pt-BR/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/pt-BR/firefox-54.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "cff8e41d257181bdc2dceaa301b3d38b51157690d4b4ab78506353f3f0f883547aa688a74de643d82851619388ee37407ef48d3578a397d9ef352ceb08d112d5"; + sha512 = "24d95447c5d4d117b1ccdd415157015b473e01489cc768403edb794eb409fbeba0e35ed74f2d6c5668d9853ada5ea04bb94fc2240d01252f7f51c3982896601f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/pt-PT/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/pt-PT/firefox-54.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "156516df4abe22265eb9f7b8515a7ace20a0d35c6e460f10ba5ce9a96b428deac0c72ac22b61c2bd95b0da9dae52c1cb055730720c5fe0c42314f83b838950c6"; + sha512 = "7d6871788279c9ccb54a62a8eac5a6dcd69481a993a8c76dd3a31bf94e2cd5e8c4abeafee5bc6e0f0724419d7a38d6680720bb9ba8c68c8dbccd2dff46be6fcb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/rm/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/rm/firefox-54.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "738716a0580928ef597b64f3cfccd73a38ff42b7d4f5ea18bf3425dbdb262fb7beb99ec11b31acf1d2ee321af4b4ab25ecc554c819223a84aea7722d14ee3246"; + sha512 = "be2420b9cb9956a7c8145bbb5ec0fa841621cb0672141ddc0c8c0c3135c9372e7e5b82387a2a123c5f838393bf5e22e14edf127325e6767461e758a4aee6fb36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ro/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ro/firefox-54.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "6c5f8e0eeda88f40765ede24c75b3f0fb70f9e90af30767d8fe4d08cb49be64a389a0e7b4e141031d15e2def42074bac0c64d2cf5b650587f898e6be981c9756"; + sha512 = "65dd955dec8460892869e3fcc555e153bc51af059fafaa1cd7a250441f166ad2c5aac2cfbb573f7320badde424c84007d121b88bbcff09ca2f474db84524de53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ru/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ru/firefox-54.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "7ddb1a185465980310695ac06794a8d659da3eef8c451f0e0c75588fcce9a1af65e75a0ebfc0dd583f0a6e6e511b03108e6d9923a2f6488da2276018d7ad2c04"; + sha512 = "ebb48f14805236b8cd36de37e514b0738f7d49b93713d536b1f2deafc1abdb67ebfce74629c131304eb440032563f17260ee319be133f0fdeadbae5bd93cd2ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/si/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/si/firefox-54.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "16d516cad8e6ae86eea95d0c4bbd8eaa56afbb74f5d6db82452176394c723c4e2b821616ca76186c990a78d30e208554e7eaf7deb82e7a3d78c97cb2c1338b45"; + sha512 = "5be8bfe9ef8f1096983d087c1e61ec197c2b1cf0388175724480898ab48ea0511127356a041045ddef7afc61d65e568b8c19bc5041a06b575f76338c88d1130c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/sk/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/sk/firefox-54.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "e6175dd3316c7b05f95e075ea5966b50e243b83d281bbc87f6a4dace16c708560bbaec8fb0700823ddf1b55d27f7f64450254a40570616a9bba0d2497bea1a08"; + sha512 = "b70627c2fa4d5b4bb90b919cf1324b3463e28ebf918b000a64ffb0ac64c997a370042d8e7029dd2fa749206645a381126ec5d24a952226c876d788d0af6f9cb3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/sl/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/sl/firefox-54.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "4e78e2d9808b88c191f51f8cf0d83f1762d743b4bc736d469bc145056af2207bdd8c3dbef7283a730486b041826bb25fb4816017786b0bc7515238b67a285062"; + sha512 = "a0ba640ba12ad5b0477942e4eb91c9e9ee1f602d5e51999ced88be2f150311b15e72d70d0de2295916b82ea577d8e07cc33b7ff4a8425a886ea4dc3a6f6634bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/son/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/son/firefox-54.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "6ee8a87158c2f7cc8bc38aa59959644514888bf683b7fbc3c703ae596fc6260190cea141b5f4d6aa72b21484b4a4218850d7d0c72cbe83b8329352de64b19e3f"; + sha512 = "e2dfc2ff732a3ded0465ae50879e4ac6c180040a24391b8e7e879051edd7b67c4022eaf03d5abbb21d0baccec795ca10b811fb14a5ffc823d860255871265873"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/sq/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/sq/firefox-54.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "1dd34fd13cb790a91f0592af0e21ecc815820ff4fe6d0c07c27b5efd82b37aa6c9526f5af9a444a1911b249651c17d9b367c02bdc5ccb420c80718f01bcae925"; + sha512 = "3e56f0d47c77c6cfc65f40088cad10bf513369a78b1d2a1ceff7e92e798f136f93333dcec4bf780598b3e8ce47a55cdd47696f20337d27ad2e2908bb6c047052"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/sr/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/sr/firefox-54.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "869e31f47498ef748557c7bc0b9d49b893826b785112b5e152bac46a9260877f9d73740ad36fa139452074cc9b0bd23880d7a046eedc0bd652ca44eb5188e035"; + sha512 = "aae94358f83f888c3ff8fab2a55e4239d2f280813534d21f199f89b8fd95cd7a37b2862becfb7e1c14a9b180cf1844df59689fe818df8ae490786a5dd65921f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/sv-SE/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/sv-SE/firefox-54.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "94601f07bfe9e13872cad9a0273c669d4a8a44b3c8f654aa866b703e325a0f1b6313cbce70fada7bd2bbc074d6d51ad28e829c6afba59d0e7d95645c276c2594"; + sha512 = "5c672bc0ea10b65eb93077e0f23e52fa081b49e12760e2d9167026d8d208710916b38b56dc24c5a78378e3f7646dffb77b3cef49923028889324ec7da39bd842"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ta/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ta/firefox-54.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "0ca3d09ceb89ece40b8f6825ee7f46d4ba2a546204ab185b82e32d9206e428e8818ca0478d8b54fabe6ceef4641e8411a1490d862bf53964e0ab269bb2bdfe1a"; + sha512 = "6649f6153c6b173d13dfa5f6bf7017102645b54d9c847bdc01d155ac005fa2ee5c997eeec13fe7897b55468912b70105c449e51947af270ceb44fa1ad02fb1f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/te/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/te/firefox-54.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "58e6e95a7972f2c5b4ad8f3428b95c82434d9041dc8879ff1fe961adc6baff87584011296621f07ac9f1277f6392d1f230310a65d64f245c7bc3494872dc0248"; + sha512 = "5c0836df0350d5b282420d96ea2886c2343641c3ecb2daf91a81b67dcdda6145532f2efd480fbc7be412bb8332247a49ef48958157b33c33c444c55ce85c06a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/th/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/th/firefox-54.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "da0c6bd3cde25ab20eec1e31538dd93d4aabd5659af3a00da1279a7ed37a30f5321f8260dc684610f37e7f744ca70bdf882c9db3d66b2988a7231ed4f07f6232"; + sha512 = "6c0a888749580afef4946b4037d722d736d654f2748827af42794ae452c6ba4eed6b0889dd20435201e19f629d5104389f42a384b637d6241fc9c0b8f22935d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/tr/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/tr/firefox-54.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "fa98f5488afce2b1b7f27810bc9fb8bf6d45e09137bd7a5dae89adcfa77f3f1eeef9ae593d037614197524128c317549edfd8b692b25ac6a79005f49f8deab4d"; + sha512 = "1301f85151378f74a7de1a33c42373feebca433f1cd6d0aa5daae229271741561bef2bbb214a104195d93664f802fc8b233d5b60913f901583eee68827643537"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/uk/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/uk/firefox-54.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "2ba13913b317f059093abd6407f9c4f798dc82491375fe8cd5ba21cd6f92f7144496f9f879b3f34eae7d41bd6a5e5a66efd57c19a76f1f89a266c2d50069f01d"; + sha512 = "d178ac2bd9b3c7a29b14effb005d046f43e78867e560ae38be3f5f55c39447d100d18958aeb9c4894579fce4a46849d7dd8a5c4951ee1bbcc4ccf4fa269da744"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/ur/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ur/firefox-54.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "b3c9ee474325b2afad9380896f2f785949170bf32582187afb414b4052bf6ec55e1ec7ee974a980f6256b178621abecf6e87a24c23d7df8c9faeb486cdf9aedf"; + sha512 = "2de7c4b29a6f897fe2df48e070164b2963a8117c1628f233d6ab93b1dc32660d957ba557f78344ab1588acb5144460068d34e4c804475813e9a39f4fed6780dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/uz/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/uz/firefox-54.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "1b419fd85815927410a43aca976074965953eb217596b6273fbdbdffaa71b0a87786a266a27fb9db11acf25df539c45807d780ec9af0c2e05fdb8b43e12833dc"; + sha512 = "a3b720e1c50bfded6d44dab4044fe283b1f718e600879663658d5d99fdc5ca36a996b79149434c71dfb951523525b59757b84dcb383ee7673c3e6e2d719048ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/vi/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/vi/firefox-54.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "74be717bec52c300b7accc9a31012c2a6483d4f5060315326aed2cbdf500d627fbb101d9cbe0e19f7a3ad76029a88e42e815118683fb5b32d6ea855c5044bfc6"; + sha512 = "6e53d4418ce4d325e705e32ca215e12c97daecb81ae5a2bd0531ae4043878a9c2fab006652f08e0eaf8ddb2893fdf4aef8b0157f04e6b9be4b63e5e191028f24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/xh/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/xh/firefox-54.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "9b5e7428042d619f61f45ca58092247462bd683060772fa7c32d862aff7882a402a10bd0ebed940d31871bfc0212b3555fc5c99b1470d590e7b9d3d614351a3a"; + sha512 = "fec4dd19fd5e109d1fcbb62538d1a0b9ad7867b111effba8fa4ca09921cc0d3d224e33016a60056e2d556c2cac4127587fcd379f8b023749355eb47ca92dc337"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/zh-CN/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/zh-CN/firefox-54.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "e86dc80340a30a89cff1063dd9559156c7a8713228d1f5bdd660a203373bf1ae99f682fbc29f8ce2de65d48eb5380e748b5484f20e1d73cb52f719327274d90a"; + sha512 = "78c162de2ecd7e698ae59f7d814f333885fdb4d5bbce2890f493008c709a3057524f098a36f437ffce0ffd7856ce5ca527bd2c03265abbf76c106ac8446d4442"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-x86_64/zh-TW/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/zh-TW/firefox-54.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "bd412bb36f6c41293ef68f38609ef0554d492aa92b6ae74e318cde23e9fe13b8e8d4d5e3d46a95020951c0dbe64ff83df0987b166d8de6afce14b6f4ca09d3ac"; + sha512 = "2e6e0084a37129adbafd524f0a8353ff0e26c4a59726be90a7c8bbedcba84d20a72d3c66c21335e302d929c5ed5aae9b67134a840a31c887c45363f957172f1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ach/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ach/firefox-54.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "bcf4707a88b8e40ce98ff2f6dfd9bd219d567e9595b1686485f6229c3644528320e2f4639752e4144493fd6066996235a850ca5539b67f2dfe07902ce4759b13"; + sha512 = "2710b4a940c3df0eb4f4a5a00e857b030ea4126bfd1d1154f169865e31597ef0f17c8e328d87bc68afbdc19a0dfd980464c1254df15dc69eed952da2c57f947d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/af/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/af/firefox-54.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "f527c2f0cf5b7585f00f1c897a178e2f526db0ed126ff8616da7ea86f1dede94b3e5e011622886323fc1245c935d362f96c8bcb792043b05febb4a8dc01c2a50"; + sha512 = "aae3f0465180bb14983d6fcbcf29d2f361e4c9703f37806889c35e60d7645dfd344aaf33a2fbac276ced63d906eb29452303ded125d86878d6c3492077d8868f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/an/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/an/firefox-54.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "b99880f2b69a44b24750642a67db2d617c237483b5da6da10b18250b419aa54b0809052ea7d09bba8e66bb8047a65f4ad3a371bdc8a016d800b24b5ef1a453f5"; + sha512 = "7f02c46293d5c6baeb75b80f3d5fdeeba5112ea350c5b04dc5750f5410be39fe4d0b9f03d21e8855922b97e1a6684b90f6eccd06d198c9f9b259b42fc51d9e46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ar/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ar/firefox-54.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "b9792beb0db0e1555e9bebf33fe5912abdecaf54302a6573d8d1a7dd3b362b4bf364e13f38c1aa326cbcb80c16ad2ce2f6ca7557f1eb8afcd3aa37c0c5272823"; + sha512 = "7c4fc8f0276029deab6756a6442cc29d75e8a31a0d62d045023c68c4f80878b920a34faee8a3e40f823de67015aca6f32567b6cf57f9a593aa1ce6ed5fbabae4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/as/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/as/firefox-54.0.1.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "f215bc4be896f04a867d516dd2dfcbe2965428306bf5faeda66981d80171d66bdf7363175fc0ab15d41ee54ce064d5f4d662518d41731b569b89fafad959b19c"; + sha512 = "e6825cbb7d228a1b8354b6030724f9e3407b7e5a33f1fe59e7b19fc71f0c28bab2db649314edff5bfab3c37b154ba9847b77fbe8e0038a7a3565c3136115862e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ast/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ast/firefox-54.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "aef5200ea3333c899e206667de6333405d8605a502ac2c1d08f9ce6609939c347d5e19c4475da3476623657e6dcf9eb92b72698901ac38eed3704fe15684d31d"; + sha512 = "8a1e64a1afe3b22349b1cad0d51ec299e02c5a9ed330792d4820bd0be4ab33cff6f05d03ce4441e2b2b757f45d23e6760d2bc370fb13d8dd1417cf562e82f331"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/az/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/az/firefox-54.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "f5dc2d4218f1433c4ec5c0e363f78ee445ad9afe70be3f019ca206fa873d6905d553b3ce6b8227f02d00353b3d4db349a2a8ef2354c5a740a799774be1ec4fbe"; + sha512 = "cf72d9045c2dd9e9c6da619ccf9fe537ae4823b3623e9873bb8ea12ba1881fdff3b05264908fa5738e0c2ee0d119ebb5799b32c90ae37186284a60cacd75b7b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/bg/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/bg/firefox-54.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "57b7e5c479e092bceae1633f6e117db0a3652d3a037667a97d9f5283cf390df731e6b67105b4c59296c4843e1f98624030a7bd72ba8812488094ebd1336ebfb4"; + sha512 = "686ca0b866d1e9504f21adec227396ebb6c6957b6d4aa9a3a74249d4ac8c23f1556bd1282f54abd82ffedf89e2852794014c5bf7bc46bd1d0df4dd5352e34725"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/bn-BD/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/bn-BD/firefox-54.0.1.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "dcb2f5c033648cf5a887cabd1ac70d4a569bf1af965e3c0eebe2c1a2b746be007b3e76cff666288b29279246b005e2309c7b5e48df20955ee9b685a0d9548636"; + sha512 = "f0e7bc6ae6297cf9e83cbdb8366def1885b96ff64a855b312d31346e9fc476f4f80877f9251520c77845fe1f695f39a757dbab2411a42e694de27f1772cba085"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/bn-IN/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/bn-IN/firefox-54.0.1.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "5cb248381eb1c67f0d18d2a9fef63ecea7bc8b3cf6f3db2aede0e9c25dfd6d0eb8aabc4d9177f2f174f2718e4361166bc5045e815ebbebbb613bf79de3345060"; + sha512 = "6caf0d5f71c1135272072439c0e2c84bdcd967cb23c51d980c47d3c6a3748e90e041e89eeaa88a42063dfa0d3369597c8eface6593d91ba1d604882e16b4cd5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/br/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/br/firefox-54.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "5e0693d9cf46a78cf5f1581e5a18d3ad56f072f975e9169c6505715dc054819fe6773196b9d71e46c40b1757ea2060d8d5365b98550fa068d4f27f63e89ebc1c"; + sha512 = "10cc66d62e68346b896c0fa081f8d8c1ebbfbfa364a52bbef5c7f368aa854afb7e968cfc344378707b93b2cf478fd74d4ee97f9b7bd160199533f26df222ea66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/bs/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/bs/firefox-54.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "71e79a378d6ff2a29a2c3e20f0595688dcb344829e6b241fe97ba6ac0dbf27b982966168a691e0293d8625459f89dbb4c7cb6072547934aba2410dc20b525f3e"; + sha512 = "6c87de221bbda9639d5751f8e8ea2f4aa5be191dce18f0b4f038f8a2fec989eb4cd3ae3b2ff36ca13c168a8ce92b6ac6a60b46ec6cb022ce6a95e921856973b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ca/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ca/firefox-54.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "5a40bf62d0d6691df4588e4db7e9e48d64922d1d81f94d383873588abbd4541a7589ee662c9624b5a9d1c70fffe3e3a468af420e54fef119d1b66c5eac9bea52"; + sha512 = "67ca5ea84b6243bc8869b96fb9dcecbc0a8e7018e256101874791444d57b5fd61a69d7ed064df41faf9ef3cc9059777412fa86ed445e9e40a3570d030f776d68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/cak/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/cak/firefox-54.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "65e760fe89659181582f86424d44406e0a2e4d033b5ae030f199564fe1666a5a85e77839ea9458c474e4c7f26b1ae6656c071c7c27553c53d276cf5a5aa976fc"; + sha512 = "b343dea962cd69bcec30b5a274a118e6ed2740120cd09d8155d0ad32e55730d9bc223a213df447ae50ec6bab67f5be2b910feebb73b4b57b30ecef49a3b0803c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/cs/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/cs/firefox-54.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "5b9e2c3d30d316ed7c013d49ff0524497ce76c02f2bc5d33254c561d94fcac5be8bc4cf269b6239399b22aa9d9c466698499149dd895644d17a65e2960d1b6bf"; + sha512 = "e4f55216ef51ba1232e15b1b842c3964a49aa31a9bff2cf292bb7cb913891057ab4cb3e351ceb57d3024f2854defd693a75aeb23431a7b7e8fb82c41f500507d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/cy/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/cy/firefox-54.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "85ca010fce9e7a15891ff51e1c69a2ddcc686857e0958495b7f7eb8ed59e2faad7de5c81453d2ad901de3db2695f8dde0c3bf4a182cd4b8ad6ce94895669ccb1"; + sha512 = "4d4340737549368855b21f11a27073c60112cfb7aa0b5e1329b27402ffcdd222eb009bb13e81a8403a72ed67b57d2ba2ff349fe0255d1cf11f32f4f32a73986d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/da/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/da/firefox-54.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "22913845f9bc2ad7eb58c0d556b2dcc139b98b37ffc3606bf4595d748890e094968adbd4f888117a2ac163ed0dcba2c5a4ab97105ffc48cfef38accc15c06ad1"; + sha512 = "4ab3cd2e39cd13608331c13bf788ebb5a75600cdc3e5bcced2adeaee3d1c70fde0b57e93be9d8ecc72bedcf14560129246baa8b6fe5549de5614dcd14bbd76a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/de/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/de/firefox-54.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "8a650095e1c80dbf8f931b8dd7f883312f52f76f2743a6428d0a5d7526946247e3ae87512454ac77a2601fdec05abc8ae16957d09ce440e02ecdefda243d4a86"; + sha512 = "5b4ec879e8bab2bb4233da0745a4e905736d98816377458333d0d5a9b8a72e6cec8f450e8a4ed49f69d75b3a5b1c223bfe96844cadad2919044c637d78a13f04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/dsb/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/dsb/firefox-54.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "7d673a98260823cdec8cd44dd564c4dbd0e6f4cbafe1b1234eb4c631dd07edbe34ec6aadc5863d62030271c1d4fb39a7f8be1036ed5048ce98d2af85d4999e09"; + sha512 = "0ff0443ec9dcd3cb11978bf8689d41ef69db93d8b50b6dd53f4d31fcbdab2e459aa93427bce476ec989e907d743fd392add82426c002aa604fbe251ae438e912"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/el/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/el/firefox-54.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "fddc48117e63558a7a8cbe83ecdd937cf5d3d444c1d58f016026b51ae46cb7a0c4a44f04474d285b8681a985c59c1962c39a8171802821702d6ed4744ab39390"; + sha512 = "5cc24ec6bd4823e5360b56ce78a97319e15c8f2a47f7138033dbc52e7df001d09577de3d9e8cac6314cb7809da0e7674faf8845e4610d6ea08e47cbc9fde7f03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/en-GB/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/en-GB/firefox-54.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "0f27b44e13c620a22ddb24adb03aa504ea48ba1674d25272ad5dff86cd59554b66c517cb378a6d2668d6c9014fbbb4fc9e56565ee943c608479a6c6ab577dd50"; + sha512 = "0b8a1576ce8b112ae35ef388191d2308aa2c7222f575bf354d3d6654c05f073429af8ec9b1a1a77a268b9191d2fb8b758a38609c6432dbe827b739b3ba25ec61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/en-US/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/en-US/firefox-54.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "727ad142bc3861407552a0c4438911493381ca5def555b3ceeb2b15d6a66cb4ef97c05dbace932b06048b3a5636f6568e3940cc8ef45af28a9797b738f2510cf"; + sha512 = "9b28b30e136b9bd89b4b374a9a6c8e6efef936354b7eaaecfaee2efca6381abec646627c57856f64b96ba5a8f771a411c4164f3a54b783a8e3e197c0a78d1622"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/en-ZA/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/en-ZA/firefox-54.0.1.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "47f1385a47014a0517a15dcdd1ec93752207992de077a89742ca1b6998ea49e9d07b1ca12cee02c3b8381be674e9687cb403d620231003bf8b683e279d281b69"; + sha512 = "360a4048ea81b10b5b834f3c2ef21776cfbaf372f3a329ec9da016728e1b83f956476ec98295e70ae3a9fe63a5f4f87b6be8d47627d6f36eff9b2909073fa70a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/eo/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/eo/firefox-54.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "b3d941ca034a50f2f998ca6827682cfb18a9a3e280696951dae1964980e153bb2a0461fa33c21109b5aec1f12514bfcb9eb89376df6d8e4d87f81fcf5f9b7d9d"; + sha512 = "23e95684f5bbf6b209a3077e173c3212b77e89dd64f22fd378ddbb8eaa43682c50f4021e743e25189b2d1cc6754bce6d0c8604d3884ec1b32cd7c51c0dee5f0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/es-AR/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/es-AR/firefox-54.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "39f930dab3f08441b6dbeb08d85803ace7e81e43208a03fc820c6245ae66de183f3759081c4f2ea4dae9ea8724f8fe5081123cd4b82bfe695e1bf0afe34407fa"; + sha512 = "88b7085fa2b4b1013a7242ca293197d0d26916f2ffbe1f1a4e8a1d2000e45705301ee83b0de8daa271111f586c3e5fad54c8e241da17f3f8cb9912b50e61538d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/es-CL/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/es-CL/firefox-54.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "469a2e7af658fb21f41cdaad5bcd77610e031c965cc5e8e1e6abb32c2553f68a6c7b60eceec56a3eed99f65dce34b09046748e0551bf95f0bf98cfe97a3f726e"; + sha512 = "990214ab2abaee7b607ac0a46fadc7c8be0fa12ecc5c0819f58324175381309742e0972ba54c144ad1dbbe0ceca076621aee0480e9e954f593c841d58f1a174f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/es-ES/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/es-ES/firefox-54.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "1e33b0a7dce58908bf98b63e3248628a8d62e5c980555b4385ffa990d8401cdeb14240f4a79eeaf6e3f5f0830455aa00009c142dd499714bf50209d10a083f51"; + sha512 = "7dce1007e0c52e048d441405a1a6c02863da24b8b8c4b7f3afd61f2c866ee6b19f29c82dd6efe34badf52df9a66c76fd56e788d047c3eac0503e3a74e41240a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/es-MX/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/es-MX/firefox-54.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "8d847605bd336079728087716b781fea40d256304c8f5bd839d83c0e5b4062ee13f30fd257da84bbe4203656aa31c8acd570c400ae04f39107f6c56f7d2ebb09"; + sha512 = "80b3ebb80a3682b6588175fee7243bbed87312463ea4bfa02d52be21b1e889208e8aedded74e9a94968969a2ede82fe63c83f742ed7c5754984f38b3f83a379f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/et/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/et/firefox-54.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "9502f47b30053aa89d0a79f6fc88a698e4206bd7cc37a2befed76d7811c5d758d61716f949de21e73c5690fb348ee26df7bd6eaa05473e4b257e4e9d6721ea77"; + sha512 = "0d31b34100214a588fc2ce5a217fde7a41f484344662e3402b69daca937e73213ae7ecfcd081437f3f4afd4bb8ad2f3810ee9e6cc160c24d81b81e20013176dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/eu/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/eu/firefox-54.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "7bbf574f723999e238ca8daff96a81dc124545046e6a0143c95ac6ea05ee3aefec86dc33b588fe206c862d2fdbc882112fe0cc1d30ac5e4b215f16f41957413f"; + sha512 = "b8ee5dc7124e8115af11d58770562d51bf7356992e84c443e4974b096dbe2e47f4f57f90ad238a68d712d9fc7c27c399719a8c4f8a4726fafb9220e448ee69ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/fa/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/fa/firefox-54.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "05ff15f72e785af68f91a890a72982c218e0dd8075e7ab5a43f11d9a0ea03b67535b5a7b088a6ebe1ef97bb6f08a1ead394fde51dc708e8aec8843c611765e3f"; + sha512 = "5bf7b9f0db610f5e1033f38e65bc86308b26c1dd6f51b0ba01064b9a0e0debc288aa5f34e7346aa68bb8eec6b81d104ee84d475968cb0a3946767f311dd85332"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ff/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ff/firefox-54.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "b70de55bcb1e582fbafe6ff7a61da548300e0c21c78ba80178e07540dda9088024e3286c3c9dd8d5473e02a1692916adf0417baae8c949ee19a8f00f6882cb65"; + sha512 = "f7d57a36612a82f94aaa5a05ee6764863ecc7c769880aceffe572ddb738cc899cfdfc68aa15cffbbe687d0413d38cd87483e78711f075eaac063d7f5f0b2d29b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/fi/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/fi/firefox-54.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "fd895e153156ebe879115c24e6e35d3983dc0e8968a061de017584f6c255d4b9aefda19ac244eca5e8b833e9a7836df2bff4e61a39ea71dadec1242431202971"; + sha512 = "9f58c3a937ea4d7eaca80c63c2ec822511335f27c254fd086ab2583a55e457dd1da98fc1e2bb8d299010e59c982b54441cf157afe3aefb9778877d25f43f545b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/fr/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/fr/firefox-54.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "ec36040ceb536d4b99da9b9b5b300b066f4e54b29faacd248c7d29834e1e902da446fdcbb3972b4a07c1bab71bc144f53650e0ace150ecb3e659cc8fc15be71b"; + sha512 = "8179c3840850a6c353834f052fd8d4529423311385fc39d0d73d6c97082573c5035cf7714a167bb3d9f0c77e64c9fbecac30bf53a03f6c01c338ac538a23e0f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/fy-NL/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/fy-NL/firefox-54.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "085a76fdf7def5a9bde73b7d92369fe577b448b8fb829445ddccf15fa3918f9fd1a6cdcea68376ec0c0b716592c8148b1ab638f5cdbe22e0a6ba7135e9702c2b"; + sha512 = "819d140b832ea5820804b0d888f96b82737926a08854c4e93d133636c633a52433e8246a0ce187cfbfa56ab4bf09a4b4c000efea697c0d50f22edb02ef756f87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ga-IE/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ga-IE/firefox-54.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "c344ca0fcdc266361ce5dde1e8adda69c9bf0ca093538ae339e520035c5cbd16906e4b40db03098647511071f6e11df819bbbf07661fb61edf8cd14662429374"; + sha512 = "c71d04d8ec3e7dc07eb909192c176b456daae54cc105199f675fd8e612c0f6527cda0635c0e1aa6221e2d5ef3f6c8168491b02571054ab0d4b7beab59ef692f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/gd/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/gd/firefox-54.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "4d44ef6abde187c2546b01bb59a1453bff07491152a9e08abc8674f72fdb201d0ca84bde913f0de7f46a69d6687affb419060994f49f5f934628456964eae075"; + sha512 = "98bc4b44b2075d615e682b7649a0a0cc696013b908aaef11a60bb299881e0ba243e70ec2e6e9205c965d31c68c6a8a66e9826fdb711676aa0cc3c8f4c44935d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/gl/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/gl/firefox-54.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "c3f3d6de8511b7f782a57d99a368ad82f8caecf86caf88508f01e4c86cda35504bc99eba89b007ed1b79e089863a3ba8a93efd348e13ed64cf2ac6b9501da65f"; + sha512 = "034b22ffe1a16ee330a8c85c18975d541b27d5ae1e5e3cba3796307c641af14797b329162a6e3f4f642de711a9f0ffe5b2fd274a90a396190ba176c5c26790e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/gn/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/gn/firefox-54.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "126c042e28e2aaa6ea6d36a52ee5d80a0700f4660d5ead0a7d756e59a1aa42044e67e2dd297d95282b71b94fe9ede9ec8ccd1a553c1e03ac2217769ea407d09a"; + sha512 = "85ba634e0b991b582ad0795c368d5df28d5e2fe773525792ab071752ac773d0d81dd3991996d6e9db7745707cbea8ccf86784b6a8f117d97e08b5ac88902d5bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/gu-IN/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/gu-IN/firefox-54.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "ec796a9f4b1d8e8c5b2c16d96efeaf1841aec9e66429f0ec2aa87b81281c29e7f99b94228a3963dd81e30685d1125d673d8b0f287593cecdbd64563353a0420d"; + sha512 = "92561dd2d270c01d9e2a1568fa9fa0e75bed2d5ac2ea49d965fa2aed6f32bfa8639cd57d564d310198796621fc1696444f976e12a26fa96b55aa7b445f81afe1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/he/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/he/firefox-54.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "1fde862295fe781992694670e015e1b3baf717032d2c8f3ce7cdf3d4a97e708c2fc7e3d0aebe2bd46b960c108f2a7843e69cdea2c0bbfc29f36f10b1a7895f89"; + sha512 = "d1f67f3e34bd67f993177ea9cc62ba432eebdd1169ded1b6ef58e9cb07a62a0ce38afecf001680b8ff6a401950ce9c13834345d7481301d59d024572fd2b8ed3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/hi-IN/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/hi-IN/firefox-54.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "f06fb8d9e06e02b9292000556a3c3e7b7076fcb832fee023411a53acb7e8a6292d5bd25afb19d840424623213149432bab52edff0976a7a05ae70a340927480f"; + sha512 = "8a10d69c6baebd21b2988a42979ec675e6ca29c96299407bd307a33c0bda11b6626cbb69bd6ab64a55f347be30d5fbbc64078b6e33209c26139efa050050541c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/hr/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/hr/firefox-54.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "7c7ddabc990da13351a2796bcd8797d67200076d3bc4df772f1db1d6b894832d54b3cb6d491d928a4266b32716a27a5dd4bb5a70e8e5b008ae72613e65894cab"; + sha512 = "667411553ac3e00e7040ff2b6f350a6586498a38409380d5c822bd1bdf2989e2e34b9b83ac2ffb00c7d3cbd57d2cae4450cd208ca1fb89480d91df1981d2802f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/hsb/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/hsb/firefox-54.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "304907257fa32adfa16afa23743f7c4f8dda5b79f92c99bbebbd971965376a2fa81995873ca13ad85698117404ae3ddc60f29b1aa19d1a54e0441eced35e56e3"; + sha512 = "8becf0d2f7a0c208ac38d390be0114159d208931da07b996e1f05138fa06f07f027c1ea429153823c580217a5d3e855f50570a5c5c2e4f264164d59b0f5cc9bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/hu/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/hu/firefox-54.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "4f9cadd48ddc7a4e25d79388a833d74418b013346a597edff0b9a7f418fe899f2ada685406fd02d0d4912126fd35c31ee51772cdab0951aaa2a38da3cef4dfc5"; + sha512 = "494144c9c2a3d06d4bc8126e106e74d72b3ec5992dbbd47a4b618a1a30905ef59e550bb4bf8a698c69d4dac09a1bb7c78b5580f77d00f103918d6d58ae74be73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/hy-AM/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/hy-AM/firefox-54.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "d8b57889da068cb0aa8c5bd8b3900d81b2944795dca03e09abc2803b985d0bf5b8ec183493ff51423bebee7ce3294ae8e9c5c3feec3e2af4c20627c4ee2f20e3"; + sha512 = "4d8160d109ccd6fdd407673c855b445eb287aaaf09c55e11b277249b54129721c60596139860cd578b297415383ebc83a9f95feec3b5deb229e5f5834df5f94a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/id/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/id/firefox-54.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "9f37f651b8fea3bab155550923a8bb6baf1d0a887f2a21c01da3c15c7935d176d7b63abfeef0fcd883807017aef39d66bf2cf5e80dbf3a42e8fe1691c12f965f"; + sha512 = "faf8df37c2b7ff621d9dc73fa225ffeb9263a6de05ce540fa4f7482b26df153c75cad46e395cd4c3994598dd42943eae7e552836d3afdb1fab56bd55e73f7207"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/is/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/is/firefox-54.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "2d98104a4b4c000416cbf3fd9fbf03e2923b502ff32cfc8e94aa10a6f86170b0ee1a6a3caa2ad6974203a3ec81b7ba17a55c7d7935170eaf67e8f59c29973d78"; + sha512 = "a0a5fdfa889d61365c9da182ab7364f3eef51ce7bfe75273a9cc50b948cb5b979629972171dfa3812edeafba76ab71b3780f11265b2026cbb70fb8c2e1bbc7a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/it/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/it/firefox-54.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "0ae1021ec2e8ad2a4c028c44fa568f3561dce73feca12245b033650a9df023a7eb957fa748159fccc0735e16b227caaf019f738094ecf06d2c09dd537a8a7adb"; + sha512 = "59530850ea817f7bcf0ebe8813aa9b653fca3127139e8b97ba7f9fcca16848c272681b59409c0dfd1b10a1e75ae6b1d0bb46bae628fb0c95daeb198189c8a173"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ja/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ja/firefox-54.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "9f555cdf704922c3151ae41bda1222371c149aa7ba1f8f6ac61962a7f296effc337ed3579a7aad4eb187bd2a7fb40a5374342ea87112589dd4a9d9335a4b8f35"; + sha512 = "67501fac457e820f2e731a77095f37817e8a44693d740cfb540d48dda8e1b10d93eb578b7d94c5efb0812688728745cbb508f497c02bc74b50fb514f8da4551b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ka/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ka/firefox-54.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "9b4a943cca2841617fd4e62cbd6e5b696282903e540f7d177e790da5ff388b1af2e2397f27b82af136fee37149bfbcd6b18906996f383f14a0bc79351efe8ffe"; + sha512 = "dd9dc48dd50cce43b48dd1a17aef95c89dbdda8e4b670044c422085ceaebca7410c24b157213acf4592c007ada45e6fdb154e690f6ba626b81ec3f8a099f205d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/kab/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/kab/firefox-54.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "39688e228149ccf9f0435fe1bc2c04bfaa3ea4da66eb0310b9eb2d757ecabbcf157ff8af7821565b2d78743f9075e398a76024854815427bc04ac99148634d01"; + sha512 = "51dd94346d62fe810208e6bcfb930880ef14fafe2b859af80da4b494563db38b4226ad43b602ac86f426c6a731cb135ac674ef65bdb2039e0aaccde0956c616f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/kk/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/kk/firefox-54.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "46c7f12f73a4fa5d7835e957ea7179b81438132fdc3683b4fd61bf68aeb78fe3cfbdcf5c92b77dfb2eea1e5e3c249e03dc5c0d9adeca75417938ddf8f8be9dff"; + sha512 = "604b59670103ce78e3ef4db5a209d68981e1168415ca4512a1edf15fb4b2554b9f655985b2a0921cca44a4c51742155822b0b6514e91b1a5fec43be57b36bc44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/km/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/km/firefox-54.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "de65d654b3381b111694134697866e6c9924e42e2957449cafbd50fa67d1330c53ee1dcad21e59dcb9993d706ca08fa0e82bbce4cb2e48d318bba46134a12a59"; + sha512 = "a81f6b44bbc9669af09b212d1960ca93e70ac085d20c37db52a474b81072a06165312207567ca4351bd110ee7e4125fbfd67981996c08b0a19c7c6669db16cb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/kn/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/kn/firefox-54.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "10c8be44d567ef6dbd5030611a3bf72604485504033d27df336e7db6e44b9e319771026dfef3db666c7107e6c9e53e57e7923b9059091ea288f44a594dba1953"; + sha512 = "7a54f78285290d3a9062d71a5b1de69a3a98ea95a1593b5a0a0c2b69098c55ec054c8575361bd5cfb67b7558b411b8b83861ecd5605906b15a06311f477bb0c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ko/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ko/firefox-54.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "d0a3a812c96990eacc2b332696b6f17a602b65691fff54d8e1511b5261cd8d482e590abaa93e56ef801388b02cb8dcb20575658d7429ceb1dba24bc2e30cd8e7"; + sha512 = "6a97670f62f70422f0d5d02091fa6ccda700705a248831d55c95034a1a63bced1bd0f282e938855a751eedf0f897be71f7257aa5ab3f8f7162ec756511f15830"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/lij/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/lij/firefox-54.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "700991c2ff12ecca4f11540a563b3cfa72c928fcb864471d638777ed53eaee105c62f62e6de768df895d54c2718cb4dc0ae1648e4869d5af102eb567d6fccaf2"; + sha512 = "c4b4bd74169731d6909acc76c40ceaaddd853e03eefad27233c05dc869ab66a208f072dfe538f1f8e2323feba021f6b3aef73d81d02ff69d31feab688838424b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/lt/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/lt/firefox-54.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "488b215810ee0672b0a0f44a3891881df312095537f6f7936ae4fcb17b211a6675080ef720b977c1a35ea2fdae38b1e0393aab57dc2a008705d6a8d27560b0c2"; + sha512 = "319bb6442b6dfa25551dfcb5704241de8b248659cfdbcfa0124c6332ff828e793ddc007f3be57d51033e334c3bf504d0a1330b1cc539e8a5a0d2587bf14604cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/lv/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/lv/firefox-54.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "b5ab118ebb407c17dabbcd32ae297fd22b663bed8f9feff40d442a9a24f2dc0c5a2762cb5136ef8910820014f404fd9ef4160a413c70bc2840ffcf11578ed56a"; + sha512 = "cd255f0922a1cd2c13baddb350082b3ef7fa130e28cf5bb1811345bce3a9d4e65aeba188304c8fdc8336b5e35c280d2a298bea39567d5309fa37e35d191ac18c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/mai/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/mai/firefox-54.0.1.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "b77d5a3b1d57ddeb45bb765610901ba6c142a125450d5a247088ec2b113ffcdce33341ddcbad277a9789972297f98bb9c120501bcd47578d9d633697bded8af3"; + sha512 = "5f44ecbd0dc239f3ed77871d548a894996192398dd845882a7c6cdaeeeb18dfde369b2e8e6d0b56883b494f537f5e0b115665d1411c1de4295c5cacb07021c54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/mk/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/mk/firefox-54.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "180a9730ffed7c69db3fe5deb0496d077a655106c06492e0da3611c5775acadc62c5ebf47e525aeb3cb51a0beb7f8599aafdb725884ffb2a9a9a5a8b61d7c032"; + sha512 = "de8a9ea6a75a4d597442e0116c70de5342f7270b2f41e9a889c7f71a44f41753d1fd0d1c029cb86a5958f8a2642ad8bd8943c30f5f3534d38d0428c83697a351"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ml/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ml/firefox-54.0.1.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "07a29dda4ab7aee1a67b8d832e5237ba5bcec6be8fc848985428f7385687269b798530582788e11cc7858a1e0be0cfba5a134d0ac164bfa61c0e2cffc5640c82"; + sha512 = "86f7a299f66f4d5c074b59f5512571c78fe924792815a0dc2ecb9b2f5e1c0a10d798bbb16c03f912051ab014c102b8e428f98ca29eeff2c30ce72962b50109f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/mr/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/mr/firefox-54.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "18b6d2f31c180ddf27082bc7d15f84c605004641bc6e48277ea061d0cddf02dee872657febab9fd84149688beb36a359864da22d9dd3ff3cfccd05dfbfe8b44b"; + sha512 = "a3e79a8f6b03e63f91c69232467704e91c73e1a4b6085a0b979f15bfb67b63bac7637130783d47755b50179a15f894223b76f572941464963bfd61e073ed1886"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ms/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ms/firefox-54.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "3ad92632ab4858581d1a3039c7ba73c94de38af920f95dd3eaff637d84d25b6925af04fddf400f2e33c5821ef9ba40b431eb66b2fac117aad56ad52850a651c2"; + sha512 = "65ca4ef417722cf12b3c7dc7081b374caa3626ddaef5ff2a0b929fd5d1b6716c4e020ac8eab9cdd4dd161d990d0bb3633757c03995426e18e0d23b1e20e0e21b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/my/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/my/firefox-54.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "e99437ff5a9417b15eaaed82c68d49712d212b2062924f84857e80b030668654e423a270199e6d8b60eaa34918c935614e4a85020e2e93f963c37781e1e059cf"; + sha512 = "200008b97d3a811533d97e96cdbe8b7f1ce30ea5b7cebe3a77f58269d2ee871b8591907f2975377e655fb01bf267e69851ec3b3680de2796183b3ceccec8f471"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/nb-NO/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/nb-NO/firefox-54.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "c342735a2470fe7e932c66e6a423bcf4b092966c9c89b1a2283a20583cec5f4d878ea35523e74c1405f69702339c453f96d3a52b3bbb851b9b1bf2ab2e304a21"; + sha512 = "03d502600bf3edd8890a6d3bb394acd4c2f310d762870784192e3515b9908f14c2db4b7e5762a323b73b4c68c13cdcee9bb952fc503421f41b59f9d2bdd3e617"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/nl/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/nl/firefox-54.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "e4a68a804e0607431ec387faf5acce61d66e8bd7f39eb6834a3eceb43349f7b2bbc70fd5939dbaaf26b72232e3d1ffb1a71ad9cecdfc9e58afe2e332e67be4f9"; + sha512 = "4bbdc99d32f2d576db66e2aa5a12d568e17f3d544e5ef613286e2d3620d4f833ed4b7385a9091fbb72e8bbc423e8e383c9b4e616f562a83c2dbfc606056f97ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/nn-NO/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/nn-NO/firefox-54.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "8df06d7a97df865099fa00b3c247bade0ea43975fe13d12904da62e0a84931a91e6555d96a5632ade139956837298b66c4b496cb6568e5794caf09236e23e64d"; + sha512 = "e0267e22ed0041d8a436bb38b9641481889b716632cdeb50bc1761bceda8d0dc6065937d15be56622cee5d4c73ba3e6f96c7fc00ceeef85ea9d852954ebf2d16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/or/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/or/firefox-54.0.1.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "8db56055a775654b83cf0ff02f9c3c46296245c1a6c3544297495904ca632288bc96f4aecef6439d85706189be3ad1c6cfd6df1c113535dfb9af281a34fcf3e2"; + sha512 = "faef925bcd51fa0851e2583e590bfe6c194c8f64f8d13a3a3f13f2129571ba7d9a403c0caefd933e94e1d312b39d1d051c5e2a1e6bdcf4b7a1962080d3874dae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/pa-IN/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/pa-IN/firefox-54.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "a3aee571e2d4d5e4c198a58c4e0cf140fc7db77f8a86aca77166b1eda04117456f1518f79d8000ea961e9a2c7c54fba5db5838bd380724c29260cc494c81a978"; + sha512 = "e95ba361380a8061fdcb4fd336fc5bd906666873f4ea84af6b5d21c05fa1691fa395bd0fe4529778d91e5d500aa162da09660854867ccf4734c737b0b4ccbd55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/pl/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/pl/firefox-54.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "39a69b56e20f6436e1dea3eba50d816c4aac496107da5a06f093e9f177eb3e11efb169cb25f27766c87f3347d00d9ac63c4028246ea31871b6861ecabccf511d"; + sha512 = "780079a117734ed5528b8efea3d0a7914cb8e8e1e81aaef33f877317bc18fafea8ce2433ffb69bccff01fa75e97e40048ed22805bcf781216116a76472f3260d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/pt-BR/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/pt-BR/firefox-54.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "02d450c530e1f219d97b894d2c3c9d2f376aeafb89edba9b2f65d5db5ef7ddf90f43fb4aecb98c0253777158f96b3f49b6adcb9c3fdbd1adf1448fb57420c401"; + sha512 = "d0243251d0793d5e3202e45e596eecde6362af25d95b8640fc5d69d3983ac4899249da9a1d5099522fbae9fd5ccb08d024ecab018fac8f0858a4f1bf201e00f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/pt-PT/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/pt-PT/firefox-54.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "319b5e765a3a561e54aa9ec967246e335e080c0008a102b1f023725f0905cb624e90dc5afa65e8a6d2209d9b04e59df50a6229f40c590041a5ad9abce9701ef0"; + sha512 = "337c792cd35fcc6bde89fbba2da9a42846af371b741c79e1226adbdfa801914bc39323b0ba2e600ebe1b12191f746b524421c8ea6e5a03f1875cf4ba24369d9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/rm/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/rm/firefox-54.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "66e70a6969a28f55276ec1a50e581b96b585b671bac733ebcdc5045c4c8473fb8c191ffcf43813cc0eeccd5dfe1068215c4731923a2e5fead423eb52ebd4724d"; + sha512 = "e316df164058d8f380274958b17a3812a6e31d9da6eb2fd0373e7bf2befc45a668a572ad4f8f8c33a7aafb5d1f8b7331fca00e12d7ef511017b1a002811040e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ro/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ro/firefox-54.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "2372437efb96d9e62215d191d3201ea2ea54bb7a328137ceb0532ce08638aa67bd88573e8a2c9746074a91717f431acf68782b75773a81a34ece7ecb117c1c12"; + sha512 = "04717cd979c8440639b407e919bf2d61814d24ea9969438397fa56fc73b5a8104d8a448c40cb0b3923ece0a61b5d232a8b94eab456f1b89fb4e24bcb0a525b64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ru/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ru/firefox-54.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "aa8c61333efdd8808819c07b00301db4a16aff10a2cd2fb57f172df538ed58148e32b9be87ff0cff69a09306036df1aff13c55532c8a63aceeee93c7692ce8c3"; + sha512 = "e0f76ebbe996f9989b00faabc08931873490c4048453ed4f32f0461c6ee977cbcf4b2ff4ff650a39e1a536f7bb214c6821c099a1f212cb4600187c698130bb2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/si/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/si/firefox-54.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "5f2ed1bc75093da1b3bd2355170575127709f61fd627e84c0170950e9991efe7d6511a29b20907f694fc797cc824fdbe793087e28dd998bd4aacab328151457f"; + sha512 = "f98a42fa1faee4be0a141d2dcd5e88641e89baae55d70440c1fc7f92cd12bf9f3d7954c23b42b16c02052f79f9451f76074c1a7aa0993ff84bde64ae12267e68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/sk/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/sk/firefox-54.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "9eb52821878542601040b926ac80035f92cbc9b568d5fba5c79e49d53245b4e4480b5e1ece0b671d0d77e86d3596758f5defd2f87e640836d1722341f24eed15"; + sha512 = "fad8a8c70e8f354e87b19fa9387c81b685c79b133ab03dad937e84e2c927d814844d281e39c45016a51056bca56cfca357ec10250035dc07b831a4e4c83ff147"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/sl/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/sl/firefox-54.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "0f0d38df630f9e501e074d7fa1c0d7e8f4841a0e7a17aaee9d369432f2a7a14321011759c843fba3cea41f24a5aa929f94b47be8b76409d3b8931cb660dfe938"; + sha512 = "39f8670cbcf942210336477cb153b7b2b39a7692103a76a476a820f2b8b9809da65351e02b4f80da7ccae3e9cd18ecb7fa1af292f507e9920f50261ab67b81d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/son/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/son/firefox-54.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "1a68b374225b6dfe831ad090c26985abf309b788ac418baba20ba9296dd647e0d66ed6563235918dcba80839f06ec8f3e64e1d54b8d8baef9a10275f860b99bb"; + sha512 = "7eb79e3638c0820b1db421e13f71805d24e2147ebe78f48497ff574058a3da91f9afb40d050801711550283b692972f4b973ea8579376bea03059d70557c20f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/sq/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/sq/firefox-54.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "382fa3024f3a776ba18e10a66d6dd6b5b9640dab2b1f1088f1e6f385332dccf1fd5acf2f77881128444c36bdd4e82a311327755c8d469e7e02360b054a7b3c20"; + sha512 = "84c410d7f7dc4524c4e8a7ff3fc186afcf922d8ca843bd81de83c1ce1d22aa2c07fdd57d1594a49aab014b07f1902c929bb9aa8d55b00b323f06ee70907b4a08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/sr/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/sr/firefox-54.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "e31e17699727e40eb3be4f21b483163edc385c5ab19f1fe6bbe51b50525f17ff126d94937e2faf31d2c993730697d5911703bf6b9519338a995c1694a016da22"; + sha512 = "9f91c5c33e3d0f01ab28601fa41c02a048a3ef3899481c6ff5858a176b72e05f8113c2fa2dfff2527ad3477a7d2bc7df5fbaa1096b1765113da855da710d7abc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/sv-SE/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/sv-SE/firefox-54.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "a7ec76ad1db4e9d0a472625ba476f410018f0df6a9c76b81079cff894300ef21b489e0be73107e349982aeb3fa496ac6aad99651228b001422270d97e8caf1a4"; + sha512 = "35c8fd0980cc641fd7bd4fd084f3d308840279ece55a33243396bbd0a3d9e500a3aab797fda63ff5d551acd82e21e48c152ff218e1a97ab395b009bea124df43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ta/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ta/firefox-54.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "cd47c0d9cdc92f91ec284aeb2f858317c6fc52afa183ebd2bdc6c038a8dc1d343f7881ceec53844c821c5a6786fc05b5344cd2e213f4ba598d5ae23a78c7a6a1"; + sha512 = "037257799dd7cd3383a35c334ec99f53be8682ac14020c7f96426a7885d9257519e3d5ab8643045e97df703a4bc63424db9dfa29cd65d6291402a034000fcf21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/te/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/te/firefox-54.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "bd0b47f0f85a5b05bbc1a7640da9ce79f018cd7daee8d5fa2b011f8c91ded499305c4bb53290ec0a0224e69f500e5b9ad173898d10a4071e425c7004ed8fe5ad"; + sha512 = "f0216fd72eba20ae094c54a4654356947441564661f6ecf5de399f55f05f7cb60370ac0072b2721d74cb40cf4c938cd3736cbd9b3a93cd641e3ef1a9089b4502"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/th/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/th/firefox-54.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "ecdbf45a5a5b1fdcbdc3fe52a69f7310dc3b1b76c758ed5a055daebe7b0aa47be398ad8cc6df403db93a9b49b85eba5611debeb6abceff4511a58ce6d71632c8"; + sha512 = "ff62cc5280928c0d9aad58c3b7fc52435f09e08d65e89ab0b7fb7280f3e61289d513f893dca2746e913121753c0f15e5a34c675c4074a0ff159e790d2bfad0f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/tr/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/tr/firefox-54.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "dad56a8230094269fcc64d01f33b38d399fbbcedcafec26ea34e2c6edd6caac2f821b3aa2ba755ae9222400076f1753ed5a31c374a1c858cb53151a5af9614e9"; + sha512 = "fc7f8d5120fb3b3c3699f13870fadf265ce7a43a1adadee89457a7df863d6da0f4d64b7f0b633d3526da39d825f30fbec3b9f1ae09bffb4c61681f4105bb5db7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/uk/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/uk/firefox-54.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "3ec96ff7b5ae14eb7331970899138c9cb12e3d369c48df1af970cf4805be9fb232c9197b0956dc69b48470eef29f85b6507dd7707da78c64611ee5229c82dd3f"; + sha512 = "f0fb3de841925f81c64877efbc8b151cec744bd0b4997bdb9a086413e7106cf05c1dca49ee797dbd2d80bd1603554e006f47b21217e60d390ae91c6a1badac47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/ur/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ur/firefox-54.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "b02959b4f8c456fbc1017b36d468449aab678008e05bf73dbeed4b69becdc9688bdc6f1c404cd749327b7cabf44c4b969c2f851402ab9ac7196ab53b5c974c26"; + sha512 = "3480fca8ef85b5db62b471c2986f124b92bd17c5682d57276b3f30fe0d3fde02f3d2a6e044f6c5157fc2bd3ab882e235f264aaeb319e09d234492c1aed674b92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/uz/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/uz/firefox-54.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "bff5034a765276f48aa43c0cf72ce1fc29ac8c39a296f72b330668ba6dd28cc32abf7eec4c31b247f12e7458f8f4640978fe0dc5a2d4a883b13e3335ede042a3"; + sha512 = "2460a419db6406542279daae938882fcc3ac29446b88a6315f3f7626925b906aed2d8a6250dfcc50c7eb87da3d57d231e4fcb5659a0fdc84ac188d4bbaf436aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/vi/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/vi/firefox-54.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "172665812d4c239ab8d9bc7610744fd88e721801d1939eff27dd8f7bc1614ca09bbc67d0de2518b76617cc804c7b98080b4a4c673b0dcf880fe57e58f8e75dff"; + sha512 = "0e54d8a00a734b4fee5ef7cc2a831453c732573d53477e53bb202311de5524839ed2290f5ed6d93a20d5b63da765f7a621d8bafaf0150d522c755347ca49ff6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/xh/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/xh/firefox-54.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "1a238fa435714d9e83a4d3e0d31f33350e40b2617d0b72698a6e381e7a8ece884a129fea5b7803b3564625089f26b4760e7547f497c964a9fce66fff11bbbd43"; + sha512 = "67950de9da98ae7bf867079f831cdcdcb5aca1f9caf951813f394e1e266787d90777e95fb33f46351086b25927ef108ee78f34b8152084410f8727ad7f3579ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/zh-CN/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/zh-CN/firefox-54.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "60fea3731a2d67b9480158011a2ea9df119b4db54018e0ac4194a1e86312f495647ee1861aa8ae1b9f6ff6cee28f925c061064c035f1fd23d37495211ad8744c"; + sha512 = "56b6bf4bdb5994f2550a47a0d6a6e5bf4eb5d456fc30e3472adb3efa909aeea17b86e24d799bc5eea11e60046afcb0eac61fe601c6e1c795ebb5a5440fc32738"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/54.0/linux-i686/zh-TW/firefox-54.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/zh-TW/firefox-54.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "0462e6b2ba08a09ec422aadcef76ed2f406f57addd4ae4a8469e4801010d7a5fe89a69e9f201cdd2c5258cad4e381f2f0616dc1c1daed07d8ebf7fc1c036e143"; + sha512 = "22fff4e32f6451b4378b45007c0fa7a1170a6897d13dfa1b0f814ac0ec9f48ea4dd5439a14aa7e9b1dabea19d0dbacd22f23dc431c38e023958692c5073147fb"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 2244ee571b0..7c9ffc0f478 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -19,7 +19,7 @@ , alsaSupport ? true, alsaLib , pulseaudioSupport ? true, libpulseaudio , ffmpegSupport ? true, gstreamer, gst-plugins-base -, gtk3Support ? true, gtk2, gtk3, wrapGAppsHook +, gtk3Support ? !isTorBrowserLike, gtk2, gtk3, wrapGAppsHook ## privacy-related options @@ -153,7 +153,7 @@ stdenv.mkDerivation (rec { ++ lib.optional googleAPISupport "--with-google-api-keyfile=ga" ++ flag crashreporterSupport "crashreporter" ++ flag safeBrowsingSupport "safe-browsing" - ++ flag drmSupport "eme" + ++ lib.optional drmSupport "--enable-eme=widevine" ++ (if debugBuild then [ "--enable-debug" "--enable-profiling" ] else [ "--disable-debug" "--enable-release" diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index bf33595b54c..11d9324c042 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -6,10 +6,10 @@ rec { firefox = common rec { pname = "firefox"; - version = "54.0"; + version = "54.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "0ff6960804e7f6d3e15faeb14b237fee45acae31b4652a6cc5cafa1a1b1eab3537616c3e8ea6d8f3109c87dcc8f86f0df3da2627903b80061c8a62fb11598ed9"; + sha512 = "43607c2c0af995a21dc7f0f68b24b7e5bdb3faa5ee06025901c826bfe4d169256ea1c9eb5fcc604c4d6426ced53e80787c12fc07cda014eca09199ef3df783a2"; }; meta = { @@ -25,10 +25,10 @@ rec { firefox-esr = common rec { pname = "firefox-esr"; - version = "52.2.0esr"; + version = "52.2.1esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "62a2bd47c9f4b325199b8a0b155a7a412ffbd493e8ca6ff246ade5b10aacea22bc806bc646824059f7c97b71d27e167025c600293c781fbad3fdefb8bbc8d18e"; + sha512 = "1d79e6e4625cf7994f6d6bbdf227e483fc407bcdb20e0296ea604969e701f551b5df32f578d4669cf654b65927328c8eb0f717c7a12399bf1b02a6ac7a0cd1d3"; }; meta = firefox.meta // { diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index cffdfa7a97d..1dd5c9191f0 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -8,6 +8,7 @@ , google_talk_plugin, fribid, gnome3/*.gnome_shell*/ , esteidfirefoxplugin , vlc_npapi +, libudev }: ## configurability of the wrapper itself @@ -46,7 +47,7 @@ let ); libs = (if ffmpegSupport then [ ffmpeg ] else with gst_all; [ gstreamer gst-plugins-base ]) ++ lib.optionals (cfg.enableQuakeLive or false) - (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]) + (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib libudev ]) ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash ++ lib.optional (config.pulseaudio or false) libpulseaudio; gst-plugins = with gst_all; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ]; diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix index 42f45419198..bbf034a1342 100644 --- a/pkgs/applications/networking/browsers/lynx/default.nix +++ b/pkgs/applications/networking/browsers/lynx/default.nix @@ -1,5 +1,7 @@ -{ stdenv, fetchurl, ncurses, gzip, pkgconfig +{ stdenv, buildPackages +, fetchurl, pkgconfig, ncurses, gzip , sslSupport ? true, openssl ? null +, buildPlatform, hostPlatform }: assert sslSupport -> openssl != null; @@ -15,7 +17,9 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-widec" ] ++ stdenv.lib.optional sslSupport "--with-ssl"; - nativeBuildInputs = stdenv.lib.optional sslSupport pkgconfig; + nativeBuildInputs = stdenv.lib.optional sslSupport pkgconfig + ++ stdenv.lib.optional (hostPlatform != buildPlatform) buildPackages.stdenv.cc; + buildInputs = [ ncurses gzip ] ++ stdenv.lib.optional sslSupport openssl.dev; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index e7893d22717..c25390a7c99 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -73,7 +73,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "26.0.0.131"; + version = "26.0.0.137"; src = fetchurl { url = @@ -84,14 +84,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "0yqrw2gl9i0z33kcv5dpp3x3jyq9ksqfaqjgkk7xcy127ahric8s" + "1kdwprrrxbdgll05x148vhg86ph77ygr99ycfblblj8wjkcz9s0z" else - "0cmjqm5asqqcqavpkldm6wgjb49m9n018rixi7cj9zcwhfakm7zr" + "1ldv0fca43kdda949095r3gk1bc9p8n94z61qijkmrpv91zv5qvl" else if arch == "x86_64" then - "0agz4k5319m5bd0nqzkzvy8r28nr6c5j9b0jr6a8yh9s844aga8w" + "0db6dcqal7p79q26kglnsbiv3ysx9r3c7rkdiynww18gzr40vwls" else - "0jzvhyi1qgfjp9l85ffgcxqa87ymi899q2j68b9hfsn9hlw1sc5f"; + "1fm6p91c63pyr0lra29vcq2dplb2c7a5114nm4r9rrrzjxakqw5w"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index b290caaee3e..d7dd83b58f3 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -55,7 +55,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; - version = "26.0.0.131"; + version = "26.0.0.137"; src = fetchurl { url = @@ -65,9 +65,9 @@ stdenv.mkDerivation rec { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/26/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "000a019x15yk6qkx8yg7l496lc5knvw0kqgzial491d73zw8qjhn" + "095457h83zs6cvdyyrh01069kgg8cnhgs1by6s9xpdxgc851n8gp" else - "0rmsfi70hvp5vvdvcr8w7knz8bzf70r3ysnsgz3yv3b9p5dvsbjk"; + "1zw3f612cfb8lr331hwqzlpd0gn3r0139bq76pbbbahh2chq99f8"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 270089b9936..52a2ce9164c 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -12,7 +12,7 @@ , gdk_pixbuf , glib , gnome2 -, gtk2 +, gtk3 , libX11 , libxcb , libXScrnSaver @@ -37,7 +37,7 @@ let mirror = https://get.geo.opera.com/pub/opera/desktop; - version = "45.0.2552.812"; + version = "46.0.2597.39"; rpath = stdenv.lib.makeLibraryPath [ @@ -55,7 +55,7 @@ let gdk_pixbuf.out glib.out gnome2.GConf.out - gtk2.out + gtk3.out libX11.out libXScrnSaver.out libXcomposite.out @@ -88,17 +88,18 @@ in stdenv.mkDerivation { name = "opera-${version}"; src = - if stdenv.system == "i686-linux" then - fetchurl { - url = "${mirror}/${version}/linux/opera-stable_${version}_i386.deb"; - sha256 = "0qhh7wwj3v8adz7ppjkpmfc04rxfjjhnnkawfvghlv77sjgnyml2"; - } - else if stdenv.system == "x86_64-linux" then + #if stdenv.system == "i686-linux" then + # fetchurl { + # url = "${mirror}/${version}/linux/opera-stable_${version}_i386.deb"; + # sha256 = "..."; + # } + #else + if stdenv.system == "x86_64-linux" then fetchurl { url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb"; - sha256 = "0xf1j8abk8f0kbjarsk1y1yna1zwrn0qc4fi1swjsxf5rx027fir"; + sha256 = "1ladvqilm5rr222wjybvribnyii2l0p8jbsd10xr06wps63g1kia"; } - else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)"; + else throw "Opera is not supported on ${stdenv.system} (only x86_64 linux is supported)"; unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc ."; diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 614473d39ee..5ec4340dba7 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, unzip, buildPythonApplication, makeWrapper, wrapGAppsHook -, qtbase, pyqt5, jinja2, pygments, pyyaml, pypeg2, cssutils, glib_networking +, qtbase, pyqt5, jinja2, pygments, pyyaml, pypeg2, pyopengl, cssutils, glib_networking , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2, libxslt , gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav , qtwebkit-plugins @@ -26,12 +26,12 @@ let in buildPythonApplication rec { name = "qutebrowser-${version}"; - version = "0.10.1"; + version = "0.11.0"; namePrefix = ""; src = fetchurl { url = "https://github.com/The-Compiler/qutebrowser/releases/download/v${version}/${name}.tar.gz"; - sha256 = "57f4915f0f2b1509f3aa1cb9c47117fdaad35b4c895e9223c4eb0a6e8af51917"; + sha256 = "13ihx66jm1dd6vx8px7pm0kbzf2sf9x43hhivc1rp17kahnxxdyv"; }; # Needs tox @@ -48,7 +48,7 @@ in buildPythonApplication rec { ]; propagatedBuildInputs = [ - pyyaml pyqt5 jinja2 pygments pypeg2 cssutils + pyyaml pyqt5 jinja2 pygments pypeg2 cssutils pyopengl ]; postPatch = '' diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 09ca83b5acd..5bcf47a4905 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -37,6 +37,9 @@ # Pluggable transport dependencies , python27 + +# Extra preferences +, extraPrefs ? "" }: with stdenv.lib; @@ -81,7 +84,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "7.0.1"; + version = "7.0.2"; lang = "en-US"; @@ -91,7 +94,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "1zmczf1bpbd85zcrs5qw91d1xmplikbna5xs053jnjl6pbbq1fs9"; + sha256 = "0xdw8mvyxz9vaxikzsj4ygzp36m4jfhvhqfiyaiiywpf39rqpkqr"; }; "i686-linux" = fetchurl { @@ -99,7 +102,7 @@ let "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "0mdlgmqkryg0i55jgf3x1nnjni0x45g1xcjwsfacsck3m70v4flq"; + sha256 = "0m522i8zih5sj18dyzk9im7gmpmrbf96657v38m3pxn4ci38b83z"; }; }; in @@ -173,11 +176,12 @@ stdenv.mkDerivation rec { cat >mozilla.cfg <. - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a - # configuration script generated by Autoconf, you may include it under --# the same distribution terms that you use for the rest of that program. -- --# Originally written by Per Bothner . --# Please send patches to . Submit a context --# diff and a properly formatted ChangeLog entry. -+# the same distribution terms that you use for the rest of that -+# program. This Exception is an additional permission under section 7 -+# of the GNU General Public License, version 3 ("GPLv3"). -+# -+# Originally written by Per Bothner. - # --# This script attempts to guess a canonical system name similar to --# config.sub. If it succeeds, it prints the system name on stdout, and --# exits with 0. Otherwise, it exits with 1. -+# You can get the latest version of this script from: -+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD - # --# The plan is that this can be called by configure scripts if you --# don't specify an explicit build system type. -+# Please send patches with a ChangeLog entry to config-patches@gnu.org. -+ - - me=`echo "$0" | sed -e 's,.*/,,'` - -@@ -53,8 +52,9 @@ - GNU config.guess ($timestamp) - - Originally written by Per Bothner. --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 --Free Software Foundation, Inc. -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, -+2012, 2013 Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -66,11 +66,11 @@ - while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) -- echo "$timestamp" ; exit 0 ;; -+ echo "$timestamp" ; exit ;; - --version | -v ) -- echo "$version" ; exit 0 ;; -+ echo "$version" ; exit ;; - --help | --h* | -h ) -- echo "$usage"; exit 0 ;; -+ echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. -@@ -104,7 +104,7 @@ - trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; - trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; - : ${TMPDIR=/tmp} ; -- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || -+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -@@ -123,7 +123,7 @@ - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; --esac ;' -+esac ; set_cc_for_build= ;' - - # This is needed to find uname on a Pyramid OSx when run in the BSD universe. - # (ghazi@noc.rutgers.edu 1994-08-24) -@@ -141,7 +141,7 @@ - case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - *:NetBSD:*:*) - # NetBSD (nbsd) targets should (where applicable) match one or -- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, -+ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward -@@ -158,6 +158,7 @@ - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; -+ sh5el) machine=sh5le-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched -@@ -166,7 +167,7 @@ - arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ -- | grep __ELF__ >/dev/null -+ | grep -q __ELF__ - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? -@@ -176,7 +177,7 @@ - fi - ;; - *) -- os=netbsd -+ os=netbsd - ;; - esac - # The OS release -@@ -196,71 +197,34 @@ - # contains redundant information, the shorter form: - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" -- exit 0 ;; -- amd64:OpenBSD:*:*) -- echo x86_64-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- amiga:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- arc:OpenBSD:*:*) -- echo mipsel-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- cats:OpenBSD:*:*) -- echo arm-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- hp300:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mac68k:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- macppc:OpenBSD:*:*) -- echo powerpc-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mvme68k:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mvme88k:OpenBSD:*:*) -- echo m88k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- mvmeppc:OpenBSD:*:*) -- echo powerpc-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- pegasos:OpenBSD:*:*) -- echo powerpc-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- pmax:OpenBSD:*:*) -- echo mipsel-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- sgi:OpenBSD:*:*) -- echo mipseb-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- sun3:OpenBSD:*:*) -- echo m68k-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -- wgrisc:OpenBSD:*:*) -- echo mipsel-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; -+ *:Bitrig:*:*) -+ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` -+ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} -+ exit ;; - *:OpenBSD:*:*) -- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} -- exit 0 ;; -+ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` -+ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} -+ exit ;; - *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; -+ *:SolidBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} -+ exit ;; - macppc:MirBSD:*:*) -- echo powerppc-unknown-mirbsd${UNAME_RELEASE} -- exit 0 ;; -+ echo powerpc-unknown-mirbsd${UNAME_RELEASE} -+ exit ;; - *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - alpha:OSF1:*:*) - case $UNAME_RELEASE in - *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - ;; - *5.*) -- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` -+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` - ;; - esac - # According to Compaq, /usr/sbin/psrinfo has been available on -@@ -306,40 +270,46 @@ - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -- exit 0 ;; -- Alpha*:OpenVMS:*:*) -- echo alpha-hp-vms -- exit 0 ;; -+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code. -+ exitcode=$? -+ trap '' 0 -+ exit $exitcode ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix -- exit 0 ;; -+ exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 -- exit 0 ;; -+ exit ;; - Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 -- exit 0;; -+ exit ;; - *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos -- exit 0 ;; -+ exit ;; - *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos -- exit 0 ;; -+ exit ;; - *:OS/390:*:*) - echo i370-ibm-openedition -- exit 0 ;; -+ exit ;; -+ *:z/VM:*:*) -+ echo s390-ibm-zvmoe -+ exit ;; - *:OS400:*:*) -- echo powerpc-ibm-os400 -- exit 0 ;; -+ echo powerpc-ibm-os400 -+ exit ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} -- exit 0;; -+ exit ;; -+ arm*:riscos:*:*|arm*:RISCOS:*:*) -+ echo arm-unknown-riscos -+ exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp -- exit 0;; -+ exit ;; - Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) - # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then -@@ -347,32 +317,51 @@ - else - echo pyramid-pyramid-bsd - fi -- exit 0 ;; -+ exit ;; - NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 -- exit 0 ;; -+ exit ;; - DRS?6000:unix:4.0:6*) - echo sparc-icl-nx6 -- exit 0 ;; -- DRS?6000:UNIX_SV:4.2*:7*) -+ exit ;; -+ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) - case `/usr/bin/uname -p` in -- sparc) echo sparc-icl-nx7 && exit 0 ;; -+ sparc) echo sparc-icl-nx7; exit ;; - esac ;; -+ s390x:SunOS:*:*) -+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -+ exit ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -- i86pc:SunOS:5.*:*) -- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; -+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) -+ echo i386-pc-auroraux${UNAME_RELEASE} -+ exit ;; -+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) -+ eval $set_cc_for_build -+ SUN_ARCH="i386" -+ # If there is a compiler, see if it is configured for 64-bit objects. -+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. -+ # This test works for both compilers. -+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then -+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ -+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ -+ grep IS_64BIT_ARCH >/dev/null -+ then -+ SUN_ARCH="x86_64" -+ fi -+ fi -+ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -+ exit ;; - sun4*:SunOS:6*:*) - # According to config.sub, this is the proper way to canonicalize - # SunOS6. Hard to guess exactly what SunOS6 will be like, but - # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; - sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in - Series*|S4*) -@@ -381,10 +370,10 @@ - esac - # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` -- exit 0 ;; -+ exit ;; - sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - sun*:*:4.2BSD:*) - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 -@@ -396,10 +385,10 @@ - echo sparc-sun-sunos${UNAME_RELEASE} - ;; - esac -- exit 0 ;; -+ exit ;; - aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - # The situation for MiNT is a little confusing. The machine name - # can be virtually everything (everything which is not - # "atarist" or "atariste" at least should have a processor -@@ -409,41 +398,41 @@ - # MiNT. But MiNT is downward compatible to TOS, so this should - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) -- echo m68k-atari-mint${UNAME_RELEASE} -- exit 0 ;; -+ echo m68k-atari-mint${UNAME_RELEASE} -+ exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) -- echo m68k-atari-mint${UNAME_RELEASE} -- exit 0 ;; -+ echo m68k-atari-mint${UNAME_RELEASE} -+ exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) -- echo m68k-milan-mint${UNAME_RELEASE} -- exit 0 ;; -+ echo m68k-milan-mint${UNAME_RELEASE} -+ exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) -- echo m68k-hades-mint${UNAME_RELEASE} -- exit 0 ;; -+ echo m68k-hades-mint${UNAME_RELEASE} -+ exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) -- echo m68k-unknown-mint${UNAME_RELEASE} -- exit 0 ;; -+ echo m68k-unknown-mint${UNAME_RELEASE} -+ exit ;; - m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 -- exit 0 ;; -+ exit ;; - RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -@@ -467,35 +456,36 @@ - exit (-1); - } - EOF -- $CC_FOR_BUILD -o $dummy $dummy.c \ -- && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ -- && exit 0 -+ $CC_FOR_BUILD -o $dummy $dummy.c && -+ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && -+ SYSTEM_NAME=`$dummy $dummyarg` && -+ { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax -- exit 0 ;; -+ exit ;; - Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax -- exit 0 ;; -+ exit ;; - Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - echo powerpc-harris-powermax -- exit 0 ;; -+ exit ;; - Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix -- exit 0 ;; -+ exit ;; - m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 -- exit 0 ;; -+ exit ;; - m88k:*:4*:R4*) - echo m88k-motorola-sysv4 -- exit 0 ;; -+ exit ;; - m88k:*:3*:R3*) - echo m88k-motorola-sysv3 -- exit 0 ;; -+ exit ;; - AViiON:dgux:*:*) -- # DG/UX returns AViiON for all architectures -- UNAME_PROCESSOR=`/usr/bin/uname -p` -+ # DG/UX returns AViiON for all architectures -+ UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] - then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ -@@ -508,29 +498,29 @@ - else - echo i586-dg-dgux${UNAME_RELEASE} - fi -- exit 0 ;; -+ exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 -- exit 0 ;; -+ exit ;; - M88*:*:R3*:*) - # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 -- exit 0 ;; -+ exit ;; - XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 -- exit 0 ;; -+ exit ;; - Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd -- exit 0 ;; -+ exit ;; - *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` -- exit 0 ;; -+ exit ;; - ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. -- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id -- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' -+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id -+ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' - i*86:AIX:*:*) - echo i386-ibm-aix -- exit 0 ;; -+ exit ;; - ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` -@@ -538,7 +528,7 @@ - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} -- exit 0 ;; -+ exit ;; - *:AIX:2:3) - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build -@@ -553,15 +543,19 @@ - exit(0); - } - EOF -- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 -- echo rs6000-ibm-aix3.2.5 -+ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` -+ then -+ echo "$SYSTEM_NAME" -+ else -+ echo rs6000-ibm-aix3.2.5 -+ fi - elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 - else - echo rs6000-ibm-aix3.2 - fi -- exit 0 ;; -- *:AIX:*:[45]) -+ exit ;; -+ *:AIX:*:[4567]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 -@@ -574,28 +568,28 @@ - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} -- exit 0 ;; -+ exit ;; - *:AIX:*:*) - echo rs6000-ibm-aix -- exit 0 ;; -+ exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) - echo romp-ibm-bsd4.4 -- exit 0 ;; -+ exit ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to -- exit 0 ;; # report: romp-ibm BSD 4.3 -+ exit ;; # report: romp-ibm BSD 4.3 - *:BOSX:*:*) - echo rs6000-bull-bosx -- exit 0 ;; -+ exit ;; - DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 -- exit 0 ;; -+ exit ;; - 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd -- exit 0 ;; -+ exit ;; - hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 -- exit 0 ;; -+ exit ;; - 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in -@@ -604,52 +598,52 @@ - 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` -- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` -- case "${sc_cpu_version}" in -- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 -- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 -- 532) # CPU_PA_RISC2_0 -- case "${sc_kernel_bits}" in -- 32) HP_ARCH="hppa2.0n" ;; -- 64) HP_ARCH="hppa2.0w" ;; -+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` -+ case "${sc_cpu_version}" in -+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 -+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 -+ 532) # CPU_PA_RISC2_0 -+ case "${sc_kernel_bits}" in -+ 32) HP_ARCH="hppa2.0n" ;; -+ 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 -- esac ;; -- esac -+ esac ;; -+ esac - fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -+ sed 's/^ //' << EOF >$dummy.c - -- #define _HPUX_SOURCE -- #include -- #include -- -- int main () -- { -- #if defined(_SC_KERNEL_BITS) -- long bits = sysconf(_SC_KERNEL_BITS); -- #endif -- long cpu = sysconf (_SC_CPU_VERSION); -- -- switch (cpu) -- { -- case CPU_PA_RISC1_0: puts ("hppa1.0"); break; -- case CPU_PA_RISC1_1: puts ("hppa1.1"); break; -- case CPU_PA_RISC2_0: -- #if defined(_SC_KERNEL_BITS) -- switch (bits) -- { -- case 64: puts ("hppa2.0w"); break; -- case 32: puts ("hppa2.0n"); break; -- default: puts ("hppa2.0"); break; -- } break; -- #else /* !defined(_SC_KERNEL_BITS) */ -- puts ("hppa2.0"); break; -- #endif -- default: puts ("hppa1.0"); break; -- } -- exit (0); -- } -+ #define _HPUX_SOURCE -+ #include -+ #include -+ -+ int main () -+ { -+ #if defined(_SC_KERNEL_BITS) -+ long bits = sysconf(_SC_KERNEL_BITS); -+ #endif -+ long cpu = sysconf (_SC_CPU_VERSION); -+ -+ switch (cpu) -+ { -+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; -+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; -+ case CPU_PA_RISC2_0: -+ #if defined(_SC_KERNEL_BITS) -+ switch (bits) -+ { -+ case 64: puts ("hppa2.0w"); break; -+ case 32: puts ("hppa2.0n"); break; -+ default: puts ("hppa2.0"); break; -+ } break; -+ #else /* !defined(_SC_KERNEL_BITS) */ -+ puts ("hppa2.0"); break; -+ #endif -+ default: puts ("hppa1.0"); break; -+ } -+ exit (0); -+ } - EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - test -z "$HP_ARCH" && HP_ARCH=hppa -@@ -657,9 +651,19 @@ - esac - if [ ${HP_ARCH} = "hppa2.0w" ] - then -- # avoid double evaluation of $set_cc_for_build -- test -n "$CC_FOR_BUILD" || eval $set_cc_for_build -- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null -+ eval $set_cc_for_build -+ -+ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating -+ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler -+ # generating 64-bit code. GNU and HP use different nomenclature: -+ # -+ # $ CC_FOR_BUILD=cc ./config.guess -+ # => hppa2.0w-hp-hpux11.23 -+ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess -+ # => hppa64-hp-hpux11.23 -+ -+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | -+ grep -q __LP64__ - then - HP_ARCH="hppa2.0w" - else -@@ -667,11 +671,11 @@ - fi - fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} -- exit 0 ;; -+ exit ;; - ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} -- exit 0 ;; -+ exit ;; - 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -@@ -699,224 +703,269 @@ - exit (0); - } - EOF -- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 -+ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && -+ { echo "$SYSTEM_NAME"; exit; } - echo unknown-hitachi-hiuxwe2 -- exit 0 ;; -+ exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) - echo hppa1.1-hp-bsd -- exit 0 ;; -+ exit ;; - 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd -- exit 0 ;; -+ exit ;; - *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix -- exit 0 ;; -+ exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf -- exit 0 ;; -+ exit ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf -- exit 0 ;; -+ exit ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi -- exit 0 ;; -+ exit ;; - parisc*:Lites*:*:*) - echo hppa1.1-hp-lites -- exit 0 ;; -+ exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd -- exit 0 ;; -+ exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi -- exit 0 ;; -+ exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd -- exit 0 ;; -+ exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd -- exit 0 ;; -+ exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd -- exit 0 ;; -+ exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ - | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ - -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ exit ;; - *:UNICOS/mp:*:*) -- echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -- exit 0 ;; -+ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -+ exit ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` -- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -- exit 0 ;; -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` -+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -+ exit ;; - 5000:UNIX_System_V:4.*:*) -- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` -- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -- exit 0 ;; -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` -+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -+ exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:FreeBSD:*:*) -- # Determine whether the default compiler uses glibc. -- eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -- #include -- #if __GLIBC__ >= 2 -- LIBC=gnu -- #else -- LIBC= -- #endif --EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` -- # GNU/KFreeBSD systems have a "k" prefix to indicate we are using -- # FreeBSD's kernel, but not the complete OS. -- case ${LIBC} in gnu) kernel_only='k' ;; esac -- echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} -- exit 0 ;; -+ UNAME_PROCESSOR=`/usr/bin/uname -p` -+ case ${UNAME_PROCESSOR} in -+ amd64) -+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ *) -+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ esac -+ exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin -- exit 0 ;; -- i*:MINGW*:*) -+ exit ;; -+ *:MINGW64*:*) -+ echo ${UNAME_MACHINE}-pc-mingw64 -+ exit ;; -+ *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 -- exit 0 ;; -+ exit ;; -+ i*:MSYS*:*) -+ echo ${UNAME_MACHINE}-pc-msys -+ exit ;; -+ i*:windows32*:*) -+ # uname -m includes "-pc" on this system. -+ echo ${UNAME_MACHINE}-mingw32 -+ exit ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 -- exit 0 ;; -- x86:Interix*:[34]*) -- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' -- exit 0 ;; -+ exit ;; -+ *:Interix*:*) -+ case ${UNAME_MACHINE} in -+ x86) -+ echo i586-pc-interix${UNAME_RELEASE} -+ exit ;; -+ authenticamd | genuineintel | EM64T) -+ echo x86_64-unknown-interix${UNAME_RELEASE} -+ exit ;; -+ IA64) -+ echo ia64-unknown-interix${UNAME_RELEASE} -+ exit ;; -+ esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks -- exit 0 ;; -+ exit ;; -+ 8664:Windows_NT:*) -+ echo x86_64-pc-mks -+ exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix -- exit 0 ;; -+ exit ;; - i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin -- exit 0 ;; -+ exit ;; -+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) -+ echo x86_64-unknown-cygwin -+ exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin -- exit 0 ;; -+ exit ;; - prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -- exit 0 ;; -+ exit ;; - *:GNU:*:*) - # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` -- exit 0 ;; -+ exit ;; - *:GNU/*:*:*) - # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu -- exit 0 ;; -+ exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix -- exit 0 ;; -+ exit ;; -+ aarch64:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ aarch64_be:Linux:*:*) -+ UNAME_MACHINE=aarch64_be -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ alpha:Linux:*:*) -+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -+ EV5) UNAME_MACHINE=alphaev5 ;; -+ EV56) UNAME_MACHINE=alphaev56 ;; -+ PCA56) UNAME_MACHINE=alphapca56 ;; -+ PCA57) UNAME_MACHINE=alphapca56 ;; -+ EV6) UNAME_MACHINE=alphaev6 ;; -+ EV67) UNAME_MACHINE=alphaev67 ;; -+ EV68*) UNAME_MACHINE=alphaev68 ;; -+ esac -+ objdump --private-headers /bin/sh | grep -q ld.so.1 -+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi -+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -+ exit ;; - arm*:Linux:*:*) -+ eval $set_cc_for_build -+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ -+ | grep -q __ARM_EABI__ -+ then -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ else -+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ -+ | grep -q __ARM_PCS_VFP -+ then -+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi -+ else -+ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf -+ fi -+ fi -+ exit ;; -+ avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - cris:Linux:*:*) -- echo cris-axis-linux-gnu -- exit 0 ;; -- ia64:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -- m32r*:Linux:*:*) -+ echo ${UNAME_MACHINE}-axis-linux-gnu -+ exit ;; -+ crisv32:Linux:*:*) -+ echo ${UNAME_MACHINE}-axis-linux-gnu -+ exit ;; -+ frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -- m68*:Linux:*:*) -+ exit ;; -+ hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -- mips:Linux:*:*) -+ exit ;; -+ i*86:Linux:*:*) -+ LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -- #undef CPU -- #undef mips -- #undef mipsel -- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) -- CPU=mipsel -- #else -- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) -- CPU=mips -- #else -- CPU= -- #endif -+ #ifdef __dietlibc__ -+ LIBC=dietlibc - #endif - EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` -- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 -- ;; -- mips64:Linux:*:*) -+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` -+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" -+ exit ;; -+ ia64:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ m32r*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ m68*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU -- #undef mips64 -- #undef mips64el -+ #undef ${UNAME_MACHINE} -+ #undef ${UNAME_MACHINE}el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) -- CPU=mips64el -+ CPU=${UNAME_MACHINE}el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) -- CPU=mips64 -+ CPU=${UNAME_MACHINE} - #else - CPU= - #endif - #endif - EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` -- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 -+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` -+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; -- ppc:Linux:*:*) -- echo powerpc-unknown-linux-gnu -- exit 0 ;; -- ppc64:Linux:*:*) -- echo powerpc64-unknown-linux-gnu -- exit 0 ;; -- alpha:Linux:*:*) -- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -- EV5) UNAME_MACHINE=alphaev5 ;; -- EV56) UNAME_MACHINE=alphaev56 ;; -- PCA56) UNAME_MACHINE=alphapca56 ;; -- PCA57) UNAME_MACHINE=alphapca56 ;; -- EV6) UNAME_MACHINE=alphaev6 ;; -- EV67) UNAME_MACHINE=alphaev67 ;; -- EV68*) UNAME_MACHINE=alphaev68 ;; -- esac -- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null -- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi -- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -- exit 0 ;; -+ or32:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ padre:Linux:*:*) -+ echo sparc-unknown-linux-gnu -+ exit ;; -+ parisc64:Linux:*:* | hppa64:Linux:*:*) -+ echo hppa64-unknown-linux-gnu -+ exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in -@@ -924,115 +973,71 @@ - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; - esac -- exit 0 ;; -- parisc64:Linux:*:* | hppa64:Linux:*:*) -- echo hppa64-unknown-linux-gnu -- exit 0 ;; -+ exit ;; -+ ppc64:Linux:*:*) -+ echo powerpc64-unknown-linux-gnu -+ exit ;; -+ ppc:Linux:*:*) -+ echo powerpc-unknown-linux-gnu -+ exit ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux -- exit 0 ;; -+ exit ;; - sh64*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit 0 ;; -+ exit ;; -+ tile*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ vax:Linux:*:*) -+ echo ${UNAME_MACHINE}-dec-linux-gnu -+ exit ;; - x86_64:Linux:*:*) -- echo x86_64-unknown-linux-gnu -- exit 0 ;; -- i*86:Linux:*:*) -- # The BFD linker knows what the default object file format is, so -- # first see if it will tell us. cd to the root directory to prevent -- # problems with other programs or directories called `ld' in the path. -- # Set LC_ALL=C to ensure ld outputs messages in English. -- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ -- | sed -ne '/supported targets:/!d -- s/[ ][ ]*/ /g -- s/.*supported targets: *// -- s/ .*// -- p'` -- case "$ld_supported_targets" in -- elf32-i386) -- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" -- ;; -- a.out-i386-linux) -- echo "${UNAME_MACHINE}-pc-linux-gnuaout" -- exit 0 ;; -- coff-i386) -- echo "${UNAME_MACHINE}-pc-linux-gnucoff" -- exit 0 ;; -- "") -- # Either a pre-BFD a.out linker (linux-gnuoldld) or -- # one that does not give us useful --help. -- echo "${UNAME_MACHINE}-pc-linux-gnuoldld" -- exit 0 ;; -- esac -- # Determine whether the default compiler is a.out or elf -- eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -- #include -- #ifdef __ELF__ -- # ifdef __GLIBC__ -- # if __GLIBC__ >= 2 -- LIBC=gnu -- # else -- LIBC=gnulibc1 -- # endif -- # else -- LIBC=gnulibc1 -- # endif -- #else -- #ifdef __INTEL_COMPILER -- LIBC=gnu -- #else -- LIBC=gnuaout -- #endif -- #endif -- #ifdef __dietlibc__ -- LIBC=dietlibc -- #endif --EOF -- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` -- test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 -- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 -- ;; -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ xtensa*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. - # earlier versions are messed up and put the nodename in both - # sysname and nodename. - echo i386-sequent-sysv4 -- exit 0 ;; -+ exit ;; - i*86:UNIX_SV:4.2MP:2.*) -- # Unixware is an offshoot of SVR4, but it has its own version -- # number series starting with 2... -- # I am not positive that other SVR4 systems won't match this, -+ # Unixware is an offshoot of SVR4, but it has its own version -+ # number series starting with 2... -+ # I am not positive that other SVR4 systems won't match this, - # I just have to hope. -- rms. -- # Use sysv4.2uw... so that sysv4* matches it. -+ # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} -- exit 0 ;; -+ exit ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx -- exit 0 ;; -+ exit ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop -- exit 0 ;; -+ exit ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos -- exit 0 ;; -- i*86:syllable:*:*) -+ exit ;; -+ i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable -- exit 0 ;; -- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) -+ exit ;; -+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp -- exit 0 ;; -+ exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then -@@ -1040,15 +1045,16 @@ - else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} - fi -- exit 0 ;; -- i*86:*:5:[78]*) -+ exit ;; -+ i*86:*:5:[678]*) -+ # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; - *Pent*|*Celeron) UNAME_MACHINE=i686 ;; - esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} -- exit 0 ;; -+ exit ;; - i*86:*:3.2:*) - if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' /dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 - else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 - fi -- exit 0 ;; -+ exit ;; - mini*:CTIX:SYS*5:*) - # "miniframe" - echo m68010-convergent-sysv -- exit 0 ;; -+ exit ;; - mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv -- exit 0 ;; -+ exit ;; - M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix -- exit 0 ;; -- M68*:*:R3V[567]*:*) -- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; -- 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) -+ exit ;; -+ M68*:*:R3V[5678]*:*) -+ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; -+ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -- && echo i486-ncr-sysv4.3${OS_REL} && exit 0 -+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ -- && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; -+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) -- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -- && echo i486-ncr-sysv4 && exit 0 ;; -+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -+ && { echo i486-ncr-sysv4; exit; } ;; -+ NCR*:*:4.2:* | MPRAS*:*:4.2:*) -+ OS_REL='.3' -+ test -r /etc/.relid \ -+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` -+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } -+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ -+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } -+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ -+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 -- exit 0 ;; -+ exit ;; - TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) -+ exit ;; -+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 -- exit 0 ;; -+ exit ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 -- exit 0 ;; -+ exit ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` -@@ -1140,68 +1159,97 @@ - else - echo ns32k-sni-sysv - fi -- exit 0 ;; -- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort -- # says -- echo i586-unisys-sysv4 -- exit 0 ;; -+ exit ;; -+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort -+ # says -+ echo i586-unisys-sysv4 -+ exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 -- exit 0 ;; -+ exit ;; - *:*:*:FTX*) - # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 -- exit 0 ;; -+ exit ;; -+ i*86:VOS:*:*) -+ # From Paul.Green@stratus.com. -+ echo ${UNAME_MACHINE}-stratus-vos -+ exit ;; - *:VOS:*:*) - # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos -- exit 0 ;; -+ exit ;; - mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 -- exit 0 ;; -+ exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then -- echo mips-nec-sysv${UNAME_RELEASE} -+ echo mips-nec-sysv${UNAME_RELEASE} - else -- echo mips-unknown-sysv${UNAME_RELEASE} -+ echo mips-unknown-sysv${UNAME_RELEASE} - fi -- exit 0 ;; -+ exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos -- exit 0 ;; -+ exit ;; - BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos -- exit 0 ;; -+ exit ;; - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos -- exit 0 ;; -+ exit ;; -+ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. -+ echo i586-pc-haiku -+ exit ;; -+ x86_64:Haiku:*:*) -+ echo x86_64-unknown-haiku -+ exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; -+ SX-7:SUPER-UX:*:*) -+ echo sx7-nec-superux${UNAME_RELEASE} -+ exit ;; -+ SX-8:SUPER-UX:*:*) -+ echo sx8-nec-superux${UNAME_RELEASE} -+ exit ;; -+ SX-8R:SUPER-UX:*:*) -+ echo sx8r-nec-superux${UNAME_RELEASE} -+ exit ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:Darwin:*:*) -- case `uname -p` in -- *86) UNAME_PROCESSOR=i686 ;; -- powerpc) UNAME_PROCESSOR=powerpc ;; -+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown -+ case $UNAME_PROCESSOR in -+ i386) -+ eval $set_cc_for_build -+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then -+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ -+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ -+ grep IS_64BIT_ARCH >/dev/null -+ then -+ UNAME_PROCESSOR="x86_64" -+ fi -+ fi ;; -+ unknown) UNAME_PROCESSOR=powerpc ;; - esac - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then -@@ -1209,22 +1257,28 @@ - UNAME_MACHINE=pc - fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:QNX:*:4*) - echo i386-pc-qnx -- exit 0 ;; -+ exit ;; -+ NEO-?:NONSTOP_KERNEL:*:*) -+ echo neo-tandem-nsk${UNAME_RELEASE} -+ exit ;; -+ NSE-*:NONSTOP_KERNEL:*:*) -+ echo nse-tandem-nsk${UNAME_RELEASE} -+ exit ;; - NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:NonStop-UX:*:*) - echo mips-compaq-nonstopux -- exit 0 ;; -+ exit ;; - BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv -- exit 0 ;; -+ exit ;; - DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} -- exit 0 ;; -+ exit ;; - *:Plan9:*:*) - # "uname -m" is not consistent, so use $cputype instead. 386 - # is converted to i386 for consistency with other x86 -@@ -1235,36 +1289,55 @@ - UNAME_MACHINE="$cputype" - fi - echo ${UNAME_MACHINE}-unknown-plan9 -- exit 0 ;; -+ exit ;; - *:TOPS-10:*:*) - echo pdp10-unknown-tops10 -- exit 0 ;; -+ exit ;; - *:TENEX:*:*) - echo pdp10-unknown-tenex -- exit 0 ;; -+ exit ;; - KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 -- exit 0 ;; -+ exit ;; - XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 -- exit 0 ;; -+ exit ;; - *:TOPS-20:*:*) - echo pdp10-unknown-tops20 -- exit 0 ;; -+ exit ;; - *:ITS:*:*) - echo pdp10-unknown-its -- exit 0 ;; -+ exit ;; - SEI:*:*:SEIUX) -- echo mips-sei-seiux${UNAME_RELEASE} -- exit 0 ;; -+ echo mips-sei-seiux${UNAME_RELEASE} -+ exit ;; - *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` -- exit 0 ;; -+ exit ;; -+ *:*VMS:*:*) -+ UNAME_MACHINE=`(uname -p) 2>/dev/null` -+ case "${UNAME_MACHINE}" in -+ A*) echo alpha-dec-vms ; exit ;; -+ I*) echo ia64-dec-vms ; exit ;; -+ V*) echo vax-dec-vms ; exit ;; -+ esac ;; -+ *:XENIX:*:SysV) -+ echo i386-pc-xenix -+ exit ;; -+ i*86:skyos:*:*) -+ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' -+ exit ;; -+ i*86:rdos:*:*) -+ echo ${UNAME_MACHINE}-pc-rdos -+ exit ;; -+ i*86:AROS:*:*) -+ echo ${UNAME_MACHINE}-pc-aros -+ exit ;; -+ x86_64:VMkernel:*:*) -+ echo ${UNAME_MACHINE}-unknown-esx -+ exit ;; - esac - --#echo '(No uname command or uname output not recognized.)' 1>&2 --#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 -- - eval $set_cc_for_build - cat >$dummy.c < - printf ("m68k-sony-newsos%s\n", - #ifdef NEWSOS4 -- "4" -+ "4" - #else -- "" -+ "" - #endif -- ); exit (0); -+ ); exit (0); - #endif - #endif - - #if defined (__arm) && defined (__acorn) && defined (__unix) -- printf ("arm-acorn-riscix"); exit (0); -+ printf ("arm-acorn-riscix\n"); exit (0); - #endif - - #if defined (hp300) && !defined (hpux) -@@ -1380,11 +1453,12 @@ - } - EOF - --$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 -+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && -+ { echo "$SYSTEM_NAME"; exit; } - - # Apollos put the system type in the environment. - --test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } -+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - - # Convex versions that predate uname can use getsysinfo(1) - -@@ -1393,22 +1467,22 @@ - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd -- exit 0 ;; -+ exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi -- exit 0 ;; -+ exit ;; - c34*) - echo c34-convex-bsd -- exit 0 ;; -+ exit ;; - c38*) - echo c38-convex-bsd -- exit 0 ;; -+ exit ;; - c4*) - echo c4-convex-bsd -- exit 0 ;; -+ exit ;; - esac - fi - -@@ -1419,7 +1493,9 @@ - the operating system you are using. It is advised that you - download the most up to date version of the config scripts from - -- ftp://ftp.gnu.org/pub/gnu/config/ -+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD -+and -+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD - - If the version you run ($0) is already up to date, please - send the following data and any information you think might be -diff -ur w3m-0.5.3/main.c new/w3m-0.5.3/main.c ---- w3m-0.5.3/main.c 2011-01-04 04:42:19.000000000 -0500 -+++ w3m-0.5.3/main.c 2013-04-28 18:42:08.408034100 -0400 -@@ -789,7 +789,8 @@ - } - - #ifdef USE_BINMODE_STREAM -- setmode(fileno(stdout), O_BINARY); -+ /* Seems to only be needed for old versions of Cygwin */ -+ /***setmode(fileno(stdout), O_BINARY);***/ - #endif - if (!w3m_dump && !w3m_backend) { - fmInit(); diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index 637041379db..e7641eb773d 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -38,8 +38,7 @@ stdenv.mkDerivation rec { url = "https://aur.archlinux.org/cgit/aur.git/plain/https.patch?h=w3m-mouse&id=5b5f0fbb59f674575e87dd368fed834641c35f03"; sha256 = "08skvaha1hjyapsh8zw5dgfy433mw2hk7qy9yy9avn8rjqj7kjxk"; }) - ] ++ optional (graphicsSupport && !x11Support) [ ./no-x11.patch ] - ++ optional stdenv.isCygwin ./cygwin.patch; + ] ++ optional (graphicsSupport && !x11Support) [ ./no-x11.patch ]; buildInputs = [ pkgconfig ncurses boehmgc gettext zlib ] ++ optional sslSupport openssl diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 19b6c030f2e..dc7d2b8b2ea 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -4,11 +4,10 @@ let then "linux-amd64" else "darwin-amd64"; checksum = if stdenv.isLinux - then "0vjkcilxzwvkgcczcbq58nl2j17ddqiysxm5yl13agnmxzvxw6r2" - else "1ga9gxzji48vhbaa0pkxd03h89zgjsbikbki9xla1qbvyvqjnw5g"; - + then "12dp2ggcjaqls4vrms21mvbphj8a8w156wmlqm19dppf6zsnxqxd" + else "1s3rhxfz663d255xc5ph6ndhb4x82baich8scyrgi84d7dxjx7mj"; pname = "helm"; - version = "2.4.1"; + version = "2.5.0"; in stdenv.mkDerivation { name = "${pname}-${version}"; diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index aaade82e31d..e036fb2f38b 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "kops-${version}"; - version = "1.6.0"; + version = "1.6.2"; goPackagePath = "k8s.io/kops"; @@ -10,7 +10,7 @@ buildGoPackage rec { rev = version; owner = "kubernetes"; repo = "kops"; - sha256 = "1z890kjgsdnghg71v4sp7lljvw14dhzr23m2qjmk6wndyssscykr"; + sha256 = "0bxknjhzj9xiws6sjw9knwqma3fjh496vnm90skl766bk4pafq9l"; }; buildInputs = [go-bindata]; diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 8779fbf2028..5cdb30b3f00 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -14,15 +14,15 @@ let # instead, we download localkube ourselves and shove it into the minikube binary. The versions URL that minikube uses is # currently https://storage.googleapis.com/minikube/k8s_releases.json - localkube-version = "1.6.0"; + localkube-version = "1.6.3"; localkube-binary = fetchurl { url = "https://storage.googleapis.com/minikube/k8sReleases/v${localkube-version}/localkube-linux-amd64"; - sha256 = "0zx0c9fwairvga1g1112l5g5pspm2m9wxb42qgfxfgyidywvirha"; + sha256 = "1fmxxjv1bxrfngc4ykfgg76b79dh8pq0k1gsbzhiy3hhrppfqylm"; }; in buildGoPackage rec { pname = "minikube"; name = "${pname}-${version}"; - version = "0.19.0"; + version = "0.20.0"; goPackagePath = "k8s.io/minikube"; @@ -30,7 +30,7 @@ in buildGoPackage rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "060zl5wx9karl0j1w3b1jnr6wkr56p3wgs75r6d5aiz36i8fkg8m"; + sha256 = "0bly2phy67x4ckcg46g6r4kqfdpjfs1cb3588a900m8b4xyavvvb"; }; # kubernetes is here only to shut up a loud warning when generating the completions below. minikube checks very eagerly diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index 1d39534bc16..ce33fca4475 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "nomad-${version}"; - version = "0.5.5"; + version = "0.5.6"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/nomad"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "nomad"; inherit rev; - sha256 = "17xq88ymm77b6y27l4v49i9hm6yjyrk61rdb2v7nvn8fa4bn6b65"; + sha256 = "1ivxsrg8s5fcyhngf8wlrqw6j7s2iggbf9xkr8jnd80cxbcpnksl"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 0173a898575..92b043cfdbd 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -48,9 +48,10 @@ in { sha256 = "0ibgpcpvz0bmn3cw60nzsabsrxrbmmym1hv7fx6zmjxiwd68w5gb"; }; - terraform_0_9_6 = generic { - version = "0.9.6"; - sha256 = "1f6z1zkklzpqgc7akgdz1g306ccmhni5lmg7i6g762n3qai60bnv"; - doCheck = true; + terraform_0_9_11 = generic { + version = "0.9.11"; + sha256 = "045zcpd4g9c52ynhgh3213p422ahds63mzhmd2iwcmj88g8i1w6x"; + # checks are failing again + doCheck = false; }; } diff --git a/pkgs/applications/networking/cluster/terragrunt/0.11.1.nix b/pkgs/applications/networking/cluster/terragrunt/0.11.1.nix index 7ed2cef0e3b..359579c3fde 100644 --- a/pkgs/applications/networking/cluster/terragrunt/0.11.1.nix +++ b/pkgs/applications/networking/cluster/terragrunt/0.11.1.nix @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "061ix4m64i8bvjpqm6hn83nnkvqrp5y0hh5gzmxiik2nz3by1rx5"; }; - goDeps = ./deps.nix; + goDeps = ./deps_0_11.nix; buildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index a343f1f951b..d7988267f2f 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "terragrunt-${version}"; - version = "0.12.16"; + version = "0.12.24"; goPackagePath = "github.com/gruntwork-io/terragrunt"; @@ -10,7 +10,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "gruntwork-io"; repo = "terragrunt"; - sha256 = "07xxk7r9wvjv3v0l95g7sy5yphypfxmlymxzi7yv3b8dznifwm0y"; + sha256 = "0rkbicvqjadb99qw65g3k7pqal5sn05png30qwy59cv4gjr9q9m4"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix index 5ea04d1f424..fc7da0a2a99 100644 --- a/pkgs/applications/networking/cluster/terragrunt/deps.nix +++ b/pkgs/applications/networking/cluster/terragrunt/deps.nix @@ -1,12 +1,12 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.0 +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 [ { goPackagePath = "github.com/aws/aws-sdk-go"; fetch = { type = "git"; url = "https://github.com/aws/aws-sdk-go"; - rev = "952498f4a390118ac65ad59cbe0c8b57ed69b6b5"; - sha256 = "03j2dn4v2wr32jd9iki68ra0r8aghy7hpad94bf8zdgsrjn6rwvj"; + rev = "ae53883b2478fd8e2bdca2748367d5b5fa27ca22"; + sha256 = "0sa5g69wpk6hbd6g52cc7l5c6zph9zyc5l9dy4288xn4hpb6c23q"; }; } { @@ -32,8 +32,8 @@ fetch = { type = "git"; url = "https://github.com/hashicorp/go-getter"; - rev = "90b6568eac830f62a08e8f1f46375daa63e57015"; - sha256 = "1cl0yqlhffjmf4qan093z49i88i7wjp9lsfwfzn52sk3c09ksism"; + rev = "2814e6fb2ca5b3bd950c97eff22553ecb3c7f77b"; + sha256 = "1pkqa5vdyc79iiw25b9vpl9f32nwv2pzh6f98l30678ypha0miqn"; }; } { @@ -86,8 +86,8 @@ fetch = { type = "git"; url = "https://github.com/mitchellh/mapstructure"; - rev = "cc8532a8e9a55ea36402aa21efdf403a60d34096"; - sha256 = "0705c0hq7b993sabnjy65yymvpy9w1j84bg9bjczh5607z16nw86"; + rev = "d0303fe809921458f417bcf828397a65db30a7e4"; + sha256 = "1fjwi5ghc1ibyx93apz31n4hj6gcq1hzismpdfbg2qxwshyg0ya8"; }; } { @@ -95,8 +95,8 @@ fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "4d4bfba8f1d1027c4fdbe371823030df51419987"; - sha256 = "1d3yz1d2s88byjzmn60jbi1m9s552f7ghzbzik97fbph37i8yjhp"; + rev = "f6abca593680b2315d2075e0f5e2a9751e3f431a"; + sha256 = "0n2vidr9zyf6k296grnc6d3rk9hd6qw7mwvnfixlxm8g5y46rzl9"; }; } { @@ -104,8 +104,8 @@ fetch = { type = "git"; url = "https://github.com/urfave/cli"; - rev = "d70f47eeca3afd795160003bc6e28b001d60c67c"; - sha256 = "1xm203qp4sdlvffcbag7v6mc2d6q61i25iiz3y9yqpy25jpcpgif"; + rev = "4b90d79a682b4bf685762c7452db20f2a676ecb2"; + sha256 = "0ls3lfmbfwirm9j95b6yrw41wgh72lfkp1cvs873zw04si4yvaqr"; }; } ] diff --git a/pkgs/applications/networking/cluster/terragrunt/deps_0_11.nix b/pkgs/applications/networking/cluster/terragrunt/deps_0_11.nix new file mode 100644 index 00000000000..5ea04d1f424 --- /dev/null +++ b/pkgs/applications/networking/cluster/terragrunt/deps_0_11.nix @@ -0,0 +1,111 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.0 +[ + { + goPackagePath = "github.com/aws/aws-sdk-go"; + fetch = { + type = "git"; + url = "https://github.com/aws/aws-sdk-go"; + rev = "952498f4a390118ac65ad59cbe0c8b57ed69b6b5"; + sha256 = "03j2dn4v2wr32jd9iki68ra0r8aghy7hpad94bf8zdgsrjn6rwvj"; + }; + } + { + goPackagePath = "github.com/bgentry/go-netrc"; + fetch = { + type = "git"; + url = "https://github.com/bgentry/go-netrc"; + rev = "9fd32a8b3d3d3f9d43c341bfe098430e07609480"; + sha256 = "0dn2h8avgavqdzdqnph8bkhj35bx0wssczry1zdczr22xv650g1l"; + }; + } + { + goPackagePath = "github.com/go-errors/errors"; + fetch = { + type = "git"; + url = "https://github.com/go-errors/errors"; + rev = "8fa88b06e5974e97fbf9899a7f86a344bfd1f105"; + sha256 = "02mvb2clbmfcqb4yclv5zhs4clkk9jxi2hiawsynl5fwmgn0d3xa"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-getter"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-getter"; + rev = "90b6568eac830f62a08e8f1f46375daa63e57015"; + sha256 = "1cl0yqlhffjmf4qan093z49i88i7wjp9lsfwfzn52sk3c09ksism"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-version"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-version"; + rev = "03c5bf6be031b6dd45afec16b1cf94fc8938bc77"; + sha256 = "0sjq57gpfznaqdrbyb2p0bn90g9h661cvr0jrk6ngags4pbw14ik"; + }; + } + { + goPackagePath = "github.com/hashicorp/hcl"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/hcl"; + rev = "392dba7d905ed5d04a5794ba89f558b27e2ba1ca"; + sha256 = "1rfm67kma2hpakabf7hxlj196jags4rpjpcirwg4kan4g9b6j0kb"; + }; + } + { + goPackagePath = "github.com/mattn/go-zglob"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-zglob"; + rev = "95345c4e1c0ebc9d16a3284177f09360f4d20fab"; + sha256 = "012hrd67v4gp3b621rykg2kp6a7iq4dr585qavragbif0z1whckx"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "b8bc1bf767474819792c23f32d8286a45736f1c6"; + sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-testing-interface"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-testing-interface"; + rev = "477c2d05a845d8b55912a5a7993b9b24abcc5ef8"; + sha256 = "0llpcyiqfjdri7pba1p13maafgcyzjbd29h99b1hgj848k5avd61"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "cc8532a8e9a55ea36402aa21efdf403a60d34096"; + sha256 = "0705c0hq7b993sabnjy65yymvpy9w1j84bg9bjczh5607z16nw86"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "4d4bfba8f1d1027c4fdbe371823030df51419987"; + sha256 = "1d3yz1d2s88byjzmn60jbi1m9s552f7ghzbzik97fbph37i8yjhp"; + }; + } + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "d70f47eeca3afd795160003bc6e28b001d60c67c"; + sha256 = "1xm203qp4sdlvffcbag7v6mc2d6q61i25iiz3y9yqpy25jpcpgif"; + }; + } +] diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix index 7b67ad235e3..376c70f3f44 100644 --- a/pkgs/applications/networking/corebird/default.nix +++ b/pkgs/applications/networking/corebird/default.nix @@ -3,14 +3,14 @@ , glib_networking }: stdenv.mkDerivation rec { - version = "1.5"; + version = "1.5.1"; name = "corebird-${version}"; src = fetchFromGitHub { owner = "baedert"; repo = "corebird"; rev = version; - sha256 = "0nll3ns1riylxg33w6myz5x8h6ai39k5fw2bkf96g5rgmi6zsjma"; + sha256 = "1qajb4xms3vsfm5sg91z9ka0nrzgfi0fjgjxqm7snhkfgxlkph7w"; }; preConfigure = '' @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 json_glib sqlite libsoup gettext vala_0_32 gnome3.rest gnome3.dconf gnome3.gspell glib_networking - ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav ]); + ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good (gst-plugins-bad.override { gtkSupport = true; }) gst-libav ]); meta = { description = "Native Gtk+ Twitter client for the Linux desktop"; diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index cda86d2e652..155c8787430 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -24,11 +24,11 @@ let # NOTE: When updating, please also update in current stable, # as older versions stop working - version = "28.4.14"; + version = "30.4.22"; sha256 = { - "x86_64-linux" = "02pfly33bg85c8y3igvkhyshra8ra089ghjibhzl1a4fmd45wf52"; - "i686-linux" = "10swkjbzkyf19cilzw7ja6byla4dllr52pbz19wjzb8rv088gcla"; + "x86_64-linux" = "0qc99j6hpd1k5bmvcll3rjglksrjw0mw2nrwj3s3kh55j6fy8a0r"; + "i686-linux" = "0zyl1q76cpwly4k7h4klnyrv50nyxi2wpz5sii1a00jbmr7snhab"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = @@ -40,7 +40,7 @@ let # relative location where the dropbox libraries are stored appdir = "opt/dropbox"; - ldpath = stdenv.lib.makeLibraryPath + libs = [ dbus_libs fontconfig freetype gcc.cc glib libdrm libffi libICE libSM libX11 libXcomposite libXext libXmu libXrender libxcb libxml2 libxslt @@ -48,6 +48,7 @@ let qtbase qtdeclarative qtwebkit ]; + ldpath = stdenv.lib.makeLibraryPath libs; desktopItem = makeDesktopItem { name = "dropbox"; @@ -70,9 +71,12 @@ in mkDerivation { sourceRoot = ".dropbox-dist"; nativeBuildInputs = [ makeWrapper patchelf ]; + buildInputs = libs; dontStrip = true; # already done installPhase = '' + runHook preInstall + mkdir -p "$out/${appdir}" cp -r --no-preserve=mode "dropbox-lnx.${arch}-${version}"/* "$out/${appdir}/" @@ -102,9 +106,11 @@ in mkDerivation { rm $out/${appdir}/wmctrl ln -s ${wmctrl}/bin/wmctrl $out/${appdir}/wmctrl + + runHook postInstall ''; - fixupPhase = '' + preFixup = '' INTERP=$(cat $NIX_CC/nix-support/dynamic-linker) RPATH="${ldpath}:$out/${appdir}" getType='s/ *Type: *\([A-Z]*\) (.*/\1/' diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix index 5645e1cebaa..14a0a54feda 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix @@ -3,13 +3,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "bitlbee-facebook-${version}"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "jgeboski"; repo = "bitlbee-facebook"; - sha256 = "0qclyc2zz8144dc42bhfv2xxrahpiv9j2iwq9h3cmfxszvkb8r3s"; + sha256 = "08ibjqqcrmq1a5nmj8z93rjrdabi0yy2a70p31xalnfrh200m24c"; }; nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index 5ee93bd4df5..abb0a117297 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -1,4 +1,5 @@ -{ fetchurl, fetchpatch, stdenv, gnutls, glib, pkgconfig, check, libotr, python }: +{ fetchurl, fetchpatch, stdenv, gnutls, glib, pkgconfig, check, libotr, python, +enableLibPurple ? false, pidgin ? null }: with stdenv.lib; stdenv.mkDerivation rec { @@ -11,20 +12,25 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ] ++ optional doCheck check; - buildInputs = [ gnutls glib libotr python ]; + buildInputs = [ gnutls glib libotr python ] + ++ optional enableLibPurple pidgin; + + preConfigure = optionalString enableLibPurple + "export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${pidgin}/lib/pkgconfig"; configureFlags = [ "--gcov=1" "--otr=1" "--ssl=gnutls" "--pidfile=/var/lib/bitlbee/bitlbee.pid" - ]; + ] + ++ optional enableLibPurple "--purple=1"; - buildPhase = '' + buildPhase = optionalString (!enableLibPurple) '' make install-dev ''; - doCheck = true; + doCheck = !enableLibPurple; # Checks fail with libpurple for some reason meta = { description = "IRC instant messaging gateway"; diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 611146080bd..eff9b71daa6 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -13,13 +13,13 @@ }: stdenv.mkDerivation rec { - name = "dino-unstable-2017-06-13"; + name = "dino-unstable-2017-06-21"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; - rev = "7bbbb738fdb233f4ad91ffdd7d9247b28849d715"; - sha256 = "09w26c6b5rkrrz7wvm629cncpdmd5n0d0805h8hw69bbzirpjjh2"; + rev = "3f0089db86e2057293a33453361678989919147f"; + sha256 = "011wd6qi8nagig8418hibgnsmznd76dvp3p2dzzr4wyrb7d6cgcb"; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index d5ef754e173..a238009cd11 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -8,6 +8,17 @@ let version = "4.0.4"; + runtimeDeps = [ + udev libnotify + ]; + deps = (with xorg; [ + libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes + libXrender libX11 libXtst libXScrnSaver + ]) ++ [ + gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus + gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc + ] ++ runtimeDeps; + desktopItem = makeDesktopItem rec { name = "Franz"; exec = name; @@ -28,17 +39,6 @@ in stdenv.mkDerivation rec { # don't remove runtime deps dontPatchELF = true; - deps = (with xorg; [ - libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes - libXrender libX11 libXtst libXScrnSaver - ]) ++ [ - gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus - gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc - # runtime deps - ] ++ [ - udev libnotify - ]; - unpackPhase = '' tar xzf $src ''; @@ -65,7 +65,7 @@ in stdenv.mkDerivation rec { description = "A free messaging app that combines chat & messaging services into one application"; homepage = http://meetfranz.com; license = licenses.free; - maintainers = [ stdenv.lib.maintainers.gnidorah ]; + maintainers = [ maintainers.gnidorah ]; platforms = ["i686-linux" "x86_64-linux"]; hydraPlatforms = []; }; diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix index a9cb3f09bce..bc6e7a5f7de 100644 --- a/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -3,14 +3,14 @@ assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.02.2"; stdenv.mkDerivation rec { - version = "2017-05-21"; + version = "2017-05-24"; name = "jackline-${version}"; src = fetchFromGitHub { owner = "hannesm"; repo = "jackline"; - rev = "0a1e4ea23245633fe23edf09b2309659a1bc3649"; - sha256 = "1wnmwsp3a5nh3qs4h9grrdsvv0i3p419cfmhrrql3lj2x3ngdw82"; + rev = "49a326d5696aa24f3ac18534c8860e03d0d58548"; + sha256 = "0p741mzq4kkqyly8njga1f5dxdnfz31wy2lpvs5542pq0iwvdj7k"; }; buildInputs = with ocamlPackages; [ diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix index 2bb0d957942..dcffa2f14f4 100644 --- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "mcabber-${version}"; - version = "1.0.5"; + version = "1.1.0"; src = fetchurl { url = "http://mcabber.com/files/mcabber-${version}.tar.bz2"; - sha256 = "0ixdzk5b3s31a4bdfqgqrsiq7vbgdzhqr49p9pz9cq9bgn0h1wm0"; + sha256 = "1ggh865p1rf10ffsnf4g6qv9i8bls36dxdb1nzs5r9vdqci2rz04"; }; buildInputs = [ openssl ncurses pkgconfig glib loudmouth libotr gpgme ]; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix index 6693550bd3b..a0b7cfa45f2 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pidgin, intltool, libxml2, nss, nspr }: -let version = "1.22.0"; in +let version = "1.22.1"; in stdenv.mkDerivation { name = "pidgin-sipe-${version}"; src = fetchurl { url = "mirror://sourceforge/sipe/pidgin-sipe-${version}.tar.gz"; - sha256 = "1aeb348e2ba79b82b1fd102555f86cdc42eaa6f9e761b771d74c4f9c9cf15fc3"; + sha256 = "f6b7b7475e349c0214eb02814b808b04850113a91dd8e8d2c26e7179a3fd1ae8"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index 2c6cf473f1c..c8c13a242ff 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -1,29 +1,28 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig, openal, opencv, - libtoxcore, libsodium, libXScrnSaver, glib, gdk_pixbuf, gtk2, cairo, xorg, - pango, atk, qrencode, ffmpeg, filter-audio, - qtbase, qtsvg, qttools, qttranslations, sqlcipher, - libvpx, libopus }: +{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig, + libtoxcore, + libpthreadstubs, libXdmcp, libXScrnSaver, + qtbase, qtsvg, qttools, qttranslations, + atk, cairo, ffmpeg, filter-audio, gdk_pixbuf, glib, gtk2, libsodium, libopus, + libvpx, openal, opencv, pango, pcre, qrencode, sqlcipher }: mkDerivation rec { name = "qtox-${version}"; - version = "1.10.2"; + version = "1.11.0"; src = fetchFromGitHub { owner = "tux3"; repo = "qTox"; rev = "v${version}"; - sha256 = "0c2633rc9l73q9qs9hybn11hmlqbwsvih3sf6jk1jp4151k5wp1y"; + sha256 = "0h8v359h1xn2xm6xa9q56mjiw58ap1bpiwx1dxxmphjildxadwck"; }; buildInputs = [ - libtoxcore openal opencv libsodium filter-audio - qtbase qttools qtsvg libXScrnSaver glib gtk2 cairo - pango atk qrencode ffmpeg qttranslations - sqlcipher - libopus libvpx - ] ++ (with xorg; [ - libpthreadstubs libXdmcp - ]); + libtoxcore + libpthreadstubs libXdmcp libXScrnSaver + qtbase qtsvg qttools qttranslations + atk cairo ffmpeg filter-audio gdk_pixbuf glib gtk2 libopus libsodium + libvpx openal opencv pango pcre qrencode sqlcipher + ]; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix index 03fc0d85292..a2510c77738 100644 --- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -2,7 +2,7 @@ mkDerivation rec { name = "quaternion-git-${version}"; - version = "2017-04-15"; + version = "2017-06-29"; # quaternion and tensor share the same libqmatrixclient library as a git submodule # @@ -12,9 +12,9 @@ mkDerivation rec { # derivation. src = fetchgit { - url = "https://github.com/Fxrh/Quaternion.git"; - rev = "c35475a6755cdb75e2a6c8ca5b943685d07d9707"; - sha256 = "0cm5j4vdnp5cljfnv5jqf89ccymspaqc6j9bb4c1x891vr42np0m"; + url = "https://github.com/QMatrixClient/Quaternion.git"; + rev = "1febc0178fd3d02b7426f58981b54924ad60c84d"; + sha256 = "1whjhlphdhk7kgw2zqc0wj3k2i9gkp79qq2bnrh4mbcp3qmcqngr"; fetchSubmodules = true; }; @@ -28,14 +28,12 @@ mkDerivation rec { postInstall = '' substituteInPlace $out/share/applications/quaternion.desktop \ --replace 'Exec=quaternion' "Exec=$out/bin/quaternion" - - rm $out/share/icons/hicolor/icon-theme.cache ''; meta = with lib; { - homepage = https://matrix.org/docs/projects/client/quaternion.html; description = "Cross-platform desktop IM client for the Matrix protocol"; - license = licenses.gpl3; + homepage = https://matrix.org/docs/projects/client/quaternion.html; + license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; inherit (qtbase.meta) platforms; inherit version; diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index 8f650e889f6..7cb89f019e0 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -6,7 +6,18 @@ let bits = if stdenv.system == "x86_64-linux" then "x64" else "ia32"; - version = "0.5.9"; + version = "0.5.10"; + + runtimeDeps = [ + udev libnotify + ]; + deps = (with xorg; [ + libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes + libXrender libX11 libXtst libXScrnSaver libxcb + ]) ++ [ + gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus + gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc + ] ++ runtimeDeps; myIcon = fetchurl { url = "https://raw.githubusercontent.com/saenzramiro/rambox/9e4444e6297dd35743b79fe23f8d451a104028d5/resources/Icon.png"; @@ -25,24 +36,13 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/saenzramiro/rambox/releases/download/${version}/Rambox-${version}-${bits}.tar.gz"; sha256 = if bits == "x64" then - "0wx1cj3h1h28lhvl8ysmvr2wxq39lklk37361i598vph2pvnibi0" else - "1dqjd5rmml63h3y43n1r68il3pn8zwy0wwr0866cnpizsbis96fy"; + "1i5jbhsfdbhr0rsb5w2pfpwjiagz47ppxk65qny3ay3lr4lbccn3" else + "1p1m6vsa9xvl3pjf3pygvllyk7j4q9vnlzmrizb8f5q30fpls25x"; }; # don't remove runtime deps dontPatchELF = true; - deps = (with xorg; [ - libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes - libXrender libX11 libXtst libXScrnSaver libxcb - ]) ++ [ - gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus - gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc - # runtime deps - ] ++ [ - udev libnotify - ]; - installPhase = '' patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" rambox patchelf --set-rpath "$out/opt/rambox:${stdenv.lib.makeLibraryPath deps}" rambox diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix new file mode 100644 index 00000000000..0632e787c70 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix @@ -0,0 +1,149 @@ +{ stdenv +, fetchgit +, which +, autoreconfHook +, pkgconfig +, automake +, libtool +, pjsip +, libyamlcpp +, alsaLib +, libpulseaudio +, libsamplerate +, libsndfile +, dbus +, dbus_cplusplus +, ffmpeg +, udev +, pcre +, gsm +, speex +, boost +, opendht +, libmsgpack +, gnutls +, zlib +, jsoncpp +, xlibs +, libargon2 +, cryptopp +, openssl +, perl +, python3 +, bash +, libupnp +, speexdsp +, fetchFromGitHub +, cmake +, asio +}: + +let + myPython = python3.withPackages (ps: with ps; [ + pygobject3 + dbus-python + ]); + + src = fetchgit { + url = https://gitlab.savoirfairelinux.com/ring/ring-daemon.git; + rev = "006b8dc7be08fe9beb68709af71004e7bc1ceb5c"; + sha256 = "0ih9g0rismrhx6nqcy3jqfbcs166grg0shnfmrnmykl9h0xy8z47"; + }; + + patchdir = "${src}/contrib/src"; + + restbed = import ./restbed.nix { + inherit stdenv fetchFromGitHub cmake asio openssl; + patches = [ + "${patchdir}/restbed/CMakeLists.patch" + "${patchdir}/restbed/strand.patch" + "${patchdir}/restbed/uri_cpp.patch" + "${patchdir}/restbed/dns-resolution-error.patch" + "${patchdir}/restbed/string.patch" + ]; + }; + + pjsip' = stdenv.lib.overrideDerivation pjsip (old: { + patches = [ + "${patchdir}/pjproject/gnutls.patch" + ./notestsapps.patch # this one had to be modified + "${patchdir}/pjproject/fix_base64.patch" + "${patchdir}/pjproject/ipv6.patch" + "${patchdir}/pjproject/ice_config.patch" + "${patchdir}/pjproject/multiple_listeners.patch" + "${patchdir}/pjproject/pj_ice_sess.patch" + "${patchdir}/pjproject/fix_turn_fallback.patch" + "${patchdir}/pjproject/fix_ioqueue_ipv6_sendto.patch" + "${patchdir}/pjproject/add_dtls_transport.patch" + ]; + CFLAGS = "-g -DPJ_ICE_MAX_CAND=256 -DPJ_ICE_MAX_CHECKS=150 -DPJ_ICE_COMP_BITS=2 -DPJ_ICE_MAX_STUN=3 -DPJSIP_MAX_PKT_LEN=8000"; + }); +in +stdenv.mkDerivation rec { + name = "ring-daemon-${version}"; + version = "2017-07-11"; + + inherit src; + + nativeBuildInputs = [ + which + autoreconfHook + automake + libtool + pkgconfig + ]; + + buildInputs = [ + pjsip' + libyamlcpp + alsaLib + libpulseaudio + libsamplerate + libsndfile + dbus + dbus_cplusplus + ffmpeg + udev + pcre + gsm + speex + boost + opendht + libmsgpack + gnutls + zlib + jsoncpp + restbed + xlibs.libX11 + libargon2 + cryptopp + openssl + perl + libupnp + speexdsp + ]; + + postInstall = '' + mkdir $out/bin + ln -s $out/lib/ring/dring $out/bin/dring + cp -R ./tools/dringctrl/ $out/ + substitute ./tools/dringctrl/dringctrl.py $out/dringctrl/dringctrl.py \ + --replace '#!/usr/bin/env python3' "#!${myPython}/bin/python3" + chmod +x $out/dringctrl/dringctrl.py + ln -s $out/dringctrl/dringctrl.py $out/bin/dringctrl.py + ''; + + meta = with stdenv.lib; { + description = "A Voice-over-IP software phone"; + longDescription = '' + As the SIP/audio daemon and the user interface are separate processes, it + is easy to provide different user interfaces. GNU Ring comes with various + graphical user interfaces and even scripts to control the daemon from the + shell. + ''; + homepage = https://ring.cx; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ taeer olynch ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/notestsapps.patch b/pkgs/applications/networking/instant-messengers/ring-daemon/notestsapps.patch new file mode 100644 index 00000000000..842060935b0 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/ring-daemon/notestsapps.patch @@ -0,0 +1,106 @@ +/* diff --git a/Makefile b/Makefile */ +/* index 33a4e6b..a486eb7 100644 */ +/* --- a/Makefile */ +/* +++ b/Makefile */ +/* @@ -4,7 +4,7 @@ include build/host-$(HOST_NAME).mak */ +/* include version.mak */ + +/* LIB_DIRS = pjlib/build pjlib-util/build pjnath/build third_party/build pjmedia/build pjsip/build */ +/* -DIRS = $(LIB_DIRS) pjsip-apps/build $(EXTRA_DIRS) */ +/* +DIRS = $(LIB_DIRS) $(EXTRA_DIRS) */ + +/* ifdef MINSIZE */ +/* MAKE_FLAGS := MINSIZE=1 */ +diff --git a/pjlib-util/build/Makefile b/pjlib-util/build/Makefile +index cb601cb..862a78a 100644 +--- a/pjlib-util/build/Makefile ++++ b/pjlib-util/build/Makefile +@@ -54,7 +54,6 @@ export UTIL_TEST_OBJS += xml.o encryption.o stun.o resolver_test.o test.o \ + export UTIL_TEST_CFLAGS += $(_CFLAGS) + export UTIL_TEST_CXXFLAGS += $(_CXXFLAGS) + export UTIL_TEST_LDFLAGS += $(PJLIB_UTIL_LDLIB) $(PJLIB_LDLIB) $(_LDFLAGS) +-export UTIL_TEST_EXE:=pjlib-util-test-$(TARGET_NAME)$(HOST_EXE) + + + export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT +diff --git a/pjlib/build/Makefile b/pjlib/build/Makefile +index 1e64950..a75fa65 100644 +--- a/pjlib/build/Makefile ++++ b/pjlib/build/Makefile +@@ -56,7 +56,6 @@ export TEST_OBJS += activesock.o atomic.o echo_clt.o errno.o exception.o \ + export TEST_CFLAGS += $(_CFLAGS) + export TEST_CXXFLAGS += $(_CXXFLAGS) + export TEST_LDFLAGS += $(PJLIB_LDLIB) $(_LDFLAGS) +-export TEST_EXE := pjlib-test-$(TARGET_NAME)$(HOST_EXE) + + + export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT +diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile +index 8012cb7..2ca283a 100644 +--- a/pjmedia/build/Makefile ++++ b/pjmedia/build/Makefile +@@ -165,7 +165,6 @@ export PJMEDIA_TEST_LDFLAGS += $(PJMEDIA_CODEC_LDLIB) \ + $(PJLIB_UTIL_LDLIB) \ + $(PJNATH_LDLIB) \ + $(_LDFLAGS) +-export PJMEDIA_TEST_EXE:=pjmedia-test-$(TARGET_NAME)$(HOST_EXE) + + + export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT +diff --git a/pjnath/build/Makefile b/pjnath/build/Makefile +index 1bc08b5..109f79b 100644 +--- a/pjnath/build/Makefile ++++ b/pjnath/build/Makefile +@@ -54,7 +54,6 @@ export PJNATH_TEST_OBJS += ice_test.o stun.o sess_auth.o server.o concur_test.o + export PJNATH_TEST_CFLAGS += $(_CFLAGS) + export PJNATH_TEST_CXXFLAGS += $(_CXXFLAGS) + export PJNATH_TEST_LDFLAGS += $(PJNATH_LDLIB) $(PJLIB_UTIL_LDLIB) $(PJLIB_LDLIB) $(_LDFLAGS) +-export PJNATH_TEST_EXE:=pjnath-test-$(TARGET_NAME)$(HOST_EXE) + + + ############################################################################### +@@ -65,7 +64,6 @@ export PJTURN_CLIENT_OBJS += client_main.o + export PJTURN_CLIENT_CFLAGS += $(_CFLAGS) + export PJTURN_CLIENT_CXXFLAGS += $(_CXXFLAGS) + export PJTURN_CLIENT_LDFLAGS += $(PJNATH_LDLIB) $(PJLIB_UTIL_LDLIB) $(PJLIB_LDLIB) $(_LDFLAGS) +-export PJTURN_CLIENT_EXE:=pjturn-client-$(TARGET_NAME)$(HOST_EXE) + + ############################################################################### + # Defines for building TURN server application +@@ -76,7 +74,6 @@ export PJTURN_SRV_OBJS += allocation.o auth.o listener_udp.o \ + export PJTURN_SRV_CFLAGS += $(_CFLAGS) + export PJTURN_SRV_CXXFLAGS += $(_CXXFLAGS) + export PJTURN_SRV_LDFLAGS += $(PJNATH_LDLIB) $(PJLIB_UTIL_LDLIB) $(PJLIB_LDLIB) $(_LDFLAGS) +-export PJTURN_SRV_EXE:=pjturn-srv-$(TARGET_NAME)$(HOST_EXE) + + + +diff --git a/pjsip/build/Makefile b/pjsip/build/Makefile +index d2a5c2a..7e2ec60 100644 +--- a/pjsip/build/Makefile ++++ b/pjsip/build/Makefile +@@ -140,7 +140,7 @@ export PJSUA2_LIB_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ + account.o endpoint.o json.o persistent.o types.o \ + siptypes.o call.o presence.o media.o + export PJSUA2_LIB_CFLAGS += $(_CFLAGS) $(PJ_VIDEO_CFLAGS) +-export PJSUA2_LIB_CXXFLAGS = $(PJSUA2_LIB_CFLAGS) ++export PJSUA2_LIB_CXXFLAGS = $(_CXXFLAGS) $(PJ_VIDEO_CFLAGS) + export PJSUA2_LIB_LDFLAGS += $(PJSUA_LIB_LDLIB) \ + $(PJSIP_UA_LDLIB) \ + $(PJSIP_SIMPLE_LDLIB) \ +@@ -165,7 +165,6 @@ export PJSUA2_TEST_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ + export PJSUA2_TEST_CFLAGS += $(_CFLAGS) $(PJ_VIDEO_CFLAGS) + export PJSUA2_TEST_CXXFLAGS = $(PJSUA2_LIB_CFLAGS) + export PJSUA2_TEST_LDFLAGS += $(PJ_LDXXFLAGS) $(PJ_LDXXLIBS) $(LDFLAGS) +-export PJSUA2_TEST_EXE := pjsua2-test-$(TARGET_NAME)$(HOST_EXE) + + export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT + +@@ -195,7 +194,6 @@ export TEST_LDFLAGS += $(PJSIP_LDLIB) \ + $(PJLIB_UTIL_LDLIB) \ + $(PJNATH_LDLIB) \ + $(_LDFLAGS) +-export TEST_EXE := pjsip-test-$(TARGET_NAME)$(HOST_EXE) + + + export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix new file mode 100644 index 00000000000..0546d2dae47 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix @@ -0,0 +1,41 @@ +{ stdenv +, fetchFromGitHub +, cmake +, asio +, openssl +, patches +}: + +stdenv.mkDerivation rec { + name = "restbed-${version}"; + version = "2016-09-15"; + + src = fetchFromGitHub { + owner = "Corvusoft"; + repo = "restbed"; + rev = "34187502642144ab9f749ab40f5cdbd8cb17a54a"; + sha256 = "1jb38331fcicyiisqdprhq6zwfc6g518fm3l4qw9aiv5k9nqim22"; + }; + + inherit patches; + + buildInputs = [ + cmake + asio + openssl + ]; + + meta = with stdenv.lib; { + description = "HTTP framework for building networked applications"; + longDescription = '' + HTTP framework for building networked applications that require seamless + and secure communication, with the flexability to model a range of + business processes. Targeting mobile, tablet, desktop, and embedded + production environments. + ''; + homepage = https://corvusoft.co.uk/; + license = licenses.agpl3; + maintainers = with maintainers; [ taeer ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 0af0c0b1d1b..446156fbe4c 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,33 +1,35 @@ { mkDerivation, lib, fetchFromGitHub, fetchgit, pkgconfig, gyp, cmake , qtbase, qtimageformats , breakpad, gtk3, libappindicator-gtk3, dee -, ffmpeg, openalSoft, minizip +, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio +, gcc }: mkDerivation rec { name = "telegram-desktop-${version}"; - version = "1.0.27"; + version = "1.1.7"; # Submodules src = fetchgit { url = "https://github.com/telegramdesktop/tdesktop"; rev = "refs/tags/v${version}"; - sha256 = "05g88g6h2a7f9biliicg81fqssx0y3akd3y5r2q2b5h8q3igqrfc"; + sha256 = "0y0nc8d4vlhsmzayy26zdxc5jaiwcv0rb2s1v5fwnnx71gf89m2w"; }; tgaur = fetchgit { url = "https://aur.archlinux.org/telegram-desktop-systemqt.git"; - rev = "b4d169076ed12ec01941a95499774d5caa6fc00e"; - sha256 = "0pmm6slabg9xazgs0ffnp8v0hx3vnpdfgymvapwqpm3h9mwk22x9"; + rev = "83af81905de7fc5dc9fbea8f5318d56fa8a6efc6"; + sha256 = "0v7g7y5cmxzp2yrcj6ylwzxlzr9yrqs2badzplm7sg012nc69yf9"; }; buildInputs = [ gtk3 libappindicator-gtk3 dee qtbase qtimageformats ffmpeg openalSoft minizip + libopus alsaLib libpulseaudio ]; - nativeBuildInputs = [ pkgconfig gyp cmake ]; + nativeBuildInputs = [ pkgconfig gyp cmake gcc ]; - patches = [ "${tgaur}/aur-build-fixes.patch" ]; + patches = [ "${tgaur}/tdesktop.patch" ]; enableParallelBuilding = true; @@ -48,10 +50,18 @@ mkDerivation rec { "-I${qtbase.dev}/include/${x}" "-I${qtbase.dev}/include/${x}/${qtbase.version}" "-I${qtbase.dev}/include/${x}/${qtbase.version}/${x}" + "-I${libopus.dev}/include/opus" + "-I${alsaLib.dev}/include/alsa" + "-I${libpulseaudio.dev}/include/pulse" ]) [ "QtCore" "QtGui" ]; CPPFLAGS = NIX_CFLAGS_COMPILE; preConfigure = '' + + pushd "Telegram/ThirdParty/libtgvoip" + patch -Np1 -i "${tgaur}/libtgvoip.patch" + popd + sed -i Telegram/gyp/telegram_linux.gypi \ -e 's,/usr,/does-not-exist,g' \ -e 's,appindicator-0.1,appindicator3-0.1,g' \ @@ -63,6 +73,7 @@ mkDerivation rec { -e "s,/usr/bin/rcc,rcc,g" gyp \ + -Dbuild_defines=${GYP_DEFINES} \ -Gconfig=Release \ --depth=Telegram/gyp \ --generator-output=../.. \ diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 45fb10da391..d77cf347e5a 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -29,7 +29,6 @@ in stdenv.mkDerivation { libpulseaudio libxml2 libxslt - mesa nspr nss sqlite diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/applications/networking/insync/default.nix index 5690705d1f2..93efdb74c08 100644 --- a/pkgs/applications/networking/insync/default.nix +++ b/pkgs/applications/networking/insync/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "insync-${version}"; - version = "1.3.16.36155"; + version = "1.3.17.36167"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "http://s.insynchq.com/builds/insync-portable_${version}_amd64.tar.bz2"; - sha256 = "1gf1qg7mkbcgqhwxkiljmd1w2zvarq6vhxhips3w06bqdyg12210"; + sha256 = "0mvg22psiy4x9g7k1fm9pigz2a70jmin7zg2nfzapfnqjlnrbw3n"; } else throw "${name} is not supported on ${stdenv.system}"; diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index 84a2106f2a2..ba0f557d0ff 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "ipfs-${version}"; - version = "0.4.9"; - rev = "7ea34c6c6ed18e886f869a1fbe725a848d13695c"; + version = "0.4.10"; + rev = "4679f806bd00c0a5299c22c82d1fbfdbad928e6d"; goPackagePath = "github.com/ipfs/go-ipfs"; extraSrcPaths = [ (fetchgx { inherit name src; - sha256 = "1xgk9gdnlcxkrpj98h2mrnlpr9b8084k4q926i4pbmxipwxkwl4b"; + sha256 = "1khlsahv9vqx3h2smif5wdyb56jrza415hqid7883pqimfi66g3x"; }) ]; @@ -18,7 +18,7 @@ buildGoPackage rec { owner = "ipfs"; repo = "go-ipfs"; inherit rev; - sha256 = "1n2m2yah54cx4i9nlcsmljrwqi3wqxih517y8jpyjij6wraa334j"; + sha256 = "1j3az0nhjisb5dxp1a4g8w17y17xjikvcsy4qrg0fm43ybpkhhvw"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index 60a04f05991..a2ad7e4d7b2 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintlOrEmpty }: stdenv.mkDerivation rec { - version = "1.0.3"; + version = "1.0.4"; name = "irssi-${version}"; src = fetchurl { url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz"; - sha256 = "08nfm1pcf2b9npnp83175yi2vcwnhjdiwsq8whz7iky33hlhvijk"; + sha256 = "1a7f9g3hlccqlf9xj1csbxw4wgl6jfywg2xvkir6ww5viagkbzs8"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix index 4cfde1f9b07..5b86e79e99a 100644 --- a/pkgs/applications/networking/irc/konversation/default.nix +++ b/pkgs/applications/networking/irc/konversation/default.nix @@ -8,6 +8,7 @@ , kconfig , kconfigwidgets , kcoreaddons +, kcrash , kdbusaddons , kemoticons , kglobalaccel @@ -17,6 +18,7 @@ , kitemviews , knotifications , knotifyconfig +, kwindowsystem , kio , kparts , kwallet @@ -27,13 +29,13 @@ let pname = "konversation"; - version = "1.6.2"; + version = "1.7.2"; in mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "1798sslwz7a3h1v524ra33p0j5iqvcg0v1insyvb5qp4kv11slmn"; + sha256 = "0616h59bsw5c3y8lij56v3fhv9by0rwdfcaa83yfxqg4rs26xyaz"; }; buildInputs = [ @@ -42,6 +44,7 @@ in mkDerivation rec { kconfig kconfigwidgets kcoreaddons + kcrash kdbusaddons kdoctools kemoticons @@ -52,6 +55,7 @@ in mkDerivation rec { kitemviews knotifications knotifyconfig + kwindowsystem kio kparts kwallet diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 17816e6a735..94ffda9fede 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -21,12 +21,12 @@ let in stdenv.mkDerivation rec { - version = "1.8"; + version = "1.9"; name = "weechat-${version}"; src = fetchurl { url = "http://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "10km0437lg9ms6f16h20s89l2w9f9g597rykybxb16s95ql48z08"; + sha256 = "0xfnhaxmvxdxs3ic0qs5lwq3yl4pi5ib99p0p5lv3v2vldqlm4lc"; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index 2f2ce79bcb1..a7a66cf550b 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, scons, pkgconfig, gnome3, gmime, webkitgtk24x +{ stdenv, fetchFromGitHub, scons, pkgconfig, gnome3, gmime, webkitgtk24x-gtk3 , libsass, notmuch, boost, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ]; - buildInputs = [ gnome3.gtkmm gmime webkitgtk24x libsass gnome3.libpeas + buildInputs = [ gnome3.gtkmm gmime webkitgtk24x-gtk3 libsass gnome3.libpeas notmuch boost gnome3.gsettings_desktop_schemas gnome3.adwaita-icon-theme ]; diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index af1829b8622..8d80da2cdfb 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, wrapGAppsHook , curl, dbus, dbus_glib, enchant, gtk2, gnutls, gnupg, gpgme, hicolor_icon_theme , libarchive, libcanberra_gtk2, libetpan, libnotify, libsoup, libxml2, networkmanager -, openldap , perl, pkgconfig, poppler, python, shared_mime_info, webkitgtk2 +, openldap , perl, pkgconfig, poppler, python, shared_mime_info, webkitgtk24x-gtk2 , glib_networking, gsettings_desktop_schemas, libSM, libytnef # Build options @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ++ optional enableNetworkManager networkmanager ++ optional enableLdap openldap ++ optional enablePluginPdf poppler - ++ optional enablePluginFancy webkitgtk2; + ++ optional enablePluginFancy webkitgtk24x-gtk2; configureFlags = optional (!enableLdap) "--disable-ldap" diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index d9ec66a53e7..7de359bae5a 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchFromGitHub, which, autoreconfHook, ncurses, perl -, cyrus_sasl, gdbm, gpgme, kerberos, libidn, notmuch, openssl, lmdb, libxslt, docbook_xsl }: +, cyrus_sasl, gss, gpgme, kerberos, libidn, notmuch, openssl, lmdb, libxslt, docbook_xsl }: stdenv.mkDerivation rec { - version = "20170602"; + version = "20170714"; name = "neomutt-${version}"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = "neomutt-${version}"; - sha256 = "0rpvxmv10ypl7la4nmp0s02ixmm9g5pn9g9ms8ygzsix9pa86w45"; + sha256 = "0jbh83hvq1jwb8ps7ffl2325y6i79wdnwcn6db0r5prmxax18hw1"; }; nativeBuildInputs = [ autoreconfHook docbook_xsl libxslt.bin which ]; buildInputs = [ - cyrus_sasl gdbm gpgme kerberos libidn ncurses + cyrus_sasl gss gpgme kerberos libidn ncurses notmuch openssl perl lmdb ]; @@ -28,23 +28,13 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-debug" "--enable-gpgme" - "--enable-hcache" - "--enable-imap" "--enable-notmuch" - "--enable-pgp" - "--enable-pop" - "--enable-sidebar" - "--enable-keywords" - "--enable-smtp" - "--enable-nntp" - "--enable-compressed" "--with-homespool=mailbox" "--with-gss" "--with-mailpath=" "--with-ssl" "--with-sasl" "--with-curses" - "--with-regex" "--with-idn" "--with-lmdb" @@ -61,6 +51,6 @@ stdenv.mkDerivation rec { homepage = http://www.neomutt.org; license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ cstrahan vrthra erikryb ]; + maintainers = with maintainers; [ cstrahan erikryb jfrankenau vrthra ]; }; } diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 7c48075704e..c53383b954e 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -10,7 +10,7 @@ }: stdenv.mkDerivation rec { - version = "0.23.5"; + version = "0.24.2"; name = "notmuch-${version}"; passthru = { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "0ry2k9sdwd1vw8cf6svch8wk98523s07mwxvsf7b8kghqnrr89n6"; + sha256 = "0lfchvapk11qazdgsxj42igp9mpp83zbd0h1jj6r3ifmhikajxma"; }; buildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix new file mode 100644 index 00000000000..4c768325fee --- /dev/null +++ b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix @@ -0,0 +1,136 @@ +{ dpkg, fetchurl, lib, pkgs, stdenv, config +, alsaLib +, atk +, cairo +, coreutils +, cups +, dbus +, desktop_file_utils +, expat +, fontconfig +, freetype +, gcc-unwrapped +, gdk_pixbuf +, glib +, gnome2 +, libgcrypt +, libgnome_keyring +, libnotify +, makeWrapper +, nodejs +, nspr +, nss +, pango +, python2 +, udev +, wget +, xorg +}: + +stdenv.mkDerivation rec { + name = "${pkgname}-${version}"; + pkgname = "nylas-mail-bin"; + version = "2.0.32"; + subVersion = "fec7941"; + + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = "https://edgehill.s3-us-west-2.amazonaws.com/${version}-${subVersion}/linux-deb/x64/NylasMail.deb"; + sha256 = "40060aa1dc3b5187b8ed4a07b9de3427e3c5a291df98c2c82395647fa2aa4ada"; + } + else + throw "NylasMail is not supported on ${stdenv.system}"; + + propagatedBuildInputs = [ + alsaLib + atk + cairo + coreutils + cups + dbus + desktop_file_utils + expat + fontconfig + freetype + gcc-unwrapped + gdk_pixbuf + glib + gnome2.GConf + gnome2.gtk + libgnome_keyring + libnotify + nodejs + nspr + nss + pango + python2 + udev + wget + xorg.libX11 + xorg.libXScrnSaver + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXtst + xorg.libxkbfile + ]; + + + buildInputs = [ gnome2.gnome_keyring ]; + + nativeBuildInputs = [ makeWrapper ]; + + buildCommand = '' + mkdir -p $out + + ${dpkg}/bin/dpkg-deb -x $src unpacked + mv unpacked/usr/* $out/ + + # Fix path in desktop file + substituteInPlace $out/share/applications/nylas-mail.desktop \ + --replace /usr/bin/nylas-mail $out/bin/nylas-mail + + # Patch librariess + noderp=$(patchelf --print-rpath $out/share/nylas-mail/libnode.so) + patchelf --set-rpath $noderp:$out/lib:${stdenv.cc.cc.lib}/lib:${xorg.libxkbfile.out}/lib:${lib.makeLibraryPath propagatedBuildInputs } \ + $out/share/nylas-mail/libnode.so + + ffrp=$(patchelf --print-rpath $out/share/nylas-mail/libffmpeg.so) + patchelf --set-rpath $ffrp:$out/lib:${stdenv.cc.cc.lib}/lib:${lib.makeLibraryPath propagatedBuildInputs } \ + $out/share/nylas-mail/libffmpeg.so + + # Patch binaries + binrp=$(patchelf --print-rpath $out/share/nylas-mail/nylas) + patchelf --interpreter $(cat "$NIX_CC"/nix-support/dynamic-linker) \ + --set-rpath $binrp:$out/lib:${stdenv.cc.cc.lib}/lib:${lib.makeLibraryPath propagatedBuildInputs } \ + $out/share/nylas-mail/nylas + + wrapProgram $out/share/nylas-mail/nylas --set LD_LIBRARY_PATH "${xorg.libxkbfile}/lib:${pkgs.gnome3.libgnome_keyring}/lib"; + + # Fix path to bash so apm can install plugins. + substituteInPlace $out/share/nylas-mail/resources/apm/bin/apm \ + --replace /bin/bash ${stdenv.shell} + + wrapProgram $out/share/nylas-mail/resources/apm/bin/apm \ + --set PATH "${coreutils}/bin" + patchelf --interpreter $(cat "$NIX_CC"/nix-support/dynamic-linker) \ + --set-rpath ${gcc-unwrapped.lib}/lib $out/share/nylas-mail/resources/apm/bin/node + ''; + + meta = with stdenv.lib; { + description = "Open-source mail client built on the modern web with Electron, React, and Flux"; + longDescription = '' + Nylas Mail is an open-source mail client built on the modern web with Electron, React, and Flux. It is designed to be extensible, so it's easy to create new experiences and workflows around email. Nylas Mail can be enabled with it's requirements by enabling 'services.nylas-mail.enable=true'. Alternatively, make sure to have services.gnome3.gnome-keyring.enable = true; in your configuration.nix before running nylas-mail. If you happen to miss this step, you should remove ~/.nylas-mail and "~/.config/Nylas Mail" for a blank setup". + ''; + license = licenses.gpl3; + maintainers = with maintainers; [ johnramsden ]; + homepage = https://nylas.com; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/generate_sources.rb b/pkgs/applications/networking/mailreaders/thunderbird-bin/generate_sources.rb deleted file mode 100644 index 43b41658413..00000000000 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/generate_sources.rb +++ /dev/null @@ -1,46 +0,0 @@ -require "open-uri" - -version = - if ARGV.empty? - $stderr.puts("Usage: ruby generate_sources.rb > sources.nix") - exit(-1) - else - ARGV[0] - end - -base_path = "http://archive.mozilla.org/pub/thunderbird/releases" - -Source = Struct.new(:hash, :arch, :locale, :filename) - -sources = open("#{base_path}/#{version}/SHA512SUMS") do |input| - input.readlines -end.select do |line| - /\/thunderbird-.*\.tar\.bz2$/ === line && !(/source/ === line) -end.map do |line| - hash, name = line.chomp.split(/ +/) - Source.new(hash, *(name.split("/"))) -end.sort_by do |source| - [source.locale, source.arch] -end - -arches = ["linux-i686", "linux-x86_64"] - -puts(<<"EOH") -# This file is generated from generate_sources.rb. DO NOT EDIT. -# Execute the following command to update the file. -# -# ruby generate_sources.rb 45.1.1 > sources.nix - -{ - version = "#{version}"; - sources = [ -EOH - -sources.each do |source| - puts(%Q| { locale = "#{source.locale}"; arch = "#{source.arch}"; sha512 = "#{source.hash}"; }|) -end - -puts(<<'EOF') - ]; -} -EOF diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 889d931c706..c3ce77adb9e 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,595 +1,595 @@ { - version = "52.2.0"; + version = "52.2.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ar/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/ar/thunderbird-52.2.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "d25bdeda7f5ee563176809811c5373d5232842ddb68315f31992754100e5cc96e5a2d0427897d245fcf9bbfc647331492e9b1fa79e0adb64f4f2169dd66ddc29"; + sha512 = "5b19b8fb7b7a6a4dd03ee5ab163f07ee664dd7b6d701571e57b6b3943d8aebf69291958d9a51b7720c5e5935daabacfd6149229e7626557927133b00a6c8750d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ast/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/ast/thunderbird-52.2.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "f7d3f2caa404fa5b97b7c966bb4ddd6fc0f26531802d4db9930d984d9b4ca635c41f9b025ca3c0ccba93a288da9c229b43b760759969b269082402584eed14f0"; + sha512 = "d0d2a562834e865cb31648255a94b120419c7cf4bba20d0a43368a05c3590333443da9416f7940eb0ed1fd774bd161d85585154b389d01b468124b6da310d5a9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/be/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/be/thunderbird-52.2.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "baa46c3e1d07b284e6cbca0f6c61710d4760f2a33e829056b8fb4e05b63162e4e4c7c8414dd9b3733c6983b74765e2ed2129122feadeb5972f037a1a739eba1e"; + sha512 = "2809c98f9b64b778c1bced8f91657a9cb8e57963d273ff380740db9be2aa999df5c32eeca7b6e63a4db65854f4e5654cc81f58a35e26eec8038520a9e78f263e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/bg/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/bg/thunderbird-52.2.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "166e64acbb8464142e78222ffb00e5ee421dbfee6789f544439963f4d3476e46795d53050e60195bbce648a3400f24edcef7a8f4cb47d5c3db0441ca564ad6d4"; + sha512 = "cd6a67c530f7ce0e3da897ed5701ce2b85f5bcb30df8db85af38918e951e7cc75e446f5709d7b02b1f54092cd8cc54c15ec46e5bfe893cd85fccdb0851a4579c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/bn-BD/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/bn-BD/thunderbird-52.2.1.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "817202f39eb6b0f79d07da92b7ad62c6dda9e8d196021828303030ac5eff97d5574ba99ae8a2d236cddf2eaa6cda4c85a17f23a6f84461654e8f0856156dc6bb"; + sha512 = "f117b3f56a79b5fd4a947a83ae6a3d28f0bd83f5ecb65cde674c12191517f51956535e1872547b985a35a9c0c398abc610a3f2fc2d7c9893bf7299222e5fbad7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/br/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/br/thunderbird-52.2.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "46eab89538b48e02237950207ce8e3d955ba87c7ffa7a030812bafa4bb54da5113a3ff53bfa1e1b243a77c1dcf32b5aa475382e824538536a759da0448cca305"; + sha512 = "72af56a4376a28ec2f3c091614b2d5907b12c2e66f2d3dda27b46ceb8b199a32d495454a2ea167180e44b1f9ef7aba89aea47bfed0976892d5d9af7102d5f5df"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ca/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/ca/thunderbird-52.2.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "7bcb35886fd0344c18f29d5221d765a91da48db3c32f7be4c4ca0e9808dee2f6577bfafff32e8b9676a00e488f7617c66dc6e2cce5238569c24fc1679ac6c1d8"; + sha512 = "85da428c53f3a2467f5be661c4f40e0f9434609fd6509e01e3c28dec522f5342d225a4f19c30a59187e42540905f156897b1f0e0ab76b2419d263923be844b3f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/cs/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/cs/thunderbird-52.2.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "8bda94fbe1043168894fb70edc3d87b670830377faee7397c26805bf8c2dd23bbbb5c4b1d797468875fb653fa02b8bc211aa3766793d3f9b21a139265651692b"; + sha512 = "f1fc63e25fd30b1f379689fbc9d7f24e94f061b39d3b0494226f25702dd6bd610dc031e2105957e2abefab1d7f8e90e81f4381f6d69cb43b815d8b80b9588715"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/cy/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/cy/thunderbird-52.2.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "65818715e994ab314ef4ac8a7d3e7c61e8918cd1d0d0ea4f51461f50d207d1c998c6452740c6f3fc07d70ebc1d24e5bebef622787d8e6f79f57ace1fc85e1e16"; + sha512 = "b15b4c2766ef32b5e8023e8002f05fa82fd1e71784d5b5f2d63c62c4b20076c46d470a253f8e0a59f1bb1425a2d297b403c32117e43ce2e4851795511604cfb2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/da/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/da/thunderbird-52.2.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "1b7166d185ff6fc8cbe826d11e7b96ccc4528ce6421a7ad73f82d9c9c0f35a8de043b30fdec1e6ea3cc6d48645f42173b941cd6f8cc6d526264d4301c2943ade"; + sha512 = "98750936e15b469d489e31eb65935d9013a0f4250543267f03b5eb9615587f8fe592b84bddf51176ecfe0864bc5c35ad5408e42861d45ed3af61f43764f5f9b0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/de/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/de/thunderbird-52.2.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "af6005f229a4cbc84c4f99ea1b13413d5a40ab506163786cacf513460170f77b3cb866a4b76b0691facc43cdccc39de68e9010550220f9d6cf288aac53909a40"; + sha512 = "7653e5e9e02aba7cacaaeb82e7106dfd7e49e4611eb3fb347c8192fcab3749ed98b2a2342788fe8f0e23c932ae5f9ae71266464d3d6b83629231f83ef8efa7c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/dsb/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/dsb/thunderbird-52.2.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "c326aa0c775e414fbfab466be742b804dbb364f60b084b4890c783f6c9e7bbe5da05b09b1608d51535ec3b60eaad5f775eb36834dd69d66f18a4746b7fe55c68"; + sha512 = "abf52e2f55f9582a5a1f5243a35e3fc2196beddb128a690479d6e82ac5f3cb7967640418f02fcc57c5525debce716345da23e4105e551ab0682dc5df5b6b3cc1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/el/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/el/thunderbird-52.2.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "b18fe1345c27095b2ea0afdec088b56d2cfccd57e285e881f1bbae4bd6eed6e39e76d24ada963d2337729eb93775d948195139815f694cb45978978a33682e08"; + sha512 = "e86bfe27cddf7b1deb2fe499df2c37488863e5af24614986ced8f9063eb8494f64e637691fe3f69f6b448a50a655725f866313cf0a881425ba5cb669c9fb9940"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/en-GB/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/en-GB/thunderbird-52.2.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "622c2c3979b30f724be73b5c6bc54f944f24a797cb1c3cafd11c2a08381e692621b29eadf64438b8207dd9254bddfa8b524211f7802e83453c1eeec99ab27108"; + sha512 = "57970ed60a24e6c02383b99ff4886ea9d90f49fe466f8175b3b9ec16294acd5900191b4a8fd7be08f5d987eebe547a9fd5004e516d13da8bfd702b82baeb7b8b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/en-US/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/en-US/thunderbird-52.2.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "76505876b7a408cc296ee575dea6f89db9cafd31f58e961bd0c1c5cf021771cdaa8bb4dfa508a4bde386846f97be6eccbd499725dab8e5a692bfd48125f1bf82"; + sha512 = "787b0c18e5cf7115ee7f317d0949f7c8d35be15f3f0c6a07b75372c07992601194a860568879164b2c5a49c276b1b48c4a723b68be46b8cd4d3bdb4144db2606"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/es-AR/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/es-AR/thunderbird-52.2.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "38f32cb430c679c63b8c6ab7d22bf5cb2af85bfa17fcbedc94d9fafa27874b917c7f34d7ddaa6a4dfa5d1674c09b3901cc19de5e217a965890eac5ef9246b22f"; + sha512 = "65e6d0726d733b9f4929a946bc9890e5eff5ad9e22d50bbaad40d2dc259028643e666b619eef25ba7d906f5a05d0e9ea456ab0d298cab5ecccc9a4a494a6f4bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/es-ES/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/es-ES/thunderbird-52.2.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "049e9445a850da0df09a0675cc9524d1bcb6ac4dc0ba8178df07ae4fcb9b4d9ff4677229968573119c5ca2c61a6f35da96167ece9d2da97e6b4e541bd9fc04b1"; + sha512 = "7266fe0dfcdc7f119e521873ea0ddc3106c6ca3d147a9cc8f9a88d563a6647d97f4c46d26547a24afaa6b10d115a3d4effc58fe2621c62395c7fc99f9587e2d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/et/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/et/thunderbird-52.2.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "e2bb4aaa7e6a447f63456adbc35feb56e5e6ceac791ae54a2f34eb283cf3a61565c06cc09f66fcf01d722b8ed0972e51da33a94dfd333108fee2e967346eb9cd"; + sha512 = "048cd4d824ddc0b075bcc6d9e7a8a3905031c3333ab8bc55893278435316fd310d6002b9fa1d7b270f8b94f3bf79679e96571b083305d687c36106b903389066"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/eu/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/eu/thunderbird-52.2.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "eacfbee76dc62b15e9a807db9409d63b2991f976faa109ef5991b2a6befadfeed8c341a448c0af84d1fc8f6914e4d515860294f2e54bb97f4ce2727c4d73a030"; + sha512 = "09b4d12b0a09de492082dc315173baccf603b387d391317a350fa67c04339b0d720a6c682e4d1c7fc7ea54e04569b004b6697d9e27a14c4f5095449f2f4e4471"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/fi/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/fi/thunderbird-52.2.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "c6ba259c3729535199905773674800f2772bf952a8596e11eb73785a9176072434ae47abb40c35e8cb0f66b4c46162d48ae699985857ad9a208c645cf76f0189"; + sha512 = "21f1069f46a8dd2dc54326bfa32d0722dd5d139f3ac10702a3cfba7d5ba462362c126ac2656ddae8c2071b20e7f96ce8fddd8049b4df9d66438e7f32f53f9316"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/fr/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/fr/thunderbird-52.2.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "eacdc3ce1967ef7913012c448c4a4898463c80fac41fb5bf16d924eb31ea2e68e7ad46ee88b5ce107e85a18789a19e05006ae4786a5d9e9a2f93c05013aa9f4a"; + sha512 = "ae30bd2a9eccb925ed4cf6acda17363e9cbbca0b185b9477a9b5611b613e332647907bc4653f6d677677dfca9347026d02f0aec3a42f29ed532a4b71b2c207ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/fy-NL/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/fy-NL/thunderbird-52.2.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "450011ce8012918dc8196b68a32f4b2ab27dd893a15ebd621fa17923ba5a63bff6fb634e1cc22cca3fa64d61dcc23565ceda518e04e7f92d91a0bc86fcd0dda7"; + sha512 = "7d35d3a78f9ab79fa8528260160d8b5fa1ee0198b53b94fdeb86e400f95320aa0d695bf1b4e1c73733ba09d6bc78d8d39f1825744e49cef1a22873f35d8a30fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ga-IE/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/ga-IE/thunderbird-52.2.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "ba8271e67b61e92bb819b0739351cfbfb128ecd3842f1c7ad69f7e9c26f4d52c10cf71f5d8cb45dc1f30d3168dc0acb991be4ef208e6947c3c36f4e5c0071f69"; + sha512 = "9886d5b9654e7cfaedd5dd60c59a6888929bc2001d4c43a2cf40f92a098ca725cfee8fc819af13c5ea2c9eeeeb3d6103289124b8fd05a234eba04f4570b5986c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/gd/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/gd/thunderbird-52.2.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "324044728236a52fe136c62f250218d6d2e364bda7b9f781a5f1c05561e37e09c9180733be0dd69f170e2229924c9ff7f2db10def13b86a7d21d5801d171a3b0"; + sha512 = "18f62933d213197ae618226aea192e30875f76568fc0a17343b49152526a32c10ad79ed4d6eb36feda0c8e287d915a99bdbff70ca942b4a313ea81ca04b257c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/gl/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/gl/thunderbird-52.2.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "a31f01bf15d17d8efc645ebe4184bf4b5f02107f24765721eee87dc10463c7e8219a1ba3d60468e132f6b934f6f138b441f94d3d3e790f2fbad45107210f69d9"; + sha512 = "c6e447722e284beba304b42d643a16b835f525d053714577425660087b03aebdcb93c57071a2e9f143ec5393616f7a0cde9a52f5bdaf42c9df1aed8b509de415"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/he/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/he/thunderbird-52.2.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "c8356bc183eb9837c3049288d63e1c13098143cf7a80cc5452d9852ffd2407eb85aa5ed574063700f93fb503c53c2b733a1bebc62cb890d408af75f8e4970856"; + sha512 = "7445dc1299038b412a39baf594c11444875d29332afd1c36a8ec603893c3f34d442566c2c18cfcee60c5b84e1bd1bf53675d1a32530dee7fc801554605d7fe4b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/hr/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/hr/thunderbird-52.2.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "8ed3f1c84f28a4435a3a6c9b136d4c27f6fdd3a41089b34afa04b74d5ca15cd535e179070cfdc862d3b3f5559fbafa7ae6c620f448afc8279765aa6518cdbd9c"; + sha512 = "9812c41f77cc76a6de78ca009989623071a3b95f992658f584bfc58b5be65a3db48d9135025f578f8877bc2f9426182f3f2dff39f50f1018ffb7b6ff272affc3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/hsb/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/hsb/thunderbird-52.2.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "bd14c07d1c2f5b8aebbee64914db544823ab90b70cc2a4e5d9fda28e9611310a5d6a6fb0f17d07e60534e9d5082506f0ffe22b1b4da1351f5657620612add6b5"; + sha512 = "af4fb4ca49ac982e28fb5b77d1ec7ec5be69cb097138bb7de865d8a0167b8ce13074d2b2ca80e11dbd68c7fec8533163b9285ed4495545da833f726dac484e7c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/hu/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/hu/thunderbird-52.2.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "9cb1430ef3036f4ce06d0734775e83ec09c551ce573cf3b50b5a2484f411e76ca09ae0295d6285d15e1f8a71f27c804f9dc328a4e4b534fbad34a97676ec2d7e"; + sha512 = "f1026a8fb44424b95e29051ab778313c417b6119fb9959d3116d6fcace96f1786f26b419eedd7f83790c13c89aba2c339c52ca5b5cfa2d62572518cebd12db9a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/hy-AM/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/hy-AM/thunderbird-52.2.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "0c1d84777286fb55c2d8d25d5f5abf5498575bd09261331cca680e1f18497dab80597e5a132618019c5d03350cc4d49f4856053b8d255f8a1d56d1029434b776"; + sha512 = "fa18a6113852d231dfcecdf682c6c1fd18f2ec5176fd9fd694a3134deb511ebaf01e00c0a336dac4a79918606136232d62f2b443ba60d25e40c573f696fca7ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/id/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/id/thunderbird-52.2.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "8adfabb7885b2442c9dd8ee1128675865690bc632185da20caa894b38c388cfff34a696c4932ffaab2217dd4c742e8c35acb2e10bee39a561aa83b19cce1ad6d"; + sha512 = "313e713ae5d1b4bc48789c2c33850b5177d8f497d9965606ad2530f26075cded2943351da7c13057aaeab72a60d4dca193b2fc8c4b8cc97734132b721d4df8fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/is/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/is/thunderbird-52.2.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "b5608a993d5a2a50a38516ba346cef8aa5f173f81eda2b29c06b77e8cc8964dc174fbd9a67294a66caa366956a0ae79aaf8c0e0d612935e871174b1073647f70"; + sha512 = "6f0f8444d230cbdb5dcc81530cd05fe08ea9e2482ea7560157ece9ef938d12b7cf86a259bcc72e132717ac143a6f3e203c869f1c37715bb87fd7b248366c7554"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/it/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/it/thunderbird-52.2.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "06bb846f018d1f8cc1bbda5e707b9aff31bf94ddd8a7aaa699c67f1c18ea8a4c92657587ae6c9a07571d2a6371d50e31b1000bec719aa432404924938a162274"; + sha512 = "f0633c2a46c66b4db18b2e70fffd9459d1c6732e872afaf8a1ef7fcac20114a09d32ec666305963acefa6caf6ec9b902d3f9d2143f68951674c12af462cb3673"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ja/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/ja/thunderbird-52.2.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "9019ec44f39918796c5da7fb2b23e19918e20d5688b8e55aa986e2b8a4f2abaf6ae87149b1bbbdedd2227c3152f48e4042078c979930db5d521d3a641312599e"; + sha512 = "5893bd100cc44aefe160a8ecfc5e9e5b581e1b9c59a1aab02ea9c63f8c062d8dc0f0c069a4a8adf4b11e5be614b3390d195df91ba3c2f3845f13ae7734e7295e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/kab/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/kab/thunderbird-52.2.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "1ed0950fd1b5cf82efe2c031abbb8d34ab3a0ef93182467592a9f77610bf494ed61a2e1d0117132abd5bd0f835bdcad75bf202588097210acdfbd67a1be5caf0"; + sha512 = "3777a5caf8208f429db9e828b6812dd16c549511e539375ff2ecb74ddeea8b8823f93194c73fc8e708ab17f8fe37c72af6ca36b5ed0ecaa2994620be7ab21de9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ko/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/ko/thunderbird-52.2.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "65ae48fbc79da6e3e20f5d325d4c93b2e945a95eaffe572c83cee08cefbe6718bd202c7e54095ef74d3069148b58aea1d2b0b795e94230b4da99b9a42fb39155"; + sha512 = "6a3e800d909db23c7abcc10a9e07feb5df47c57c072544ba84246c84ad364c8027e6b383a65867d9d0f1523682c45a929fb1c628999b18df2c959e32d374a15a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/lt/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/lt/thunderbird-52.2.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "f8870ee532dd73a0a387c00a1295209ebb965b3e7a63abcce7f17457c38636a07334ff7f4dd99c60349e748510645487ab3761efdbde985d1f3cd9038613cd05"; + sha512 = "486691138c9548343e6841ab1e84d2e795f280fbcfbef06769c7ad816e2dec79381a1d7bc0a4bdf0d5723d48f62ffa1acb7170ff6f1f1a5364ba6872a7b34fbc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/nb-NO/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/nb-NO/thunderbird-52.2.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "d4316434d0e8a824b3502bd413abe112bdb9b6da28acb39127ca83b43f8fa3f7b80bdde15758f2ca5a5013abcb374382ce79dd16ea48342fb6f6283eb242e162"; + sha512 = "0f3745ef22be9cb7fab9d5540a1ba9433e4450511398442debce3909577ca97e1ad5ec3a41c834b31ff60852a8479321dba44559fa2262afeadc16947f69eca9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/nl/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/nl/thunderbird-52.2.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "da6c7cf68f5502ea29a1600f2040953dcd064859a9b82856ae419472ae039bff5c2b31f56c282961eb02ae0c86c8ce63131fdc4aaaa712da03d76ee05726ba0c"; + sha512 = "6ad18ac7eb19eee591b64d6118de057ec49736e93f60b18ad979536a722a2d5df4b55a8b3d69a335eb0ef96451d2516c0a160a9218fd2ccd92c290752fca61fa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/nn-NO/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/nn-NO/thunderbird-52.2.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "9a5203e6f451aab318500eea9b7fcbdf70fcd22d6cf42e838926fa9fae14176f1abee875ac085823adeb40d2fd2e2992d538c34ad817b408fdae19248302aa88"; + sha512 = "879e402e2dade3acaf1354b8566d1abc11994b749c90f5c1169b1fdff5ea5dd19ae31fbfd1628adaa02c93f2346c02cc69a8625de8302e9965724d8f79c5d384"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/pa-IN/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/pa-IN/thunderbird-52.2.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "43e86e758f547363bfd5bb1c9c16506bbf6314354aee4265fed588fc29759d87482a86c442ba9d3e16c50477c4a5542b02a1539de8833052ee23811d61bcdba8"; + sha512 = "f23942c425238016e1a13b84e6407badac50efa6f11960c9996e4bf7845d3a56537721bb4b6e1c1002870739534f2dd7ce6fb74781bb8e9986e744f36b704c8f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/pl/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/pl/thunderbird-52.2.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "d418735505f1152a3cf1a1c2ff36d4cba4801327b1f01e3743c6411d30b7fdad7f0ae72fa78de9b356bfb712bc834c6eef46df9c251be7d18119f5da423f3ca1"; + sha512 = "0ce3854480f0d9969e6c836e92ba7aecca8f662aec5c7784d8e0e9986239cd8e721baf0aae1142f43dcdc54d66708fe7b7d8f1d32c3410c69306e57e1d663159"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/pt-BR/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/pt-BR/thunderbird-52.2.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "3e33431860b0f815153845ebde36de52d8bd0c2e1828e127009b467c33710c70d38c4b9f70c5572e09778b17c30f7688f1e802e48ce7cb0a6a015d0fa1e26648"; + sha512 = "13d2b36dcbc85016066b4fecd61b695eabdcfdf729996eb37ee3aabac3b6b06fb619db915fbca6d59e4827b9e724e9ce0f8308e033c5469ac906d8766bf7021c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/pt-PT/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/pt-PT/thunderbird-52.2.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "953143e100d3ffcb76224da98ee5ae1d98342d2806565ab048fbb6d8de65f6a02c3b6dd87aec4cecff676ff724d4790964b2e82ebbc64a3eae8beb343ebab211"; + sha512 = "9bce5873c1266fece8d14df41d44dfed545eaa7a9435336650cf102f765a99978d117c787d1ea0f0987407139bfd07765728c6fb188699e8e70dea557e4b4f12"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/rm/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/rm/thunderbird-52.2.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "b5aa940b99282bd84748e47d8f51a53e250d20cf0c7b68e5f66719ae88d9c241f290b2d637fe3e711948f9a6c6df8304cf9514599d73e387eb268a1c8f8c8397"; + sha512 = "d15bcd925d9be3d0a27478c62d178c99ed1ee474799dfb1a63b505cff3560f1d4a287a5067d6ed4b67cd05c6e8a7398a09468269f262fc001b934e5e6cef1bc7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ro/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/ro/thunderbird-52.2.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "26dc1b0c57b468ba815154b035c3fe382051b638bdc673db69a88c879a8524f55a24626c655026cb67c2688a29b6c946e2b495cd7dec4f16d8fbba21d5a493bb"; + sha512 = "7ef381e722553644d8f3842be5c0fcd1c2f08b4128a53380a6aeb54f4d7d8dba5f73ccecc60d5212429ccac96045eb9dffd77b39b42b637020ea0142daf98097"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ru/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/ru/thunderbird-52.2.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "5d17e85ec3eeac8ea3916f0dc71be7560bb1c4877c505a1f29421a9d496d8aafe48b9236c225f1de48a4dffbc9ed536f91dffed7d6c823480ef1e0c5b6e400be"; + sha512 = "1f71926edd82ba36e98045e8135b4c60fcc59ab0b0a097385231a5dcc40a2d7628d6f3f3691981056f013d01a4a3b1765a58d3cab683ecd55fcfdbf1b974d138"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/si/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/si/thunderbird-52.2.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "d4599a3814173d8bce2f24b6b015492d7b24547d4e53d17cad45cc9c01c8b65be3447f8b89ab8ef2f573140ef7e1aae7eef7943102e21611525abc6efcd02694"; + sha512 = "453b2d6898cfe04580f2846da0d534eedb77aa9627a39d7e7b6af1287c9e2feb695bf3d1e5b51b9d15f293579df2ebb1d2f9afb6cfdc3071ad24618e43ae925c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/sk/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/sk/thunderbird-52.2.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "a990104e68df9c2bf833c821eefdc1cbefc16f6e782bb8202683261f395f33c419afb967119ced710dc08966978043731c1adcf16dc716ff6eac8275b03f1834"; + sha512 = "c604c83470157e881f3563c04e3e5ad368fb2d0d1cc3fb58b176cfd03953141fe037baa14120f857e238071f55ab1a3d2c1ca06c847eaabf8012b96de1409c8c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/sl/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/sl/thunderbird-52.2.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "2fab7f52ceebee1895e520c6d185bbb92793a31c52ed2398731c0cf36e3888a58d945d92f5777fc87a0a55b96418406a0be15cdd95b0f54482e821ea1cf29ced"; + sha512 = "da7a37a7fe21a338ed2ebbe13e46a2395cebde8036a5544e8678083cddf092fd47ee80ad7e7fef66dcae59567cecb1bd15b99d470d4ee083d328e5c2932ad518"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/sq/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/sq/thunderbird-52.2.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "f201861a30f993306378043ecab288970c4a311a91a3d232cdfe9a4d9339052f026ceb35bc6dbc2bb452f58faa5e3eccd273b87e96af5cfcf292dfcf94612077"; + sha512 = "1b1e592b2eeab57e843eb4fd6745886946dbba451b5bc78e2212400a4e10fffaa5159034e8ea5d32a0f3dab7527e91b642209a7233140e0fd9c1c44363da9fef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/sr/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/sr/thunderbird-52.2.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "6f8962d8c30086434764f0d037801bfefeef13c67e46f2b639bc4f5a93ac0094630af375bffcc54574d50ecd8c7b5c5decdd9e2083666dc4394e6237fac0b746"; + sha512 = "836d1b2c786e787e07be4df837efb2051f8fb5a964facc94e82cbc05aca77ae54e1553e285a868f4703b48e72e2a0b739ae5e92e7b3da55e4ffc70567e1ce992"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/sv-SE/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/sv-SE/thunderbird-52.2.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "b29f506138f62350717ba2d2881cf8852dbef0c9797da64b9d5d9affa884cd1057483e2d0e357e967d9567ff4e861d1ad79596b39aa02a36087041e1f94d9d67"; + sha512 = "ddb52211226353c021350dd94014061a42ce1ee06d2b4e8c612bcfb5e17525bf41ead152f91c466e69ae3041136fb7350ec58de21ed2726cab2d6695dacac332"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/ta-LK/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/ta-LK/thunderbird-52.2.1.tar.bz2"; locale = "ta-LK"; arch = "linux-x86_64"; - sha512 = "3bc50fdc95776aeca2de94fa1b895d5a17cedafb95aa08f2d0100fbb4c3acd31990b96a57fad451c82b56d8cab7ea5066642da7b000857f00ba8f0bf94051f5a"; + sha512 = "c8c79641c7d80391d5007155b4ec3bb0ff36c2ae3e1dfb908013274ce6c64e03563a68a2ed4fbfed8e4684c4c49e7f9710050aab6851cbff2e77609ce6e25f34"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/tr/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/tr/thunderbird-52.2.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "8e1481a03ba5de00bc64aa252f779dc0ceb14c238985d11bb49467a719ca88bc4e7946086b039951f03ed43e11a15a5bbe98139d158f63dc3cdbf01686ec91e2"; + sha512 = "3c6740c9512b0d2d7f809312ba9f375be8635dc41a477e5084007cdffec9fae3c3677faf96745b61a384a4b899f48c5e9c239f52549faea00e198539181f8ba8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/uk/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/uk/thunderbird-52.2.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "e9bfce635b1d56d646baf06bc642a7914846a6a796e983c4b0f78b912833ccee850719f0857ceb7199d328415a976b436706d72c95f01da1d0d0b4c0c5d0d732"; + sha512 = "0950bfca73dd4907e493e9b15667f70be1f1174ca755baeefbd2ed40160bec3f41e1c67207454e31afed919bc72314e671ed47492509c9b2c0c207bfe3e22088"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/vi/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/vi/thunderbird-52.2.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "ea989bcf275162c8d72ad595bee767b9652f192ac18f61119cae8f084f9a25c0d0a83caa14cbbf901fa675f1a0c0a6b40ef46454f9c8f1fc3d5173a0ef1397be"; + sha512 = "0107c16694feaffb18160e4eac666ec840b7efda706ddd04596cd4f54feaad07a95e9168eb8eb78cf800b4c60f3f4d229d6d217e3d3c681d2a2b0182ff65251b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/zh-CN/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/zh-CN/thunderbird-52.2.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "35637dedad6da1662057fc1506b2e21bc6269eb0256e332ff6b12bcdb71906e28dc0f361bd7aded2fa52d982589f0e319667acb7ccd405e2fbfa8ba991e5aeb2"; + sha512 = "879cd62661967b85919fddc90658d40a3119715eb2cfa95edfa60e7ef3dbc3eb23c2d317a9c632d1c2055900f03e8437af635d72efbf14d7b9fee7f87ed5b19e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-x86_64/zh-TW/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-x86_64/zh-TW/thunderbird-52.2.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "286ed00a024029f7e6ce30709cac3da3d6bf00576248622a09bd9ce1ae2e965a0fe158d718d35f1e088f51ac4e271d57aaa98446c87c0bdcdecfa0d36d988e92"; + sha512 = "2c26ff8ed886aa5abf82511bb61fe96fc5817b211dcbfaf91deabb992b1cc968baccafcf1787b6f11b26052e18ff7f0da1d86de7ce45579bf2f6f403b11e9613"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ar/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/ar/thunderbird-52.2.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "8783d0cfba31ead11e49bf1a8afb5b66b1387b29681acf3c63217ba4a399a6fe496eb0357e0871c98e8b6465abc6539e6ccbd9d40e799e04674f3ab2dee25390"; + sha512 = "5d0971ab1c51c50a9f44967a13ea7c8cd7828f14625c5d5fc02ef001adbf69f7895ec6aa691a05c7a5ce5b038854d4dcfda0204c50533b028c2458adf5a6de97"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ast/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/ast/thunderbird-52.2.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "213f0457760072fd2e6cd2daa56677d8b67b8c345f44faebb2623f073ecf141ba4d30d2176fd5680efe91e46086b4add86462385fe5b9e72978cf2828eb8ed68"; + sha512 = "26e55787bc6e7a9fa8e3a40d0cee9912201026ec04454cbb117dbbad97d448dab1de9aba0c84e8cb10dda5cf818fd0c98116590b9e62849b5b714e63029d0fd7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/be/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/be/thunderbird-52.2.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "645d7eceac4d98ab37b8c85c2d0c58499bdba1c8db495690bc665c80b5aae414b0a8caad16931a74768137812f3ba8ce173f5080e95bd44e95e51d6f544cbf03"; + sha512 = "432295c9cbcbd59ea6bfca3d3509f9ba3ea07bc4004cd96bdfaff468210f30f9401e372c1f19c6504895e35db907d35c282d39666eb1c99e5362f46fe6dd9ecd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/bg/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/bg/thunderbird-52.2.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "b9030a61e8d964dd18362e472d18d7a9d6a7636679c016bca82b254b06e221c6551aebb166f829977fb4f0d1809b18b820cb1d842e6949f44dd4e5becbf98651"; + sha512 = "137f4baad093df14da263ec707aaa64edfe0972b36e6441b864722a1577cc1683d4205649f79fac9262c5a53f7adcf045991bbdd3168cde74365ca2938bc8df5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/bn-BD/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/bn-BD/thunderbird-52.2.1.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "fcf50581bb2f1548f4aab01b8f7a89e351e642a49ca76e05fc47d77b9e2459f2ff700501079180b92120727ab2ba74c3c6990fc7d6d9018b9ee4ec1d27c42aaf"; + sha512 = "fc33faeec367b1161c969b82c0ec703fd4f443908284b0cae309f44942473cf6042723de8895442ca21da40d404f24a8c1a490313352b95cb949e568db56b953"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/br/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/br/thunderbird-52.2.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "5359fa3b6f745db0da286a0180773d3fd43c446c78d8351cc0c5589ade332fec5ccb6106a84ed3bc96e34ec7ca2d72f93c22f6653aa39250df05b0e39108fa89"; + sha512 = "69c71b3af91d6bd5c63198937f43d5ac4c29c1c075b9faa64a94362cc544d5abd9182b339936a88da87bb69ec3201c6b54185c67d0dff1defede541a48d721a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ca/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/ca/thunderbird-52.2.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "e5d6d77ad204d279abcd34b9734ef5489d5b8522558af7cfb26de77fc0d22a5ce669dd6ff9fce7046745aa9ef75323fadaa70ad3ca4fa0f05aad85add6c1e7fd"; + sha512 = "b3b33c69e411cb4e920a72cb9a4eaf41469c709e0b04199e53094856121ed7fefe84d3987045442317dfed27069686692e9e0ea00562856a15c916c74c4f8e90"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/cs/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/cs/thunderbird-52.2.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "4bee0154e7f1658ea88c7cf7cb5d89e354d29516c727090bd704945ecb2c0988551e98de2c8b44d5899e44ae141a6e3c230550392d34b5dac121cd1c4d6ce994"; + sha512 = "c38deac7a95fe30166f8a22e6e4c76039fa3ec31ddc4ffb4e84f78c549bd76ced476efeb0b4abac0d73b4f5ab54e6f9a7181804450f882c123f41b8c2dfa9f25"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/cy/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/cy/thunderbird-52.2.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "23779727198092d4d8e7ed1d40615b020858999ae5023ebf81553dfdc62b7cc03cf864eae262450d75d6088f6b283ef7f791073901f5fda367df96e291e9537f"; + sha512 = "0ad5a4e40d03d0f329c479c56ad43a6151e262faa225e6f0280e4e60c7a13dd2ea949695f84514034031b796a8cf190fdab519cd58d998a254ad9238c337057e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/da/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/da/thunderbird-52.2.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "e780597823f156e273832ff731adb2cb39a58e6e232d910f9f0a3b05dee68411ee3e8345462137d74a8aa2a6dd0c3d5e93bb889bd425c051ed7befcd4da5c711"; + sha512 = "e681d601bbeebad6c2abbd7784041b700bf0d2abcd490fa41165b608334e3a98ab2a8bd2291935622788c506c475de89ab5a868be734225219c499ad147d02be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/de/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/de/thunderbird-52.2.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "1c35b4aab4bb27569955f3c29034e8c301c32d24547075c4662e162bfe1c19feb602b3fcc3c561956651328fa33605f60ed29ae52b50b06eecf39e43e82663e6"; + sha512 = "f6388f6992e1057906e5343adcef5d3cc08c983d3319b2880190d7ad3a42266c1635f5a04914f44edea6487dbba64ec8a916383938d6c1c064eb06ead06da39d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/dsb/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/dsb/thunderbird-52.2.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "59fb994bd8b2db74ae5024e8c2f6c859b93afd247a159c552bffe8c2337a0d4229bd17433635f8c87420af614c7725af7b0ecd144938654f9372fe6d39a4152c"; + sha512 = "661f1eef600803d2c76f623be25a0b3143dceda01e146c12075b8aab32112922bdfbdafcb0d1f9be88ec1414f8447a7804494d1b5e6ab91873eb5ab00039e29b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/el/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/el/thunderbird-52.2.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "87e43e3c66db44c6c1d659eff81b72bae4d6961045c37ce776531ab6e4f4a3e6c8d3774f39fd437e5ca4cc289bbae25fae8dbf8ed3e21aa2327cc166d4f17f47"; + sha512 = "7c6cfdd5c97c7a721ccd02ecc6d000d759aafd9c1a05dd77da09ff077f2a284a5349a5c14371af35a5a9ab4829e4fb93d93042d75fd9eeefb95e2fc368dc458f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/en-GB/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/en-GB/thunderbird-52.2.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "b397fb3142c0693282405d9e6d4515f368b3c6aba581e6eb0712c3d161f8fc9dbe034a913a67ea034dd89860b32072f82dbf2b767bd0c360f3bc9c0c8944d045"; + sha512 = "a76afaab47e279ebf5ebacf510a1ad39cebc7f1abfda826bb9b5a6af9d4de9a02066f040affe33238aba40e875402a35aa819ab1f4895ebafe370bb3d32e7d74"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/en-US/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/en-US/thunderbird-52.2.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "05926a74f6ecef5caa43884a3fa2cdf85f40c53da58ffa24cdd2c8c31efd1b3e90a0d06ddba33d612a3b88f31d4c72fe92f49e31b4f3ba3479c510a02d91eb33"; + sha512 = "09e72c7a26e52973bf63e18e8c85f49c0aed00a7b4ea238bcb82c55964a019965cc24f5e71d3a7ab6f5d8f288a64609ce15bb584a2fddc08aea03ff5e6d071b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/es-AR/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/es-AR/thunderbird-52.2.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "4652c005c0c28760d1a2657b691b13fcf7882763cff4ff05313d1dc5786661e76ca74a4fa23e1e71e4315818c9c2a386407151a996fab4d2f3bf343a353038db"; + sha512 = "412cf566707a02d62cc8a60d65a1974c608eaaf4ed666830facf137f7611a0346319a2cb560ae04742bffe776299facb7ea214e637248774bf406d5e7aab08ba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/es-ES/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/es-ES/thunderbird-52.2.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "64e8eedb59df8ebc5a568aa05d0df5217a3c91311455a090b4614dddbb2bd0d09add02e11c712b84696f3d203bb5503959dee9ec8e0aee7ba5d0ef2e606942a4"; + sha512 = "a56988ffdae668c2321f999b0cebf8008bbddbfc3469f053135d848d4cbfaccfac75ae2db325b6a080eacdb8ede5dc91e8c2fa2be255b2e72c3a47c761e63f02"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/et/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/et/thunderbird-52.2.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "2773894ea50cb0bc889ad1cd887bd7c34d594a19ae69fe48cc181d5bb31a9a15bf6e0e41fa1493ff86e481715e888d35db5b100b22516b187cbbb4e35f36fdbb"; + sha512 = "0df3306cebff726d26cd3b46e8ef14ccbe730ff2002b80c463185c6fa1b491eec1c3262dc792db8fd96da2b4394e00ed8abe21700f85cf2f969dc8bc9b548421"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/eu/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/eu/thunderbird-52.2.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "8a73144e9085f4f07db7d24da388808ebe94b4cbd2c3cb1f327ed0c44a3144c94fd61171b74c18c3e4ee72fd809791a8c942adc0a4b3bcaebaa2f02dbf26d572"; + sha512 = "ddf6542c17196aa7877409a4e37948eb351ea4fa7e10dfae21e4b8c21aa92b8bb3065c504b526784efcaa41c621889bc5ecebe4cf95ff56b0f2788d3b5cb7190"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/fi/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/fi/thunderbird-52.2.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "ba53c735c136901bbcfebff6fa646d884aaeb919a77744c1ec412a109f39853b2d74d70a56f85e4bdc3b7780475283284c46b0db79c64980a7655eb8f0bbe0f6"; + sha512 = "e86c14d4416939cd04d2a23849afc3cb991c352b9bdc3ecbc8f83aaa14360b30c706aa74ffbfef2bd369f62610c057232ec9e621871010d187965c177ed06e85"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/fr/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/fr/thunderbird-52.2.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "fe93f41bbf357eb1b60c0418dd64afbb37310ec25aeb66521472f84eebc6205d87d19090df6f38de3d9fee29f7f961e68e9794a65f51a0fcd103a40a16a919fa"; + sha512 = "b0fdd4da60b3278e4639a17e896d1c817ab80a44207edf21845614a8c32c70bc2094184e8d90e1b831a3516dd5b18088f21a35b09e9e8c52d72ee41764bb45d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/fy-NL/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/fy-NL/thunderbird-52.2.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "1739f96789414049ebb5a8fa47f0455a630bdfbc9757fd96f81a8fe0fbf6c0b522bdf04a315b590c968d1832ee2faa2bdd98fa4ef6e86cd8ab2d0a338e8a47f2"; + sha512 = "b314386f0cf27ee7f46f703c50eec9bbd879e0bc6c304c07f75f2b1455bb29c067c9c3c3d168fe3986f3018c406cf10815edde01a74764aa6d3f48a3999ff409"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ga-IE/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/ga-IE/thunderbird-52.2.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "b42fb3d2cb8ba5be74d3f4212aa80fbf2af0366bdd9eceba69555eb766f0a96c1a8092a3b1e39c0ddc8bae7cc7efb59f56806f90c0de95d3073db15e3d894a20"; + sha512 = "0dafbe71c9f8da9bb6b2c2ea29498a9e6f120e59d6f352d96c89a2e3c5ea1b2b072e91943490320ba52e070fe5b2a39332945edf34c729b672a83a2afe16a86c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/gd/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/gd/thunderbird-52.2.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "0921d25bd235d2a234c75f24297ef38568d0532fbe1dbfe98f2b9ca3641ea95db6c4df0dba3f8a8313a2fd169d2d86f7adab21db795a96f68fa566117db2c2e9"; + sha512 = "50809368c1fdde1181e163c9d77c79191454a68d0ebf4429d52c4e95ebf651adbfb7769b07ba4e3b365312ff12ed2fbb96be60dc3d90c6b8fc6fe35f3ea8c1de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/gl/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/gl/thunderbird-52.2.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "7fe9346fcb26a7d4a96cb6cd2d804874bdf2f3f89c9b9791742f9a2a03a7a865fc20766f8618c04e7d7fbe1fcf0fc907b4db5834770218f4e1fbe8d8df37e94f"; + sha512 = "f08d5bf61cca0e2fce5894619736a267be1851e8ad66fe2800b7a1dea2d847300bfa434c9dd539eaf966a63ee32a383cdede9029ce71758fb88e3fa6b35670d7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/he/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/he/thunderbird-52.2.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "7082a591a52e8a0e7bf112dec08dc3e130791eebee6e7d39baf052f40b8b9fbc350518b7785f3bf7ec62df8dbe05a256fa322714ba7a4f704a9cddf40cd4b11c"; + sha512 = "0a0a502e8da5945057c30f5a3de0fb623111e48d585cb7707addf0ea608e8683a882c0525e19ef4300f3d827e8d7989f09ff643955b3dc9379fcd6506e1415f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/hr/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/hr/thunderbird-52.2.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "397a1214ab27b187df6129f6f2f863ec1b76ce2af41c0ef5650f255451c57f07741f6a7d0674ad38432c7ea9c95fc2b36606d31defc698fffa4b676549b2c197"; + sha512 = "954cc5c1f3687945c6a66698ddb45ce74731bdc72f34b9ed874883b732149ad9a50773acfa1f19eec16840be3aeeec7d37ca140158def750c68d7ef6d5a2ffd4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/hsb/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/hsb/thunderbird-52.2.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "f0c76d90ae2b47e8d5c66a536ee1b2572f60164f76424b61b491326e719f4454448a9af4b6ceb8e1055f7e44adb6490a0fc4df086c344d160861d877766e227f"; + sha512 = "15b7f0ae3741e6578e492b14ba3e43dd60e6d9f3768053cb43cd88d91d40fa247b6035b9746c173d272f752d86da2f5778779b3e3677792b976da68ff460c542"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/hu/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/hu/thunderbird-52.2.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "d26eb645574d9298c75bd334371fc7a4baaa9b358b37c5d8da6e61b6d8fdf3fe165a5ea1855a840a742c6b19e3a15fbe7879e43bb29b187daffa63c59a863e06"; + sha512 = "32938f7f6a4f2f611a6e057a5eef8a1af67eee710f8de6053d4c9d1ef9b92fef5af29dfcc3c37939811f07dbdf89c529a9481ef4823aacfab7fa753f47144a5b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/hy-AM/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/hy-AM/thunderbird-52.2.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "add66a00fd3a8be7c71276d02588ffafd0ed0a8b2e4875dab3b82e4fe9b2be3964096509ce6b0e67350f62cc814b7c7ed069f481516f72f19a8039967123346a"; + sha512 = "0cceb38a1b6d679b3a5dfa63a44b90255a271ad0b9808d55408fb18cfa1e034b7010365b32a86cd72a29020fe211f404b7fc640f2b24428c3bc3945b4970ce8f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/id/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/id/thunderbird-52.2.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "b793e65e9e9f8d30ad0193f019acf33bfbfb165313a960f120bfabeb4df0c769cc9fc5b7e34ea05eaa085a5c0872134d606862b381852d04748c2e97ed1bf9f7"; + sha512 = "89b8172a07ae809b153ea6c48dca1bf0ae7fcbc7dea6e13b78bce99f2e84d6bb3d23e3d7955344e71c918b1c26729b920429c1efdb6a4bd5db1bb24001220ccd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/is/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/is/thunderbird-52.2.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "d4f163358a2c8830e3a77a5a82b8ee42d2aff39f19fb95171a249d1cde5119c66ee29bc894f5e6ea023c34e030282194025b25c04af25f647df8745d2b8aa2b9"; + sha512 = "54875ec1b89501f52ad3525233ee8f7c9f50b1cf0b3061dc734a0733c0cf72c537f7279729b1c3afcfcdc411f708a519a4585877858c5c040e7455a0c5d30342"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/it/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/it/thunderbird-52.2.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "9e73d51cfac30480fe0ef46c02df12c771fdd827bf4c2971b99cad7b3db42d3d60a2355c20c0b3601c7d27be5b9c2d1748a1e3b8954523ef919d120429153103"; + sha512 = "4766a810c7c49049ff20e52045100ab4a46a687e37613cb6161e680cdffe6fce708251a830c2b38f9fa5e93d6c31c5afa0856a79a20a9ac972c1624e77da932e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ja/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/ja/thunderbird-52.2.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "ce3d8342c0fc63a9c6ab10a2d15f6ef79d8d827cbf542cf0eead9d01d1a26567edb48269ba2ed66dcf81bf83e35a120190614f740898181a3b2cd7fcbfd5e739"; + sha512 = "ef031bb68f1edf02c43887ec3c7d092c43e3b0694b18951997a3e2356675e09cd1f6be12a33945f8ebf877678c86266e61e1d3802ffbb42c7a7d1c3832f25eed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/kab/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/kab/thunderbird-52.2.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "9ef94353b58ade84737debbd58a26aca9b8c5358c3fb852f2dd925e9c8eec46f091d4edeb0a4fe46da45eb9860ab76f43a97605085907fa79d2ba90751ea64e7"; + sha512 = "6876c464c3e23640a3a03cc977b727fd1fea9925efacf9bb8a14afa575ef88041b85dc30569035fab700663eca1224928584b98b99735fdd6a68d9f00071e75a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ko/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/ko/thunderbird-52.2.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "651ab9ae9b966e10f420802937140a689a3c925a67732cc3082e8f265d2f98fe88195188632386d64f892338b1c4ba659c7e475951810d5b6ee48a7339155413"; + sha512 = "0e2f64e9499d0cfc7597fe76214de6d9312804eaafdaef07d95e8ab84927db1d27232c9ac8b9283f24cf04e8bfac8667a253e7e229116e9241005ea433476019"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/lt/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/lt/thunderbird-52.2.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "f64c0869033ac939538f982ff66b0a88cb566e7000838e549d63fa6509afe8a29865fce3cb6c7fea84c78b5ffd07a4f8b11b44b14c234ae957f22439f7a84a99"; + sha512 = "6e3c400dacb213a767699263a7106e08183d7c8b0fa06976ff5626aeb35be1d839a4383fb7cd61cf2437a1ab33e6315fdac8b921b2f0967bfd991a90ca2fe157"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/nb-NO/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/nb-NO/thunderbird-52.2.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "9dbd31177470ba94a646d7d63890dcc2465681a4c6fc684f7cbe61eeebc788c03a863ed5a01a1baeb26ffa61d7af4631bebd74261c22ee1a109ceaf928ce4925"; + sha512 = "dce647bac69f3d7d7bee0e3ef622eedc6f7d97adf991a244718f24d8ba2c33a75c470c05e95d66109535a832c65d6cd2c064157e4e9806e44cd0f6f950de6de6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/nl/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/nl/thunderbird-52.2.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "3616bce4895db1c2f3b02773b05586bf6e38550ad7abd5beb3b31a6c5b414120972b5475c080bed782e7f2b09fe47bde3e5b41f4c3fdb7ffd823767c976dca0a"; + sha512 = "e797cf5d6300b6478435c554ed39d4d1ef5ff9a61cd47557a2db1766912f8da9b1e60599b66e35ca9138d3e04e234b2f443a675d0329639b21f37cd787faea4c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/nn-NO/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/nn-NO/thunderbird-52.2.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "4ec009d5aca053ffbbb6cd5c84572f0305f22f33cd24eec13eb3fd04aa4eccd3447701edb53e4929914ebd2f7acc8e3d7f8e5d91c9e7a7f0b9e9c18493f74d55"; + sha512 = "f30cf85b92a024a2c7133e97203c60ed18d2ddba2ddf081779962ea1af2be893cd820638b08dbbb09304ff1412df94a4dd5f6e9e05b49527a5d6d15011a4f024"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/pa-IN/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/pa-IN/thunderbird-52.2.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "584c5cf7fc62f4f6435d9ed2ba9aa200012aa65e7fcd249aae10dc2b3dde8b4db724b11beb206a727f3eb2f60e4a8c0e5e1abbd4e621645d651cba449bc4a474"; + sha512 = "b6256747abfe759c0c65a0dd3431e9e498339259caff450b0988e1936ce10e9f2f019a241b21d7f2c1e9911e4396a055ab9640fcfd9a22d5f520ed461d476411"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/pl/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/pl/thunderbird-52.2.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "aa02a2910513159c2621dc17aff373a8c2124bf9aebb24bf54c239d823d0080a1c05c330185af5dce21084d7ac9060a2b8daf890a3227650416d82afd0fa8e9a"; + sha512 = "a6cd073fd83eb0a31e1cbcadd149e5c1be90e0bd8d890cde0ceec19bf4be15582fcceb5d6987c1682492a4e6370c215995c3ea49f3ae25529be6c5b1534c198b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/pt-BR/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/pt-BR/thunderbird-52.2.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "b5b2654bf153bd7f7c85534b95f836892550e519e254312584b22981bcdf7205f31babb5cf32033f7d676eee2bf2400f88503b52268f2ef10286da82b2713704"; + sha512 = "016eeaa8804945f34a89d0fbb60133f1e0beca5c6ccd695201f09ab8fe529b85f98f0d992875ba8ce866d147ce9f92807773d44f9932ba1de73fdb1398fdece1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/pt-PT/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/pt-PT/thunderbird-52.2.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "3d557b432531a757bad6f18754b9d2fb2359bdba49f20faf797f7eba821926aeb8476c89a93b475273514bf26a6f471637505c5eb8a1cc08d1cf830b28b21fca"; + sha512 = "e76b5313089da90a6cb34190bd07e65cb7fda4a34ee0581009fcdf9d0135c42b698f2a6c575cc13e63d749ca0ee0f3485fb05308419b5f7e72c9a1ff89601a69"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/rm/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/rm/thunderbird-52.2.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "434122ff7524630ec45a7e6a0e5f90e74ea1397b31bf67ce9e3046f8a31114a8320e56a5dedf1686e2eebc8c648e4a94fd0cdbe523bdcd6312448100d548e302"; + sha512 = "fcb0fc5ef00a370396f01bdb885f3bedd551344849f6eba53057506a573486af5ec781f2850aaf1e6fede9a3613c9c94629511c0a7d445565db8fe1cabcec29c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ro/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/ro/thunderbird-52.2.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "6f2c74d119ad7380961c50d5bb91afd4bb9455737776a08eb5168c17e83143fefacfeaa3b98e1816d1fe96a7f2022256cd2acf7b697508e4139d792562be2176"; + sha512 = "fafff899f366c17bc81b4432a4b1c6cae8fd6bff6c307bd377a314b9b4f520fbce4ba23b144a816d24fad65e90b33e17b25767c60f4ef10136dac6701f3d326f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ru/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/ru/thunderbird-52.2.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "d9eff15876619a1bf0b8467847df18b0dba20c598e05428037b81e0cd90797b8baafc44541fed2a29dfb27075da19730919159495712099a54c9b488a693e3ca"; + sha512 = "0a0598479ced443e18d9b29bd0e0deca39176303f81e25999282af9fa1d67ffe5d0e66ad4f4461a24fbd94ca960876e2836ad2d69ba0fb4bbe81c1e471555625"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/si/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/si/thunderbird-52.2.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "a2e58a6b2632f8c2f6eaf6113e2af9e98ea222c5d2c98f0cfb4443804ce260bb3dba64bd5165590563fa946b500bbaed4341629eb25ea0c5388c61c69f4be5cf"; + sha512 = "5aff4f01e7902140e817b206dd543a73b003a808bea448478918be7214de0601568151814baa96c4ae2ea193c76e7c8daa411f742b719df34dc275b4e9f8d52b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/sk/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/sk/thunderbird-52.2.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "0b26b3848864def3a5b485c2d67d3c907b58d9977ae91db58d91218da278243c04eeac781fe0063b762d0797809dcbee18010824aa5d25926f8f48011e2a5bb4"; + sha512 = "560557b1662f58311a2ba694544a6b329a4fa709bc1702e12351c90b2647b974ffca4ac7c78e0c2430193cd6fcf194fb40f078c8c7c4cbb628e9b8e4a8abc37f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/sl/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/sl/thunderbird-52.2.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "7158c776ec3776ac269402973482e2dfedb3c17aeac11fcae3bee6a982717443068223cc901ee71e6b7a42a8073f05d2a54047804997d992761fbe71d46bd223"; + sha512 = "c3689c69bad7cd2f8ae58e430de4141b593db86adfc58e1f4b65258aa2a74c68595bbdaa966437a732502aae8f8c6952e10a27e453e632e2a162457261426a55"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/sq/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/sq/thunderbird-52.2.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "1a838db31f4db574669987614dfcbd5f7f1eb061dc4f2fd0c9ca206d5a5291ac348efce3ce59b30f89fdc375e72467531d9d96b8ce43ffe28e92916f2864908c"; + sha512 = "6ab246a7878e68204c2d4548a1583edb7293a7d7c671ad2be4767e098d7e5ab2308e5f5d8f02a7081bf6aead42207e88b16a38667ebde5f76bfb8fcf398545d3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/sr/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/sr/thunderbird-52.2.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "beb9eee26aa5474ac5e70c168e2ee32c84216d919528c9edce4d45ab6c522d5fc888ba2f8c57cfcd47d299367ddb7c367dafc9ccd3d29c5700de28eb2efe08fe"; + sha512 = "923fd4d862bb8c363f20a5f05dc67a98de3266b961790299c667492c1c528b860524bf7197377c73f68c849dca8a96ac7adccfd32b0e9513d631550e786c43b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/sv-SE/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/sv-SE/thunderbird-52.2.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "e4c2320e547b2e61991feb586b7f9e4180cbeb88dc90cd0dfd2c026b062e4e1858d1d1b331cfde1e373cacec2231f7cb2ba61b5e4ef02a36802edbc96b39cf72"; + sha512 = "81d7662ebaa211208f435b8d66a5766289ca9bc897c81aeef9666f10157a5c6b3cd5226585e144ceb2ac3a2ca9edb336e82e4b3d9097e4a4097e5b6de5626e1a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/ta-LK/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/ta-LK/thunderbird-52.2.1.tar.bz2"; locale = "ta-LK"; arch = "linux-i686"; - sha512 = "aa42add8ba31edb5a40fd62304f10ac55006918d5196f71ca0330c3ca52dbbf4d9b5d39a07e977ee89c6b913e6ac4d4a4c9460da194b41760826d96e89e7bffb"; + sha512 = "dd8bd65fe029cb0fa7016119b354fc0e2d1a3bac2b89e899edcdc03e3514aad4ae91707f72d19156b1d24e778f0b7a54fbbdff049e553a3daeaf56c6486dec47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/tr/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/tr/thunderbird-52.2.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "ceb90e08e906d5a2520152c40c4e32ab85da31c746ea285280b6e9bfbd60e9178886799357f39d54e0e072c616059ae7fe1948c39f6152b5f0d1b196185c8475"; + sha512 = "3a71dcf6e9562d2e196e7bd76c662f5181f11cc6cc121a1ed1724e13e5e897777f1c36a4eeef36bf8a606ab8f13fbe8c4b3b345e9c70f42f8c22155ac7da3963"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/uk/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/uk/thunderbird-52.2.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "9d9fc486d556dbe3a216a3d4e822750cfa1cd0348af37ddaa5a19f9c390170e348a41b8251fff1499d2dc6d92feb34061286ff5400a4f9b6ed4fdee27064078c"; + sha512 = "6094592ebae6b37073e7c15da36f5fd39ccbbfbc104dac8faea889ebf00f9c6e7cd5f0a2bbd54b53c0495a7166ed871b7aa4c3abe4b97827d15646b4d002b010"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/vi/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/vi/thunderbird-52.2.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "010bc7ce4ee4329857291796e2077e0872593f2b52799b1524720fa7fca11f2f4b760610bc97db171421552eb59a36725f80d4852cd77d30c8e7eb6c6c523d2d"; + sha512 = "f96d09771ebd3ff63d35f95e42e77b2227c5b48a459f6e1e782a1259a845c2d6d819afb3a12333f19d5440cc6098db98b502514c5bb68c509a5a4778a5b88501"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/zh-CN/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/zh-CN/thunderbird-52.2.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "c07d2559296acb160c19af2db9f516254d33e1d55c78b2397d2c28764a8296e3da0b74409d48702e889bbf34f06115b493bbcea2666ad8b4884ea01fed6ad12f"; + sha512 = "eba8d0ee4cc69f386dc114019501fac6b5ebeb3828755062167519ca062fa1e60d2327aec6db647459efd9ce83d31dbfeff28ea7821f52e9254de362a46ee472"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.0/linux-i686/zh-TW/thunderbird-52.2.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.2.1/linux-i686/zh-TW/thunderbird-52.2.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "8fa1da0c35584cfb8013df9e86a37268e6ffed1ee5ba4617d3db185975b874af5dba3f3af5498b8ebfdf85e40409fb9fee8d517f84f4942cf69deaa94f3c64a1"; + sha512 = "f0af41f4faa7259f6caa2a675e60880aea434b0f2bcbde3db00001c32362c001c92b10c14d06d1ea344390d16e20f87f0cb5a7e7ecfcfbb0b3ec1da9ece8f5dd"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 334bba1c7aa..0e861400496 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -22,11 +22,11 @@ let wrapperTool = if enableGTK3 then wrapGAppsHook else makeWrapper; in stdenv.mkDerivation rec { name = "thunderbird-${version}"; - version = "52.2.0"; + version = "52.2.1"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "e5c2ad5f7bbea4fb9abca94db6c149ee459c1c35b756b7840ee87b5fb631ccbcd323c743a12cddf8d504e0175bb93378beb7fe100b185ea6ab03a4968859ea89"; + sha512 = "f30ba358b1bfc57265b26da3d2205a8a77c6cd1987278de40cde6c1c1241db3c2fedc60aebb6ff56ffb340492c5580294420158f4b7c4787f558e79f72e3d7fb"; }; patches = [ ./gcc6.patch ]; diff --git a/pkgs/applications/networking/ndppd/default.nix b/pkgs/applications/networking/ndppd/default.nix new file mode 100644 index 00000000000..a15c441b9cc --- /dev/null +++ b/pkgs/applications/networking/ndppd/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, gzip, ... }: + +stdenv.mkDerivation rec { + name = "ndppd-${version}"; + version = "0.2.5"; + + src = fetchFromGitHub { + owner = "DanielAdolfsson"; + repo = "ndppd"; + rev = "${version}"; + sha256 = "0niri5q9qyyyw5lmjpxk19pv3v4srjvmvyd5k6ks99mvqczjx9c0"; + }; + + makeFlags = [ + "PREFIX=$(out)" + ]; + + preConfigure = '' + substituteInPlace Makefile --replace /bin/gzip ${gzip}/bin/gzip + ''; + + meta = { + description = "A daemon that proxies NDP (Neighbor Discovery Protocol) messages between interfaces"; + homepage = "https://github.com/DanielAdolfsson/ndppd"; + license = stdenv.lib.licenses.gpl3; + + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.fadenb ]; + }; +} diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix index 4bf571a93d8..e95963c695c 100644 --- a/pkgs/applications/networking/newsreaders/quiterss/default.nix +++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "quiterss-${version}"; - version = "0.18.5"; + version = "0.18.6"; src = fetchFromGitHub { owner = "QuiteRSS"; repo = "quiterss"; rev = "${version}"; - sha256 = "1y0n5ps1z4wgf9hkfjrw7dfyncrw22bf9mi3052vmf3s7xzz6vbb"; + sha256 = "0qklgdv6b3zg4xil9yglja33vaa25d4i7vipv5aafhlavjz16mh6"; }; nativeBuildInputs = [ pkgconfig qmake ]; diff --git a/pkgs/applications/networking/offrss/default.nix b/pkgs/applications/networking/offrss/default.nix index fd1406127ad..1cae91dbf86 100644 --- a/pkgs/applications/networking/offrss/default.nix +++ b/pkgs/applications/networking/offrss/default.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation { preConfigure = '' sed 's/^PDF/#PDF/' -i Makefile ''; - makeFlags = "CC=${stdenv.cross.config}-gcc"; }; buildInputs = [ curl libmrss podofo ] diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix index 73cd26b2a6e..77c7cf321cb 100644 --- a/pkgs/applications/networking/p2p/ktorrent/default.nix +++ b/pkgs/applications/networking/p2p/ktorrent/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake , extra-cmake-modules, qtbase, qtscript , ki18n, kio, knotifications, knotifyconfig, kdoctools, kross, kcmutils, kdelibs4support -, libktorrent, boost, taglib +, libktorrent, boost, taglib, libgcrypt, kplotting }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake qtbase qtscript ki18n kio knotifications knotifyconfig kross kcmutils kdelibs4support - libktorrent taglib + libktorrent taglib libgcrypt kplotting ]; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index 416995f120c..629e748fcac 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -1,14 +1,20 @@ -{stdenv, fetchurl, ocaml, zlib, bzip2, ncurses, file, gd, libpng, libjpeg }: +{ stdenv, fetchurl, ocamlPackages, zlib, bzip2, ncurses, file, gd, libpng, libjpeg }: stdenv.mkDerivation (rec { - name = "mldonkey-3.1.5"; + name = "mldonkey-3.1.6"; src = fetchurl { - url = "mirror://sourceforge/mldonkey/${name}.tar.bz2"; - sha256 = "1jqik6b09p27ckssppfiqpph7alxbgpnf9w1s0lalmi3qyyd9ybl"; + url = https://github.com/ygrek/mldonkey/releases/download/release-3-1-6/mldonkey-3.1.6.tar.bz2; + sha256 = "0g84islkj72ymp0zzppcj9n4r21h0vlghnq87hv2wg580mybadhv"; }; - buildInputs = [ ocaml zlib ncurses bzip2 file gd libpng libjpeg ]; + preConfigure = stdenv.lib.optionalString (ocamlPackages.camlp4 != null) '' + substituteInPlace Makefile --replace '+camlp4' \ + '${ocamlPackages.camlp4}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/camlp4' + ''; + + buildInputs = [ zlib ncurses bzip2 file gd libpng libjpeg ] ++ + (with ocamlPackages; [ ocaml camlp4 ]); configureFlags = [ "--disable-gui" ]; meta = { @@ -17,7 +23,7 @@ stdenv.mkDerivation (rec { license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; }; -} // (if !ocaml.nativeCompilers then +} // (if !ocamlPackages.ocaml.nativeCompilers then { # Byte code compilation (the ocaml opt compiler is not supported in some platforms) buildPhase = "make mlnet.byte"; diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 4db6c9dc16b..c848f13b0d9 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, which -, boost, libtorrentRasterbar, qmake, qtbase, qttools +, boost, libtorrentRasterbar, qtbase, qttools , debugSupport ? false # Debugging , guiSupport ? true, dbus_libs ? null # GUI (disable to run headless) , webuiSupport ? true # WebUI @@ -10,14 +10,14 @@ assert guiSupport -> (dbus_libs != null); with stdenv.lib; stdenv.mkDerivation rec { name = "qbittorrent-${version}"; - version = "3.3.12"; + version = "3.3.13"; src = fetchurl { url = "mirror://sourceforge/qbittorrent/${name}.tar.xz"; - sha256 = "0vs626khavhqqnq2hrwrxyc8ihbngharcf1fd37nwccvy13qqljn"; + sha256 = "13a6rv4f4xgbjh6nai7fnqb04rh7i2kjpp7y2z5j1wyy4x8pncc4"; }; - nativeBuildInputs = [ pkgconfig which qmake ]; + nativeBuildInputs = [ pkgconfig which ]; buildInputs = [ boost libtorrentRasterbar qtbase qttools ] ++ optional guiSupport dbus_libs; @@ -34,9 +34,9 @@ stdenv.mkDerivation rec { ] ++ optional debugSupport "--enable-debug"; # The lrelease binary is named lrelease instead of lrelease-qt4 - patches = [ ./fix-lrelease.patch]; + patches = [ ./fix-lrelease.patch ]; - # https://github.com/qbittorrent/qBittorrent/issues/1992 + # https://github.com/qbittorrent/qBittorrent/issues/1992 enableParallelBuilding = false; meta = { diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index 4ccc3fd5237..bceabc2a64a 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pjsip-${version}"; - version = "2.5.5"; + version = "2.6"; src = fetchurl { url = "http://www.pjsip.org/release/${version}/pjproject-${version}.tar.bz2"; - sha256 = "ab39207b761d3485199cd881410afeb2d171dff7c2bf75e8caae91c6dca508f3"; + sha256 = "1d67c58jn22f7h6smkykk5vwl3sqpc7xi2vm3j3lbn3lq6hisnig"; }; buildInputs = [ openssl libsamplerate alsaLib ]; diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 53b723f5ec2..1f5e9601ff2 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl +{ stdenv, fetchurl, perl, libiconv, zlib, popt , enableACLs ? true, acl ? null , enableCopyDevicesPatch ? false }: @@ -18,10 +18,10 @@ stdenv.mkDerivation rec { srcs = [mainSrc] ++ stdenv.lib.optional enableCopyDevicesPatch patchesSrc; patches = stdenv.lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff"; - buildInputs = stdenv.lib.optional enableACLs acl; + buildInputs = [libiconv zlib popt] ++ stdenv.lib.optional enableACLs acl; nativeBuildInputs = [perl]; - configureFlags = "--with-nobody-group=nogroup"; + configureFlags = ["--with-nobody-group=nogroup"]; meta = base.meta // { description = "A fast incremental file transfer utility"; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index e0ba43986e3..5fb950886e3 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,14 +1,14 @@ -{ stdenv, lib, fetchFromGitHub, go, pkgs, removeReferencesTo }: +{ stdenv, lib, fetchFromGitHub, go, procps, removeReferencesTo }: stdenv.mkDerivation rec { - version = "0.14.30"; + version = "0.14.32"; name = "syncthing-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "14f2v8i8ga9vii015vbx70k1vd85ac0ygykz2z614ii932g5lfdr"; + sha256 = "1agjr3m4gnywbp40idi0pwy25cp836sdcar7r6r9hwcqxyyzz545"; }; buildInputs = [ go removeReferencesTo ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { '' + lib.optionalString (stdenv.isLinux) '' substitute etc/linux-systemd/system/syncthing-resume.service \ $out/lib/systemd/system/syncthing-resume.service \ - --replace /usr/bin/pkill ${pkgs.procps}/bin/pkill + --replace /usr/bin/pkill ${procps}/bin/pkill substitute etc/linux-systemd/system/syncthing@.service \ $out/lib/systemd/system/syncthing@.service \ diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index fda320dd54a..69a96c6148e 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -9,11 +9,11 @@ let isonum = fetchurl { url = http://www.oasis-open.org/docbook/xml/4.5/ent/isonum.ent; sha256 = "04b62dw2g3cj9i4vn9xyrsrlz8fpmmijq98dm0nrkky31bwbbrs3"; }; isogrk1 = fetchurl { url = http://www.oasis-open.org/docbook/xml/4.5/ent/isogrk1.ent; sha256 = "04b23anhs5wr62n4rgsjirzvw7rpjcsf8smz4ffzaqh3b0vw90vm"; }; in stdenv.mkDerivation rec { - name = "gnumeric-1.12.34"; + name = "gnumeric-1.12.35"; src = fetchurl { url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz"; - sha256 = "0b4920812d82ec4c25204543dff9dd3bdbac17bfaaabd1aa02d47fbe2981c725"; + sha256 = "77b1e3ce523578a807767ad71680fb865ac021d7bfadf93eada99ae094c06c0a"; }; configureFlags = "--disable-component"; @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { for f in "$out"/bin/gnumeric-*; do wrapProgram $f \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ - ${stdenv.lib.optionalString (!stdenv.isDarwin) "--prefix GIO_EXTRA_MODULES : '${gnome3.dconf}/lib/gio/modules'"} + ${stdenv.lib.optionalString (!stdenv.isDarwin) "--prefix GIO_EXTRA_MODULES : '${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules'"} done ''; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 0f5f5920966..89cd2548806 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -158,7 +158,7 @@ in stdenv.mkDerivation rec { mkdir -p "$out/share/gsettings-schemas/collected-for-libreoffice/glib-2.0/schemas/" - for a in sbase scalc sdraw smath swriter spadmin simpress soffice; do + for a in sbase scalc sdraw smath swriter simpress soffice; do ln -s $out/lib/libreoffice/program/$a $out/bin/$a wrapProgram "$out/bin/$a" \ --prefix XDG_DATA_DIRS : \ diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 7178a0930e7..c5ef0e8a277 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -110,8 +110,8 @@ stdenv.mkDerivation { wrapProgram $out/bin/mendeleydesktop \ --add-flags "--unix-distro-build" \ - ${stdenv.lib.optionalString autorunLinkHandler - ''--run "$out/bin/install-mendeley-link-handler.sh $out/bin/mendeleydesktop"''} + ${stdenv.lib.optionalString autorunLinkHandler # ignore errors installing the link handler + ''--run "$out/bin/install-mendeley-link-handler.sh $out/bin/mendeleydesktop ||:"''} # Remove bundled qt bits rm -rf $out/lib/qt diff --git a/pkgs/applications/office/paperwork/default.nix b/pkgs/applications/office/paperwork/default.nix index c2481241818..e24d96257b2 100644 --- a/pkgs/applications/office/paperwork/default.nix +++ b/pkgs/applications/office/paperwork/default.nix @@ -1,19 +1,19 @@ { lib, python3Packages, fetchFromGitHub, gtk3, cairo , aspellDicts, buildEnv , gnome3, hicolor_icon_theme -, xvfb_run, dbus +, xvfb_run, dbus, libnotify }: python3Packages.buildPythonApplication rec { name = "paperwork-${version}"; # Don't forget to also update paperwork-backend when updating this! - version = "1.0.6.1"; + version = "1.2"; src = fetchFromGitHub { repo = "paperwork"; owner = "jflesch"; rev = version; - sha256 = "1v1lxyi4crdik4jlwjds9n6lzw4m4l4f9n5azlinv8wb477qpv6h"; + sha256 = "1cb9wnhhpm3dyxjrkyl9bbva56xx85vlwlb7z07m1icflcln14x5"; }; # Patch out a few paths that assume that we're using the FHS: @@ -47,7 +47,7 @@ python3Packages.buildPythonApplication rec { }}/lib/aspell"; checkInputs = [ xvfb_run dbus.daemon ]; - buildInputs = [ gnome3.defaultIconTheme hicolor_icon_theme ]; + buildInputs = [ gnome3.defaultIconTheme hicolor_icon_theme libnotify ]; # A few parts of chkdeps need to have a display and a dbus session, so we not # only need to run a virtual X server + dbus but also have a large enough @@ -59,7 +59,7 @@ python3Packages.buildPythonApplication rec { ''; propagatedBuildInputs = with python3Packages; [ - paperwork-backend pypillowfight gtk3 cairo + paperwork-backend pypillowfight gtk3 cairo pyxdg dateutil ]; makeWrapperArgs = [ diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index 38ec107bcf7..0a53d5f8c22 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -1,23 +1,24 @@ { mkDerivation, lib, fetchurl, cmake, extra-cmake-modules, qtwebkit, qtscript, grantlee, kxmlgui, kwallet, kparts, kdoctools, kjobwidgets, kdesignerplugin, - kiconthemes, knewstuff, sqlcipher, qca-qt5, kdelibs4support, kactivities, - knotifyconfig, krunner, libofx }: + kiconthemes, knewstuff, sqlcipher, qca-qt5, kactivities, karchive, + kguiaddons, knotifyconfig, krunner, kwindowsystem, libofx, shared_mime_info +}: mkDerivation rec { name = "skrooge-${version}"; - version = "2.7.0"; + version = "2.8.1"; src = fetchurl { url = "http://download.kde.org/stable/skrooge/${name}.tar.xz"; - sha256 = "1xrh9nal122rzlv4m0x8qah6zpqb6891al3351piarpk2xgjgj4x"; + sha256 = "0q34fh86yjd471jf6xa87vy4l8i1s3gqjzqrxbh0rnr79avns5lg"; }; - nativeBuildInputs = [ cmake extra-cmake-modules ]; + nativeBuildInputs = [ cmake extra-cmake-modules shared_mime_info ]; buildInputs = [ qtwebkit qtscript grantlee kxmlgui kwallet kparts kdoctools kjobwidgets kdesignerplugin kiconthemes knewstuff sqlcipher qca-qt5 - kdelibs4support kactivities knotifyconfig krunner libofx + kactivities karchive kguiaddons knotifyconfig krunner kwindowsystem libofx ]; meta = with lib; { diff --git a/pkgs/applications/science/biology/iv/default.nix b/pkgs/applications/science/biology/iv/default.nix new file mode 100644 index 00000000000..714b7fddd44 --- /dev/null +++ b/pkgs/applications/science/biology/iv/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, neuron-version +, libX11, libXext, patchelf +}: + +stdenv.mkDerivation rec + { name = "iv-19"; + src = fetchurl + { url = "http://www.neuron.yale.edu/ftp/neuron/versions/v${neuron-version}/${name}.tar.gz"; + sha256 = "1q22vjngvn3m61mjxynkik7pxvsgc9a0ym46qpa84hmz1v86mdrw"; + }; + nativeBuildInputs = [ patchelf ]; + buildInputs = [ libXext ]; + propagatedBuildInputs = [ libX11 ]; + hardeningDisable = [ "format" ]; + postInstall = '' + for dir in $out/*; do # */ + if [ -d $dir/lib ]; then + mv $dir/* $out # */ + rmdir $dir + break + fi + done + patchelf --add-needed ${libX11}/lib/libX11.so $out/lib/libIVhines.so + ''; + meta = with stdenv.lib; + { description = "InterViews graphical library for Neuron"; + license = licenses.bsd3; + homepage = http://www.neuron.yale.edu/neuron; + platforms = platforms.all; + }; + } diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix index 136fba47eb7..bd300846cf0 100644 --- a/pkgs/applications/science/biology/neuron/default.nix +++ b/pkgs/applications/science/biology/neuron/default.nix @@ -9,6 +9,7 @@ , which , python ? null , mpi ? null +, iv }: stdenv.mkDerivation rec { @@ -16,7 +17,7 @@ stdenv.mkDerivation rec { version = "7.4"; nativeBuildInputs = [ which pkgconfig automake autoconf libtool ]; - buildInputs = [ ncurses readline python mpi ]; + buildInputs = [ ncurses readline python mpi iv ]; src = fetchurl { url = "http://www.neuron.yale.edu/ftp/neuron/versions/v${version}/nrn-${version}.tar.gz"; @@ -45,7 +46,7 @@ stdenv.mkDerivation rec { ''; configureFlags = with stdenv.lib; - [ "--without-x" "--with-readline=${readline}" ] + [ "--with-readline=${readline}" "--with-iv=${iv}" ] ++ optionals (python != null) [ "--with-nrnpython=${python.interpreter}" ] ++ (if mpi != null then ["--with-mpi" "--with-paranrn"] else ["--without-mpi"]); diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index 47fd8e5dbc8..bab9b302d7d 100644 --- a/pkgs/applications/science/logic/abc/default.nix +++ b/pkgs/applications/science/logic/abc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "A tool for squential logic synthesis and ormal verification"; + description = "A tool for squential logic synthesis and formal verification"; homepage = "https://people.eecs.berkeley.edu/~alanmi/abc/abc.htm"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/applications/science/logic/acgtk/default.nix index fa890c03b6f..9c8ecd01639 100644 --- a/pkgs/applications/science/logic/acgtk/default.nix +++ b/pkgs/applications/science/logic/acgtk/default.nix @@ -1,42 +1,42 @@ -{ stdenv, fetchurl, ocaml, findlib, dypgen, bolt, ansiterminal, camlp4, +{ stdenv, fetchurl, ocamlPackages, buildBytecode ? true, buildNative ? true, installExamples ? true, installEmacsMode ? true }: -let inherit (stdenv.lib) getVersion versionAtLeast +let inherit (stdenv.lib) versionAtLeast optionals optionalString; in -assert versionAtLeast (getVersion ocaml) "3.07"; -assert versionAtLeast (getVersion dypgen) "20080925"; -assert versionAtLeast (getVersion bolt) "1.4"; +let inherit (ocamlPackages) ocaml camlp4; in assert buildBytecode || buildNative; stdenv.mkDerivation { - name = "acgtk-1.1"; + name = "acgtk-1.3.1"; src = fetchurl { - url = "http://www.loria.fr/equipes/calligramme/acg/software/acg-1.1-20140905.tar.gz"; - sha256 = "1k1ldqg34bwmgdpmi9gry9czlsk85ycjxnkd25fhlf3mmgg4n9p6"; + url = http://calligramme.loria.fr/acg/software/acg-1.3.1-20170303.tar.gz; + sha256 = "1hhrf6bx2x2wbv5ldn4fnxhpr9lyrj3zh1vcnx8wf8f06ih4rzfq"; }; - buildInputs = [ ocaml findlib dypgen bolt ansiterminal camlp4 ]; + buildInputs = with ocamlPackages; [ + ocaml findlib camlp4 ansiterminal biniou bolt ocaml_cairo2 dypgen easy-format ocf yojson + ]; patches = [ ./install-emacs-to-site-lisp.patch ./use-nix-ocaml-byteflags.patch ]; postPatch = stdenv.lib.optionalString (camlp4 != null) '' substituteInPlace src/Makefile.master.in \ - --replace "+camlp4" "${camlp4}/lib/ocaml/${getVersion ocaml}/site-lib/camlp4/" + --replace "+camlp4" "${camlp4}/lib/ocaml/${ocaml.version}/site-lib/camlp4/" ''; # The bytecode executable is dependent on the dynamic library provided by # ANSITerminal. We can use the -dllpath flag of ocamlc (analogous to # -rpath) to make sure that ocamlrun is able to link the library at # runtime and that Nix detects a runtime dependency. - NIX_OCAML_BYTEFLAGS = "-dllpath ${ansiterminal}/lib/ocaml/${getVersion ocaml}/site-lib/ANSITerminal"; + NIX_OCAML_BYTEFLAGS = "-dllpath ${ocamlPackages.ansiterminal}/lib/ocaml/${ocaml.version}/site-lib/ANSITerminal"; buildFlags = optionalString buildBytecode "byte" + " " diff --git a/pkgs/applications/science/logic/boolector/default.nix b/pkgs/applications/science/logic/boolector/default.nix index 37d25c9e947..2b40995b743 100644 --- a/pkgs/applications/science/logic/boolector/default.nix +++ b/pkgs/applications/science/logic/boolector/default.nix @@ -1,48 +1,23 @@ -{ stdenv, fetchurl, zlib, useV16 ? false }: +{ stdenv, fetchurl }: -let - v15 = rec { - name = "boolector-${version}"; - version = "1.5.118"; - src = fetchurl { - url = "http://fmv.jku.at/boolector/${name}-with-sat-solvers.tar.gz"; - sha256 = "17j7q02rryvfwgvglxnhx0kv8hxwy8wbhzawn48lw05i98vxlmk9"; - }; +stdenv.mkDerivation rec { + name = "boolector-${version}"; + version = "2.4.1"; + src = fetchurl { + url = "http://fmv.jku.at/boolector/boolector-${version}-with-lingeling-bbc.tar.bz2"; + sha256 = "0mdf7hwix237pvknvrpazcx6s3ininj5k7vhysqjqgxa7lxgq045"; }; - v16 = rec { - name = "boolector-${version}"; - version = "1.6.0"; - src = fetchurl { - url = "http://fmv.jku.at/boolector/${name}-with-sat-solvers.tar.gz"; - sha256 = "0jka4r6bc3i24axgdp6qbq6gjadwz9kvi11s2c5sbwmdnjd7cp85"; - }; - }; - - boolectorPkg = if useV16 then v16 else v15; - license = with stdenv.lib.licenses; if useV16 then unfreeRedistributable else gpl3; -in -stdenv.mkDerivation (boolectorPkg // { - buildInputs = [ - zlib zlib.static (stdenv.lib.getOutput "static" stdenv.cc.libc) - ]; - - enableParallelBuilding = false; - installPhase = '' - mkdir -p $out/bin $out/lib $out/include - cp boolector/boolector $out/bin - cp boolector/deltabtor $out/bin - cp boolector/synthebtor $out/bin - cp boolector/libboolector.a $out/lib - cp boolector/boolector.h $out/include + mkdir $out + mv boolector/bin $out ''; meta = { - inherit license; + license = stdenv.lib.licenses.unfreeRedistributable; description = "An extremely fast SMT solver for bit-vectors and arrays"; homepage = "http://fmv.jku.at/boolector"; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; }; -}) +} diff --git a/pkgs/applications/science/logic/hol_light/Makefile.patch b/pkgs/applications/science/logic/hol_light/Makefile.patch deleted file mode 100644 index 5c1ec4f7aaf..00000000000 --- a/pkgs/applications/science/logic/hol_light/Makefile.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: Makefile -=================================================================== ---- a/Makefile (révision 199) -+++ b/Makefile (copie de travail) -@@ -59,7 +59,7 @@ - then cp pa_j_3.1x_6.02.1.ml pa_j.ml; \ - else if test ${CAMLP5_VERSION} = "6.02.2" -o ${CAMLP5_VERSION} = "6.02.3" -o ${CAMLP5_VERSION} = "6.03" -o ${CAMLP5_VERSION} = "6.04" -o ${CAMLP5_VERSION} = "6.05" -o ${CAMLP5_VERSION} = "6.06" ; \ - then cp pa_j_3.1x_6.02.2.ml pa_j.ml; \ -- else if test ${CAMLP5_VERSION} = "6.06" -o ${CAMLP5_VERSION} = "6.07" -o ${CAMLP5_VERSION} = "6.08" -o ${CAMLP5_VERSION} = "6.09" -o ${CAMLP5_VERSION} = "6.10" -o ${CAMLP5_VERSION} = "6.11" -o ${CAMLP5_VERSION} = "6.12" -o ${CAMLP5_VERSION} = "6.13" -o ${CAMLP5_VERSION} = "6.14" -o ${CAMLP5_VERSION} = "6.15" -o ${CAMLP5_VERSION} = "6.16" ; \ -+ else if test ${CAMLP5_VERSION} = "6.06" -o ${CAMLP5_VERSION} = "6.07" -o ${CAMLP5_VERSION} = "6.08" -o ${CAMLP5_VERSION} = "6.09" -o ${CAMLP5_VERSION} = "6.10" -o ${CAMLP5_VERSION} = "6.11" -o ${CAMLP5_VERSION} = "6.12" -o ${CAMLP5_VERSION} = "6.13" -o ${CAMLP5_VERSION} = "6.14" -o ${CAMLP5_VERSION} = "6.15" -o ${CAMLP5_VERSION} = "6.16" -o ${CAMLP5_VERSION} = "6.17" ; \ - then cp pa_j_3.1x_6.11.ml pa_j.ml; \ - else cp pa_j_3.1x_${CAMLP5_BINARY_VERSION}.xx.ml pa_j.ml; \ - fi \ diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index fbd732595e6..8d7c11ee91b 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, writeScript, ocaml, camlp5 }: +{ stdenv, fetchFromGitHub, fetchpatch, writeScript, ocaml, camlp5 }: let start_script = '' @@ -9,18 +9,24 @@ let in stdenv.mkDerivation { - name = "hol_light-2016-07-23"; + name = "hol_light-2017-07-06"; src = fetchFromGitHub { owner = "jrh13"; repo = "hol-light"; - rev = "67cff936dda719f0e0ee57ab9d07c779ff664660"; - sha256 = "0r85ifdvsvk2cdv7s4a0kf9ha6jdznqmz7swvp577f8r182klr28"; + rev = "0ad8cbdb4de08a38dac600f352555e8454499faa"; + sha256 = "0px9hl1b0mkyqv84j0si1zdq4066ffdrhzp27p2iah9l8ynbvpaq"; }; buildInputs = [ ocaml camlp5 ]; - patches = [ ./Makefile.patch ]; + patches = [ (fetchpatch { + url = https://github.com/girving/hol-light/commit/f80524bad61fd6f6facaa42153b2e29d1eab4658.patch; + sha256 = "1563wp597vakhmsgg8940dpirzzfvvxqp75x3dnx20rvmi2n2xw0"; + }) + ]; + + postPatch = "cp pa_j_3.1x_{6,7}.xx.ml"; installPhase = '' mkdir -p "$out/lib/hol_light" "$out/bin" diff --git a/pkgs/applications/science/logic/iprover/default.nix b/pkgs/applications/science/logic/iprover/default.nix index fe906fbe357..af225a2961d 100644 --- a/pkgs/applications/science/logic/iprover/default.nix +++ b/pkgs/applications/science/logic/iprover/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, ocaml, eprover }: +{ stdenv, fetchurl, ocaml, eprover, zlib }: stdenv.mkDerivation rec { name = "iprover-${version}"; - version = "0.8.1"; + version = "2.5"; src = fetchurl { - url = "http://iprover.googlecode.com/files/iprover_v${version}.tar.gz"; - sha256 = "15qn523w4l296np5rnkwi50a5x2xqz0kaza7bsh9bkazph7jma7w"; + url = "http://www.cs.man.ac.uk/~korovink/iprover/iprover-v${version}.tar.gz"; + sha256 = "1mbxjczp6nqw0p33glqmw973c268yzy4gxflk1lfiyiihrjdhinb"; }; - buildInputs = [ ocaml eprover ]; + buildInputs = [ ocaml eprover zlib ]; preConfigure = ''patchShebangs .''; @@ -25,12 +25,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An automated first-order logic theorem prover"; - maintainers = with maintainers; - [ - raskin - ]; + homepage = http://www.cs.man.ac.uk/~korovink/iprover/; + maintainers = with maintainers; [ raskin gebner ]; platforms = platforms.linux; license = licenses.gpl3; - downloadPage = "http://code.google.com/p/iprover/downloads/list"; }; } diff --git a/pkgs/applications/science/logic/poly/default.nix b/pkgs/applications/science/logic/poly/default.nix new file mode 100644 index 00000000000..2fdbd87a275 --- /dev/null +++ b/pkgs/applications/science/logic/poly/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl, gmp, cmake, python}: + +let version = "0.1.3"; +in + +stdenv.mkDerivation { + name = "libpoly-${version}"; + + src = fetchurl { + url = "https://github.com/SRI-CSL/libpoly/archive/v${version}.tar.gz"; + sha256 = "0nd90585imnznyp04vg6a5ixxkd3bavhv1437397aj2k3dfc0y2k"; + }; + + buildInputs = [ cmake gmp python ]; + + meta = with stdenv.lib; { + homepage = https://github.com/SRI-CSL/libpoly; + description = "C library for manipulating polynomials"; + license = licenses.lgpl3; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix index cf5114b4a41..0ec7f93d26f 100644 --- a/pkgs/applications/science/logic/yices/default.nix +++ b/pkgs/applications/science/logic/yices/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, gmp-static, gperf, autoreconfHook }: +{ stdenv, fetchurl, gmp-static, gperf, autoreconfHook, libpoly }: stdenv.mkDerivation rec { name = "yices-${version}"; version = "2.5.1"; src = fetchurl { - url = "http://yices.csl.sri.com/cgi-bin/yices2-newnewdownload.cgi?file=yices-${version}-src.tar.gz&accept=I+Agree"; - name = "yices-${version}-src.tar.gz"; + url = "http://yices.csl.sri.com/cgi-bin/yices2-newnewdownload.cgi?file=${name}-src.tar.gz&accept=I+Agree"; + name = "${name}-src.tar.gz"; sha256 = "1wfq6hcm54h0mqmbs1ip63i0ywlwnciav86sbzk3gafxyzg1nd0c"; }; @@ -14,13 +14,19 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-static-gmp=${gmp-static.out}/lib/libgmp.a" "--with-static-gmp-include-dir=${gmp-static.dev}/include" + "--enable-mcsat" ]; - buildInputs = [ gmp-static gperf autoreconfHook ]; + buildInputs = [ gmp-static gperf autoreconfHook libpoly ]; enableParallelBuilding = true; doCheck = true; - installPhase = ''make install LDCONFIG=true''; + # Includes a fix for the embedded soname being libyices.so.2.5, but + # only installing the libyices.so.2.5.1 file. + installPhase = '' + make install LDCONFIG=true + (cd $out/lib && ln -s -f libyices.so.2.5.1 libyices.so.2.5) + ''; meta = with stdenv.lib; { description = "A high-performance theorem prover and SMT solver"; diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 285673baa3c..e75ae2222ae 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -7,11 +7,11 @@ }: stdenv.mkDerivation rec { - name = "R-3.4.0"; + name = "R-3.4.1"; src = fetchurl { url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz"; - sha256 = "14cb8bwi3akvdb6934kqic2862f2qgav6cq4g0h7gi2p4ka9x3i8"; + sha256 = "0y7wlfk3cn1dxn2mpnxwvsk31s0599crbsyah8srm5pa2mfi7c82"; }; buildInputs = [ @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ tcl tk ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation cf-private libobjc ]; - patches = [ ./no-usr-local-search-paths.patch ./fix-sweave-exit-code.patch ]; + patches = [ ./no-usr-local-search-paths.patch ]; preConfigure = '' configureFlagsArray=( diff --git a/pkgs/applications/science/math/R/fix-sweave-exit-code.patch b/pkgs/applications/science/math/R/fix-sweave-exit-code.patch deleted file mode 100644 index 8ca1be750a5..00000000000 --- a/pkgs/applications/science/math/R/fix-sweave-exit-code.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 0ff560ba912fad126576818519035c8d3c693bed Mon Sep 17 00:00:00 2001 -From: maechler -Date: Mon, 24 Apr 2017 14:24:11 +0000 -Subject: [PATCH] R CMD Sweave status bug fix - -git-svn-id: https://svn.r-project.org/R/trunk@72612 00db46b3-68df-0310-9c12-caf00c1e9a41 - -diff --git a/src/library/utils/R/Sweave.R b/src/library/utils/R/Sweave.R -index 2beb094..8d4950b 100644 ---- a/src/library/utils/R/Sweave.R -+++ b/src/library/utils/R/Sweave.R -@@ -1,7 +1,7 @@ - # File src/library/utils/R/Sweave.R - # Part of the R package, https://www.R-project.org - # --# Copyright (C) 1995-2016 The R Core Team -+# Copyright (C) 1995-2017 The R Core Team - # - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -452,10 +452,10 @@ SweaveHooks <- function(options, run = FALSE, envir = .GlobalEnv) - } - do_exit <- - if(no.q) -- function(status = 1L) (if(status) stop else message)( -+ function(status = 0L) (if(status) stop else message)( - ".Sweave() exit status ", status) - else -- function(status = 1L) q("no", status = status, runLast = FALSE) -+ function(status = 0L) q("no", status = status, runLast = FALSE) - - if (!length(args)) { - Usage() -@@ -577,16 +577,15 @@ SweaveHooks <- function(options, run = FALSE, envir = .GlobalEnv) - } - do_exit <- - if(no.q) -- function(status = 1L) (if(status) stop else message)( -+ function(status = 0L) (if(status) stop else message)( - ".Stangle() exit status ", status) - else -- function(status = 1L) q("no", status = status, runLast = FALSE) -+ function(status = 0L) q("no", status = status, runLast = FALSE) - - if (!length(args)) { - Usage() - do_exit(1L) - } -- - file <- character() - encoding <- options <- "" - engine <- NULL diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix index 2712388ffe7..b6fdd6f58b9 100644 --- a/pkgs/applications/science/math/geogebra/default.nix +++ b/pkgs/applications/science/math/geogebra/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, jre, makeDesktopItem, makeWrapper }: +{ stdenv, fetchurl, jre, makeDesktopItem, makeWrapper, language ? "en_US" }: stdenv.mkDerivation rec { name = "geogebra-${version}"; - version = "5-0-361-0"; + version = "5-0-369-0"; preferLocalBuild = true; src = fetchurl { url = "http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"; - sha256 = "14kidnk8bidklv474zqipv3f77qnfmc697pl407v0rja481c649a"; + sha256 = "0b5015z1ff3ksnkmyn2hbfwvhqp1572pdn8llpws32k7w1lb0jnk"; }; srcIcon = fetchurl { @@ -34,7 +34,8 @@ stdenv.mkDerivation rec { makeWrapper "$out/libexec/geogebra/geogebra" "$out/bin/geogebra" \ --set JAVACMD "${jre}/bin/java" \ - --set GG_PATH "$out/libexec/geogebra" + --set GG_PATH "$out/libexec/geogebra" \ + --add-flags "--language=${language}" install -Dm644 "${desktopItem}/share/applications/"* \ -t $out/share/applications/ diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix index ee67af62bb1..1956ebdcb0f 100644 --- a/pkgs/applications/science/math/ginac/default.nix +++ b/pkgs/applications/science/math/ginac/default.nix @@ -1,18 +1,20 @@ -{ stdenv, fetchurl, cln, pkgconfig, readline, gmp }: +{ stdenv, fetchurl, cln, pkgconfig, readline, gmp, python }: stdenv.mkDerivation rec { - name = "ginac-1.6.2"; + name = "ginac-1.7.2"; src = fetchurl { url = "${meta.homepage}/${name}.tar.bz2"; - sha256 = "1pivcqqaf142l6vrj2azq6dxrcyzhag4za2dwicb4gsb09ax4d0g"; + sha256 = "1dyq47gc97jn1r5sy0klxs5b4lzhckyjqgsvwcs2a9ybqmhmpdr4"; }; propagatedBuildInputs = [ cln ]; buildInputs = [ readline ] ++ stdenv.lib.optional stdenv.isDarwin gmp; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig python ]; + + preConfigure = "patchShebangs ginsh"; configureFlags = "--disable-rpath"; diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index eae4b0ceb62..3e4c8c70286 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -1,17 +1,20 @@ -{ stdenv, fetchdarcs, ocaml, findlib, lablgl, camlimages, mesa, freeglut, ocaml_mysql, mysql, mlgmp, mpfr, gmp, libtiff, libjpeg, libpng, giflib }: +{ stdenv, fetchurl, ocamlPackages, mesa, freeglut +, mysql, mpfr, gmp, libtiff, libjpeg, libpng, giflib +}: stdenv.mkDerivation { - name = "glsurf-3.3"; + name = "glsurf-3.3.1"; - src = fetchdarcs { - url = "http://lama.univ-savoie.fr/~raffalli/GlSurf"; - rev = "3.3"; - sha256 = "0ljvvzz31j7l8rvsv63x1kj70nhw3al3k294m79hpmwjvym1mzfa"; + src = fetchurl { + url = "http://lama.univ-savoie.fr/~raffalli/glsurf/glsurf-3.3.1.tar.gz"; + sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7"; }; - buildInputs = [ ocaml findlib freeglut mesa - lablgl camlimages ocaml_mysql mysql.lib mlgmp mpfr gmp - libtiff libjpeg libpng giflib ]; + buildInputs = [ freeglut mesa mysql.lib mpfr gmp + libtiff libjpeg libpng giflib ] + ++ (with ocamlPackages; [ + ocaml findlib ocaml_mysql lablgl camlimages_4_0 mlgmpidl + ]); installPhase = '' mkdir -p $out/bin $out/share/doc/glsurf @@ -23,6 +26,5 @@ stdenv.mkDerivation { meta = { homepage = http://www.lama.univ-savoie.fr/~raffalli/glsurf; description = "A program to draw implicit surfaces and curves"; - broken = true; }; } diff --git a/pkgs/applications/science/medicine/aliza/default.nix b/pkgs/applications/science/medicine/aliza/default.nix new file mode 100644 index 00000000000..7cdacc1738b --- /dev/null +++ b/pkgs/applications/science/medicine/aliza/default.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchurl, rpmextract, makeWrapper, patchelf, qt4, zlib, libX11, libXt, libSM, libICE, libXext, mesa }: + +with stdenv.lib; +stdenv.mkDerivation { + name = "aliza"; + src = fetchurl { + # Hosted on muoniurn's google drive + url = "https://drive.google.com/uc?export=download&id=0B0s_Yf4jjfZ4WUJaSERHN3FsNFE"; + sha256 = "1nfp3ghjnfxmxiclg76gcn7a3mhvi6h7s5wmd9v9l6w8lfq9vj5h"; + name = "aliza.rpm"; + }; + + buildInputs = [ rpmextract makeWrapper ]; + + unpackCmd = "rpmextract $curSrc"; + + patchPhase = '' + sed -i 's/^Exec.*$/Exec=aliza %F/' share/applications/aliza.desktop + ''; + + installPhase = '' + mkdir -p $out + cp -r bin share $out + + runHook postInstall + ''; + + postInstall = let + libs = stdenv.lib.makeLibraryPath [ qt4 zlib stdenv.cc.cc libSM libICE libX11 libXext libXt mesa ]; + in '' + ${patchelf}/bin/patchelf \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + $out/bin/aliza + + ${patchelf}/bin/patchelf \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + $out/bin/aliza-vtkvol + + wrapProgram $out/bin/aliza \ + --prefix LD_LIBRARY_PATH : ${libs} + + wrapProgram $out/bin/aliza-vtkvol \ + --prefix LD_LIBRARY_PATH : ${libs} + ''; + + meta = { + description = "Medical imaging software with 2D, 3D and 4D capabilities"; + homepage = "http://www.aliza-dicom-viewer.com"; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ mounium ]; + }; +} diff --git a/pkgs/applications/science/misc/root/ROOT-8728-extra.patch b/pkgs/applications/science/misc/root/ROOT-8728-extra.patch index ec8c160c6f3..a396a848f14 100644 --- a/pkgs/applications/science/misc/root/ROOT-8728-extra.patch +++ b/pkgs/applications/science/misc/root/ROOT-8728-extra.patch @@ -1,16 +1,3 @@ -diff --git a/core/base/inc/ROOT/StringConv.hxx b/core/base/inc/ROOT/StringConv.hxx -index 629fc18..4efa54a 100644 ---- a/core/base/inc/ROOT/StringConv.hxx -+++ b/core/base/inc/ROOT/StringConv.hxx -@@ -89,7 +89,7 @@ EFromHumanReadableSize FromHumanReadableSize(std::string_view str, T &value) - size_t size = str.size(); - size_t cur; - // Parse leading numeric factor -- const double coeff = stod(str, &cur); -+ const double coeff = stod(static_cast(str), &cur); - - // Skip any intermediate white space - while (cur(im)); -diff -aru a/core/base/inc/TString.h b/core/base/inc/TString.h ---- a/core/base/inc/TString.h -+++ b/core/base/inc/TString.h -@@ -106,7 +106,7 @@ - char operator[](Ssiz_t i) const; // Index with bounds checking - - operator std::string_view() const { return std::string_view(Data(),fExtent); } -- operator std::string() const { return std::string_view(Data(),fExtent).to_string(); } -+ operator std::string() const { return static_cast(std::string_view(Data(),fExtent)); } - - const char *Data() const; - Ssiz_t Length() const { return fExtent; } diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 726f6352c95..c13169041aa 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "root-${version}"; - version = "6.09.02"; + version = "6.10.02"; src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - sha256 = "0fc6b0l7bw66cyckxs4ikvyzcv1zlfx88205jx153smdhih0jj2k"; + sha256 = "1ryp9397xpbnxha6s222c10pa50lf2qf5s35n31lc29s90p8s9kc"; }; buildInputs = [ cmake pcre pkgconfig python2 zlib libxml2 lzma gsl ] @@ -23,10 +23,6 @@ stdenv.mkDerivation rec { ./thisroot.patch # https://sft.its.cern.ch/jira/browse/ROOT-8728 - (fetchpatch { - url = "https://sft.its.cern.ch/jira/secure/attachment/20025/0001-std-string_view-has-no-more-to_string.patch"; - sha256 = "0ngyk960xfrcsj4vhr1ax8h85fx0g1cfycxi3k35a6ych2zmyg8q"; - }) ./ROOT-8728-extra.patch ]; @@ -47,6 +43,7 @@ stdenv.mkDerivation rec { "-Dfftw3=OFF" "-Dfitsio=OFF" "-Dfortran=OFF" + "-Dimt=OFF" "-Dgfal=OFF" "-Dgviz=OFF" "-Dhdfs=OFF" @@ -66,7 +63,8 @@ stdenv.mkDerivation rec { "-Dxml=ON" "-Dxrootd=OFF" ] - ++ stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.lib.getDev stdenv.cc.libc}/include"; + ++ stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.lib.getDev stdenv.cc.libc}/include" + ++ stdenv.lib.optional stdenv.isDarwin "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"; enableParallelBuilding = true; diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix index 141ef44b77e..6dbc75e9c06 100644 --- a/pkgs/applications/science/spyder/default.nix +++ b/pkgs/applications/science/spyder/default.nix @@ -51,6 +51,5 @@ buildPythonApplication rec { homepage = https://github.com/spyder-ide/spyder/; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor fridh ]; }; } diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index 14a492f6cc2..cefdc1108bf 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -2,15 +2,15 @@ , tcllib, withJson ? true}: stdenv.mkDerivation rec { - name = "fossil-1.36"; + name = "fossil-2.2"; src = fetchurl { urls = [ - https://fossil-scm.org/index.html/uv/download/fossil-src-1.36.tar.gz + https://www.fossil-scm.org/index.html/uv/fossil-src-2.2.tar.gz ]; name = "${name}.tar.gz"; - sha256 = "04px1mnq5dlc6gaihxj5nj6k7ac43wfryzifaairjh74qmgc6xi6"; + sha256 = "0wfgacfg29dkl0c3l1rp5ji0kraa64gcbg5lh8p4m7mqdqcq53wv"; }; buildInputs = [ zlib openssl readline sqlite which ed ] @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { crossAttrs = { doCheck = false; - makeFlagsArray = [ "TCC=${stdenv.cross.config}-gcc" ]; + makeFlags = [ "TCC=$CC" ]; }; meta = { diff --git a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix index 3b1837d16f1..b613898faaa 100644 --- a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix +++ b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "diff-so-fancy-${version}"; - version = "0.11.4"; + version = "1.1.0"; src = fetchFromGitHub { owner = "so-fancy"; repo = "diff-so-fancy"; rev = "v${version}"; - sha256 = "1za2rm8jzcdc6bkpl198nrqf5bc05nw53vlkk15nmmb9snnb69ig"; + sha256 = "0wd9npcfp41ggvddrbif8qr25pm7jlzxzd3xn5rlq0y0frwx5akj"; }; # Perl is needed here for patchShebangs @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # itself, so we are copying executable to lib, and only symlink it # from bin/ cp diff-so-fancy $out/lib/diff-so-fancy - cp -r libexec $out/lib/diff-so-fancy + cp -r lib $out/lib/diff-so-fancy ln -s $out/lib/diff-so-fancy/diff-so-fancy $out/bin # ncurses is needed for `tput` @@ -43,5 +43,6 @@ stdenv.mkDerivation rec { diff-so-fancy builds on the good-lookin' output of git contrib's diff-highlight to upgrade your diffs' appearances. ''; + maintainers = with maintainers; [ fpletz ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix new file mode 100644 index 00000000000..6918f048eae --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix @@ -0,0 +1,30 @@ +{ fetchFromGitHub, python2Packages, stdenv, git, graphviz }: + +python2Packages.buildPythonApplication rec { + pname = "git-big-picture"; + version = "0.9.0"; + + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "esc"; + repo = pname; + rev = "v${version}"; + sha256 = "1h283gzs4nx8lrarmr454zza52cilmnbdrqn1n33v3cn1rayl3c9"; + }; + + buildInputs = [ git graphviz ]; + + postFixup = '' + wrapProgram $out/bin/git-big-picture \ + --prefix PATH ":" ${ stdenv.lib.makeBinPath buildInputs } + ''; + + meta = { + description = "Tool for visualization of Git repositories."; + homepage = https://github.com/esc/git-big-picture; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.nthorne ]; + }; +} 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 bb00a22730b..c6082f71af8 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -1,5 +1,6 @@ { fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio -, gnugrep, gzip, openssh +, gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc +, gzip, openssh , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45 , libxslt, tcl, tk, makeWrapper, libiconv , svnSupport, subversionClient, perlLibs, smtpPerlLibs, gitwebPerlLibs @@ -11,7 +12,7 @@ }: let - version = "2.13.1"; + version = "2.13.3"; svn = subversionClient.override { perlBindings = true; }; in @@ -20,7 +21,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "1zl88rlga9nhgaqc9d04vp1l1g4x6qj1d02698asnxrzk36vxh9v"; + sha256 = "0qiy696pwqhbxcrvm3zhyjnfjrym541glhvgc4cynrwg8az27ali"; }; hardeningDisable = [ "format" ]; @@ -104,11 +105,24 @@ stdenv.mkDerivation { --replace ' grep' ' ${gnugrep}/bin/grep' \ --replace ' egrep' ' ${gnugrep}/bin/egrep' - # Fix references to the perl binary. Note that the tab character - # in the patterns is important. - sed -i -e 's| perl -ne| ${perl}/bin/perl -ne|g' \ - -e 's| perl -e| ${perl}/bin/perl -e|g' \ - $out/libexec/git-core/{git-am,git-submodule} + # Fix references to the perl, sed, awk and various coreutil binaries used by + # shell scripts that git calls (e.g. filter-branch) + SCRIPT="$(cat <<'EOS' + BEGIN{ + @a=( + '${perl}/bin/perl', '${gnugrep}/bin/grep', '${gnused}/bin/sed', '${gawk}/bin/awk', + '${coreutils}/bin/cut', '${coreutils}/bin/basename', '${coreutils}/bin/dirname', + '${coreutils}/bin/wc', '${coreutils}/bin/tr' + ); + } + foreach $c (@a) { + $n=(split("/", $c))[-1]; + s|(?<=[^#][^/.-])\b''${n}(?=\s)|''${c}|g + } + EOS + )" + perl -0777 -i -pe "$SCRIPT" \ + $out/libexec/git-core/git-{sh-setup,filter-branch,merge-octopus,mergetool,quiltimport,request-pull,stash,submodule,subtree,web--browse} # Fix references to gettext. substituteInPlace $out/libexec/git-core/git-sh-i18n \ diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index 4ab97cc06d2..c8af3fe63f9 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; buildGoPackage rec { name = "gogs-${version}"; - version = "0.10.18"; + version = "0.11.19"; src = fetchFromGitHub { owner = "gogits"; repo = "gogs"; rev = "v${version}"; - sha256 = "1f1dlickjpdilf4j295i9v2h4ig4pf5d2mnpbr59wh14bby4bh0y"; + sha256 = "0smzklhpfv3smqgzd0cnjdif3zi5q7b02grrnb5zssmdi1b2dlsd"; }; patchPhase = '' @@ -26,7 +26,9 @@ buildGoPackage rec { outputs = [ "bin" "out" "data" ]; - postInstall = '' + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -delete_rpath $out/lib $bin/bin/gogs + '' + '' mkdir $data cp -R $src/{public,templates} $data @@ -38,7 +40,6 @@ buildGoPackage rec { ''; goPackagePath = "github.com/gogits/gogs"; - goDeps = ./deps.nix; meta = { description = "A painless self-hosted Git service"; diff --git a/pkgs/applications/version-management/gogs/deps.nix b/pkgs/applications/version-management/gogs/deps.nix deleted file mode 100644 index 4596eb1d243..00000000000 --- a/pkgs/applications/version-management/gogs/deps.nix +++ /dev/null @@ -1,443 +0,0 @@ -[ - { - goPackagePath = "github.com/Unknwon/cae"; - fetch = { - type = "git"; - url = "https://github.com/Unknwon/cae"; - rev = "c6aac99ea2cae2ebaf23f26f76b04fe3fcfc9f8c"; - sha256 = "0j6l1fcs6gp4qw6b9w3pg9fgah18lh1hanfz5y64r6ks244v3l7s"; - }; - } - { - goPackagePath = "github.com/Unknwon/com"; - fetch = { - type = "git"; - url = "https://github.com/Unknwon/com"; - rev = "28b053d5a2923b87ce8c5a08f3af779894a72758"; - sha256 = "09i9slj4zbsqmwkkx9bqi7cgpv6hqby6r98l6qx1wag89qijybz2"; - }; - } - { - goPackagePath = "github.com/Unknwon/i18n"; - fetch = { - type = "git"; - url = "https://github.com/Unknwon/i18n"; - rev = "39d6f2727e0698b1021ceb6a77c1801aa92e7d5d"; - sha256 = "1f4s9srdaqw2yqgc3d76vww3glbwka2f5q4zrwn8bb66kcazbfb7"; - }; - } - { - goPackagePath = "github.com/Unknwon/paginater"; - fetch = { - type = "git"; - url = "https://github.com/Unknwon/paginater"; - rev = "701c23f468663c34d1b1768c3ae1bcc57e11c5b3"; - sha256 = "09h3gyd9wyzgbkny5g5ihd4ckmv0bams8g5y2xfkd55gizlmx07p"; - }; - } - { - goPackagePath = "github.com/bradfitz/gomemcache"; - fetch = { - type = "git"; - url = "https://github.com/bradfitz/gomemcache"; - rev = "2fafb84a66c4911e11a8f50955b01e74fe3ab9c5"; - sha256 = "1k3vqmq008gad1cq1gaqa35k5ldn0z8fcx07c15x9v8p9xjbhkc9"; - }; - } - { - goPackagePath = "github.com/go-macaron/binding"; - fetch = { - type = "git"; - url = "https://github.com/go-macaron/binding"; - rev = "48920167fa152d02f228cfbece7e0f1e452d200a"; - sha256 = "00h4mdyhqkh75vgafyyyn54kdpwj82ifg9l6lxv9gnkw6frxhkan"; - }; - } - { - goPackagePath = "github.com/go-macaron/cache"; - fetch = { - type = "git"; - url = "https://github.com/go-macaron/cache"; - rev = "56173531277692bc2925924d51fda1cd0a6b8178"; - sha256 = "1116a22wm43q2l54nnycgli90kix787j20mpgya9qb6xnglcck59"; - }; - } - { - goPackagePath = "github.com/go-macaron/captcha"; - fetch = { - type = "git"; - url = "https://github.com/go-macaron/captcha"; - rev = "8aa5919789ab301e865595eb4b1114d6b9847deb"; - sha256 = "0wdihxbl7yw4wg2x0wb09kv9swfpr5j06wsj4hxn3xcbpqi9viwm"; - }; - } - { - goPackagePath = "github.com/go-macaron/csrf"; - fetch = { - type = "git"; - url = "https://github.com/go-macaron/csrf"; - rev = "6a9a7df172cc1fcd81e4585f44b09200b6087cc0"; - sha256 = "173da2hl9fcfgkn0nv1ws3pr0gyyp88amhj2bfk4414k5a3r0nsa"; - }; - } - { - goPackagePath = "github.com/go-macaron/gzip"; - fetch = { - type = "git"; - url = "https://github.com/go-macaron/gzip"; - rev = "cad1c6580a07c56f5f6bc52d66002a05985c5854"; - sha256 = "12mq3dd1vd0jbi80fxab4ysmipbz9zhbm9nw6y6a6bw3byc8w4jf"; - }; - } - { - goPackagePath = "github.com/go-macaron/i18n"; - fetch = { - type = "git"; - url = "https://github.com/go-macaron/i18n"; - rev = "ef57533c3b0fc2d8581deda14937e52f11a203ab"; - sha256 = "1nkrcnpjl3x6fhjss2vp29mnvam20vpvxvxpfg1zspi1rjmpyhqy"; - }; - } - { - goPackagePath = "github.com/go-macaron/inject"; - fetch = { - type = "git"; - url = "https://github.com/go-macaron/inject"; - rev = "d8a0b8677191f4380287cfebd08e462217bac7ad"; - sha256 = "0p47pz699xhmi8yxhahvrpai9r49rqap5ckwmz1dlkrnh3zwhrhh"; - }; - } - { - goPackagePath = "github.com/go-macaron/session"; - fetch = { - type = "git"; - url = "https://github.com/go-macaron/session"; - rev = "b8a2b5ef7fb4c91c1c8ca23e2a52e29a4bcbb22f"; - sha256 = "1nz823fn23wp87pzzhpxlbr6j7q4khywa9n0h1kpdikiy87z5k5m"; - }; - } - { - goPackagePath = "github.com/go-macaron/toolbox"; - fetch = { - type = "git"; - url = "https://github.com/go-macaron/toolbox"; - rev = "99a42f20e9e88daec5c0d7beb4e7eac134680ab0"; - sha256 = "0r6ksiqzrii7b9vv8daz68044pyifsxmpz48m6h8m6l3h9ygz8cx"; - }; - } - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "2e00b5cd70399450106cec6431c2e2ce3cae5034"; - sha256 = "085g48jq9hzmlcxg122n0c4pi41sc1nn2qpx1vrl2jfa8crsppa5"; - }; - } - { - goPackagePath = "github.com/go-xorm/builder"; - fetch = { - type = "git"; - url = "https://github.com/go-xorm/builder"; - rev = "db75972580de4a7c6c20fff5b16a924c3de3fa12"; - sha256 = "0qgrvjfghkgfhbrm989yhrwgs36d6wxcap012glpmd2ddp5klw46"; - }; - } - { - goPackagePath = "github.com/go-xorm/core"; - fetch = { - type = "git"; - url = "https://github.com/go-xorm/core"; - rev = "2fbe2c76c6781d9e1c0398fc25386426e611f975"; - sha256 = "1rfry5md6g8b6d6vyqpqys3wl2mxf6v55d2aapxlx3hqn6lz0lax"; - }; - } - { - goPackagePath = "github.com/go-xorm/xorm"; - fetch = { - type = "git"; - url = "https://github.com/go-xorm/xorm"; - rev = "2189b36884a485d1d609fc5690bfc71a8a7de8c3"; - sha256 = "02z140xbwqins6ql8hwdr6ar3d67jqrkm22bamqbj2rmfl7z0846"; - }; - } - { - goPackagePath = "github.com/gogits/chardet"; - fetch = { - type = "git"; - url = "https://github.com/gogits/chardet"; - rev = "2404f777256163ea3eadb273dada5dcb037993c0"; - sha256 = "1dki2pqhnzcmzlqrq4d4jwknnjxm82xqnmizjjdblb6h98ans1cd"; - }; - } - { - goPackagePath = "github.com/gogits/cron"; - fetch = { - type = "git"; - url = "https://github.com/gogits/cron"; - rev = "2fc07a4c4f1e3c4d2301c5ed578d5e2c31c70421"; - sha256 = "0a153pspisnhjpxjsryqdb29y6b8ics0203icbq5lps2g5jyaiw0"; - }; - } - { - goPackagePath = "github.com/gogits/git-module"; - fetch = { - type = "git"; - url = "https://github.com/gogits/git-module"; - rev = "df1013f8eb4dc70de90bc5597bf560a4b7da802e"; - sha256 = "1vnfiwdwp210hn7z7fgi5i80mggk76blbhykqg8wvx8bi0wxlrs8"; - }; - } - { - goPackagePath = "github.com/gogits/go-gogs-client"; - fetch = { - type = "git"; - url = "https://github.com/gogits/go-gogs-client"; - rev = "98046bb98061fc6baa5bb86359af0b7c300d384a"; - sha256 = "1wsg70irk4lwyak4kn2ml64j1fglqkyzs2lgc2mk4n4j5kn9hs1k"; - }; - } - { - goPackagePath = "github.com/gogits/go-libravatar"; - fetch = { - type = "git"; - url = "https://github.com/gogits/go-libravatar"; - rev = "cd1abbd55d09b793672732a7a1dfdaa12a40dfd0"; - sha256 = "00xvnddfh1m5g17mrnvp505i4sgwpk1r0wqz6a15bp6lvadwwlnj"; - }; - } - { - goPackagePath = "github.com/issue9/identicon"; - fetch = { - type = "git"; - url = "https://github.com/issue9/identicon"; - rev = "d36b54562f4cf70c83653e13dc95c220c79ef521"; - sha256 = "0y82b3gq8rpqglvf3lsqhgp5djfdammwd1w24k3i97iqls0rch7l"; - }; - } - { - goPackagePath = "github.com/jaytaylor/html2text"; - fetch = { - type = "git"; - url = "https://github.com/jaytaylor/html2text"; - rev = "4b9124c9b0a2279e2092c4a9aaf1c83bbd2dcffc"; - sha256 = "1yp0rawzziia9diffxs6k5g85acq3a62yb5ajbvy04r2p04dv85h"; - }; - } - { - goPackagePath = "github.com/klauspost/compress"; - fetch = { - type = "git"; - url = "https://github.com/klauspost/compress"; - rev = "e3b7981a12dd3cab49afa1d3a50e715846f23732"; - sha256 = "0hxciiaqrbf7rr112r7rwk7jcwhvjpbhnp8ikszp56zwqd64k9vn"; - }; - } - { - goPackagePath = "github.com/klauspost/cpuid"; - fetch = { - type = "git"; - url = "https://github.com/klauspost/cpuid"; - rev = "09cded8978dc9e80714c4d85b0322337b0a1e5e0"; - sha256 = "05l8pfch0gvxh0khapwxhsk4xajn40vbjr360n49vh2z5531v2xq"; - }; - } - { - goPackagePath = "github.com/klauspost/crc32"; - fetch = { - type = "git"; - url = "https://github.com/klauspost/crc32"; - rev = "cb6bfca970f6908083f26f39a79009d608efd5cd"; - sha256 = "0q4yr4isgmph1yf1vq527lpmid7vqv56q7vxh3gkp5679fb90q6n"; - }; - } - { - goPackagePath = "github.com/lib/pq"; - fetch = { - type = "git"; - url = "https://github.com/lib/pq"; - rev = "8df6253d1317616f36b0c3740eb30c239a7372cb"; - sha256 = "0djs6k6rdh06v8bz0msn0lv532hk2vrljj1pz4kgmbqcmd17y31k"; - }; - } - { - goPackagePath = "github.com/mcuadros/go-version"; - fetch = { - type = "git"; - url = "https://github.com/mcuadros/go-version"; - rev = "257f7b9a7d87427c8d7f89469a5958d57f8abd7c"; - sha256 = "0mpbcc698503hbrlc74l3nqd6hdr0n6vybfzw10pg7qx3cpmn512"; - }; - } - { - goPackagePath = "github.com/microcosm-cc/bluemonday"; - fetch = { - type = "git"; - url = "https://github.com/microcosm-cc/bluemonday"; - rev = "e79763773ab6222ca1d5a7cbd9d62d83c1f77081"; - sha256 = "04rd8jzy8kzzm0j0k7wy90pykl8ws43yhhwl2gkyz6rak10jhqpz"; - }; - } - { - goPackagePath = "github.com/nfnt/resize"; - fetch = { - type = "git"; - url = "https://github.com/nfnt/resize"; - rev = "891127d8d1b52734debe1b3c3d7e747502b6c366"; - sha256 = "08lg2v4s1iyzqja7xb69d57gpz1y43yqfwv7i4fa7a06m595r9iw"; - }; - } - { - goPackagePath = "github.com/russross/blackfriday"; - fetch = { - type = "git"; - url = "https://github.com/russross/blackfriday"; - rev = "5f33e7b7878355cd2b7e6b8eefc48a5472c69f70"; - sha256 = "0d7faqxrxvh8hwc1r8gbasgmr8x5blxvzciwspir2yafjfbqy87k"; - }; - } - { - goPackagePath = "github.com/satori/go.uuid"; - fetch = { - type = "git"; - url = "https://github.com/satori/go.uuid"; - rev = "b061729afc07e77a8aa4fad0a2fd840958f1942a"; - sha256 = "0q87n5an7ha2d8kl6gn9wi41rq0whsxq68w5x3nxz7w9vgkfnq1k"; - }; - } - { - goPackagePath = "github.com/sergi/go-diff"; - fetch = { - type = "git"; - url = "https://github.com/sergi/go-diff"; - rev = "83532ca1c1caa393179c677b6facf48e61f4ca5d"; - sha256 = "08niiivkn9a1hdl738w2sq4vq6csqhw91an8wq83dk40q62f4sq8"; - }; - } - { - goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; - fetch = { - type = "git"; - url = "https://github.com/shurcooL/sanitized_anchor_name"; - rev = "1dba4b3954bc059efc3991ec364f9f9a35f597d2"; - sha256 = "0pwap8lp79pldd95a1qi3xhlsa17m8zddpgc5jzvk6d1cjpsm6qg"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "0bdeddeeb0f650497d603c4ad7b20cfe685682f6"; - sha256 = "1ny63c7bfwfrsp7vfkvb4i0xhq4v7yxqnwxa52y4xlfxs4r6v6fg"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "cb497ae8f18e3c55f81bc9f3876c8f4c3d8a2813"; - sha256 = "0zah08y0a9rqk1ggp0ylkpycr3amrc22ncsppyrymry44g56xyfj"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "ae05321a78c1401cec22ba7bc203b597ea372496"; - sha256 = "1fzbijklrmhwj4mlwrnrxbbrhlzpgrsbv05zldbkvhic14g0ii2c"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "44f4f658a783b0cee41fe0a23b8fc91d9c120558"; - sha256 = "1hgwc2p5azfyzvl7i47my3wnbp2g7814a2sshqw63dvggs9mszcx"; - }; - } - { - goPackagePath = "gopkg.in/asn1-ber.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/asn1-ber.v1"; - rev = "4e86f4367175e39f69d9358a5f17b4dda270378d"; - sha256 = "13p8s74kzklb5lklfpxwxb78rknihawv1civ4s9bfqx565010fwk"; - }; - } - { - goPackagePath = "gopkg.in/bufio.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/bufio.v1"; - rev = "567b2bfa514e796916c4747494d6ff5132a1dfce"; - sha256 = "1z5pj778hdianlfj14p0d67g69v4gc2kvn6jg27z5jf75a88l19b"; - }; - } - { - goPackagePath = "gopkg.in/editorconfig/editorconfig-core-go.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/editorconfig/editorconfig-core-go.v1"; - rev = "a872f05c2e34b37b567401384d202aff11ba06d4"; - sha256 = "17mc7rm0fl5vi7ky95c2bd7c8ck0ms5bghzmgx9qk7x1zrw91335"; - }; - } - { - goPackagePath = "gopkg.in/gomail.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/gomail.v2"; - rev = "81ebce5c23dfd25c6c67194b37d3dd3f338c98b1"; - sha256 = "0zdykrv5s19lnq0g49p6njldy4cpk4g161vyjafiw7f84h8r28mc"; - }; - } - { - goPackagePath = "gopkg.in/ini.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/ini.v1"; - rev = "6f66b0e091edb3c7b380f7c4f0f884274d550b67"; - sha256 = "1n09b7ypbayhk6x7qi3g3hrqjlmj5yszwl5d8jykjd5azp6h8sb8"; - }; - } - { - goPackagePath = "gopkg.in/ldap.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/ldap.v2"; - rev = "8168ee085ee43257585e50c6441aadf54ecb2c9f"; - sha256 = "1w0993i8bl8sap01gwm1v6hjp0rsanj2mbpyabwcwnns2g79n895"; - }; - } - { - goPackagePath = "gopkg.in/macaron.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/macaron.v1"; - rev = "ddb19a9f3e8cedd44696b9dd5854dc8a43f3dd6c"; - sha256 = "0riggdq8zxy5x6zhks66slvsg22b9i4399f7ns2l6daj79myqyvy"; - }; - } - { - goPackagePath = "gopkg.in/redis.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/redis.v2"; - rev = "e6179049628164864e6e84e973cfb56335748dea"; - sha256 = "02hifpgak39y39lbn7v2ybbpk3rmb8nvmb3h3490frr8s4pfkb8h"; - }; - } - { - goPackagePath = "github.com/mattn/go-sqlite3"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-sqlite3"; - rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42"; - sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla"; - }; - } -] diff --git a/pkgs/applications/version-management/vcsh/default.nix b/pkgs/applications/version-management/vcsh/default.nix index e15bc489beb..77663e858ef 100644 --- a/pkgs/applications/version-management/vcsh/default.nix +++ b/pkgs/applications/version-management/vcsh/default.nix @@ -12,9 +12,15 @@ stdenv.mkDerivation rec { }; patches = - [ (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/RichiH/vcsh/pull/222.patch"; - sha256 = "0grdbiwq04x5qj0a1yd9a78g5v28dxhwl6mwxvgvvmzs6k5wnl3k"; - }) + [ + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/RichiH/vcsh/pull/222.patch"; + sha256 = "0grdbiwq04x5qj0a1yd9a78g5v28dxhwl6mwxvgvvmzs6k5wnl3k"; + }) + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/RichiH/vcsh/pull/228.patch"; + sha256 = "0sdn4mzrhaynw85knia2iw5b6rgy0l1rd6dwh0lwspnh668wqgam"; + }) ]; buildInputs = [ which git ronn perl ShellCommand TestMost ]; diff --git a/pkgs/applications/video/handbrake/handbrake-0.10.3-nolibav.patch b/pkgs/applications/video/handbrake/handbrake-0.10.3-nolibav.patch deleted file mode 100644 index 8539186aaa5..00000000000 --- a/pkgs/applications/video/handbrake/handbrake-0.10.3-nolibav.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 75549414927212d4d1666730133805b33447de79 Mon Sep 17 00:00:00 2001 -From: John Stebbins -Date: Tue, 3 Nov 2015 10:16:01 -0800 -Subject: [PATCH] muxavformat: add support for mp4 fallback audio signalling - ---- -diff --git a/libhb/muxavformat.c b/libhb/muxavformat.c -index 0d70597..373c2ab 100644 ---- a/libhb/muxavformat.c -+++ b/libhb/muxavformat.c -@@ -121,7 +121,7 @@ static int avformatInit( hb_mux_object_t * m ) - hb_mux_data_t * track; - int meta_mux; - int max_tracks; -- int ii, ret; -+ int ii, jj, ret; - - int clock_min, clock_max, clock; - hb_video_framerate_get_limits(&clock_min, &clock_max, &clock); -@@ -589,6 +589,56 @@ static int avformatInit( hb_mux_object_t * m ) - } - } - -+ // Check for audio track associations -+ for (ii = 0; ii < hb_list_count(job->list_audio); ii++) -+ { -+ audio = hb_list_item(job->list_audio, ii); -+ switch (audio->config.out.codec & HB_ACODEC_MASK) -+ { -+ case HB_ACODEC_FFAAC: -+ case HB_ACODEC_CA_AAC: -+ case HB_ACODEC_CA_HAAC: -+ case HB_ACODEC_FDK_AAC: -+ case HB_ACODEC_FDK_HAAC: -+ break; -+ -+ default: -+ { -+ // Mark associated fallback audio tracks for any non-aac track -+ for(jj = 0; jj < hb_list_count( job->list_audio ); jj++ ) -+ { -+ hb_audio_t * fallback; -+ int codec; -+ -+ if (ii == jj) continue; -+ -+ fallback = hb_list_item( job->list_audio, jj ); -+ codec = fallback->config.out.codec & HB_ACODEC_MASK; -+ if (fallback->config.in.track == audio->config.in.track && -+ (codec == HB_ACODEC_FFAAC || -+ codec == HB_ACODEC_CA_AAC || -+ codec == HB_ACODEC_CA_HAAC || -+ codec == HB_ACODEC_FDK_AAC || -+ codec == HB_ACODEC_FDK_HAAC)) -+ { -+ hb_mux_data_t * fallback_track; -+ int * sd; -+ -+ track = audio->priv.mux_data; -+ fallback_track = fallback->priv.mux_data; -+ sd = (int*)av_stream_new_side_data(track->st, -+ AV_PKT_DATA_FALLBACK_TRACK, -+ sizeof(int)); -+ if (sd != NULL) -+ { -+ *sd = fallback_track->st->index; -+ } -+ } -+ } -+ } break; -+ } -+ } -+ - char * subidx_fmt = - "size: %dx%d\n" - "org: %d, %d\n" diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index bb905440498..1559535f342 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -4,17 +4,17 @@ stdenv.mkDerivation rec { name = "makemkv-${ver}"; - ver = "1.10.5"; + ver = "1.10.6"; builder = ./builder.sh; src_bin = fetchurl { url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz"; - sha256 = "00jym62yga4m146lbz6dwdy6rgrwbc0kgmpcarri0prdwjsb8l6x"; + sha256 = "99d68e4e0166c9a4e2dce6638e19cbe312b5981f6e1811ed0987578ceefac3e3"; }; src_oss = fetchurl { url = "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz"; - sha256 = "0kanj0mh09sn5wlc4jl5ykbhdq1kpwjhmh1ck990dhkxb2m3rvaa"; + sha256 = "ab028ba05364f2d899b76e6a7392c9ef555379de2ef4732e1de27c23fd78d235"; }; buildInputs = [openssl qt4 mesa zlib pkgconfig libav]; diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix index 971588901b4..f70c142ab41 100644 --- a/pkgs/applications/video/minitube/default.nix +++ b/pkgs/applications/video/minitube/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper, phonon, phonon-backend-vlc, qt4, qmake4Hook -# "Free" API key generated by nckx +# "Free" key generated by nckx . I no longer have a Google +# account. You'll need to generate (and please share :-) a new one if it breaks. , withAPIKey ? "AIzaSyBtFgbln3bu1swQC-naMxMtKh384D3xJZE" }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix index 0efa4aba276..5ca530cfe9d 100644 --- a/pkgs/applications/video/miro/default.nix +++ b/pkgs/applications/video/miro/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, pythonPackages, pyrex096, ffmpeg, boost, glib, gtk2, webkitgtk2, libsoup +, pythonPackages, pyrex096, ffmpeg, boost, glib, gtk2, webkitgtk24x-gtk2, libsoup , taglib, sqlite , libtorrentRasterbar, glib_networking, gsettings_desktop_schemas , gst-python, gst-plugins-base, gst-plugins-good, gst-ffmpeg @@ -70,7 +70,7 @@ in buildPythonApplication rec { ''; buildInputs = with pythonPackages; [ pygtk pygobject2 ] ++ [ - pkgconfig pyrex096 ffmpeg boost glib gtk2 webkitgtk2 libsoup + pkgconfig pyrex096 ffmpeg boost glib gtk2 webkitgtk24x-gtk2 libsoup taglib gsettings_desktop_schemas sqlite ]; diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 8650142f8b4..0877df0a68c 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -10,13 +10,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mkvtoolnix-${version}"; - version = "12.0.0"; + version = "13.0.0"; src = fetchFromGitHub { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "1xn24f9046q2lr1xbl02cpmqa4fhhxqjc14j14c9r6qfc4ix4n9w"; + sha256 = "0dz86fzv19wknd8p31nnx2imj80v7m944ssapp8fmq9hkc36m777"; }; nativeBuildInputs = [ pkgconfig autoconf automake gettext drake ruby docbook_xsl libxslt ]; diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 37b424d922b..9ae1b99f86f 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -25,6 +25,7 @@ , libjpegSupport ? true, libjpeg ? null , useUnfreeCodecs ? false , darwin ? null +, hostPlatform }: assert fontconfigSupport -> (fontconfig != null); @@ -185,13 +186,14 @@ stdenv.mkDerivation rec { ''; crossAttrs = { - dontSetConfigureCross = true; + configurePlatforms = []; # Some things (vidix) are nanonote specific. Once someone cares, we can make options from them. + # Note, the `target` vs `host` confusion is intensional. preConfigure = '' configureFlags="`echo $configureFlags | sed -e 's/--codecsdir[^ ]\+//' \ -e 's/--enable-runtime-cpudetection//' `" - configureFlags="$configureFlags --target=${stdenv.cross.arch}-linux + configureFlags="$configureFlags --target=${hostPlatform.arch}-linux --enable-cross-compile --cc=$crossConfig-gcc --as=$crossConfig-as --disable-vidix-pcidb --with-vidix-drivers=no --host-cc=gcc" ''; diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index f7037ee668c..0aebb4dcb64 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -26,13 +26,13 @@ let optional = stdenv.lib.optional; in stdenv.mkDerivation rec { name = "obs-studio-${version}"; - version = "19.0.2"; + version = "19.0.3"; src = fetchFromGitHub { owner = "jp9000"; repo = "obs-studio"; rev = "${version}"; - sha256 = "0sawpk2yr52frdm4pkvahc11i1s1jlm7i07crhkxa8342sdc70ab"; + sha256 = "1qh69bw848l61fmh6n5q86yl3djmvzh76ln044ngi2k69a9bl94b"; }; patches = [ ./find-xcb.patch ]; diff --git a/pkgs/applications/video/omxplayer/default.nix b/pkgs/applications/video/omxplayer/default.nix index 449190cfaa1..29345f7548d 100644 --- a/pkgs/applications/video/omxplayer/default.nix +++ b/pkgs/applications/video/omxplayer/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl, raspberrypifw, pcre, boost, freetype, zlib }: +{ stdenv, fetchurl +, raspberrypifw, pcre, boost, freetype, zlib +, hostPlatform +}: let ffmpeg = stdenv.mkDerivation rec { @@ -44,12 +47,12 @@ let enableParallelBuilding = true; crossAttrs = { - dontSetConfigureCross = true; + configurePlatforms = []; configureFlags = configureFlags ++ [ - "--cross-prefix=${stdenv.cross.config}-" + "--cross-prefix=${stdenv.cc.prefix}" "--enable-cross-compile" "--target_os=linux" - "--arch=${stdenv.cross.arch}" + "--arch=${hostPlatform.arch}" ]; }; diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index b7e4fe6b7c6..ea5af4ab118 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qmake, qtscript }: stdenv.mkDerivation rec { - name = "smplayer-17.6.0"; + name = "smplayer-17.7.0"; src = fetchurl { url = "mirror://sourceforge/smplayer/${name}.tar.bz2"; - sha256 = "0kgrkn50sgr79jfj66p59wka17prnxibf7fbfpg5m0n95kdkr7rg"; + sha256 = "1g35h8xqs2bdwjdibzgs1ab2z2lmwgj8h53a7vqydv3j3crxx9wk"; }; buildInputs = [ qtscript ]; diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 513eea07ced..1c92d66bcfc 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -1,14 +1,14 @@ { stdenv, pythonPackages, fetchFromGitHub, rtmpdump, ffmpeg }: pythonPackages.buildPythonApplication rec { - version = "0.6.0"; + version = "0.7.0"; name = "streamlink-${version}"; src = fetchFromGitHub { owner = "streamlink"; repo = "streamlink"; rev = "${version}"; - sha256 = "0602mybh9qrxbalnpg930prjfmfkfiwdyr6iz4byfzv0qrwa08yq"; + sha256 = "0knh7lw6bv1vix3p40hjp5lc0z9pavvx6rncviw5h095rzcw5287"; }; buildInputs = with pythonPackages; [ pytest mock ]; diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix index dfd92685579..211bd2f39e0 100644 --- a/pkgs/applications/virtualization/bochs/default.nix +++ b/pkgs/applications/virtualization/bochs/default.nix @@ -1,11 +1,10 @@ -{ stdenv, fetchurl, config +{ stdenv, fetchurl , pkgconfig, libtool , gtk2, mesa, readline, libX11, libXpm , docbook_xml_dtd_45, docbook_xsl , sdlSupport ? true, SDL2 ? null -, termSupport ? true , ncurses ? null +, termSupport ? true, ncurses ? null , wxSupport ? true, wxGTK ? null -# Optional, undocumented dependencies , wgetSupport ? false, wget ? null , curlSupport ? false, curl ? null }: @@ -16,58 +15,17 @@ assert wxSupport -> (gtk2 != null && wxGTK != null); assert wgetSupport -> (wget != null); assert curlSupport -> (curl != null); +with stdenv.lib; stdenv.mkDerivation rec { name = "bochs-${version}"; - version = "2.6.8"; + version = "2.6.9"; src = fetchurl { url = "mirror://sourceforge/project/bochs/bochs/${version}/${name}.tar.gz"; - sha256 = "1kl5cmbz6qgg33j5vv9898nzdppp1rqgy24r5pv762aaj7q0ww3r"; + sha256 = "1379cq4cnfprhw8mgh60i0q9j8fz8d7n3d5fnn2g9fdiv5znfnzf"; }; - # The huge list of configurable options - # Blatantly based on ffmpeg expressions - - termSupport = config.bochs.termSupport or true; - sdlSupport = config.bochs.sdlSupport or true; - wxSupport = config.bochs.wxSupport or false; - largefile = config.bochs.largefile or true; - idleHack = config.bochs.idleHack or true; - plugins = config.bochs.plugins or false; # Warning! Broken - a20Pin = config.bochs.a20Pin or true; - emulate64Bits = config.bochs.emulate64Bits or false; - smp = config.bochs.smp or false; - largeRamfile = config.bochs.largeRamfile or true; - repeatSpeedups = config.bochs.repeatSpeedups or false; - handlersChaining = config.bochs.handlersChaining or false; - traceLinking = config.bochs.traceLinking or false; - configurableMSRegs = config.bochs.configurableMSRegs or false; - showIPS = config.bochs.showIPS or true; - debugger = config.bochs.debugger or false; - disasm = config.bochs.disasm or false; - debuggerGui = config.bochs.debuggerGui or false; - gdbStub = config.bochs.gdbStub or false; - IODebug = config.Bochs.IODebug or false; - fpu = config.bochs.fpu or true; - svm = config.bochs.svm or false; - avx = config.bochs.avx or false; - evex = config.bochs.evex or false; - x86Debugger = config.bochs.x86Debugger or false; - pci = config.bochs.pci or true; - uhci = config.bochs.uhci or false; - ohci = config.bochs.ohci or false; - ne2k = config.bochs.ne2k or true; - pNIC = config.bochs.pNIC or true; - e1000 = config.bochs.e1000 or true; - clgd54xx = config.bochs.clgd54xx or true; - voodoo = config.bochs.voodoo or true; - cdrom = config.bochs.cdrom or true; - sb16 = config.bochs.sb16 or true; - es1370 = config.bochs.es1370 or true; - gameport = config.bochs.gameport or true; - busMouse = config.bochs.busMouse or false; - buildInputs = with stdenv.lib; [ pkgconfig libtool gtk2 mesa readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ] ++ optionals termSupport [ ncurses ] @@ -83,7 +41,6 @@ stdenv.mkDerivation rec { "--with-rfb=no" "--with-vncsrv=no" "--with-svga=no" # it doesn't compile on NixOS - "--with-wx=no" # These will always be "yes" on NixOS "--enable-ltdl-install=yes" @@ -100,69 +57,69 @@ stdenv.mkDerivation rec { # Dangerous options - they are marked as "incomplete/experimental" on Bochs documentation "--enable-3dnow=no" - "--enable-usb-xhci=no" "--enable-monitor-mwait=no" "--enable-raw-serial=no" ] # Boolean flags - ++ stdenv.lib.optional termSupport "--with-term" - ++ stdenv.lib.optional sdlSupport "--with-sdl2" - ++ stdenv.lib.optional wxSupport "--with-wx" - ++ stdenv.lib.optional largefile "--enable-largefile" - ++ stdenv.lib.optional idleHack "--enable-idle-hack" - ++ stdenv.lib.optional plugins "--enable-plugins" - ++ stdenv.lib.optional a20Pin "--enable-a20-pin" - ++ stdenv.lib.optional emulate64Bits "--enable-x86-64" - ++ stdenv.lib.optional smp "--enable-smp" - ++ stdenv.lib.optional largeRamfile "--enable-large-ramfile" - ++ stdenv.lib.optional repeatSpeedups "--enable-repeat-speedups" - ++ stdenv.lib.optional handlersChaining "--enable-handlers-chaining" - ++ stdenv.lib.optional traceLinking "--enable-trace-linking" - ++ stdenv.lib.optional configurableMSRegs "--enable-configurable-msrs" - ++ stdenv.lib.optional showIPS "--enable-show-ips" - ++ stdenv.lib.optional debugger "--enable-debugger" - ++ stdenv.lib.optional disasm "--enable-disasm" - ++ stdenv.lib.optional debuggerGui "--enable-debugger-gui" - ++ stdenv.lib.optional gdbStub "--enable-gdb-stub" - ++ stdenv.lib.optional IODebug "--enable-iodebug" - ++ stdenv.lib.optional fpu "--enable-fpu" - ++ stdenv.lib.optional svm "--enable-svm" - ++ stdenv.lib.optional avx "--enable-avx" - ++ stdenv.lib.optional evex "--enable-evex" - ++ stdenv.lib.optional x86Debugger "--enable-x86-debugger" - ++ stdenv.lib.optional pci "--enable-pci" - ++ stdenv.lib.optional uhci "--enable-usb" - ++ stdenv.lib.optional ohci "--enable-usb-ohci" - ++ stdenv.lib.optional ne2k "--enable-ne2000" - ++ stdenv.lib.optional pNIC "--enable-pnic" - ++ stdenv.lib.optional e1000 "--enable-e1000" - ++ stdenv.lib.optional clgd54xx "--enable-clgd54xx" - ++ stdenv.lib.optional voodoo "--enable-voodoo" - ++ stdenv.lib.optional cdrom "--enable-cdrom" - ++ stdenv.lib.optional sb16 "--enable-sb16" - ++ stdenv.lib.optional es1370 "--enable-es1370" - ++ stdenv.lib.optional busMouse "--enable-busmouse" - ; + ++ optionals termSupport [ "--with-term" ] + ++ optionals sdlSupport [ "--with-sdl2" ] + ++ optionals wxSupport [ "--with-wx" ] + # These are completely configurable, and they don't depend of external tools + ++ [ "--enable-cpu-level=6" # from 3 to 6 + "--enable-largefile" + "--enable-idle-hack" + "--enable-plugins=no" # Plugins are a bit buggy in Bochs + "--enable-a20-pin" + "--enable-x86-64" + "--enable-smp" + "--enable-large-ramfile" + "--enable-repeat-speedups" + "--enable-handlers-chaining" + "--enable-trace-linking" + "--enable-configurable-msrs" + "--enable-show-ips" + "--enable-debugger" #conflicts with gdb-stub option + "--enable-disasm" + "--enable-debugger-gui" + "--enable-gdb-stub=no" # conflicts with debugger option + "--enable-iodebug" + "--enable-fpu" + "--enable-svm" + "--enable-avx" + "--enable-evex" + "--enable-x86-debugger" + "--enable-pci" + "--enable-usb" + "--enable-usb-ohci" + "--enable-usb-ehci" + "--enable-usb-xhci" + "--enable-ne2000" + "--enable-pnic" + "--enable-e1000" + "--enable-clgd54xx" + "--enable-voodoo" + "--enable-cdrom" + "--enable-sb16" + "--enable-es1370" + "--enable-busmouse" ]; NIX_CFLAGS_COMPILE="-I${gtk2.dev}/include/gtk-2.0/ -I${libtool}/include/"; NIX_LDFLAGS="-L${libtool.lib}/lib"; hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = { description = "An open-source IA-32 (x86) PC emulator"; longDescription = '' - Bochs is an open-source (LGPL), highly portable IA-32 PC emulator, - written in C++, that runs on most popular platforms. It includes - emulation of the Intel x86 CPU, common I/O devices, and a custom - BIOS. + Bochs is an open-source (LGPL), highly portable IA-32 PC emulator, written + in C++, that runs on most popular platforms. It includes emulation of the + Intel x86 CPU, common I/O devices, and a custom BIOS. ''; homepage = http://bochs.sourceforge.net/; license = licenses.lgpl2Plus; maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } - -# TODO: study config.bochs.* implementation (like config.ffmpeg.* options) -# TODO: investigate the wxWidgets problem (maybe upstream devteam didn't update wxGTK GUI) -# TODO: investigate svga support - the Bochs sources explicitly cite /usr/include/svga.h +# TODO: plugins +# TODO: svga support - the Bochs sources explicitly cite /usr/include/vga.h +# TODO: a better way to organize the options diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index c07670b5de6..b918177f543 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ removeReferencesTo go ]; preBuild = '' - ln -s $(pwd) vendor/src/github.com/docker/containerd + ln -s $(pwd) vendor/src/github.com/containerd/containerd ''; installPhase = '' diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index ffab4303c4a..c42b2a098f7 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,13 +1,10 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, removeReferencesTo, pkgconfig -, go-md2man, go, containerd, runc, docker-proxy, tini +, go-md2man, go, containerd, runc, docker-proxy, tini, libtool , sqlite, iproute, bridge-utils, devicemapper, systemd , btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs , procps }: -# https://github.com/docker/docker/blob/master/project/PACKAGERS.md -# https://github.com/docker/docker/blob/TAG/hack/dockerfile/binaries-commits - with lib; rec { @@ -23,7 +20,7 @@ rec { src = fetchFromGitHub { owner = "docker"; - repo = "docker"; + repo = "docker-ce"; rev = "v${version}"; sha256 = sha256; }; @@ -68,7 +65,7 @@ rec { buildInputs = [ makeWrapper removeReferencesTo pkgconfig go-md2man go - sqlite devicemapper btrfs-progs systemd + sqlite devicemapper btrfs-progs systemd libtool ]; dontStrip = true; @@ -78,26 +75,43 @@ rec { ++ optional (btrfs-progs == null) "exclude_graphdriver_btrfs" ++ optional (devicemapper == null) "exclude_graphdriver_devicemapper"; - # systemd 230 no longer has libsystemd-journal as a separate entity from libsystemd - postPatch = '' - substituteInPlace ./hack/make.sh --replace libsystemd-journal libsystemd - substituteInPlace ./daemon/logger/journald/read.go --replace libsystemd-journal libsystemd - ''; - buildPhase = '' - patchShebangs . + # build engine + cd ./components/engine export AUTO_GOPATH=1 export DOCKER_GITCOMMIT="${rev}" ./hack/make.sh dynbinary + cd - + + # build cli + cd ./components/cli + # Mimic AUTO_GOPATH + mkdir -p .gopath/src/github.com/docker/ + ln -sf $PWD .gopath/src/github.com/docker/cli + export GOPATH="$PWD/.gopath:$GOPATH" + export GITCOMMIT="${rev}" + export VERSION="${version}" + source ./scripts/build/.variables + export CGO_ENABLED=1 + go build -tags pkcs11 --ldflags "$LDFLAGS" github.com/docker/cli/cmd/docker + cd - ''; + # systemd 230 no longer has libsystemd-journal as a separate entity from libsystemd + patchPhase = '' + patchShebangs . + substituteInPlace ./components/engine/hack/make.sh --replace libsystemd-journal libsystemd + substituteInPlace ./components/engine/daemon/logger/journald/read.go --replace libsystemd-journal libsystemd + substituteInPlace ./components/cli/scripts/build/.variables --replace "set -eu" "" + ''; + outputs = ["out" "man"]; extraPath = makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux ]; installPhase = '' - install -Dm755 ./bundles/${version}/dynbinary-client/docker-${version} $out/libexec/docker/docker - install -Dm755 ./bundles/${version}/dynbinary-daemon/dockerd-${version} $out/libexec/docker/dockerd + install -Dm755 ./components/cli/docker $out/libexec/docker/docker + install -Dm755 ./components/engine/bundles/${version}/dynbinary-daemon/dockerd-${version} $out/libexec/docker/dockerd makeWrapper $out/libexec/docker/docker $out/bin/docker \ --prefix PATH : "$out/libexec/docker:$extraPath" makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \ @@ -111,18 +125,28 @@ rec { ln -s ${docker-tini}/bin/tini-static $out/libexec/docker/docker-init # systemd - install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service + install -Dm644 ./components/engine/contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service - # completion - install -Dm644 ./contrib/completion/bash/docker $out/share/bash-completion/completions/docker - install -Dm644 ./contrib/completion/fish/docker.fish $out/share/fish/vendor_completions.d/docker.fish - install -Dm644 ./contrib/completion/zsh/_docker $out/share/zsh/site-functions/_docker + # completion (cli) + install -Dm644 ./components/cli/contrib/completion/bash/docker $out/share/bash-completion/completions/docker + install -Dm644 ./components/cli/contrib/completion/fish/docker.fish $out/share/fish/vendor_completions.d/docker.fish + install -Dm644 ./components/cli/contrib/completion/zsh/_docker $out/share/zsh/site-functions/_docker + + # Include contributed man pages (cli) + # Generate man pages from cobra commands + echo "Generate man pages from cobra" + cd ./components/cli + mkdir -p ./man/man1 + go build -o ./gen-manpages github.com/docker/cli/man + ./gen-manpages --root . --target ./man/man1 + + # Generate legacy pages from markdown + echo "Generate legacy manpages" + ./man/md2man-all.sh -q - # Include contributed man pages - man/md2man-all.sh -q manRoot="$man/share/man" mkdir -p "$manRoot" - for manDir in man/man?; do + for manDir in ./man/man?; do manBase="$(basename "$manDir")" # "man1" for manFile in "$manDir"/*; do manName="$(basename "$manFile")" # "docker-build.1" @@ -140,31 +164,19 @@ rec { homepage = http://www.docker.com/; description = "An open source project to pack, ship and run any application as a lightweight container"; license = licenses.asl20; - maintainers = with maintainers; [ offline tailhook ]; + maintainers = with maintainers; [ offline tailhook vdemeester ]; platforms = platforms.linux; }; }; - docker_17_03 = dockerGen rec { - version = "17.03.1-ce"; - rev = "c6d412e"; # git commit - sha256 = "1h3hkg15c3isfgaqpkp3mr7ys5826cz24hn3f3wz07jmismq98q7"; - runcRev = "54296cf40ad8143b62dbcaa1d90e520a2136ddfe"; - runcSha256 = "0ylymx7pi4jmvbqj94j2i8qspy8cpq0m91l6a0xiqlx43yx6qi2m"; - containerdRev = "4ab9917febca54791c5f071a9d1f404867857fcc"; - containerdSha256 = "06f2gsx4w9z4wwjhrpafmz6c829wi8p7crj6sya6x9ii50bkn8p6"; - tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; - tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; - }; - - docker_17_05 = dockerGen rec { - version = "17.05.0-ce"; - rev = "90d35abf7b3535c1c319c872900fbd76374e521c"; # git commit - sha256 = "1m4fcawjj14qws57813wjxjwgnrfxgxnnzlj61csklp0s9dhg7df"; - runcRev = "9c2d8d184e5da67c95d601382adf14862e4f2228"; - runcSha256 = "131jv8f77pbdlx88ar0zjwdsp0a5v8kydaw0w0cl3i0j3622ydjl"; - containerdRev = "9048e5e50717ea4497b757314bad98ea3763c145"; - containerdSha256 = "1r9xhvzzh7md08nqb0rbp5d1rdr7jylb3da954d0267i0kh2iksa"; + docker_17_06 = dockerGen rec { + version = "17.06.0-ce"; + rev = "02c1d876176546b5f069dae758d6a7d2ead6bd48"; # git commit + sha256 = "0wrg4ygcq4c7f2bwa7pgc7y33idg0hijavx40588jaglz4k8sqpm"; + runcRev = "992a5be178a62e026f4069f443c6164912adbf09"; + runcSha256 = "0ylkbn5rprw5cgxazvrwj7balikpfm8vlybwdbfpwnsqk3gc6p8k"; + containerdRev = "cfb82a876ecc11b5ca0977d1733adbe58599088a"; + containerdSha256 = "0rix0mv203fn3rcxmpqdpb54l1a0paqplg2xgldpd943qi1rm552"; tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; }; diff --git a/pkgs/applications/virtualization/docker/proxy.nix b/pkgs/applications/virtualization/docker/proxy.nix index beb65976696..651631b478f 100644 --- a/pkgs/applications/virtualization/docker/proxy.nix +++ b/pkgs/applications/virtualization/docker/proxy.nix @@ -27,4 +27,3 @@ buildGoPackage rec { platforms = docker.meta.platforms; }; } - diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix index e40d054520f..d1bf5792a1b 100644 --- a/pkgs/applications/virtualization/lkl/default.nix +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, bc, python, fuse, libarchive }: stdenv.mkDerivation rec { - name = "lkl-2017-03-24"; - rev = "a063e1631db5e2b9b04f184c5e6d185c1cd645cb"; + name = "lkl-2017-06-27"; + rev = "0d91d102b046eec535a6d67df9829b80b24e9ce9"; outputs = [ "dev" "lib" "out" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { inherit rev; owner = "lkl"; repo = "linux"; - sha256 = "07dmira76i0ki577sra4fdl1wvzfzxzd75252lza0sc6jdzrrwvj"; + sha256 = "1sc18fik2dm0hnsb5q4srvwbf6wgv27zlf3qa7x39g4vbj1jqgas"; }; # Fix a /usr/bin/env reference in here that breaks sandboxed builds diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index 41c2397d59e..bca2e558b38 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -12,15 +12,15 @@ let stage1Dir = "lib/rkt/stage1-images"; in stdenv.mkDerivation rec { - version = "1.26.0"; + version = "1.27.0"; name = "rkt-${version}"; BUILDDIR="build-${name}"; src = fetchFromGitHub { - owner = "coreos"; - repo = "rkt"; - rev = "v${version}"; - sha256 = "16zwrx5v6pjjw1c6nbl19cchq71fj0bp5ci52rrfvl5mbn8xrs70"; + owner = "coreos"; + repo = "rkt"; + rev = "v${version}"; + sha256 = "153nkl4mp2p0llv4bpdhdd6127qyaz27jsnxmjgvxhaia0ab79v2"; }; stage1BaseImage = fetchurl { diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 32e8f9d23f4..6675068bda9 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -9,6 +9,7 @@ , pulseSupport ? false, libpulseaudio ? null , enableHardening ? false , headless ? false +, enable32bitGuests ? true , patchelfUnstable # needed until 0.10 is released }: @@ -17,11 +18,10 @@ with stdenv.lib; let python = python2; buildType = "release"; - - extpack = "996f783996a597d3936fc5f1ccf56edd31ae1f8fb4d527009647d9a2c8c853cd"; - extpackRev = "114002"; - main = "7ed0959bbbd02826b86b3d5dc8348931ddfab267c31f8ed36ee53c12f5522cd9"; - version = "5.1.18"; + extpack = "244e6f450cba64e0b025711050db3c43e6ce77e12cd80bcd08796315a90c8aaf"; + extpackRev = "115126"; + main = "fcc918000b8c5ece553541ec10a9182410a742b7266257c76dda895dcd389899"; + version = "5.1.22"; # See https://github.com/NixOS/nixpkgs/issues/672 for details extensionPack = requireFile rec { @@ -88,7 +88,7 @@ in stdenv.mkDerivation { ''; patches = optional enableHardening ./hardened.patch - ++ [ ./qtx11extras.patch ]; + ++ [ ./qtx11extras.patch ./linux-4.12.patch ]; postPatch = '' sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \ @@ -129,6 +129,7 @@ in stdenv.mkDerivation { ${optionalString (!pythonBindings) "--disable-python"} \ ${optionalString (!pulseSupport) "--disable-pulse"} \ ${optionalString (!enableHardening) "--disable-hardening"} \ + ${optionalString (!enable32bitGuests) "--disable-vmmraw"} \ --disable-kmods --with-mkisofs=${xorriso}/bin/xorrisofs sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib.dev}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \ -i AutoConfig.kmk diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 38f452efe6c..8865022c23e 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "f2951b49f48a560fbc1afe9d135d1f3f82a3e158b9002278d05d978428adca8a"; + sha256 = "54df14f234b6aa484b94939ab0f435b5dd859417612b65a399ecc34a62060380"; }; KERN_DIR = "${kernel.dev}/lib/modules/*/build"; @@ -62,6 +62,9 @@ stdenv.mkDerivation { for i in * do cd $i + # Files within the guest additions ISO are using DOS line endings + sed -re '/^(@@|---|\+\+\+)/!s/$/\r/' ${../linux-4.12.patch} \ + | patch -d vboxguest -p4 find . -type f | xargs sed 's/depmod -a/true/' -i make cd .. @@ -139,7 +142,7 @@ stdenv.mkDerivation { meta = { description = "Guest additions for VirtualBox"; - longDescriptions = '' + longDescription = '' Various add-ons which makes NixOS work better as guest OS inside VirtualBox. This add-on provides support for dynamic resizing of the X Display, shared host/guest clipboard support and guest OpenGL support. diff --git a/pkgs/applications/virtualization/virtualbox/hardened.patch b/pkgs/applications/virtualization/virtualbox/hardened.patch index 8d408d3494e..bd29ca9a65a 100644 --- a/pkgs/applications/virtualization/virtualbox/hardened.patch +++ b/pkgs/applications/virtualization/virtualbox/hardened.patch @@ -1,8 +1,8 @@ diff --git a/include/iprt/mangling.h b/include/iprt/mangling.h -index 70c596a..78972ed 100644 +index c1daa8f..8618371 100644 --- a/include/iprt/mangling.h +++ b/include/iprt/mangling.h -@@ -1068,6 +1068,7 @@ +@@ -1440,6 +1440,7 @@ # define RTPathStripSuffix RT_MANGLER(RTPathStripSuffix) # define RTPathStripFilename RT_MANGLER(RTPathStripFilename) # define RTPathStripTrailingSlash RT_MANGLER(RTPathStripTrailingSlash) @@ -10,7 +10,7 @@ index 70c596a..78972ed 100644 # define RTPathTemp RT_MANGLER(RTPathTemp) # define RTPathTraverseList RT_MANGLER(RTPathTraverseList) # define RTPathUnlink RT_MANGLER(RTPathUnlink) -@@ -1105,6 +1106,7 @@ +@@ -1478,6 +1479,7 @@ # define RTProcGetAffinityMask RT_MANGLER(RTProcGetAffinityMask) # define RTProcGetExecutablePath RT_MANGLER(RTProcGetExecutablePath) # define RTProcGetPriority RT_MANGLER(RTProcGetPriority) @@ -19,10 +19,10 @@ index 70c596a..78972ed 100644 # define RTProcQueryParent RT_MANGLER(RTProcQueryParent) # define RTProcQueryUsername RT_MANGLER(RTProcQueryUsername) diff --git a/include/iprt/path.h b/include/iprt/path.h -index 7e42754..b4de4c8 100644 +index 8bd42bc..2c23d3e 100644 --- a/include/iprt/path.h +++ b/include/iprt/path.h -@@ -1049,6 +1049,15 @@ RTDECL(int) RTPathCalcRelative(char *pszPathDst, size_t cbPathDst, +@@ -1064,6 +1064,15 @@ RTDECL(int) RTPathCalcRelative(char *pszPathDst, size_t cbPathDst, RTDECL(int) RTPathExecDir(char *pszPath, size_t cchPath); /** @@ -39,10 +39,10 @@ index 7e42754..b4de4c8 100644 * * @returns iprt status code. diff --git a/include/iprt/process.h b/include/iprt/process.h -index 2760306..0ce6c92 100644 +index 043653e..1070280 100644 --- a/include/iprt/process.h +++ b/include/iprt/process.h -@@ -313,6 +313,16 @@ RTR3DECL(const char *) RTProcShortName(void); +@@ -327,6 +327,16 @@ RTR3DECL(const char *) RTProcShortName(void); RTR3DECL(char *) RTProcGetExecutablePath(char *pszExecPath, size_t cbExecPath); /** @@ -60,11 +60,11 @@ index 2760306..0ce6c92 100644 * * The way this work is that it will spawn a detached / backgrounded / diff --git a/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp b/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp -index c39d2f7..896b352 100644 +index ce0f288..6193108 100644 --- a/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp +++ b/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp -@@ -1415,18 +1415,19 @@ static int supR3HardenedVerifyFsObject(PCSUPR3HARDENEDFSOBJSTATE pFsObjState, bo - NOREF(fRelaxed); +@@ -1489,9 +1489,9 @@ static int supR3HardenedVerifyFsObject(PCSUPR3HARDENEDFSOBJSTATE pFsObjState, bo + bool fBad = !fRelaxed || pFsObjState->Stat.st_gid != 2 /*bin*/ || suplibHardenedStrCmp(pszPath, "/usr/lib/iconv"); #else NOREF(fRelaxed); - bool fBad = true; @@ -75,23 +75,11 @@ index c39d2f7..896b352 100644 return supR3HardenedSetError3(VERR_SUPLIB_WRITE_NON_SYS_GROUP, pErrInfo, "An unknown (and thus untrusted) group has write access to '", pszPath, "' and we therefore cannot trust the directory content or that of any subdirectory"); - } - - /* -- * World must not have write access. There is no relaxing this rule. -+ * World must not have write access. -+ * There is no relaxing this rule, except when it comes to the Nix store. - */ -- if (pFsObjState->Stat.st_mode & S_IWOTH) -+ if (pFsObjState->Stat.st_mode & S_IWOTH && suplibHardenedStrCmp(pszPath, "/nix/store")) - return supR3HardenedSetError3(VERR_SUPLIB_WORLD_WRITABLE, pErrInfo, - "World writable: '", pszPath, "'"); - diff --git a/src/VBox/Main/src-server/MachineImpl.cpp b/src/VBox/Main/src-server/MachineImpl.cpp -index 95dc9a7..39170bc 100644 +index 320c569..9bfe41f 100644 --- a/src/VBox/Main/src-server/MachineImpl.cpp +++ b/src/VBox/Main/src-server/MachineImpl.cpp -@@ -7326,7 +7326,7 @@ HRESULT Machine::i_launchVMProcess(IInternalSessionControl *aControl, +@@ -7543,7 +7543,7 @@ HRESULT Machine::i_launchVMProcess(IInternalSessionControl *aControl, /* get the path to the executable */ char szPath[RTPATH_MAX]; @@ -101,10 +89,10 @@ index 95dc9a7..39170bc 100644 szPath[cchBufLeft++] = RTPATH_DELIMITER; szPath[cchBufLeft] = 0; diff --git a/src/VBox/Main/src-server/NetworkServiceRunner.cpp b/src/VBox/Main/src-server/NetworkServiceRunner.cpp -index e9e1ba62..4d1c1e1 100644 +index 1e38d99..5e43dda 100644 --- a/src/VBox/Main/src-server/NetworkServiceRunner.cpp +++ b/src/VBox/Main/src-server/NetworkServiceRunner.cpp -@@ -79,7 +79,7 @@ int NetworkServiceRunner::start() +@@ -85,7 +85,7 @@ int NetworkServiceRunner::start(bool aKillProcOnStop) /* get the path to the executable */ char exePathBuf[RTPATH_MAX]; @@ -114,7 +102,7 @@ index e9e1ba62..4d1c1e1 100644 char *substrBs = strrchr(exePathBuf, '\\'); char *suffix = substrSl ? substrSl : substrBs; diff --git a/src/VBox/Main/src-server/generic/NetIf-generic.cpp b/src/VBox/Main/src-server/generic/NetIf-generic.cpp -index 8559d2a..2177f27 100644 +index 98dc91a..43a819f 100644 --- a/src/VBox/Main/src-server/generic/NetIf-generic.cpp +++ b/src/VBox/Main/src-server/generic/NetIf-generic.cpp @@ -47,7 +47,7 @@ static int NetIfAdpCtl(const char * pcszIfName, const char *pszAddr, const char @@ -126,7 +114,7 @@ index 8559d2a..2177f27 100644 if (RT_FAILURE(rc)) { LogRel(("NetIfAdpCtl: failed to get program path, rc=%Rrc.\n", rc)); -@@ -90,7 +90,7 @@ static int NetIfAdpCtl(HostNetworkInterface * pIf, const char *pszAddr, const ch +@@ -89,7 +89,7 @@ static int NetIfAdpCtl(HostNetworkInterface * pIf, const char *pszAddr, const ch int NetIfAdpCtlOut(const char * pcszName, const char * pcszCmd, char *pszBuffer, size_t cBufSize) { char szAdpCtl[RTPATH_MAX]; @@ -135,7 +123,7 @@ index 8559d2a..2177f27 100644 if (RT_FAILURE(rc)) { LogRel(("NetIfAdpCtlOut: Failed to get program path, rc=%Rrc\n", rc)); -@@ -202,7 +202,7 @@ int NetIfCreateHostOnlyNetworkInterface(VirtualBox *pVirtualBox, +@@ -201,7 +201,7 @@ int NetIfCreateHostOnlyNetworkInterface(VirtualBox *pVirtualBox, progress.queryInterfaceTo(aProgress); char szAdpCtl[RTPATH_MAX]; @@ -145,7 +133,7 @@ index 8559d2a..2177f27 100644 { progress->i_notifyComplete(E_FAIL, diff --git a/src/VBox/Runtime/r3/path.cpp b/src/VBox/Runtime/r3/path.cpp -index be2ad8f..7ddf105 100644 +index 944848e..744a261 100644 --- a/src/VBox/Runtime/r3/path.cpp +++ b/src/VBox/Runtime/r3/path.cpp @@ -81,6 +81,12 @@ RTDECL(int) RTPathExecDir(char *pszPath, size_t cchPath) @@ -162,7 +150,7 @@ index be2ad8f..7ddf105 100644 { #if !defined(RT_OS_WINDOWS) && defined(RTPATH_APP_PRIVATE) diff --git a/src/VBox/Runtime/r3/process.cpp b/src/VBox/Runtime/r3/process.cpp -index 7bde6af..2656cae 100644 +index 2aab645..9795f21 100644 --- a/src/VBox/Runtime/r3/process.cpp +++ b/src/VBox/Runtime/r3/process.cpp @@ -111,6 +111,26 @@ RTR3DECL(char *) RTProcGetExecutablePath(char *pszExecPath, size_t cbExecPath) diff --git a/pkgs/applications/virtualization/virtualbox/linux-4.12.patch b/pkgs/applications/virtualization/virtualbox/linux-4.12.patch new file mode 100644 index 00000000000..7157365466f --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/linux-4.12.patch @@ -0,0 +1,80 @@ +commit 47fee9325e3b5feed0dbc4ba9e2de77c6d55e3bb +Author: vboxsync +Date: Wed May 17 09:42:23 2017 +0000 + + Runtime/r0drv: Linux 4.12 5-level page table adaptions + + + git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@66927 cfe28804-0f27-0410-a406-dd0f0b0b656f + +diff --git a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c +index 28dc33f963..41ed058860 100644 +--- a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c ++++ b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c +@@ -902,6 +902,9 @@ static struct page *rtR0MemObjLinuxVirtToPage(void *pv) + union + { + pgd_t Global; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) ++ p4d_t Four; ++#endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11) + pud_t Upper; + #endif +@@ -917,12 +920,26 @@ static struct page *rtR0MemObjLinuxVirtToPage(void *pv) + u.Global = *pgd_offset(current->active_mm, ulAddr); + if (RT_UNLIKELY(pgd_none(u.Global))) + return NULL; +- +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) ++ u.Four = *p4d_offset(&u.Global, ulAddr); ++ if (RT_UNLIKELY(p4d_none(u.Four))) ++ return NULL; ++ if (p4d_large(u.Four)) ++ { ++ pPage = p4d_page(u.Four); ++ AssertReturn(pPage, NULL); ++ pfn = page_to_pfn(pPage); /* doing the safe way... */ ++ AssertCompile(P4D_SHIFT - PAGE_SHIFT < 31); ++ pfn += (ulAddr >> PAGE_SHIFT) & ((UINT32_C(1) << (P4D_SHIFT - PAGE_SHIFT)) - 1); ++ return pfn_to_page(pfn); ++ } ++ u.Upper = *pud_offset(&u.Four, ulAddr); ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11) + u.Upper = *pud_offset(&u.Global, ulAddr); ++#endif + if (RT_UNLIKELY(pud_none(u.Upper))) + return NULL; +-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25) + if (pud_large(u.Upper)) + { + pPage = pud_page(u.Upper); +@@ -931,8 +948,8 @@ static struct page *rtR0MemObjLinuxVirtToPage(void *pv) + pfn += (ulAddr >> PAGE_SHIFT) & ((UINT32_C(1) << (PUD_SHIFT - PAGE_SHIFT)) - 1); + return pfn_to_page(pfn); + } +-# endif +- ++#endif ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11) + u.Middle = *pmd_offset(&u.Upper, ulAddr); + #else /* < 2.6.11 */ + u.Middle = *pmd_offset(&u.Global, ulAddr); +diff --git a/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h b/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h +index 5afdee9e71..20aab0817f 100644 +--- a/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h ++++ b/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h +@@ -159,6 +159,11 @@ + # include + #endif + ++/* for set_pages_x() */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) ++# include ++#endif ++ + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0) + # include + #else diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix index c6aa1522160..5fe4fa823fe 100644 --- a/pkgs/applications/virtualization/xen/4.5.nix +++ b/pkgs/applications/virtualization/xen/4.5.nix @@ -71,6 +71,10 @@ callPackage (import ./generic.nix (rec { name = "211-qemuu-4.6"; sha256 = "1g090xs8ca8676vyi78b99z5yjdliw6mxkr521b8kimhf8crx4yg"; }) + (xsaPatch { + name = "216-qemuu-4.5"; + sha256 = "0nh5akbal93czia1gh1pzvwq7gc4zwiyr1hbyk1m6wwdmqv6ph61"; + }) ]; meta.description = "Xen's fork of upstream Qemu"; }; @@ -342,6 +346,62 @@ callPackage (import ./generic.nix (rec { name = "215"; sha256 = "0sv8ccc5xp09f1w1gj5a9n3mlsdsh96sdb1n560vh31f4kkd61xs"; }) + (xsaPatch { + name = "217-4.5"; + sha256 = "067pgsfrb9py2dhm1pk9g8f6fs40vyfrcxhj8c12vzamb6svzmn4"; + }) + (xsaPatch { + name = "218-4.5/0001-IOMMU-handle-IOMMU-mapping-and-unmapping-failures"; + sha256 = "00y6j3yjxw0igpldsavikmhlxw711k2jsj1qx0s05w2k608gadkq"; + }) + (xsaPatch { + name = "218-4.5/0002-gnttab-fix-unmap-pin-accounting-race"; + sha256 = "0qbbfnnjlpdcd29mzmacfmi859k92c213l91q7w1rg2k6pzx928k"; + }) + (xsaPatch { + name = "218-4.5/0003-gnttab-Avoid-potential-double-put-of-maptrack-entry"; + sha256 = "1cndzvyhf41mk4my6vh3bk9jvh2y4gpmqdhvl9zhxhmppszslqkc"; + }) + (xsaPatch { + name = "218-4.5/0004-gnttab-correct-maptrack-table-accesses"; + sha256 = "02zpb0ffigijacqvyyjylwx3qpgibwslrka7mbxwnclf4s9c03a2"; + }) + (xsaPatch { + name = "219-4.5"; + sha256 = "003msr5vhsc66scmdpgn0lp3p01g4zfw5vj86y5lw9ajkbaywdsm"; + }) + (xsaPatch { + name = "220-4.5"; + sha256 = "1dj9nn6lzxlipjb3nb7b9m4337fl6yn2bd7ap1lqrjn8h9zkk1pp"; + }) + (xsaPatch { + name = "221"; + sha256 = "1mcr1nqgxyjrkywdg7qhlfwgz7vj2if1dhic425vgd41p9cdgl26"; + }) + (xsaPatch { + name = "222-1-4.6"; + sha256 = "1g4dqm5qx4wqlv1520jpfiscph95vllcp4gqp1rdfailk8xi0mcf"; + }) + (xsaPatch { + name = "222-2-4.5"; + sha256 = "1hw8rhc7q4v309f4w11gxfsn5x1pirvxkg7s4kr711fnmvp9hkzd"; + }) + (xsaPatch { + name = "224-4.5/0001-gnttab-Fix-handling-of-dev_bus_addr-during-unmap"; + sha256 = "1aislj66ss4cb3v2bh12mrqsyrf288d4h54rj94jjq7h1hnycw7h"; + }) + (xsaPatch { + name = "224-4.5/0002-gnttab-never-create-host-mapping-unless-asked-to"; + sha256 = "1j6fgm1ccb07gg0mi5qmdr0vqwwc3n12z433g1jrija2gbk1x8aq"; + }) + (xsaPatch { + name = "224-4.5/0003-gnttab-correct-logic-to-get-page-references-during-m"; + sha256 = "166kmicwx280fjqjvgigbmhabjksa0hhvqx5h4v6kjlcjpmxqy08"; + }) + (xsaPatch { + name = "224-4.5/0004-gnttab-__gnttab_unmap_common_complete-is-all-or-noth"; + sha256 = "1skc0yj1zsn8xgyq1y57bdc0scvvlmd0ynrjwwf1zkias1wlilav"; + }) ]; # Fix build on Glibc 2.24. diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix new file mode 100644 index 00000000000..f6205f5c467 --- /dev/null +++ b/pkgs/applications/virtualization/xen/4.8.nix @@ -0,0 +1,217 @@ +{ stdenv, callPackage, fetchurl, fetchpatch, fetchgit +, withInternalQemu ? true +, withInternalTraditionalQemu ? true +, withInternalSeabios ? true +, withSeabios ? !withInternalSeabios, seabios ? null +, withInternalOVMF ? false # FIXME: tricky to build +, withOVMF ? false, OVMF +, withLibHVM ? true + +# qemu +, udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice_protocol, usbredir +, alsaLib +, ... } @ args: + +assert withInternalSeabios -> !withSeabios; +assert withInternalOVMF -> !withOVMF; + +with stdenv.lib; + +# Patching XEN? Check the XSAs at +# https://xenbits.xen.org/xsa/ +# and try applying all the ones we don't have yet. + +let + xsaPatch = { name , sha256 }: (fetchpatch { + url = "https://xenbits.xen.org/xsa/xsa${name}.patch"; + inherit sha256; + }); + + qemuDeps = [ + udev pciutils xorg.libX11 SDL pixman acl glusterfs spice_protocol usbredir + alsaLib + ]; +in + +callPackage (import ./generic.nix (rec { + version = "4.8.1"; + + src = fetchurl { + url = "http://bits.xensource.com/oss-xen/release/${version}/xen-${version}.tar.gz"; + sha256 = "158kb1w61jmwxi3fc560s4269hhpxrin9xhm60ljj52njhxias8x"; + }; + + # Sources needed to build tools and firmwares. + xenfiles = optionalAttrs withInternalQemu { + "qemu-xen" = { + src = fetchgit { + url = https://xenbits.xen.org/git-http/qemu-xen.git; + rev = "refs/tags/qemu-xen-${version}"; + sha256 = "1v19pp86kcgwvsbkrdrn4rlaj02i4054avw8k70w1m0rnwgcsdbs"; + }; + buildInputs = qemuDeps; + patches = [ + (xsaPatch { + name = "216-qemuu"; + sha256 = "09gp980qdlfpfmxy0nk7ncyaa024jnrpzx9gpq2kah21xygy5ma1"; + }) + ]; + meta.description = "Xen's fork of upstream Qemu"; + }; + } // optionalAttrs withInternalTraditionalQemu { + "qemu-xen-traditional" = { + src = fetchgit { + url = https://xenbits.xen.org/git-http/qemu-xen-traditional.git; + rev = "refs/tags/xen-${version}"; + sha256 = "0mryap5y53r09m7qc0b821f717ghwm654r8c3ik1w7adzxr0l5qk"; + }; + buildInputs = qemuDeps; + patches = [ + ]; + postPatch = '' + substituteInPlace xen-hooks.mak \ + --replace /usr/include/pci ${pciutils}/include/pci + ''; + meta.description = "Xen's fork of upstream Qemu that uses old device model"; + }; + } // optionalAttrs withInternalSeabios { + "firmware/seabios-dir-remote" = { + src = fetchgit { + url = https://xenbits.xen.org/git-http/seabios.git; + rev = "f0cdc36d2f2424f6b40438f7ee7cc502c0eff4df"; + sha256 = "1wq5pjkjrfzqnq3wyr15mcn1l4c563m65gdyf8jm97kgb13pwwfm"; + }; + patches = [ ./0000-qemu-seabios-enable-ATA_DMA.patch ]; + meta.description = "Xen's fork of Seabios"; + }; + } // optionalAttrs withInternalOVMF { + "firmware/ovmf-dir-remote" = { + src = fetchgit { + url = https://xenbits.xen.org/git-http/ovmf.git; + rev = "173bf5c847e3ca8b42c11796ce048d8e2e916ff8"; + sha256 = "07zmdj90zjrzip74fvd4ss8n8njk6cim85s58mc6snxmqqv7gmcr"; + }; + meta.description = "Xen's fork of OVMF"; + }; + } // { + # TODO: patch Xen to make this optional? + "firmware/etherboot/ipxe.git" = { + src = fetchgit { + url = https://git.ipxe.org/ipxe.git; + rev = "356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d"; + sha256 = "15n400vm3id5r8y3k6lrp9ab2911a9vh9856f5gvphkazfnmns09"; + }; + meta.description = "Xen's fork of iPXE"; + }; + } // optionalAttrs withLibHVM { + "xen-libhvm-dir-remote" = { + src = fetchgit { + name = "xen-libhvm"; + url = https://github.com/michalpalka/xen-libhvm; + rev = "83065d36b36d6d527c2a4e0f5aaf0a09ee83122c"; + sha256 = "1jzv479wvgjkazprqdzcdjy199azmx2xl3pnxli39kc5mvjz3lzd"; + }; + buildPhase = '' + make + cd biospt + cc -Wall -g -D_LINUX -Wstrict-prototypes biospt.c -o biospt -I../libhvm -L../libhvm -lxenhvm + ''; + installPhase = '' + make install + cp biospt/biospt $out/bin/ + ''; + meta = { + description = '' + Helper library for reading ACPI and SMBIOS firmware values + from the host system for use with the HVM guest firmware + pass-through feature in Xen''; + license = licenses.bsd2; + }; + }; + }; + + configureFlags = [] + ++ optional (!withInternalQemu) "--with-system-qemu" # use qemu from PATH + ++ optional (withInternalTraditionalQemu) "--enable-qemu-traditional" + ++ optional (!withInternalTraditionalQemu) "--disable-qemu-traditional" + + ++ optional (withSeabios) "--with-system-seabios=${seabios}" + ++ optional (!withInternalSeabios && !withSeabios) "--disable-seabios" + + ++ optional (withOVMF) "--with-system-ovmf=${OVMF.fd}/FV/OVMF.fd" + ++ optional (withInternalOVMF) "--enable-ovmf"; + + patches = + [ (xsaPatch { + name = "213-4.8"; + sha256 = "0ia3zr6r3bqy2h48fdy7p0iz423lniy3i0qkdvzgv5a8m80darr2"; + }) + (xsaPatch { + name = "214"; + sha256 = "0qapzx63z0yl84phnpnglpkxp6b9sy1y7cilhwjhxyigpfnm2rrk"; + }) + (xsaPatch { + name = "217"; + sha256 = "1khs5ilif14dzcm7lmikjzkwsrfzlmir1rgrgzkc411gf18ylzmj"; + }) + (xsaPatch { + name = "218-4.8/0001-gnttab-fix-unmap-pin-accounting-race"; + sha256 = "0r363frai239r2wmwxi48kcr50gbk5l64nja0h9lppi3z2y3dkdd"; + }) + (xsaPatch { + name = "218-4.8/0002-gnttab-Avoid-potential-double-put-of-maptrack-entry"; + sha256 = "07wm06i7frv7bsaykakx3g9h0hfqv96zcadvwf6wv194dggq1plc"; + }) + (xsaPatch { + name = "218-4.8/0003-gnttab-correct-maptrack-table-accesses"; + sha256 = "0ad0irc3p4dmla8sp3frxbh2qciji1dipkslh0xqvy2hyf9p80y9"; + }) + (xsaPatch { + name = "219-4.8"; + sha256 = "16q7kiamy86x8qdvls74wmq5j72kgzgdilryig4q1b21mp0ij1jq"; + }) + (xsaPatch { + name = "220-4.8"; + sha256 = "0214qyqx7qap5y1pdi9fm0vz4y2fbyg71gaq36fisknj35dv2mh5"; + }) + (xsaPatch { + name = "221"; + sha256 = "1mcr1nqgxyjrkywdg7qhlfwgz7vj2if1dhic425vgd41p9cdgl26"; + }) + (xsaPatch { + name = "222-1"; + sha256 = "0x02x4kqwfw255638fh2zcxwig1dy6kadlmqim1jgnjgmrvvqas2"; + }) + (xsaPatch { + name = "222-2-4.8"; + sha256 = "1xhyp6q3c5l8djh965g1i8201m2wvhms8k886h4sn30hks38giin"; + }) + (xsaPatch { + name = "224-4.8/0001-gnttab-Fix-handling-of-dev_bus_addr-during-unmap"; + sha256 = "1k326yan5811qzyvpdfkv801a19nyd09nsqayi8gyh58xx9c21m4"; + }) + (xsaPatch { + name = "224-4.8/0002-gnttab-never-create-host-mapping-unless-asked-to"; + sha256 = "06nj1x59bbx9hrj26xmvbw8z805lfqhld9hm0ld0fs6dmcpqzcck"; + }) + (xsaPatch { + name = "224-4.8/0003-gnttab-correct-logic-to-get-page-references-during-m"; + sha256 = "0kmag6fdsskgplcvzqp341yfi6pgc14wvjj58bp7ydb9hdk53qx2"; + }) + (xsaPatch { + name = "224-4.8/0004-gnttab-__gnttab_unmap_common_complete-is-all-or-noth"; + sha256 = "1ww80pi7jr4gjpymkcw8qxmr5as18b2asdqv35527nqprylsff9f"; + }) + ]; + + # Fix build on Glibc 2.24. + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + + postPatch = '' + # Avoid a glibc >= 2.25 deprecation warnings that get fatal via -Werror. + sed 1i'#include ' \ + -i tools/blktap2/control/tap-ctl-allocate.c \ + -i tools/libxl/libxl_device.c + ''; + +})) args diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index b0b353c5fa2..434853b7cc1 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -14,7 +14,7 @@ config: # Scripts , coreutils, gawk, gnused, gnugrep, diffutils, multipath-tools , iproute, inetutils, iptables, bridge-utils, openvswitch, nbd, drbd -, lvm2, utillinux, procps +, lvm2, utillinux, procps, systemd # Documentation # python2Packages.markdown @@ -61,7 +61,7 @@ stdenv.mkDerivation (rec { libiconv libuuid ncurses openssl perl python2Packages.python xz yajl zlib # oxenstored - ocamlPackages.findlib ocamlPackages.ocaml + ocamlPackages.findlib ocamlPackages.ocaml systemd # Python fixes python2Packages.wrapPython @@ -153,12 +153,19 @@ stdenv.mkDerivation (rec { substituteInPlace tools/xenstat/Makefile \ --replace /usr/include/curses.h ${ncurses.dev}/include/curses.h - # TODO: use this as a template and support our own if-up scripts instead? - substituteInPlace tools/hotplug/Linux/xen-backend.rules.in \ - --replace "@XEN_SCRIPT_DIR@" $out/etc/xen/scripts + ${optionalString (config.version >= "4.8") '' + substituteInPlace tools/hotplug/Linux/launch-xenstore.in \ + --replace /bin/mkdir mkdir + ''} - # blktap is not provided by xen, but by xapi - sed -i '/blktap/d' tools/hotplug/Linux/xen-backend.rules.in + ${optionalString (config.version < "4.6") '' + # TODO: use this as a template and support our own if-up scripts instead? + substituteInPlace tools/hotplug/Linux/xen-backend.rules.in \ + --replace "@XEN_SCRIPT_DIR@" $out/etc/xen/scripts + + # blktap is not provided by xen, but by xapi + sed -i '/blktap/d' tools/hotplug/Linux/xen-backend.rules.in + ''} ${withTools "patches" (name: x: '' ${concatMapStringsSep "\n" (p: '' @@ -191,7 +198,7 @@ stdenv.mkDerivation (rec { ''; installPhase = '' - mkdir -p $out $out/share + mkdir -p $out $out/share $out/share/man cp -prvd dist/install/nix/store/*/* $out/ cp -prvd dist/install/boot $out/boot cp -prvd dist/install/etc $out diff --git a/pkgs/applications/virtualization/xen/packages.nix b/pkgs/applications/virtualization/xen/packages.nix index 633ec4f3d12..8f5262acb02 100644 --- a/pkgs/applications/virtualization/xen/packages.nix +++ b/pkgs/applications/virtualization/xen/packages.nix @@ -57,6 +57,56 @@ rec { }; }; + xen_4_8-vanilla = callPackage ./4.8.nix { + # At the very least included seabios and etherboot need gcc49, + # so we have to build all of it with gcc49. + stdenv = overrideCC stdenv gcc49; + + meta = { + description = "vanilla"; + longDescription = '' + Vanilla version of Xen. Uses forks of Qemu and Seabios bundled + with Xen. This gives vanilla experince, but wastes space and + build time: typical NixOS setup that runs lots of VMs will + build three different versions of Qemu when using this (two + forks and upstream). + ''; + }; + }; + + xen_4_8-slim = xen_4_8-vanilla.override { + withInternalQemu = false; + withInternalTraditionalQemu = true; + withInternalSeabios = false; + withSeabios = true; + + meta = { + description = "slim"; + longDescription = '' + Slimmed-down version of Xen that reuses nixpkgs packages as + much as possible. Different parts may get out of sync, but + this builds faster and uses less space than vanilla. Use with + `qemu_xen` from nixpkgs. + ''; + }; + }; + + xen_4_8-light = xen_4_8-vanilla.override { + withInternalQemu = false; + withInternalTraditionalQemu = false; + withInternalSeabios = false; + withSeabios = true; + + meta = { + description = "light"; + longDescription = '' + Slimmed-down version of Xen without `qemu-traditional` (you + don't need it if you don't know what it is). Use with + `qemu_xen-light` from nixpkgs. + ''; + }; + }; + xen-vanilla = xen_4_5-vanilla; xen-slim = xen_4_5-slim; xen-light = xen_4_5-light; diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix index d9ea14828dd..9d7b4502565 100644 --- a/pkgs/applications/window-managers/i3/lock.nix +++ b/pkgs/applications/window-managers/i3/lock.nix @@ -2,11 +2,12 @@ pam, libX11, libev, cairo, libxkbcommon, libxkbfile }: stdenv.mkDerivation rec { - name = "i3lock-2.8"; + name = "i3lock-${version}"; + version = "2.9.1"; src = fetchurl { - url = "http://i3wm.org/i3lock/${name}.tar.bz2"; - sha256 = "028fc0f74df10826514d5a4ed38f6895935d1f5d47ca9fcffc64b076aaf6e2f4"; + url = "https://i3wm.org/i3lock/${name}.tar.bz2"; + sha256 = "1467ha4ssbfjk1jh0ya2i5ljzm554ln18nyrppvsipg8shb1cshh"; }; buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11 diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index f392945b36d..ac725733d64 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchFromGitHub, pango, libinput , makeWrapper, cmake, pkgconfig, asciidoc, libxslt, docbook_xsl, cairo , wayland, wlc, libxkbcommon, pixman, fontconfig, pcre, json_c, dbus_libs, libcap -, xwayland +, xwayland, pam, gdk_pixbuf }: let - version = "0.12.2"; + version = "0.13.0"; in stdenv.mkDerivation rec { name = "sway-${version}"; @@ -14,18 +14,19 @@ in owner = "Sircmpwn"; repo = "sway"; rev = "${version}"; - sha256 = "1hkr6pmz45xa5w5y21ijz7i2dwb62rifhcy28r8kh5r2hwbil2hs"; + sha256 = "1vgk4rl51nx66yzpwg4yhnbj7wc30k5q0hh5lf8y0i1nvpal0p3q"; }; nativeBuildInputs = [ makeWrapper cmake pkgconfig asciidoc libxslt docbook_xsl ]; - buildInputs = [ wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs pango cairo libinput libcap xwayland ]; + buildInputs = [ wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs pango cairo libinput libcap xwayland pam gdk_pixbuf ]; patchPhase = '' sed -i s@/etc/sway@$out/etc/sway@g CMakeLists.txt; ''; makeFlags = "PREFIX=$(out)"; + cmakeFlags = "-DVERSION=${version}"; installPhase = "PREFIX=$out make install"; LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ wlc dbus_libs ]; diff --git a/pkgs/build-support/build-fhs-userenv/chroot-user.rb b/pkgs/build-support/build-fhs-userenv/chroot-user.rb index 11f672acb9f..833aab16ceb 100755 --- a/pkgs/build-support/build-fhs-userenv/chroot-user.rb +++ b/pkgs/build-support/build-fhs-userenv/chroot-user.rb @@ -16,6 +16,7 @@ mounts = { '/' => 'host', # Propagate environment variables envvars = [ 'TERM', 'DISPLAY', + 'XAUTHORITY', 'HOME', 'XDG_RUNTIME_DIR', 'LANG', diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index e56f1f9a7d4..37d62891ecf 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -5,11 +5,13 @@ # script that sets up the right environment variables so that the # compiler and the linker just "work". -{ name ? "", stdenv, nativeTools, nativeLibc, nativePrefix ? "" +{ name ? "", stdenv, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" , cc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenv.shell , zlib ? null, extraPackages ? [], extraBuildCommands ? "" , dyld ? null # TODO: should this be a setup-hook on dyld? , isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null +, buildPackages ? {}, hostPlatform, targetPlatform +, runCommand ? null }: with stdenv.lib; @@ -17,32 +19,126 @@ with stdenv.lib; assert nativeTools -> nativePrefix != ""; assert !nativeTools -> cc != null && binutils != null && coreutils != null && gnugrep != null; -assert !nativeLibc -> libc != null; +assert !(nativeLibc && noLibc); +assert (noLibc || nativeLibc) == (libc == null); + +assert stdenv.targetPlatform != stdenv.hostPlatform -> runCommand != null; # For ghdl (the vhdl language provider to gcc) we need zlib in the wrapper. assert cc.langVhdl or false -> zlib != null; let + inherit (stdenv) hostPlatform targetPlatform; + + # Prefix for binaries. Customarily ends with a dash separator. + # + # TODO(@Ericson2314) Make unconditional, or optional but always true by + # default. + prefix = stdenv.lib.optionalString (targetPlatform != hostPlatform) + (targetPlatform.config + "-"); ccVersion = (builtins.parseDrvName cc.name).version; ccName = (builtins.parseDrvName cc.name).name; - libc_bin = if nativeLibc then null else getBin libc; - libc_dev = if nativeLibc then null else getDev libc; - libc_lib = if nativeLibc then null else getLib libc; + libc_bin = if libc == null then null else getBin libc; + libc_dev = if libc == null then null else getDev libc; + libc_lib = if libc == null then null else getLib libc; cc_solib = getLib cc; binutils_bin = if nativeTools then "" else getBin binutils; # The wrapper scripts use 'cat' and 'grep', so we may need coreutils. coreutils_bin = if nativeTools then "" else getBin coreutils; - default_cxx_stdlib_compile=optionalString (stdenv.isLinux && !(cc.isGNU or false)) + default_cxx_stdlib_compile=optionalString (targetPlatform.isLinux && !(cc.isGNU or false)) "-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/$(${cc.gcc}/bin/gcc -dumpmachine)"; + + dashlessTarget = stdenv.lib.replaceStrings ["-"] ["_"] targetPlatform.config; + # TODO(@Ericson2314) Make unconditional + infixSalt = stdenv.lib.optionalString (targetPlatform != hostPlatform) dashlessTarget; + infixSalt_ = stdenv.lib.optionalString (targetPlatform != hostPlatform) (dashlessTarget + "_"); + _infixSalt = stdenv.lib.optionalString (targetPlatform != hostPlatform) ("_" + dashlessTarget); + + # We want to prefix all NIX_ flags with the target triple + preWrap = textFile: + # TODO: Do even when not cross on next mass-rebuild + # TODO: use @target_tripple@ for consistency + if targetPlatform == hostPlatform + then textFile + else runCommand "sed-nix-env-vars" {} ('' + cp --no-preserve=mode ${textFile} $out + + sed -i $out \ + -e 's^NIX_^NIX_${infixSalt_}^g' \ + -e 's^addCVars^addCVars${_infixSalt}^g' \ + -e 's^\[ -z "\$crossConfig" \]^\[\[ "${builtins.toString (targetPlatform != hostPlatform)}" || -z "$crossConfig" \]\]^g' + + '' + stdenv.lib.optionalString (textFile == ./setup-hook.sh) '' + cat << 'EOF' >> $out + for CMD in ar as nm objcopy ranlib strip strings size ld windres + do + # which is not part of stdenv, but compgen will do for now + if + PATH=$_PATH type -p ${prefix}$CMD > /dev/null + then + export ''$(echo "$CMD" | tr "[:lower:]" "[:upper:]")=${prefix}''${CMD}; + fi + done + EOF + + sed -i $out -e 's_envHooks_crossEnvHooks_g' + '' + '' + + # NIX_ things which we don't both use and define, we revert them + #asymmetric=$( + # for pre in "" "\\$" + # do + # grep -E -ho $pre'NIX_[a-zA-Z_]*' ./* | sed 's/\$//' | sort | uniq + # done | sort | uniq -c | sort -nr | sed -n 's/^1 NIX_//gp') + + # hard-code for now + asymmetric=("CXXSTDLIB_COMPILE" "CC") + + # The ([^a-zA-Z_]|$) bussiness is to ensure environment variables that + # begin with `NIX_CC` don't also get blacklisted. + for var in "''${asymmetric[@]}" + do + sed -i $out -E -e "s~NIX_${infixSalt_}$var([^a-zA-Z_]|$)~NIX_$var\1~g" + done + ''); + + # The dynamic linker has different names on different platforms. + dynamicLinker = + if !nativeLibc then + (if targetPlatform.system == "i686-linux" then "ld-linux.so.2" else + if targetPlatform.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else + # ARM with a wildcard, which can be "" or "-armhf". + if targetPlatform.isArm32 then "ld-linux*.so.3" else + if targetPlatform.system == "aarch64-linux" then "ld-linux-aarch64.so.1" else + if targetPlatform.system == "powerpc-linux" then "ld.so.1" else + if targetPlatform.system == "mips64el-linux" then "ld.so.1" else + if targetPlatform.system == "x86_64-darwin" then "/usr/lib/dyld" else + if stdenv.lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1" else + builtins.trace + "Don't know the name of the dynamic linker for platform ${targetPlatform.config}, so guessing instead." + null) + else ""; + + expand-response-params = if buildPackages.stdenv.cc or null != null && buildPackages.stdenv.cc != "/dev/null" + then buildPackages.stdenv.mkDerivation { + name = "expand-response-params"; + src = ./expand-response-params.c; + buildCommand = '' + # Work around "stdenv-darwin-boot-2 is not allowed to refer to path /nix/store/...-expand-response-params.c" + cp "$src" expand-response-params.c + "$CC" -std=c99 -O3 -o "$out" expand-response-params.c + ''; + } else ""; + in stdenv.mkDerivation { - name = - (if name != "" then name else ccName + "-wrapper") + - (if cc != null && ccVersion != "" then "-" + ccVersion else ""); + name = prefix + + (if name != "" then name else "${ccName}-wrapper") + + (stdenv.lib.optionalString (cc != null && ccVersion != "") "-${ccVersion}"); preferLocalBuild = true; @@ -51,17 +147,18 @@ stdenv.mkDerivation { passthru = { - inherit libc nativeTools nativeLibc nativePrefix isGNU isClang default_cxx_stdlib_compile; + inherit libc nativeTools nativeLibc nativePrefix isGNU isClang default_cxx_stdlib_compile + prefix infixSalt infixSalt_ _infixSalt; emacsBufferSetup = pkgs: '' ; We should handle propagation here too (mapc (lambda (arg) (when (file-directory-p (concat arg "/include")) - (setenv "NIX_CFLAGS_COMPILE" (concat (getenv "NIX_CFLAGS_COMPILE") " -isystem " arg "/include"))) + (setenv "NIX_${infixSalt_}CFLAGS_COMPILE" (concat (getenv "NIX_${infixSalt_}CFLAGS_COMPILE") " -isystem " arg "/include"))) (when (file-directory-p (concat arg "/lib")) - (setenv "NIX_LDFLAGS" (concat (getenv "NIX_LDFLAGS") " -L" arg "/lib"))) + (setenv "NIX_${infixSalt_}LDFLAGS" (concat (getenv "NIX_${infixSalt_}LDFLAGS") " -L" arg "/lib"))) (when (file-directory-p (concat arg "/lib64")) - (setenv "NIX_LDFLAGS" (concat (getenv "NIX_LDFLAGS") " -L" arg "/lib64")))) '(${concatStringsSep " " (map (pkg: "\"${pkg}\"") pkgs)})) + (setenv "NIX_${infixSalt_}LDFLAGS" (concat (getenv "NIX_${infixSalt_}LDFLAGS") " -L" arg "/lib64")))) '(${concatStringsSep " " (map (pkg: "\"${pkg}\"") pkgs)})) ''; }; @@ -78,7 +175,12 @@ stdenv.mkDerivation { } '' - + optionalString (!nativeLibc) (if (!stdenv.isDarwin) then '' + # TODO(@Ericson2314): Unify logic next hash break + + optionalString (libc != null) (if (targetPlatform.isDarwin) then '' + echo $dynamicLinker > $out/nix-support/dynamic-linker + + echo "export LD_DYLD_PATH=\"$dynamicLinker\"" >> $out/nix-support/setup-hook + '' else if dynamicLinker != null then '' dynamicLinker="${libc_lib}/lib/$dynamicLinker" echo $dynamicLinker > $out/nix-support/dynamic-linker @@ -91,12 +193,24 @@ stdenv.mkDerivation { # (the *last* value counts, so ours should come first). echo "-dynamic-linker" $dynamicLinker > $out/nix-support/libc-ldflags-before '' else '' - echo $dynamicLinker > $out/nix-support/dynamic-linker + dynamicLinker=`eval 'echo $libc/lib/ld*.so.?'` + if [ -n "$dynamicLinker" ]; then + echo $dynamicLinker > $out/nix-support/dynamic-linker - echo "export LD_DYLD_PATH=\"$dynamicLinker\"" >> $out/nix-support/setup-hook + if [ -e ${libc_lib}/lib/32/ld-linux.so.2 ]; then + echo ${libc_lib}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32 + fi + + ldflagsBefore="-dynamic-linker $dlinker" + fi + + # The dynamic linker is passed in `ldflagsBefore' to allow + # explicit overrides of the dynamic linker by callers to gcc/ld + # (the *last* value counts, so ours should come first). + echo "$ldflagsBefore" > $out/nix-support/libc-ldflags-before '') - + optionalString (!nativeLibc) '' + + optionalString (libc != null) '' # The "-B${libc_lib}/lib/" flag is a quick hack to force gcc to link # against the crt1.o from our own glibc, rather than the one in # /usr/lib. (This is only an issue when using an `impure' @@ -117,7 +231,7 @@ stdenv.mkDerivation { '' + (if nativeTools then '' - ccPath="${if stdenv.isDarwin then cc else nativePrefix}/bin" + ccPath="${if targetPlatform.isDarwin then cc else nativePrefix}/bin" ldPath="${nativePrefix}/bin" '' else '' echo $cc > $out/nix-support/orig-cc @@ -161,136 +275,122 @@ stdenv.mkDerivation { # Propagate the wrapped cc so that if you install the wrapper, # you get tools like gcov, the manpages, etc. as well (including # for binutils and Glibc). - echo ${cc} ${cc.man or ""} ${binutils_bin} ${libc_bin} > $out/nix-support/propagated-user-env-packages + printLines ${cc} ${cc.man or ""} ${binutils_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages - echo ${toString extraPackages} > $out/nix-support/propagated-native-build-inputs + printLines ${toString extraPackages} > $out/nix-support/propagated-native-build-inputs '' - + optionalString (stdenv.isSunOS && nativePrefix != "") '' + + optionalString (targetPlatform.isSunOS && nativePrefix != "") '' # Solaris needs an additional ld wrapper. ldPath="${nativePrefix}/bin" - exec="$ldPath/ld" - wrap ld-solaris ${./ld-solaris-wrapper.sh} + exec="$ldPath/${prefix}ld" + wrap ld-solaris ${preWrap ./ld-solaris-wrapper.sh} '') + '' # Create a symlink to as (the assembler). This is useful when a # cc-wrapper is installed in a user environment, as it ensures that # the right assembler is called. - if [ -e $ldPath/as ]; then - ln -s $ldPath/as $out/bin/as + if [ -e $ldPath/${prefix}as ]; then + ln -s $ldPath/${prefix}as $out/bin/${prefix}as fi - wrap ld ${./ld-wrapper.sh} ''${ld:-$ldPath/ld} + wrap ${prefix}ld ${preWrap ./ld-wrapper.sh} ''${ld:-$ldPath/${prefix}ld} - if [ -e ${binutils_bin}/bin/ld.gold ]; then - wrap ld.gold ${./ld-wrapper.sh} ${binutils_bin}/bin/ld.gold + if [ -e ${binutils_bin}/bin/${prefix}ld.gold ]; then + wrap ${prefix}ld.gold ${preWrap ./ld-wrapper.sh} ${binutils_bin}/bin/${prefix}ld.gold fi if [ -e ${binutils_bin}/bin/ld.bfd ]; then - wrap ld.bfd ${./ld-wrapper.sh} ${binutils_bin}/bin/ld.bfd + wrap ${prefix}ld.bfd ${preWrap ./ld-wrapper.sh} ${binutils_bin}/bin/${prefix}ld.bfd fi - export real_cc=cc - export real_cxx=c++ + export real_cc=${prefix}cc + export real_cxx=${prefix}c++ export default_cxx_stdlib_compile="${default_cxx_stdlib_compile}" - if [ -e $ccPath/gcc ]; then - wrap gcc ${./cc-wrapper.sh} $ccPath/gcc - ln -s gcc $out/bin/cc - export real_cc=gcc - export real_cxx=g++ + if [ -e $ccPath/${prefix}gcc ]; then + wrap ${prefix}gcc ${preWrap ./cc-wrapper.sh} $ccPath/${prefix}gcc + ln -s ${prefix}gcc $out/bin/${prefix}cc + export real_cc=${prefix}gcc + export real_cxx=${prefix}g++ elif [ -e $ccPath/clang ]; then - wrap clang ${./cc-wrapper.sh} $ccPath/clang - ln -s clang $out/bin/cc + wrap ${prefix}clang ${preWrap ./cc-wrapper.sh} $ccPath/clang + ln -s ${prefix}clang $out/bin/${prefix}cc export real_cc=clang export real_cxx=clang++ fi - if [ -e $ccPath/g++ ]; then - wrap g++ ${./cc-wrapper.sh} $ccPath/g++ - ln -s g++ $out/bin/c++ + if [ -e $ccPath/${prefix}g++ ]; then + wrap ${prefix}g++ ${preWrap ./cc-wrapper.sh} $ccPath/${prefix}g++ + ln -s ${prefix}g++ $out/bin/${prefix}c++ elif [ -e $ccPath/clang++ ]; then - wrap clang++ ${./cc-wrapper.sh} $ccPath/clang++ - ln -s clang++ $out/bin/c++ + wrap ${prefix}clang++ ${preWrap ./cc-wrapper.sh} $ccPath/clang++ + ln -s ${prefix}clang++ $out/bin/${prefix}c++ fi if [ -e $ccPath/cpp ]; then - wrap cpp ${./cc-wrapper.sh} $ccPath/cpp + wrap ${prefix}cpp ${preWrap ./cc-wrapper.sh} $ccPath/cpp fi '' + optionalString cc.langFortran or false '' - wrap gfortran ${./cc-wrapper.sh} $ccPath/gfortran - ln -sv gfortran $out/bin/g77 - ln -sv gfortran $out/bin/f77 + wrap ${prefix}gfortran ${preWrap ./cc-wrapper.sh} $ccPath/${prefix}gfortran + ln -sv ${prefix}gfortran $out/bin/${prefix}g77 + ln -sv ${prefix}gfortran $out/bin/${prefix}f77 '' + optionalString cc.langJava or false '' - wrap gcj ${./cc-wrapper.sh} $ccPath/gcj + wrap ${prefix}gcj ${preWrap ./cc-wrapper.sh} $ccPath/${prefix}gcj '' + optionalString cc.langGo or false '' - wrap gccgo ${./cc-wrapper.sh} $ccPath/gccgo + wrap ${prefix}gccgo ${preWrap ./cc-wrapper.sh} $ccPath/${prefix}gccgo '' + optionalString cc.langAda or false '' - wrap gnatgcc ${./cc-wrapper.sh} $ccPath/gnatgcc - wrap gnatmake ${./gnat-wrapper.sh} $ccPath/gnatmake - wrap gnatbind ${./gnat-wrapper.sh} $ccPath/gnatbind - wrap gnatlink ${./gnatlink-wrapper.sh} $ccPath/gnatlink + wrap ${prefix}gnatgcc ${preWrap ./cc-wrapper.sh} $ccPath/${prefix}gnatgcc + wrap ${prefix}gnatmake ${preWrap ./gnat-wrapper.sh} $ccPath/${prefix}gnatmake + wrap ${prefix}gnatbind ${preWrap ./gnat-wrapper.sh} $ccPath/${prefix}gnatbind + wrap ${prefix}gnatlink ${preWrap ./gnatlink-wrapper.sh} $ccPath/${prefix}gnatlink '' + optionalString cc.langVhdl or false '' - ln -s $ccPath/ghdl $out/bin/ghdl + ln -s $ccPath/${prefix}ghdl $out/bin/${prefix}ghdl '' + '' - substituteAll ${./setup-hook.sh} $out/nix-support/setup-hook.tmp + substituteAll ${preWrap ./setup-hook.sh} $out/nix-support/setup-hook.tmp cat $out/nix-support/setup-hook.tmp >> $out/nix-support/setup-hook rm $out/nix-support/setup-hook.tmp # some linkers on some platforms don't support specific -z flags hardening_unsupported_flags="" - if [[ "$($ldPath/ld -z now 2>&1 || true)" =~ un(recognized|known)\ option ]]; then + if [[ "$($ldPath/${prefix}ld -z now 2>&1 || true)" =~ un(recognized|known)\ option ]]; then hardening_unsupported_flags+=" bindnow" fi - if [[ "$($ldPath/ld -z relro 2>&1 || true)" =~ un(recognized|known)\ option ]]; then + if [[ "$($ldPath/${prefix}ld -z relro 2>&1 || true)" =~ un(recognized|known)\ option ]]; then hardening_unsupported_flags+=" relro" fi + '' - substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh - substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh - cp -p ${./utils.sh} $out/nix-support/utils.sh + + optionalString hostPlatform.isCygwin '' + hardening_unsupported_flags+=" pic" + '' + + + '' + substituteAll ${preWrap ./add-flags.sh} $out/nix-support/add-flags.sh + substituteAll ${preWrap ./add-hardening.sh} $out/nix-support/add-hardening.sh + substituteAll ${preWrap ./utils.sh} $out/nix-support/utils.sh '' + extraBuildCommands; - # The dynamic linker has different names on different Linux platforms. - dynamicLinker = - if !nativeLibc then - (if stdenv.system == "i686-linux" then "ld-linux.so.2" else - if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else - # ARM with a wildcard, which can be "" or "-armhf". - if stdenv.isArm then "ld-linux*.so.3" else - if stdenv.system == "aarch64-linux" then "ld-linux-aarch64.so.1" else - if stdenv.system == "powerpc-linux" then "ld.so.1" else - if stdenv.system == "mips64el-linux" then "ld.so.1" else - if stdenv.system == "x86_64-darwin" then "/usr/lib/dyld" else - abort "Don't know the name of the dynamic linker for this platform.") - else ""; + inherit dynamicLinker expand-response-params; + + expandResponseParams = expand-response-params; # for substitution in utils.sh crossAttrs = { shell = shell.crossDrv + shell.crossDrv.shellPath; - libc = stdenv.ccCross.libc; - # - # This is not the best way to do this. I think the reference should be - # the style in the gcc-cross-wrapper, but to keep a stable stdenv now I - # do this sufficient if/else. - dynamicLinker = - (if stdenv.cross.arch == "arm" then "ld-linux.so.3" else - if stdenv.cross.arch == "mips" then "ld.so.1" else - if stdenv.lib.hasSuffix "pc-gnu" stdenv.cross.config then "ld.so.1" else - abort "don't know the name of the dynamic linker for this platform"); }; meta = diff --git a/pkgs/build-support/cc-wrapper/expand-response-params.c b/pkgs/build-support/cc-wrapper/expand-response-params.c new file mode 100644 index 00000000000..05b9c62b1e8 --- /dev/null +++ b/pkgs/build-support/cc-wrapper/expand-response-params.c @@ -0,0 +1,84 @@ +#include +#include +#include +#include +#include + +typedef struct { char *data; size_t len, cap; } String; + +void resize(String *s, size_t len) { + s->len = len; + if (s->cap < s->len) { + s->cap = s->len * 2; + s->data = (char *)realloc(s->data, s->cap); + assert(s->data); + } +} + +void append(String *s, const char *data, size_t len) { + resize(s, s->len + len); + memcpy(s->data + s->len - len, data, len); +} + +typedef enum { space = 0, other = 1, backslash = 2, apostrophe = 3, quotation_mark = 4 } CharClass; +typedef enum { outside, unq, unq_esc, sq, sq_esc, dq, dq_esc } State; + +// current State -> CharClass -> next State +const State transitions[][5] = { + [outside] = {outside, unq, unq_esc, sq, dq}, + [unq] = {outside, unq, unq_esc, sq, dq}, + [unq_esc] = {unq, unq, unq, unq, unq}, + [sq] = {sq, sq, sq_esc, unq, sq}, + [sq_esc] = {sq, sq, sq, sq, sq}, + [dq] = {dq, dq, dq_esc, dq, unq}, + [dq_esc] = {dq, dq, dq, dq, dq}, +}; + +CharClass charClass(int c) { + return c == '\\' ? backslash : c == '\'' ? apostrophe : c == '"' ? quotation_mark : + isspace(c) ? space : other; +} + +// expandArg writes NULL-terminated expansions of `arg', a NULL-terminated +// string, to stdout. If arg does not begin with `@' or does not refer to a +// file, it is written as is. Otherwise the contents of the file are +// recursively expanded. On unexpected EOF in malformed response files an +// incomplete final argument is written, even if it is empty, to parse like GCC. +void expandArg(String *arg) { + FILE *f; + if (arg->data[0] != '@' || !(f = fopen(&arg->data[1], "r"))) { + fwrite(arg->data, 1, arg->len, stdout); + return; + } + + resize(arg, 0); + State cur = outside; + int c; + do { + c = fgetc(f); + State next = transitions[cur][charClass(c)]; + if ((cur == unq && next == outside) || (cur != outside && c == EOF)) { + append(arg, "", 1); + expandArg(arg); + resize(arg, 0); + } else if (cur == unq_esc || cur == sq_esc || cur == dq_esc || + (cur == outside ? next == unq : cur == next)) { + char s = c; + append(arg, &s, 1); + } + cur = next; + } while (c != EOF); + + fclose(f); +} + +int main(int argc, char **argv) { + String arg = { 0 }; + while (*++argv) { + resize(&arg, 0); + append(&arg, *argv, strlen(*argv) + 1); + expandArg(&arg); + } + free(arg.data); + return EXIT_SUCCESS; +} diff --git a/pkgs/build-support/cc-wrapper/utils.sh b/pkgs/build-support/cc-wrapper/utils.sh index d17930e8ab5..87e48da9c8d 100644 --- a/pkgs/build-support/cc-wrapper/utils.sh +++ b/pkgs/build-support/cc-wrapper/utils.sh @@ -23,55 +23,18 @@ badPath() { "${p:0:${#NIX_BUILD_TOP}}" != "$NIX_BUILD_TOP" } -# @args.rsp parser. -# Char classes: space, other, backslash, single quote, double quote. -# States: 0 - outside, 1/2 - unquoted arg/slash, 3/4 - 'arg'/slash, 5/6 - "arg"/slash. -# State transitions: -rspT=(01235 01235 11111 33413 33333 55651 55555) -# Push char on transition: -rspC[01]=1 rspC[11]=1 rspC[21]=1 rspC[33]=1 rspC[43]=1 rspC[55]=1 rspC[65]=1 - -rspParse() { - rsp=() - local s="$1" - local state=0 - local arg='' - - for (( i=0; i<${#s}; i++ )); do - local c="${s:$i:1}" - local cls=1 - case "$c" in - ' ' | $'\t' | $'\r' | $'\n') cls=0 ;; - '\') cls=2 ;; - "'") cls=3 ;; - '"') cls=4 ;; - esac - local nextstates="${rspT[$state]}" - local nextstate="${nextstates:$cls:1}" - if [ "${rspC[$state$nextstate]}" ]; then - arg+="$c" - elif [ "$state$nextstate" = "10" ]; then - rsp+=("$arg") - arg='' - fi - state="$nextstate" - done - - if [ "$state" -ne 0 ]; then - rsp+=("$arg") - fi -} - expandResponseParams() { - params=() - while [ $# -gt 0 ]; do - local p="$1" - shift - if [ "${p:0:1}" = '@' -a -e "${p:1}" ]; then - rspParse "$(<"${p:1}")" - set -- "${rsp[@]}" "$@" - else - params+=("$p") + params=("$@") + local arg + for arg in "$@"; do + if [[ "$arg" == @* ]]; then + if [ -n "@expandResponseParams@" ]; then + readarray -d '' params < <("@expandResponseParams@" "$@") + return 0 + else + echo "Response files aren't supported during bootstrapping" >&2 + return 1 + fi fi done } diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 6bc9b7475e1..506ef7837a2 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -42,7 +42,7 @@ rec { cp ${./tarsum.go} tarsum.go export GOPATH=$(pwd) mkdir src - ln -sT ${docker.src}/pkg/tarsum src/tarsum + ln -sT ${docker.src}/components/engine/pkg/tarsum src/tarsum go build cp tarsum $out @@ -234,11 +234,10 @@ rec { # Files to add to the layer. contents ? null, # Additional commands to run on the layer before it is tar'd up. - extraCommands ? "" + extraCommands ? "", uid ? 0, gid ? 0 }: runCommand "docker-layer-${name}" { inherit baseJson contents extraCommands; - buildInputs = [ jshon rsync ]; } '' @@ -253,6 +252,8 @@ rec { echo "No contents to add to layer." fi + chmod ug+w layer + if [[ -n $extraCommands ]]; then (cd layer; eval "$extraCommands") fi @@ -260,7 +261,7 @@ rec { # Tar up the layer and throw it into 'layer.tar'. echo "Packing layer..." mkdir $out - tar -C layer --mtime="@$SOURCE_DATE_EPOCH" -cf $out/layer.tar . + tar -C layer --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf $out/layer.tar . # Compute a checksum of the tarball. echo "Computing layer checksum..." @@ -312,6 +313,8 @@ rec { echo "Adding $item..." rsync -ak --chown=0:0 $item/ layer/ done + + chmod ug+w layer ''; postMount = '' @@ -375,11 +378,13 @@ rec { # Docker config; e.g. what command to run on the container. config ? null, # Optional bash script to run on the files prior to fixturizing the layer. - extraCommands ? "", + extraCommands ? "", uid ? 0, gid ? 0, # Optional bash script to run as root on the image when provisioning. runAsRoot ? null, # Size of the virtual machine disk to provision when building the image. diskSize ? 1024, + # Time of creation of the image. + created ? "1970-01-01T00:00:01Z", }: let @@ -387,17 +392,16 @@ rec { # Create a JSON blob of the configuration. Set the date to unix zero. baseJson = writeText "${baseName}-config.json" (builtins.toJSON { - created = "1970-01-01T00:00:01Z"; + inherit created config; architecture = "amd64"; os = "linux"; - config = config; }); layer = if runAsRoot == null then mkPureLayer { name = baseName; - inherit baseJson contents extraCommands; + inherit baseJson contents extraCommands uid gid; } else mkRootLayer { name = baseName; inherit baseJson fromImage fromImageName fromImageTag @@ -497,7 +501,7 @@ rec { chmod -R a-w image echo "Cooking the image..." - tar -C image --mtime="@$SOURCE_DATE_EPOCH" -c . | pigz -nT > $out + tar -C image --mtime="@$SOURCE_DATE_EPOCH" --owner=0 --group=0 -c . | pigz -nT > $out echo "Finished." ''; diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index a5f81ef1794..8e060b87ebd 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -1,6 +1,7 @@ {stdenv, git, cacert}: let urlToName = url: rev: let - base = baseNameOf (stdenv.lib.removeSuffix "/" url); + inherit (stdenv.lib) removeSuffix splitString last; + base = last (splitString ":" (baseNameOf (removeSuffix "/" url))); matched = builtins.match "(.*).git" base; diff --git a/pkgs/build-support/fetchgit/gitrepotoname.nix b/pkgs/build-support/fetchgit/gitrepotoname.nix new file mode 100644 index 00000000000..90005b54569 --- /dev/null +++ b/pkgs/build-support/fetchgit/gitrepotoname.nix @@ -0,0 +1,19 @@ +{ lib }: + +let + inherit (lib) removeSuffix hasPrefix removePrefix splitString stringToCharacters concatMapStrings last elem; + + allowedChars = stringToCharacters "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789+-._?="; + sanitizeStoreName = s: + let + s' = concatMapStrings (c: if elem c allowedChars then c else "") (stringToCharacters s); + s'' = if hasPrefix "." s' then "_${removePrefix "." s'}" else s'; + in + s''; +in + urlOrRepo: rev: + let + repo' = last (splitString ":" (baseNameOf (removeSuffix ".git" (removeSuffix "/" urlOrRepo)))); + rev' = baseNameOf rev; + in + "${sanitizeStoreName repo'}-${sanitizeStoreName rev'}-src" diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 3d656eba5ff..a180509a326 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -47,6 +47,7 @@ Options: --leave-dotGit Keep the .git directories. --fetch-submodules Fetch submodules. --builder Clone as fetchgit does, but url, rev, and out option are mandatory. + --quiet Only print the final json summary. " exit 1 } @@ -120,9 +121,8 @@ hash_from_ref(){ url_to_name(){ local url=$1 local ref=$2 - # basename removes the / and .git suffixes local base - base=$(basename "$url" .git) + base=$(basename "$url" .git | cut -d: -f2) if [[ $ref =~ ^[a-z0-9]+$ ]]; then echo "$base-${ref:0:7}" @@ -283,8 +283,8 @@ _clone_user_rev() { if test -z "$(echo "$rev" | tr -d 0123456789abcdef)"; then clone "$dir" "$url" "$rev" "" 1>&2 else - echo 1>&2 "Bad commit hash or bad reference." - exit 1 + # if revision is not hexadecimal it might be a tag + clone "$dir" "$url" "" "refs/tags/$rev" 1>&2 fi;; esac diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix index 1145d32ba02..751dba56930 100644 --- a/pkgs/build-support/fetchzip/default.nix +++ b/pkgs/build-support/fetchzip/default.nix @@ -23,7 +23,6 @@ lib.overrideDerivation (fetchurl ({ postFetch = '' export PATH=${unzip}/bin:$PATH - mkdir $out unpackDir="$TMPDIR/unpack" mkdir "$unpackDir" @@ -32,8 +31,6 @@ lib.overrideDerivation (fetchurl ({ renamed="$TMPDIR/${baseNameOf url}" mv "$downloadedFile" "$renamed" unpackFile "$renamed" - - shopt -s dotglob '' + (if stripRoot then '' if [ $(ls "$unpackDir" | wc -l) != 1 ]; then @@ -43,12 +40,11 @@ lib.overrideDerivation (fetchurl ({ fi fn=$(cd "$unpackDir" && echo *) if [ -f "$unpackDir/$fn" ]; then - mv "$unpackDir/$fn" "$out" - else - mv "$unpackDir/$fn"/* "$out/" + mkdir $out fi + mv "$unpackDir/$fn" "$out" '' else '' - mv "$unpackDir"/* "$out/" + mv "$unpackDir" "$out" '') #*/ + extraPostFetch; } // removeAttrs args [ "stripRoot" "extraPostFetch" ])) diff --git a/pkgs/build-support/gcc-cross-wrapper/add-flags b/pkgs/build-support/gcc-cross-wrapper/add-flags deleted file mode 100644 index 9ff4522e800..00000000000 --- a/pkgs/build-support/gcc-cross-wrapper/add-flags +++ /dev/null @@ -1,5 +0,0 @@ -export NIX_CROSS_CFLAGS_COMPILE="@cflagsCompile@ $NIX_CROSS_CFLAGS_COMPILE" -export NIX_CROSS_CFLAGS_LINK="@cflagsLink@ $NIX_CROSS_CFLAGS_LINK" -export NIX_CROSS_LDFLAGS="@ldflags@ $NIX_CROSS_LDFLAGS" -export NIX_CROSS_LDFLAGS_BEFORE="@ldflagsBefore@ $NIX_CROSS_LDFLAGS_BEFORE" -export NIX_CROSS_GLIBC_FLAGS_SET=1 diff --git a/pkgs/build-support/gcc-cross-wrapper/builder.sh b/pkgs/build-support/gcc-cross-wrapper/builder.sh deleted file mode 100644 index b729144b860..00000000000 --- a/pkgs/build-support/gcc-cross-wrapper/builder.sh +++ /dev/null @@ -1,120 +0,0 @@ -source $stdenv/setup - -mkdir $out -mkdir $out/bin -mkdir $out/nix-support - -# Force gcc to use ld-wrapper.sh when calling ld. -cflagsCompile="-B$out/bin/" - -if test -z "$nativeLibc" -a -n "$libc"; then - cflagsCompile="$cflagsCompile -B$gccLibs/lib -B$libc/lib/ -isystem $libc_dev/include" - ldflags="$ldflags -L$libc/lib" - # Get the proper dynamic linker for glibc and uclibc. - dlinker=`eval 'echo $libc/lib/ld*.so.?'` - if [ -n "$dlinker" ]; then - ldflagsBefore="-dynamic-linker $dlinker" - - # The same as above, but put into files, useful for the gcc builder. - echo $dlinker > $out/nix-support/dynamic-linker - # This trick is to avoid dependencies on the cross-toolchain gcc - # for libgcc, libstdc++, ... - # -L is for libtool's .la files, and -rpath for the usual fixupPhase - # shrinking rpaths. - if [ -n "$gccLibs" ]; then - ldflagsBefore="$ldflagsBefore -rpath $gccLibs/lib" - fi - fi - - if [ -n "$osxMinVersion" ]; then - cflagsCompile="$cflagsCompile -mmacosx-version-min=$osxMinVersion" - fi - - echo "$cflagsCompile -B$libc/lib/ -idirafter $libc/include -idirafter $gcc/lib/gcc/*/*/include-fixed" > $out/nix-support/libc-cflags - - echo "-L$libc/lib -rpath $libc/lib -rpath-link $libc/lib" > $out/nix-support/libc-ldflags - - # The dynamic linker is passed in `ldflagsBefore' to allow - # explicit overrides of the dynamic linker by callers to gcc/ld - # (the *last* value counts, so ours should come first). - echo "$ldflagsBefore" > $out/nix-support/libc-ldflags-before -fi - -if test -n "$nativeTools"; then - gccPath="$nativePrefix/bin" - ldPath="$nativePrefix/bin" -else - ldflags="$ldflags -L$gcc/lib -L$gcc/lib64" - gccPath="$gcc/bin" - ldPath="$binutils/$crossConfig/bin" -fi - - -doSubstitute() { - local src=$1 - local dst=$2 - substitute "$src" "$dst" \ - --subst-var "out" \ - --subst-var "shell" \ - --subst-var "gcc" \ - --subst-var "gccProg" \ - --subst-var "binutils" \ - --subst-var "libc" \ - --subst-var "cflagsCompile" \ - --subst-var "cflagsLink" \ - --subst-var "ldflags" \ - --subst-var "ldflagsBefore" \ - --subst-var "ldPath" \ - --subst-var-by "ld" "$ldPath/ld" -} - - -# Make wrapper scripts around gcc, g++, and g77. Also make symlinks -# cc, c++, and f77. -mkGccWrapper() { - local dst=$1 - local src=$2 - - if ! test -f "$src"; then - echo "$src does not exist (skipping)" - return - fi - - gccProg="$src" - doSubstitute "$gccWrapper" "$dst" - chmod +x "$dst" -} - -mkGccWrapper $out/bin/$crossConfig-gcc $gccPath/$crossConfig-gcc -#ln -s gcc $out/bin/cc - -mkGccWrapper $out/bin/$crossConfig-g++ $gccPath/$crossConfig-g++ -ln -s $crossConfig-g++ $out/bin/$crossConfig-c++ - -mkGccWrapper $out/bin/$crossConfig-cpp $gccPath/$crossConfig-cpp - -mkGccWrapper $out/bin/$crossConfig-g77 $gccPath/$crossConfig-g77 -ln -s $crossConfig-g77 $out/bin/$crossConfig-f77 - -ln -s $binutils/bin/$crossConfig-ar $out/bin/$crossConfig-ar -ln -s $binutils/bin/$crossConfig-as $out/bin/$crossConfig-as -ln -s $binutils/bin/$crossConfig-nm $out/bin/$crossConfig-nm -ln -s $binutils/bin/$crossConfig-strip $out/bin/$crossConfig-strip - - -# Make a wrapper around the linker. -doSubstitute "$ldWrapper" "$out/bin/$crossConfig-ld" -chmod +x "$out/bin/$crossConfig-ld" - - -# Emit a setup hook. Also store the path to the original GCC and -# Glibc. -test -n "$gcc" && echo $gcc > $out/nix-support/orig-cc -test -n "$libc" && echo $libc > $out/nix-support/orig-libc -test -n "$libc_dev" && echo $libc_dev > $out/nix-support/orig-libc-dev - -doSubstitute "$addFlags" "$out/nix-support/add-flags" - -doSubstitute "$setupHook" "$out/nix-support/setup-hook" - -cp -p $utils $out/nix-support/utils diff --git a/pkgs/build-support/gcc-cross-wrapper/default.nix b/pkgs/build-support/gcc-cross-wrapper/default.nix deleted file mode 100644 index 505d80a6b2a..00000000000 --- a/pkgs/build-support/gcc-cross-wrapper/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -# The Nix `gcc' stdenv.mkDerivation is not directly usable, since it doesn't -# know where the C library and standard header files are. Therefore -# the compiler produced by that package cannot be installed directly -# in a user environment and used from the command line. This -# stdenv.mkDerivation provides a wrapper that sets up the right environment -# variables so that the compiler and the linker just "work". - -{ name ? "", stdenv, nativeTools, nativeLibc, noLibc ? false, nativePrefix ? "" -, gcc ? null, libc ? null, binutils ? null, shell ? "", cross -}: - -assert nativeTools -> nativePrefix != ""; -assert !nativeTools -> gcc != null && binutils != null; -assert !noLibc -> (!nativeLibc -> libc != null); - -let - chosenName = if name == "" then gcc.name else name; - gccLibs = stdenv.mkDerivation { - name = chosenName + "-libs"; - phases = [ "installPhase" ]; - installPhase = '' - echo $out - mkdir -p "$out" - - if [ -d "${gcc}/${cross.config}/lib" ] - then - cp -Rd "${gcc}/${cross.config}/lib" "$out/lib" - chmod -R +w "$out/lib" - for a in "$out/lib/"*.la; do - sed -i -e "s,${gcc}/${cross.config}/lib,$out/lib,g" $a - done - rm -f "$out/lib/"*.py - else - # The MinGW cross-compiler falls into this category. - mkdir "$out/lib" - fi - ''; - }; -in -stdenv.mkDerivation { - builder = ./builder.sh; - setupHook = ./setup-hook.sh; - gccWrapper = ./gcc-wrapper.sh; - ldWrapper = ./ld-wrapper.sh; - utils = ./utils.sh; - addFlags = ./add-flags; - inherit nativeTools nativeLibc nativePrefix gcc binutils; - libc = if libc ? out then libc.out else libc; - libc_dev = if libc ? dev then libc.dev else libc; - crossConfig = if cross != null then cross.config else null; - osxMinVersion = cross.osxMinVersion or null; - gccLibs = if gcc != null then gccLibs else null; - name = chosenName; - langC = if nativeTools then true else gcc.langC; - langCC = if nativeTools then true else gcc.langCC; - langF77 = if nativeTools then false else gcc ? langFortran; - shell = if shell == "" then stdenv.shell else shell; - meta = if gcc != null then gcc.meta else - { description = "System C compiler wrapper"; - }; - - passthru = { - target = cross; - }; -} diff --git a/pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh b/pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh deleted file mode 100644 index c15777144e1..00000000000 --- a/pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh +++ /dev/null @@ -1,117 +0,0 @@ -#! @shell@ -e - -if test -n "$NIX_CC_WRAPPER_START_HOOK"; then - source "$NIX_CC_WRAPPER_START_HOOK" -fi - -if test -z "$NIX_CROSS_GLIBC_FLAGS_SET"; then - source @out@/nix-support/add-flags -fi - -source @out@/nix-support/utils - - -# Figure out if linker flags should be passed. GCC prints annoying -# warnings when they are not needed. -dontLink=0 -if test "$*" = "-v" -o -z "$*"; then - dontLink=1 -else - for i in "$@"; do - if test "$i" = "-c"; then - dontLink=1 - elif test "$i" = "-S"; then - dontLink=1 - elif test "$i" = "-E"; then - dontLink=1 - elif test "$i" = "-E"; then - dontLink=1 - elif test "$i" = "-M"; then - dontLink=1 - elif test "$i" = "-MM"; then - dontLink=1 - fi - done -fi - - -# Optionally filter out paths not refering to the store. -params=("$@") -if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE"; then - rest=() - n=0 - while test $n -lt ${#params[*]}; do - p=${params[n]} - p2=${params[$((n+1))]} - if test "${p:0:3}" = "-L/" && badPath "${p:2}"; then - skip $p - elif test "$p" = "-L" && badPath "$p2"; then - n=$((n + 1)); skip $p2 - elif test "${p:0:3}" = "-I/" && badPath "${p:2}"; then - skip $p - elif test "$p" = "-I" && badPath "$p2"; then - n=$((n + 1)); skip $p2 - elif test "$p" = "-isystem" && badPath "$p2"; then - n=$((n + 1)); skip $p2 - else - rest=("${rest[@]}" "$p") - fi - n=$((n + 1)) - done - params=("${rest[@]}") -fi - - -# Add the flags for the C compiler proper. -extraAfter=($NIX_CROSS_CFLAGS_COMPILE) -extraBefore=() - -if test "$dontLink" != "1"; then - - # Add the flags that should only be passed to the compiler when - # linking. - extraAfter=(${extraAfter[@]} $NIX_CROSS_CFLAGS_LINK) - - # Add the flags that should be passed to the linker (and prevent - # `ld-wrapper' from adding NIX_CROSS_LDFLAGS again). - for i in $NIX_CROSS_LDFLAGS_BEFORE; do - if test "${i:0:3}" = "-L/"; then - extraBefore=(${extraBefore[@]} "$i") - else - extraBefore=(${extraBefore[@]} "-Wl,$i") - fi - done - for i in $NIX_CROSS_LDFLAGS; do - if test "${i:0:3}" = "-L/"; then - extraAfter=(${extraAfter[@]} "$i") - else - extraAfter=(${extraAfter[@]} "-Wl,$i") - fi - done - export NIX_CROSS_LDFLAGS_SET=1 -fi - -# Optionally print debug info. -if test "$NIX_DEBUG" = "1"; then - echo "original flags to @gccProg@:" >&2 - for i in "${params[@]}"; do - echo " $i" >&2 - done - echo "extraBefore flags to @gccProg@:" >&2 - for i in ${extraBefore[@]}; do - echo " $i" >&2 - done - echo "extraAfter flags to @gccProg@:" >&2 - for i in ${extraAfter[@]}; do - echo " $i" >&2 - done -fi - -if test -n "$NIX_CC_WRAPPER_EXEC_HOOK"; then - source "$NIX_CC_WRAPPER_EXEC_HOOK" -fi - -# We want gcc to call the wrapper linker, not that of binutils. -export PATH="@ldPath@:$PATH" - -exec @gccProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} diff --git a/pkgs/build-support/gcc-cross-wrapper/ld-wrapper.sh b/pkgs/build-support/gcc-cross-wrapper/ld-wrapper.sh deleted file mode 100644 index 226fad83359..00000000000 --- a/pkgs/build-support/gcc-cross-wrapper/ld-wrapper.sh +++ /dev/null @@ -1,145 +0,0 @@ -#! @shell@ -e - -if test -n "$NIX_LD_WRAPPER_START_HOOK"; then - source "$NIX_LD_WRAPPER_START_HOOK" -fi - -if test -z "$NIX_CROSS_GLIBC_FLAGS_SET"; then - source @out@/nix-support/add-flags -fi - -source @out@/nix-support/utils - - -# Optionally filter out paths not refering to the store. -params=("$@") -if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE" \ - -a \( -z "$NIX_IGNORE_LD_THROUGH_GCC" -o -z "$NIX_CROSS_LDFLAGS_SET" \); then - rest=() - n=0 - while test $n -lt ${#params[*]}; do - p=${params[n]} - p2=${params[$((n+1))]} - if test "${p:0:3}" = "-L/" && badPath "${p:2}"; then - skip $p - elif test "$p" = "-L" && badPath "$p2"; then - n=$((n + 1)); skip $p2 - elif test "$p" = "-rpath" && badPath "$p2"; then - n=$((n + 1)); skip $p2 - elif test "$p" = "-dynamic-linker" && badPath "$p2"; then - n=$((n + 1)); skip $p2 - elif test "${p:0:1}" = "/" && badPath "$p"; then - # We cannot skip this; barf. - echo "impure path \`$p' used in link" >&2 - exit 1 - else - rest=("${rest[@]}" "$p") - fi - n=$((n + 1)) - done - params=("${rest[@]}") -fi - - -extra=() -extraBefore=() - -if test -z "$NIX_CROSS_LDFLAGS_SET"; then - extra=(${extra[@]} $NIX_CROSS_LDFLAGS) - extraBefore=(${extraBefore[@]} $NIX_CROSS_LDFLAGS_BEFORE) -fi - - -# Add all used dynamic libraries to the rpath. -if test "$NIX_DONT_SET_RPATH" != "1"; then - - # First, find all -L... switches. - allParams=("${params[@]}" ${extra[@]}) - libPath="" - addToLibPath() { - local path="$1" - if test "${path:0:1}" != "/"; then return 0; fi - case "$path" in - *..*|*./*|*/.*|*//*) - local path2 - if path2=$(readlink -f "$path"); then - path="$path2" - fi - ;; - esac - case $libPath in - *\ $path\ *) return 0 ;; - esac - libPath="$libPath $path " - } - n=0 - while test $n -lt ${#allParams[*]}; do - p=${allParams[n]} - p2=${allParams[$((n+1))]} - if test "${p:0:3}" = "-L/"; then - addToLibPath ${p:2} - elif test "$p" = "-L"; then - addToLibPath ${p2} - n=$((n + 1)) - fi - n=$((n + 1)) - done - - # Second, for each -l... switch, find the directory containing the - # library and add it to the rpath. - rpath="" - addToRPath() { - # If the path is not in the store, don't add it to the rpath. - # This typically happens for libraries in /tmp that are later - # copied to $out/lib. If not, we're screwed. - if test "${1:0:${#NIX_STORE}}" != "$NIX_STORE"; then return 0; fi - case $rpath in - *\ $1\ *) return 0 ;; - esac - rpath="$rpath $1 " - } - findLib() { - for i in $libPath; do - if test -f $i/lib$1.so; then - addToRPath $i - fi - done - } - n=0 - while test $n -lt ${#allParams[*]}; do - p=${allParams[n]} - p2=${allParams[$((n+1))]} - if test "${p:0:2}" = "-l"; then - findLib ${p:2} - elif test "$p" = "-l"; then - # I haven't seen `-l foo', but you never know... - findLib ${p2} - n=$((n + 1)) - fi - n=$((n + 1)) - done - - # Finally, add `-rpath' switches. - for i in $rpath; do - extra=(${extra[@]} -rpath $i -rpath-link $i) - done -fi - - -# Optionally print debug info. -if test "$NIX_DEBUG" = "1"; then - echo "original flags to @ld@:" >&2 - for i in "${params[@]}"; do - echo " $i" >&2 - done - echo "extra flags to @ld@:" >&2 - for i in ${extra[@]}; do - echo " $i" >&2 - done -fi - -if test -n "$NIX_LD_WRAPPER_EXEC_HOOK"; then - source "$NIX_LD_WRAPPER_EXEC_HOOK" -fi - -exec @ld@ ${extraBefore[@]} "${params[@]}" ${extra[@]} diff --git a/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh b/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh deleted file mode 100644 index 599954bd127..00000000000 --- a/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh +++ /dev/null @@ -1,90 +0,0 @@ -NIX_CROSS_CFLAGS_COMPILE="" -NIX_CROSS_LDFLAGS="" - -crossAddCVars () { - if test -d $1/include; then - export NIX_CROSS_CFLAGS_COMPILE="$NIX_CROSS_CFLAGS_COMPILE -I$1/include" - fi - - if test -d $1/lib; then - export NIX_CROSS_LDFLAGS="$NIX_CROSS_LDFLAGS -L$1/lib -rpath-link $1/lib" - fi -} - -crossEnvHooks+=(crossAddCVars) - -crossStripDirs() { - local dirs="$1" - local stripFlags="$2" - local dirsNew= - - for d in ${dirs}; do - if test -d "$prefix/$d"; then - dirsNew="${dirsNew} $prefix/$d " - fi - done - dirs=${dirsNew} - - if test -n "${dirs}"; then - header "cross stripping (with flags $stripFlags) in $dirs" - # libc_nonshared.a should never be stripped, or builds will break. - find $dirs -type f -print0 | xargs -0 ${xargsFlags:--r} $crossConfig-strip $stripFlags || true - stopNest - fi -} - -crossStrip () { - # In cross_renaming we may rename dontCrossStrip to dontStrip, and - # dontStrip to dontNativeStrip. - # TODO: strip _only_ ELF executables, and return || fail here... - if test -z "$dontCrossStrip"; then - stripDebugList=${stripDebugList:-lib lib64 libexec bin sbin} - if test -n "$stripDebugList"; then - crossStripDirs "$stripDebugList" "${stripDebugFlags:--S}" - fi - - stripAllList=${stripAllList:-} - if test -n "$stripAllList"; then - crossStripDirs "$stripAllList" "${stripAllFlags:--s}" - fi - fi -} - -preDistPhases=(${preDistPhases[@]} crossStrip) - - -# Note: these come *after* $out in the PATH (see setup.sh). - -if test -n "@gcc@"; then - PATH=$PATH:@gcc@/bin -fi - -if test -n "@binutils@"; then - PATH=$PATH:@binutils@/bin -fi - -if test -n "@libc@"; then - PATH=$PATH:@libc@/bin - crossAddCVars @libc@ -fi - -if test "$dontSetConfigureCross" != "1"; then - configureFlags="$configureFlags --build=$system --host=$crossConfig" -fi -# Disabling the tests when cross compiling, as usually the tests are meant for -# native compilations. -doCheck="" - -# Don't strip foreign binaries with native "strip" tool. -dontStrip=1 - -# Add the output as an rpath. -if test "$NIX_NO_SELF_RPATH" != "1"; then - export NIX_CROSS_LDFLAGS="-rpath $out/lib -rpath-link $out/lib $NIX_CROSS_LDFLAGS" - if test -n "$NIX_LIB64_IN_SELF_RPATH"; then - export NIX_CROSS_LDFLAGS="-rpath $out/lib64 -rpath-link $out/lib $NIX_CROSS_LDFLAGS" - fi -fi - -export CC=${crossConfig}-gcc -export CXX=${crossConfig}-g++ diff --git a/pkgs/build-support/gcc-cross-wrapper/utils.sh b/pkgs/build-support/gcc-cross-wrapper/utils.sh deleted file mode 100644 index 753b3772e95..00000000000 --- a/pkgs/build-support/gcc-cross-wrapper/utils.sh +++ /dev/null @@ -1,24 +0,0 @@ -skip () { - if test "$NIX_DEBUG" = "1"; then - echo "skipping impure path $1" >&2 - fi -} - - -# Checks whether a path is impure. E.g., `/lib/foo.so' is impure, but -# `/nix/store/.../lib/foo.so' isn't. -badPath() { - local p=$1 - - # Relative paths are okay (since they're presumably relative to - # the temporary build directory). - if test "${p:0:1}" != "/"; then return 1; fi - - # Otherwise, the path should refer to the store or some temporary - # directory (including the build directory). - test \ - "$p" != "/dev/null" -a \ - "${p:0:${#NIX_STORE}}" != "$NIX_STORE" -a \ - "${p:0:4}" != "/tmp" -a \ - "${p:0:${#NIX_BUILD_TOP}}" != "$NIX_BUILD_TOP" -} diff --git a/pkgs/build-support/gcc-wrapper-old/builder.sh b/pkgs/build-support/gcc-wrapper-old/builder.sh index a8e8a370ec0..4f141f6b8f2 100644 --- a/pkgs/build-support/gcc-wrapper-old/builder.sh +++ b/pkgs/build-support/gcc-wrapper-old/builder.sh @@ -211,5 +211,5 @@ cp -p $utils $out/nix-support/utils.sh # tools like gcov, the manpages, etc. as well (including for binutils # and Glibc). if test -z "$nativeTools"; then - echo $gcc $binutils $libc $libc_bin > $out/nix-support/propagated-user-env-packages + printLines $gcc $binutils $libc $libc_bin > $out/nix-support/propagated-user-env-packages fi diff --git a/pkgs/build-support/gcc-wrapper-old/default.nix b/pkgs/build-support/gcc-wrapper-old/default.nix index a87c726e0a8..a37d94c36e0 100644 --- a/pkgs/build-support/gcc-wrapper-old/default.nix +++ b/pkgs/build-support/gcc-wrapper-old/default.nix @@ -8,6 +8,7 @@ { name ? "", stdenv, lib, nativeTools, nativeLibc, nativePrefix ? "" , gcc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? "" , zlib ? null +, hostPlatform, targetPlatform }: assert nativeTools -> nativePrefix != ""; @@ -61,7 +62,6 @@ stdenv.mkDerivation { crossAttrs = { shell = shell.crossDrv + shell.crossDrv.shellPath; - libc = stdenv.ccCross.libc; coreutils = coreutils.crossDrv; binutils = binutils.crossDrv; gcc = gcc.crossDrv; @@ -70,9 +70,9 @@ stdenv.mkDerivation { # the style in the gcc-cross-wrapper, but to keep a stable stdenv now I # do this sufficient if/else. dynamicLinker = - (if stdenv.cross.arch == "arm" then "ld-linux.so.3" else - if stdenv.cross.arch == "mips" then "ld.so.1" else - if stdenv.lib.hasSuffix "pc-gnu" stdenv.cross.config then "ld.so.1" else + (if hostPlatform.arch == "arm" then "ld-linux.so.3" else + if hostPlatform.arch == "mips" then "ld.so.1" else + if stdenv.lib.hasSuffix "pc-gnu" hostPlatform.config then "ld.so.1" else abort "don't know the name of the dynamic linker for this platform"); }; @@ -86,15 +86,20 @@ stdenv.mkDerivation { + " (wrapper script)"; }; - # The dynamic linker has different names on different Linux platforms. + # The dynamic linker has different names on different platforms. dynamicLinker = if !nativeLibc then - (if stdenv.system == "i686-linux" then "ld-linux.so.2" else - if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else + (if targetPlatform.system == "i686-linux" then "ld-linux.so.2" else + if targetPlatform.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else # ARM with a wildcard, which can be "" or "-armhf". - if stdenv.isArm then "ld-linux*.so.3" else - if stdenv.system == "powerpc-linux" then "ld.so.1" else - if stdenv.system == "mips64el-linux" then "ld.so.1" else - abort "don't know the name of the dynamic linker for this platform") + if targetPlatform.isArm32 then "ld-linux*.so.3" else + if targetPlatform.system == "aarch64-linux" then "ld-linux-aarch64.so.1" else + if targetPlatform.system == "powerpc-linux" then "ld.so.1" else + if targetPlatform.system == "mips64el-linux" then "ld.so.1" else + if targetPlatform.system == "x86_64-darwin" then "/usr/lib/dyld" else + if stdenv.lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1" else + builtins.trace + "Don't know the name of the dynamic linker for platform ${targetPlatform.config}, so guessing instead." + null) else ""; } diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix index 092ab4586b3..70727f9b49d 100644 --- a/pkgs/build-support/kernel/make-initrd.nix +++ b/pkgs/build-support/kernel/make-initrd.nix @@ -12,7 +12,9 @@ # `contents = {object = ...; symlink = /init;}' is a typical # argument. -{ stdenv, perl, cpio, contents, ubootChooser, compressor, prepend }: +{ stdenv, perl, cpio, contents, ubootChooser, compressor, prepend +, hostPlatform +}: let inputsFun = ubootName : [ perl cpio ] @@ -22,9 +24,9 @@ in stdenv.mkDerivation { name = "initrd"; builder = ./make-initrd.sh; - nativeBuildInputs = inputsFun stdenv.platform.uboot; + nativeBuildInputs = inputsFun hostPlatform.platform.uboot; - makeUInitrd = makeUInitrdFun stdenv.platform.uboot; + makeUInitrd = makeUInitrdFun hostPlatform.platform.uboot; # !!! should use XML. objects = map (x: x.object) contents; @@ -36,9 +38,5 @@ stdenv.mkDerivation { map (x: [("closure-" + baseNameOf x.symlink) x.object]) contents; pathsFromGraph = ./paths-from-graph.pl; - crossAttrs = { - nativeBuildInputs = inputsFun stdenv.cross.platform.uboot; - makeUInitrd = makeUInitrdFun stdenv.cross.platform.uboot; - }; inherit compressor prepend; } diff --git a/pkgs/build-support/make-startupitem/default.nix b/pkgs/build-support/make-startupitem/default.nix index fad6f00d821..da1d4105c89 100644 --- a/pkgs/build-support/make-startupitem/default.nix +++ b/pkgs/build-support/make-startupitem/default.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation { priority = 5; buildCommand = '' - mkdir -p $out/share/autostart + mkdir -p $out/etc/xdg/autostart target=${name}.desktop cp ${package}/share/applications/${srcPrefix}${name}.desktop $target chmod +rw $target echo "X-KDE-autostart-phase=${phase}" >> $target ${lib.optionalString (after != null) ''echo "${after}" >> $target''} ${lib.optionalString (condition != null) ''echo "${condition}" >> $target''} - cp $target $out/share/autostart + cp $target $out/etc/xdg/autostart ''; # this will automatically put 'package' in the environment when you diff --git a/pkgs/build-support/release/default.nix b/pkgs/build-support/release/default.nix index 82919cf819f..5e3eb751b81 100644 --- a/pkgs/build-support/release/default.nix +++ b/pkgs/build-support/release/default.nix @@ -73,4 +73,56 @@ rec { done ''; + /* Create a channel job which success depends on the success of all of + its contituents. Channel jobs are a special type of jobs that are + listed in the channel tab of Hydra and that can be suscribed. + A tarball of the src attribute is distributed via the channel. + + - constituents: a list of derivations on which the channel success depends. + - name: the channel name that will be used in the hydra interface. + - src: should point to the root folder of the nix-expressions used by the + channel, typically a folder containing a `default.nix`. + + channel { + constituents = [ foo bar baz ]; + name = "my-channel"; + src = ./.; + }; + + */ + channel = + { name, src, constituents ? [], meta ? {}, isNixOS ? true, ... }@args: + stdenv.mkDerivation ({ + preferLocalBuild = true; + _hydraAggregate = true; + + phases = [ "unpackPhase" "patchPhase" "installPhase" ]; + + patchPhase = stdenv.lib.optionalString isNixOS '' + touch .update-on-nixos-rebuild + ''; + + installPhase = '' + mkdir -p $out/{tarballs,nix-support} + + tar cJf "$out/tarballs/nixexprs.tar.xz" \ + --owner=0 --group=0 --mtime="1970-01-01 00:00:00 UTC" \ + --transform='s!^\.!${name}!' . + + echo "channel - $out/tarballs/nixexprs.tar.xz" > "$out/nix-support/hydra-build-products" + echo $constituents > "$out/nix-support/hydra-aggregate-constituents" + + # Propagate build failures. + for i in $constituents; do + if [ -e "$i/nix-support/failed" ]; then + touch "$out/nix-support/failed" + fi + done + ''; + + meta = meta // { + isHydraChannel = true; + }; + } // removeAttrs args [ "meta" ]); + } diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 2275a065594..36130289fba 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -1,5 +1,10 @@ -{ stdenv, cacert, git, rust, rustRegistry }: +{ stdenv, callPackage, path, cacert, git, rust, rustRegistry }: + +let + rustRegistry' = rustRegistry; +in { name, depsSha256 +, rustRegistry ? rustRegistry' , src ? null , srcs ? null , sourceRoot ? null @@ -11,6 +16,8 @@ , ... } @ args: let + lib = stdenv.lib; + fetchDeps = import ./fetchcargo.nix { inherit stdenv cacert git rust rustRegistry; }; diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh index 62a6491b8dc..9abf50f6ea4 100644 --- a/pkgs/build-support/setup-hooks/multiple-outputs.sh +++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh @@ -202,7 +202,7 @@ _multioutPropagateDev() { mkdir -p "${!propagaterOutput}"/nix-support for output in $propagatedBuildOutputs; do - echo -n " ${!output}" >> "${!propagaterOutput}"/nix-support/$propagatedBuildInputsFile + echo "${!output}" >> "${!propagaterOutput}"/nix-support/$propagatedBuildInputsFile done } diff --git a/pkgs/build-support/setup-hooks/win-dll-link.sh b/pkgs/build-support/setup-hooks/win-dll-link.sh index 634a9d18f00..9658b9f8259 100644 --- a/pkgs/build-support/setup-hooks/win-dll-link.sh +++ b/pkgs/build-support/setup-hooks/win-dll-link.sh @@ -35,7 +35,7 @@ _linkDLLs() { local dllPath2 for dllPath2 in "$dllPath" "$(dirname $(readlink "$dllPath" || echo "$dllPath"))"/*.dll; do if [ -e ./"$(basename "$dllPath2")" ]; then continue; fi - ln -sr "$dllPath2" . + CYGWIN+=\ winsymlinks:nativestrict ln -sr "$dllPath2" . linkCount=$(($linkCount+1)) done done diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 4debd963639..1ee1fe8298f 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -84,7 +84,7 @@ rec { mkdir -p $out/nix-support cp ${script} $out/nix-support/setup-hook '' + lib.optionalString (deps != []) '' - echo ${toString deps} > $out/nix-support/propagated-native-build-inputs + printLines ${toString deps} > $out/nix-support/propagated-native-build-inputs '' + lib.optionalString (substitutions != {}) '' substituteAll ${script} $out/nix-support/setup-hook ''); diff --git a/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix b/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix index 0e895339f24..4082d5949a3 100644 --- a/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix +++ b/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "emacs-all-the-icons-fonts-${version}"; - version = "2.50"; + version = "3.1.1"; src = fetchFromGitHub { owner = "domtronn"; repo = "all-the-icons.el"; - rev = "2.5.0"; - sha256 = "125qw96rzbkv39skxk5511jrcx9hxm0fqcmny6213wzswgdn37z3"; + rev = version; + sha256 = "0h8a2jvn2wfi3bqd35scmhm8wh20mlk09sy68m1whi9binzkm8rf"; }; installPhase = '' diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix index fd3425e3c7c..de281c278e6 100644 --- a/pkgs/data/fonts/google-fonts/default.nix +++ b/pkgs/data/fonts/google-fonts/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { name = "google-fonts-${version}"; - version = "2016-08-30"; + version = "2017-06-28"; src = fetchFromGitHub { owner = "google"; repo = "fonts"; - rev = "7a4070f65f2ca85ffdf2d465ff5e095005bae197"; - sha256 = "0c20vcsd0jki8drrim68z2ca0cxli4wyh1i1gyg4iyac0a0v8wx3"; + rev = "b1cb16c0ce2402242e0106d15b0429d1b8075ecc"; + sha256 = "18kyclwipkdv4zxfws87x2l91jwn34vrizw8rmv8lqznnfsjh2lg"; }; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "13n2icpdp1z7i14rnfwkjdydhbjgdvyl1crd71hfy6l1j2p3kzyf"; + outputHash = "0n0j2hi1qb2sc6p3v6lpaqb2aq0m9xjmi7apz3hf2nx97rrsam22"; phases = [ "unpackPhase" "patchPhase" "installPhase" ]; diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 10bc5787e40..053a3ae76c1 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "iosevka-${version}"; - version = "1.13.0"; + version = "1.13.1"; buildInputs = [ unzip ]; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/iosevka-pack-${version}.zip"; - sha256 = "03jc8a10177wk35gyp0n317azakyy5qzc6vbh331552asawckswr"; + sha256 = "05nnzbhv0sidbzzamz10nlh3j974m95p3dmd66165y4wxyhs989i"; }; sourceRoot = "."; diff --git a/pkgs/data/fonts/monoid/default.nix b/pkgs/data/fonts/monoid/default.nix new file mode 100644 index 00000000000..5e9a2c21916 --- /dev/null +++ b/pkgs/data/fonts/monoid/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, python, fontforge }: + +stdenv.mkDerivation rec { + name = "monoid-${version}"; + version = "2016-07-21"; + + src = fetchFromGitHub { + owner = "larsenwork"; + repo = "monoid"; + rev = "e9d77ec18c337dc78ceae787a673328615f0b120"; + sha256 = "07h5q6cn6jjpmxp9vyag1bxx481waz344sr2kfs7d37bba8yjydj"; + }; + + nativeBuildInputs = [ python fontforge ]; + + enableParallelBuilding = true; + + buildPhase = '' + local _d="" + local _l="" + for _d in {Monoisome,Source}/*.sfdir; do + _l="''${_d##*/}.log" + echo "Building $_d (log at $_l)" + python Scripts/build.py ${if enableParallelBuilding then "$NIX_BUILD_CORES" else "1"} 0 $_d > $_l + done + ''; + + installPhase = '' + mkdir -p $out/share/{doc,fonts/truetype} + cp -va _release/* $out/share/fonts/truetype + cp -va Readme.md $out/share/doc + ''; + + meta = with stdenv.lib; { + homepage = http://larsenwork.com/monoid; + description = "Customisable coding font with alternates, ligatures and contextual positioning"; + license = [ licenses.ofl licenses.mit ]; + platforms = platforms.all; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/data/fonts/terminus-font-ttf/default.nix b/pkgs/data/fonts/terminus-font-ttf/default.nix index e9adc4c0422..01959f91195 100644 --- a/pkgs/data/fonts/terminus-font-ttf/default.nix +++ b/pkgs/data/fonts/terminus-font-ttf/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "c3cb690c2935123035a0b1f3bfdd9511c282dab489cd423e161a47c592edf188"; }; - buildInputs = [unzip]; + nativeBuildInputs = [ unzip ]; installPhase = '' for i in *.ttf; do @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { install -Dm 644 "$i" "$out/share/fonts/truetype/$destname" done - install -Dm 644 COPYING "$out/share/doc/COPYING" + install -Dm 644 COPYING "$out/share/doc/terminus-font-ttf/COPYING" ''; meta = with stdenv.lib; { @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { homepage = http://files.ax86.net/terminus-ttf; license = licenses.ofl; maintainers = with maintainers; [ okasu ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/data/fonts/terminus-font/default.nix index 29c4c250fb9..c1ee2250c9a 100644 --- a/pkgs/data/fonts/terminus-font/default.nix +++ b/pkgs/data/fonts/terminus-font/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, perl, bdftopcf, mkfontdir, mkfontscale }: +{ stdenv, fetchurl, python3, bdftopcf, mkfontdir, mkfontscale }: stdenv.mkDerivation rec { - name = "terminus-font-4.40"; + name = "terminus-font-4.46"; src = fetchurl { url = "mirror://sourceforge/project/terminus-font/${name}/${name}.tar.gz"; - sha256 = "0487cyx5h1f0crbny5sg73a22gmym5vk1i7646gy7hgiscj2rxb4"; + sha256 = "1kavqw38aarz0vpwz4b7l6l8xkyc5096zaf9ypqnvdwraqz46aaf"; }; - buildInputs = [ perl bdftopcf mkfontdir mkfontscale ]; + buildInputs = [ python3 bdftopcf mkfontdir mkfontscale ]; patchPhase = '' substituteInPlace Makefile --replace 'fc-cache' '#fc-cache' diff --git a/pkgs/data/fonts/ttf-envy-code-r/default.nix b/pkgs/data/fonts/ttf-envy-code-r/default.nix new file mode 100644 index 00000000000..8db10d7f582 --- /dev/null +++ b/pkgs/data/fonts/ttf-envy-code-r/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, unzip }: +let + pname = "ttf-envy-code-r"; + version = "PR7"; +in +stdenv.mkDerivation rec { + name = "${pname}-0.${version}"; + + src = fetchurl { + url = "http://download.damieng.com/fonts/original/EnvyCodeR-${version}.zip"; + sha256 = "9f7e9703aaf21110b4e1a54d954d57d4092727546348598a5a8e8101e4597aff"; + }; + + buildInputs = [unzip]; + + installPhase = '' + for f in *.ttf; do + install -Dm 644 "$f" "$out/share/fonts/truetype/$f" + done + install -Dm 644 Read\ Me.txt "$out/share/doc/${pname}/readme.txt" + ''; + + meta = with stdenv.lib; { + homepage = http://damieng.com/blog/tag/envy-code-r; + description = "Free scalable coding font by DamienG"; + license = licenses.unfree; + platforms = platforms.unix; + maintainers = [ maintainers.lyt ]; + }; +} diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index 8ac65dcae35..bd99d20480b 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "unifont-${version}"; - version = "9.0.06"; + version = "10.0.04"; ttf = fetchurl { url = "mirror://gnu/unifont/${name}/${name}.ttf"; - sha256 = "0r96giih04din07wlmw8538izwr7dh5v6dyriq13zfn19brgn5z2"; + sha256 = "0qp9zf8cx86syr8wl2z8yxlr5r83n156744ylzc0cg3rlmkx6r22"; }; pcf = fetchurl { url = "mirror://gnu/unifont/${name}/${name}.pcf.gz"; - sha256 = "11ivfzpyz54rbz0cvd437abs6qlv28q0qp37kn27jggxlcpfh8vd"; + sha256 = "1mj2np6j4jdbfnl0i3zlpg95ic9zq8bhvz8wf3pxkc85zmnk6w62"; }; buildInputs = [ mkfontscale mkfontdir ]; diff --git a/pkgs/data/icons/moka-icon-theme/default.nix b/pkgs/data/icons/moka-icon-theme/default.nix index 57dfe0797fa..5ac2a13be4d 100644 --- a/pkgs/data/icons/moka-icon-theme/default.nix +++ b/pkgs/data/icons/moka-icon-theme/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${package-name}-${version}"; package-name = "moka-icon-theme"; - version = "2017-02-13"; + version = "5.3.6"; src = fetchFromGitHub { owner = "snwh"; repo = package-name; - rev = "5ac530d2394574bdbd5360de46391d0dfc7aa2ab"; - sha256 = "1zw1jm03706086gnplkkrdlrcyhgwm9kp4qax57wwc1s27bhc90n"; + rev = "v${version}"; + sha256 = "17f8k8z8xvib4hkxq0cw9j7bhdpqpv5frrkyc4sbyildcbavzzbr"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix new file mode 100644 index 00000000000..082fa29fa9d --- /dev/null +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "papirus-icon-theme-${version}"; + version = "20170715"; + + src = fetchFromGitHub { + owner = "PapirusDevelopmentTeam"; + repo = "papirus-icon-theme"; + rev = "${version}"; + sha256 = "0mpmgpjwc7azhypvrlnxaa0c4jc6g7vgy242apxrn8jcv9ndmwyk"; + }; + + dontBuild = true; + + installPhase = '' + install -dm 755 $out/share/icons + cp -dr Papirus{,-Dark,-Light} $out/share/icons/ + cp -dr ePapirus $out/share/icons/ + ''; + + meta = with stdenv.lib; { + description = "Papirus icon theme for Linux"; + homepage = "https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"; + license = licenses.lgpl3; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 5b54ea2178c..3aef8f6017b 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -6,6 +6,6 @@ fetchFromGitHub { owner = "commercialhaskell"; repo = "all-cabal-hashes"; - rev = "60443435510c1523ae4596f20595a274531dd485"; - sha256 = "1k3c0ix5rax92ywrpjxd7cmbzwsgrv03s6dvq6wjm8vljchqg4li"; + rev = "43b26c8a8f64f6caf7b4345eff0099798adcac28"; + sha256 = "1yfaxzgdrf7cifz4qq462amja2iq7r99nvpggggs8scwg4dz1i0b"; } diff --git a/pkgs/data/misc/nixos-artwork/icons.nix b/pkgs/data/misc/nixos-artwork/icons.nix new file mode 100644 index 00000000000..cee6e600cbe --- /dev/null +++ b/pkgs/data/misc/nixos-artwork/icons.nix @@ -0,0 +1,13 @@ +{ stdenv, fetchFromGitHub, imagemagick }: + +stdenv.mkDerivation { + name = "nixos-icons-2017-03-16"; + srcs = fetchFromGitHub { + owner = "nixos"; + repo = "nixos-artwork"; + rev = "783ca1249fc4cfe523ad4e541f37e2229891bc8b"; + sha256 = "0wp08b1gh2chs1xri43wziznyjcplx0clpsrb13wzyscv290ay5a"; + }; + makeFlags = [ "DESTDIR=$(out)" "prefix=" ]; + buildInputs = [ imagemagick ]; +} diff --git a/pkgs/desktops/enlightenment/econnman.nix b/pkgs/desktops/enlightenment/econnman.nix index 60e63dc68ed..7739e2bd09e 100644 --- a/pkgs/desktops/enlightenment/econnman.nix +++ b/pkgs/desktops/enlightenment/econnman.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, efl, python2Packages, dbus, makeWrapper }: +{ stdenv, fetchurl, pkgconfig, efl, python2Packages, dbus, curl, makeWrapper }: stdenv.mkDerivation rec { name = "econnman-${version}"; @@ -11,12 +11,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pkgconfig python2Packages.wrapPython ]; - buildInputs = [ efl python2Packages.python dbus ]; + buildInputs = [ efl python2Packages.python dbus curl ]; pythonPath = [ python2Packages.pythonefl python2Packages.dbus-python ]; postInstall = '' wrapPythonPrograms + wrapProgram $out/bin/econnman-bin --prefix LD_LIBRARY_PATH : ${curl.out}/lib ''; meta = { diff --git a/pkgs/desktops/enlightenment/ephoto.nix b/pkgs/desktops/enlightenment/ephoto.nix index b0606e95792..ee6013dae29 100644 --- a/pkgs/desktops/enlightenment/ephoto.nix +++ b/pkgs/desktops/enlightenment/ephoto.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, efl }: +{ stdenv, fetchurl, pkgconfig, efl, curl, makeWrapper }: stdenv.mkDerivation rec { name = "ephoto-${version}"; @@ -9,13 +9,9 @@ stdenv.mkDerivation rec { sha256 = "0l6zrk22fap6pylmzxwp6nycy8l5wdc7jza890h4zrwmpfag8w31"; }; - nativeBuildInputs = [ - pkgconfig - ]; + nativeBuildInputs = [ pkgconfig makeWrapper ]; - buildInputs = [ - efl - ]; + buildInputs = [ efl curl ]; NIX_CFLAGS_COMPILE = [ "-I${efl}/include/ecore-con-1" @@ -29,6 +25,10 @@ stdenv.mkDerivation rec { "-I${efl}/include/ethumb-client-1" ]; + postInstall = '' + wrapProgram $out/bin/ephoto --prefix LD_LIBRARY_PATH : ${curl.out}/lib + ''; + meta = { description = "Image viewer and editor written using the Enlightenment Foundation Libraries"; homepage = http://smhouston.us/ephoto/; diff --git a/pkgs/desktops/enlightenment/rage.nix b/pkgs/desktops/enlightenment/rage.nix index a9222105058..4d102b31e3b 100644 --- a/pkgs/desktops/enlightenment/rage.nix +++ b/pkgs/desktops/enlightenment/rage.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, efl, gst_all_1, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, efl, gst_all_1, curl, wrapGAppsHook }: stdenv.mkDerivation rec { name = "rage-${version}"; @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-libav + curl ]; NIX_CFLAGS_COMPILE = [ @@ -38,6 +39,10 @@ stdenv.mkDerivation rec { "-I${efl}/include/ethumb-client-1" ]; + postInstall = '' + wrapProgram $out/bin/rage --prefix LD_LIBRARY_PATH : ${curl.out}/lib + ''; + meta = { description = "Video + Audio player along the lines of mplayer"; homepage = http://enlightenment.org/; diff --git a/pkgs/desktops/enlightenment/terminology.nix b/pkgs/desktops/enlightenment/terminology.nix index fc36a7e7a65..5f2db064af2 100644 --- a/pkgs/desktops/enlightenment/terminology.nix +++ b/pkgs/desktops/enlightenment/terminology.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, efl }: +{ stdenv, fetchurl, pkgconfig, efl, curl, makeWrapper }: stdenv.mkDerivation rec { name = "terminology-${version}"; @@ -9,9 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1x4j2q4qqj10ckbka0zaq2r2zm66ff1x791kp8slv1ff7fw45vdz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig makeWrapper ]; - buildInputs = [ efl ]; + buildInputs = [ efl curl ]; NIX_CFLAGS_COMPILE = [ "-I${efl}/include/ecore-con-1" @@ -22,6 +22,12 @@ stdenv.mkDerivation rec { "-I${efl}/include/ethumb-1" ]; + postInstall = '' + for f in $out/bin/*; do + wrapProgram $f --prefix LD_LIBRARY_PATH : ${curl.out}/lib + done + ''; + meta = { description = "The best terminal emulator written with the EFL"; homepage = http://enlightenment.org/; diff --git a/pkgs/desktops/gnome-3/3.22/apps/ghex/default.nix b/pkgs/desktops/gnome-3/3.22/apps/ghex/default.nix new file mode 100644 index 00000000000..1179b2fdc5c --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/ghex/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, libxml2, + wrapGAppsHook }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + + buildInputs = [ gnome3.gtk intltool itstool libxml2 ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Ghex; + description = "Hex editor for GNOME desktop environment"; + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/ghex/src.nix b/pkgs/desktops/gnome-3/3.22/apps/ghex/src.nix new file mode 100644 index 00000000000..edaa51d9478 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.22/apps/ghex/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "ghex-3.18.3"; + + src = fetchurl { + url = mirror://gnome/sources/ghex/3.18/ghex-3.18.3.tar.xz; + sha256 = "c67450f86f9c09c20768f1af36c11a66faf460ea00fbba628a9089a6804808d3"; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/core/evince/default.nix b/pkgs/desktops/gnome-3/3.22/core/evince/default.nix index 7629e5b5655..340825cd666 100644 --- a/pkgs/desktops/gnome-3/3.22/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/evince/default.nix @@ -4,12 +4,23 @@ , librsvg, gobjectIntrospection , recentListSize ? null # 5 is not enough, allow passing a different number , supportXPS ? false # Open XML Paper Specification via libgxps +, fetchpatch, autoreconfHook }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + patches = [ + (fetchpatch { + name = "CVE-2017-1000083"; # https://bugzilla.gnome.org/show_bug.cgi?id=784630 + url = "https://git.gnome.org/browse/evince/patch/?id=fa072dbbfd96"; + sha256 = "12xg00jvbsh54dr2dyq2ha5a05x2bpzd1lh2k3sppq3h7a02lsjy"; + }) + ]; + # missing help for now; fixing the autogen phase seemed too difficult + postPatch = "sed '/@YELP_HELP_RULES@/d' -i help/Makefile.am"; + + nativeBuildInputs = [ pkgconfig wrapGAppsHook autoreconfHook/*for patches*/ ]; buildInputs = [ intltool perl perlXMLParser libxml2 @@ -43,6 +54,8 @@ stdenv.mkDerivation rec { gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared_mime_info}/share") ''; + enableParallelBuilding = true; + doCheck = false; # would need pythonPackages.dogTail, which is missing meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.22/core/evince/src.nix b/pkgs/desktops/gnome-3/3.22/core/evince/src.nix index 36572a58e17..07997a5c095 100644 --- a/pkgs/desktops/gnome-3/3.22/core/evince/src.nix +++ b/pkgs/desktops/gnome-3/3.22/core/evince/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "evince-3.22.0"; + name = "evince-3.22.1"; src = fetchurl { - url = mirror://gnome/sources/evince/3.22/evince-3.22.0.tar.xz; - sha256 = "22ebabf890057e8b43020ffdebdbb57d6a586beba031838f0f0c8a596c479d46"; + url = mirror://gnome/sources/evince/3.22/evince-3.22.1.tar.xz; + sha256 = "f3d439db3b5a5745d26175d615a71dffa1535235b1e3aa0b85d397ea33ab231c"; }; } diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix index 726f47d0cde..23d32cdbac3 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper +{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, wrapGAppsHook , libcanberra_gtk2, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio , gdk_pixbuf, librsvg, libxkbfile, libnotify, libgudev , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk @@ -20,14 +20,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; buildInputs = with gnome3; - [ pkgconfig intltool ibus gtk glib upower libcanberra_gtk2 gsettings_desktop_schemas + [ pkgconfig intltool ibus gtk glib glib_networking upower libcanberra_gtk2 gsettings_desktop_schemas libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus gnome_online_accounts libsoup colord libpulseaudio fontconfig colord-gtk libpwquality accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify libxkbfile shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk - gnome3.vino udev libcanberra_gtk3 libgudev - networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth grilo tracker ]; + gnome3.vino udev libcanberra_gtk3 libgudev wrapGAppsHook + networkmanager modemmanager gnome3.gnome-bluetooth grilo tracker + cracklib ]; preBuild = '' substituteInPlace panels/datetime/tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab" @@ -38,9 +39,6 @@ stdenv.mkDerivation rec { ''; preFixup = with gnome3; '' - wrapProgram $out/bin/gnome-control-center \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:${sound-theme-freedesktop}/share:$out/share:$out/share/gnome-control-center:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" for i in $out/share/applications/*; do substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center" done diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/default.nix index 85c15042614..29f6ae3e860 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, glib, libxslt, gtk, makeWrapper +{ stdenv, fetchurl, pkgconfig, glib, libxslt, gtk, wrapGAppsHook , webkitgtk, json_glib, rest, libsecret, dbus_glib, gnome_common -, telepathy_glib, intltool, dbus_libs, icu +, telepathy_glib, intltool, dbus_libs, icu, glib_networking , libsoup, docbook_xsl_ns, docbook_xsl, gnome3 }: @@ -11,16 +11,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest gnome_common makeWrapper - libsecret dbus_glib telepathy_glib intltool icu libsoup + buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest gnome_common wrapGAppsHook + libsecret dbus_glib telepathy_glib glib_networking intltool icu libsoup docbook_xsl_ns docbook_xsl gnome3.defaultIconTheme ]; - preFixup = '' - for f in "$out/libexec/"*; do - wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - done - ''; - meta = with stdenv.lib; { platforms = platforms.linux; maintainers = gnome3.maintainers; diff --git a/pkgs/desktops/gnome-3/3.22/default.nix b/pkgs/desktops/gnome-3/3.22/default.nix index b1293cb47ba..e79b66bdedf 100644 --- a/pkgs/desktops/gnome-3/3.22/default.nix +++ b/pkgs/desktops/gnome-3/3.22/default.nix @@ -76,7 +76,7 @@ let dconf-editor = callPackage ./core/dconf-editor { }; # empathy = callPackage ./core/empathy { - # webkitgtk = webkitgtk24x; + # webkitgtk = webkitgtk24x-gtk3; # clutter-gst = pkgs.clutter-gst; # }; @@ -257,7 +257,7 @@ let bijiben = callPackage ./apps/bijiben { # https://bugzilla.gnome.org/show_bug.cgi?id=728293 - webkitgtk = pkgs.webkitgtk24x; + webkitgtk = pkgs.webkitgtk24x-gtk3; }; cheese = callPackage ./apps/cheese { }; @@ -268,6 +268,8 @@ let gedit = callPackage ./apps/gedit { }; + ghex = callPackage ./apps/ghex { }; + glade = callPackage ./apps/glade { }; gnome-boxes = callPackage ./apps/gnome-boxes { }; @@ -363,7 +365,7 @@ let geary = callPackage ./misc/geary { # https://bugzilla.gnome.org/show_bug.cgi?id=728002 - webkitgtk = pkgs.webkitgtk24x; + webkitgtk = pkgs.webkitgtk24x-gtk3; }; gfbgraph = callPackage ./misc/gfbgraph { }; diff --git a/pkgs/desktops/gnome-3/3.22/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/3.22/misc/gexiv2/default.nix index d27e10f104c..69d89bd5879 100644 --- a/pkgs/desktops/gnome-3/3.22/misc/gexiv2/default.nix +++ b/pkgs/desktops/gnome-3/3.22/misc/gexiv2/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation rec { name = "gexiv2-${version}"; - version = "${majorVersion}.4"; + version = "${majorVersion}.6"; src = fetchurl { url = "mirror://gnome/sources/gexiv2/${majorVersion}/${name}.tar.xz"; - sha256 = "190www3b61spfgwx42jw8h5hsz2996jcxky48k63468avjpk33dd"; + sha256 = "09aqsnpah71p9gx0ap2px2dyanrs7jmkkar6q114n9b7js8qh9qk"; }; preConfigure = '' diff --git a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix b/pkgs/desktops/gnome-3/extensions/caffeine/default.nix new file mode 100644 index 00000000000..d556c5e55ca --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/caffeine/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, glib, gettext, bash }: + +stdenv.mkDerivation rec { + name = "gnome-shell-extension-caffeine-${version}"; + version = "unstable-2017-06-21"; + + src = fetchFromGitHub { + owner = "eonpatapon"; + repo = "gnome-shell-extension-caffeine"; + rev = "ce0d0d4d3a9fed4b35b82cf59609a00502862271"; + sha256 = "01gf9c8nhhm78iakqf30900y6lywxks1pm5h2cs0jvp8d3ygd7sd"; + }; + + uuid = "caffeine@patapon.info"; + + nativeBuildInputs = [ + glib gettext + ]; + + buildPhase = '' + ${bash}/bin/bash ./update-locale.sh + ${glib.dev}/bin/glib-compile-schemas --strict --targetdir=caffeine@patapon.info/schemas/ caffeine@patapon.info/schemas + ''; + + installPhase = '' + mkdir -p $out/share/gnome-shell/extensions + cp -r ${uuid} $out/share/gnome-shell/extensions + ''; + + meta = with stdenv.lib; { + description = "Fill the cup to inhibit auto suspend and screensaver"; + license = licenses.gpl2; + maintainers = with maintainers; [ eperuffo ]; + homepage = https://github.com/eonpatapon/gnome-shell-extension-caffeine; + }; +} diff --git a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix new file mode 100644 index 00000000000..4aedc10e056 --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, glib, gettext, bash }: + +stdenv.mkDerivation rec { + name = "gnome-shell-extension-topicons-plus-${version}"; + version = "20"; + + src = fetchFromGitHub { + owner = "phocean"; + repo = "TopIcons-plus"; + rev = "01535328bd43ecb3f2c71376de6fc8d1d8a88577"; + sha256 = "0pwpg72ihgj2jl9pg63y0hibdsl27srr3mab881w0gh17vwyixzi"; + }; + + buildInputs = [ glib ]; + + nativeBuildInputs = [ gettext ]; + + makeFlags = [ "INSTALL_PATH=$(out)/share/gnome-shell/extensions" ]; + + meta = with stdenv.lib; { + description = "Brings all icons back to the top panel, so that it's easier to keep track of apps running in the backround"; + license = licenses.gpl2; + maintainers = with maintainers; [ eperuffo ]; + homepage = https://github.com/phocean/TopIcons-plus; + }; +} diff --git a/pkgs/desktops/kde-4.14/kde-package/default.nix b/pkgs/desktops/kde-4.14/kde-package/default.nix index d5de6f5f6bc..3637d9f89cb 100644 --- a/pkgs/desktops/kde-4.14/kde-package/default.nix +++ b/pkgs/desktops/kde-4.14/kde-package/default.nix @@ -86,7 +86,7 @@ rec { };}) '' mkdir -pv $out/nix-support - echo "${toString list}" | tee $out/nix-support/propagated-user-env-packages + printLines ${toString list} | tee $out/nix-support/propagated-user-env-packages ''; # Given manifest module data, return the module diff --git a/pkgs/desktops/lumina/default.nix b/pkgs/desktops/lumina/default.nix index 81ced85d462..77b47533d53 100644 --- a/pkgs/desktops/lumina/default.nix +++ b/pkgs/desktops/lumina/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop_file_utils, numlockx, - xorg, qtbase, qtsvg, qtmultimedia, qtx11extras, qmake, qttools, oxygen-icons5 + xorg, qtbase, qtsvg, qtmultimedia, qtx11extras, qmake, qttools }: stdenv.mkDerivation rec { name = "lumina-${version}"; - version = "1.2.0-p1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "trueos"; repo = "lumina"; rev = "v${version}"; - sha256 = "0k16lcpxp9avwkadbbyqficd1wxsmwian5ji38wyax76v22yq7p6"; + sha256 = "13kwlhv2qscrn52xvx0n1sqbl96fkcb5r1ixa0wazflx8dfl9ndn"; }; nativeBuildInputs = [ @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { qtsvg qtmultimedia qtx11extras - oxygen-icons5 fluxbox xscreensaver desktop_file_utils diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index e101d4e14c5..a592a623510 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -43,17 +43,26 @@ let propagate = out: let setupHook = { writeScript }: - writeScript "setup-hook.sh" '' - # Propagate $${out} output - propagatedUserEnvPkgs+=" @${out}@" + writeScript "setup-hook" '' + if [ "$hookName" != postHook ]; then + postHooks+=("source @dev@/nix-support/setup-hook") + else + # Propagate $${out} output + propagatedUserEnvPkgs="$propagatedUserEnvPkgs @${out}@" - # Propagate $dev so that this setup hook is propagated - # But only if there is a separate $dev output - if [ "$outputDev" != out ]; then - if [ -n "$crossConfig" ]; then - propagatedBuildInputs+=" @dev@" - else - propagatedNativeBuildInputs+=" @dev@" + if [ -z "$outputDev" ]; then + echo "error: \$outputDev is unset!" >&2 + exit 1 + fi + + # Propagate $dev so that this setup hook is propagated + # But only if there is a separate $dev output + if [ "$outputDev" != out ]; then + if [ -n "$crossConfig" ]; then + propagatedBuildInputs="$propagatedBuildInputs @dev@" + else + propagatedNativeBuildInputs="$propagatedNativeBuildInputs @dev@" + fi fi fi ''; diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 1ebc6553ff2..c1a6e867274 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.10.2/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.10.3/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/khotkeys.nix b/pkgs/desktops/plasma-5/khotkeys.nix index abfb85a867c..77f1002c08a 100644 --- a/pkgs/desktops/plasma-5/khotkeys.nix +++ b/pkgs/desktops/plasma-5/khotkeys.nix @@ -13,4 +13,5 @@ mkDerivation { plasma-framework plasma-workspace qtx11extras ]; outputs = [ "out" "dev" "bin" ]; + enableParallelBuilding = false; } diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index b866ebab0e5..b28a1e87fb6 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -20,8 +20,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ isocodes libdbusmenu libSM libXcursor libXtst pam wayland - ]; - propagatedBuildInputs = [ + baloo kactivities kcmutils kconfig kcrash kdbusaddons kdeclarative kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff knotifyconfig kpackage krunner kscreenlocker ktexteditor ktextwidgets diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 899f6a3f63c..d1824f30527 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -3,339 +3,339 @@ { bluedevil = { - version = "5.10.2"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.2/bluedevil-5.10.2.tar.xz"; - sha256 = "1510gjbvyjr4bg00m28hz9ynz7m7h35c859ksq7r1y102kjxgyr7"; - name = "bluedevil-5.10.2.tar.xz"; + url = "${mirror}/stable/plasma/5.10.3/bluedevil-5.10.3.tar.xz"; + sha256 = "03qkd08nwqkc25wvj4964xgrj40m6vhzqg67fdqamav6d5np106g"; + name = "bluedevil-5.10.3.tar.xz"; }; }; breeze = { - version = "5.10.2"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.2/breeze-5.10.2.tar.xz"; - sha256 = "1wywa8y07ssxvl59xw4xifi41wj9dd594hy17vjigfp1xi7h62br"; - name = "breeze-5.10.2.tar.xz"; + url = "${mirror}/stable/plasma/5.10.3/breeze-5.10.3.tar.xz"; + sha256 = "048z84dsrx9ln5whg7vbp0amhhsnggh1jm4z6nmraizms2ay0w8a"; + name = "breeze-5.10.3.tar.xz"; }; }; breeze-grub = { - version = "5.10.2"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.2/breeze-grub-5.10.2.tar.xz"; - sha256 = "0xb7gvl1yrh8g75w1f97wvwig99fwqfk8azkpxxhrg8j5nr4vaz2"; - name = "breeze-grub-5.10.2.tar.xz"; + url = "${mirror}/stable/plasma/5.10.3/breeze-grub-5.10.3.tar.xz"; + sha256 = "1ghg7vc9ad6bw0b0q88srjwm8h9khyl93ljr2riaw3wh23slkw5z"; + name = "breeze-grub-5.10.3.tar.xz"; }; }; breeze-gtk = { - version = "5.10.2"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.2/breeze-gtk-5.10.2.tar.xz"; - sha256 = "06pgbkf078zl57vyfvsmm1bll8g2x419fy2waqh9n7jkycihlinx"; - name = "breeze-gtk-5.10.2.tar.xz"; + url = "${mirror}/stable/plasma/5.10.3/breeze-gtk-5.10.3.tar.xz"; + sha256 = "0ai2hkd79g1y8clk0650qijq5w5fmaamhbapw6yddf4v4a40vspc"; + name = "breeze-gtk-5.10.3.tar.xz"; }; }; breeze-plymouth = { - version = "5.10.2"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.2/breeze-plymouth-5.10.2.tar.xz"; - sha256 = "0db00k3h7vsp3pf7xnix8kazsw5wcjzkcj1wfkn4c7vdcvfv48pd"; - name = "breeze-plymouth-5.10.2.tar.xz"; + url = "${mirror}/stable/plasma/5.10.3/breeze-plymouth-5.10.3.tar.xz"; + sha256 = "1249ywi5s8ba5mzgi2773xz04g3shzc61bwsfcgpvzyc61q3dsl9"; + name = "breeze-plymouth-5.10.3.tar.xz"; }; }; discover = { - version = "5.10.2"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.2/discover-5.10.2.tar.xz"; - sha256 = "0ky5yk5nknipxy4hamy6i6m46jhv3n1lsmcs149j687jw2l6ryls"; - name = "discover-5.10.2.tar.xz"; + url = "${mirror}/stable/plasma/5.10.3/discover-5.10.3.tar.xz"; + sha256 = "189pv0zbl7mzswk65nlj8yq5ymj3ska8a52ws852blnccj8x18qn"; + name = "discover-5.10.3.tar.xz"; }; }; kactivitymanagerd = { - version = "5.10.2"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.2/kactivitymanagerd-5.10.2.tar.xz"; - sha256 = "1x7fc3nszg9fcksyf2c9dyagsa9486ybh6yrrn4c6d6z813479qj"; - name = "kactivitymanagerd-5.10.2.tar.xz"; + url = "${mirror}/stable/plasma/5.10.3/kactivitymanagerd-5.10.3.tar.xz"; + sha256 = "1y4xyg5swr2abiiqp67b95jfj4xbmgw1y51vj6njcdrkkkksz7qh"; + name = "kactivitymanagerd-5.10.3.tar.xz"; }; }; kde-cli-tools = { - version = "5.10.2"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.2/kde-cli-tools-5.10.2.tar.xz"; - sha256 = "0d1vfxgi0anggjirp1ncaqr1l7rlbniiv74gf5npb3f260h6yr0h"; - name = "kde-cli-tools-5.10.2.tar.xz"; + url = "${mirror}/stable/plasma/5.10.3/kde-cli-tools-5.10.3.tar.xz"; + sha256 = "1xmk45hj96qmfcprccsnlzr0hms98yvnnz8wkylgbnj75rcfq7ws"; + name = "kde-cli-tools-5.10.3.tar.xz"; }; }; kdecoration = { - version = "5.10.2"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.2/kdecoration-5.10.2.tar.xz"; - sha256 = "05mg8aacayfx63mx8yb6g1j6wx7kkk21msl33krks7bdqx0jx9kw"; - name = "kdecoration-5.10.2.tar.xz"; + url = "${mirror}/stable/plasma/5.10.3/kdecoration-5.10.3.tar.xz"; + sha256 = "14ayrnv1q1rhjclh2pbjwnzssqk2m9zlpm64011y258r5q9mw8h3"; + name = "kdecoration-5.10.3.tar.xz"; }; }; kde-gtk-config = { - version = "5.10.2"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.2/kde-gtk-config-5.10.2.tar.xz"; - sha256 = "096dfl5nm65v6m4m6r1smwbcxv5fkxnbgrgi17x5lfipa9mmrf58"; - name = "kde-gtk-config-5.10.2.tar.xz"; + url = "${mirror}/stable/plasma/5.10.3/kde-gtk-config-5.10.3.tar.xz"; + sha256 = "049dk79wgqgk2jiicqyv32m6nhj6k7hw5qrhagg8js28b6sqkw0m"; + name = "kde-gtk-config-5.10.3.tar.xz"; }; }; kdeplasma-addons = { - version = "5.10.2"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.2/kdeplasma-addons-5.10.2.tar.xz"; - sha256 = "1yznzz0yrjckv4b1h58fsn0sww5iwmkqvsajdqhgzqw1cs4v98p0"; - name = "kdeplasma-addons-5.10.2.tar.xz"; + url = "${mirror}/stable/plasma/5.10.3/kdeplasma-addons-5.10.3.tar.xz"; + sha256 = "1lzkwa51845f97qz43j1k284hwjbg05cry7lj16nlaq0rlwncgps"; + name = "kdeplasma-addons-5.10.3.tar.xz"; }; }; kgamma5 = { - version = "5.10.2"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.2/kgamma5-5.10.2.tar.xz"; - sha256 = "0hwnn057jbqpzbp8jryfcdp2qlypmyvh5zmfay8iy9vy068zzcmc"; - name = "kgamma5-5.10.2.tar.xz"; + url = "${mirror}/stable/plasma/5.10.3/kgamma5-5.10.3.tar.xz"; + sha256 = "19mcdj1xcsf43k3n77ybqj9i99l6m8yryw3bhcbzfxk0c6ccx9cy"; + name = "kgamma5-5.10.3.tar.xz"; }; }; khotkeys = { - version = "5.10.2"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.2/khotkeys-5.10.2.tar.xz"; - sha256 = "1kdvdb5i0mjrv4h4m539kikdrb0vybgphaahxk4392npv2zqz1xs"; - name = "khotkeys-5.10.2.tar.xz"; + url = "${mirror}/stable/plasma/5.10.3/khotkeys-5.10.3.tar.xz"; + sha256 = "1xbxbqvpnci2fanwvdrr6rnwabh3yfamndfhmy4gjik26y0i8yz4"; + name = "khotkeys-5.10.3.tar.xz"; }; }; kinfocenter = { - version = "5.10.2"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.2/kinfocenter-5.10.2.tar.xz"; - sha256 = "1r0q8xmb9m0xgcw21a6klagfh560ywzdcnly6r36fpwj0hjv60hj"; - name = "kinfocenter-5.10.2.tar.xz"; + url = "${mirror}/stable/plasma/5.10.3/kinfocenter-5.10.3.tar.xz"; + sha256 = "0a94wz7fbck08aw3xrvn2hjbj3px5ivfzkh6hhqcxblnc5ahr0fk"; + name = "kinfocenter-5.10.3.tar.xz"; }; }; kmenuedit = { - version = "5.10.2"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.2/kmenuedit-5.10.2.tar.xz"; - sha256 = "0dcy5r829dpzfmkqzmcbwxv5bqdamq0lvz7khd0n08f4h7a32wnz"; - name = "kmenuedit-5.10.2.tar.xz"; + url = "${mirror}/stable/plasma/5.10.3/kmenuedit-5.10.3.tar.xz"; + sha256 = "1y4riijwp1g3bji2wd21m7raf95prajd3sxcgr140sg0lq8zg8h2"; + name = "kmenuedit-5.10.3.tar.xz"; }; }; kscreen = { - version = "5.10.2"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.2/kscreen-5.10.2.tar.xz"; - sha256 = "0304vi87xq7p8l6dibgb74dzcf7721nps18cm6p9a05nnlvpr1l7"; - name = "kscreen-5.10.2.tar.xz"; + url = "${mirror}/stable/plasma/5.10.3/kscreen-5.10.3.tar.xz"; + sha256 = "03l8ammyir82w8kdl4sm8lkp1nr0qghk04g838p34m05ah8hb7nl"; + name = "kscreen-5.10.3.tar.xz"; }; }; kscreenlocker = { - version = "5.10.2"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.2/kscreenlocker-5.10.2.tar.xz"; - sha256 = "079vkca9q509qg5qq4kwlzl3dmnqrigs0xm6vyz000589cpg6ib5"; - name = "kscreenlocker-5.10.2.tar.xz"; + url = "${mirror}/stable/plasma/5.10.3/kscreenlocker-5.10.3.tar.xz"; + sha256 = "07k0smksglzq44llpn80xs7p8salfryphihran7frb1mvyg09yzx"; + name = "kscreenlocker-5.10.3.tar.xz"; }; }; ksshaskpass = { - version = "5.10.2"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.2/ksshaskpass-5.10.2.tar.xz"; - sha256 = "1mjbpsaj3qyrd7f5yqnw0y81d8srjjd537sx7yjgvyijaf2v0vyz"; - name = "ksshaskpass-5.10.2.tar.xz"; + url = "${mirror}/stable/plasma/5.10.3/ksshaskpass-5.10.3.tar.xz"; + sha256 = "10cy8d4dbg8dzkh428x3vl6n2hh73b3fxnal8a2wwx23flhmg04c"; + name = "ksshaskpass-5.10.3.tar.xz"; }; }; ksysguard = { - version = "5.10.2"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.2/ksysguard-5.10.2.tar.xz"; - sha256 = "1ndz3l91chq1n3p9xrw57mkdxa7hw778baydk8y9pbdr2yr961cv"; - name = "ksysguard-5.10.2.tar.xz"; + url = "${mirror}/stable/plasma/5.10.3/ksysguard-5.10.3.tar.xz"; + sha256 = "0mgzqd3abhs03k815kij6n6jpiqhd13vzbyifcp4r0q8kh34b71s"; + name = "ksysguard-5.10.3.tar.xz"; }; }; kwallet-pam = { - version = "5.10.2"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.2/kwallet-pam-5.10.2.tar.xz"; - sha256 = "01ki2rfn4sw8m8qh7lwwikcr9kxwiv9x7mv86h86ssd1hfzwzhda"; - name = "kwallet-pam-5.10.2.tar.xz"; + url = "${mirror}/stable/plasma/5.10.3/kwallet-pam-5.10.3.tar.xz"; + sha256 = "0pysv9lfljar4krdkwns7fyyi0zz5629prfmdxs2aww6cq4d2x7m"; + name = "kwallet-pam-5.10.3.tar.xz"; }; }; kwayland-integration = { - version = "5.10.2"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.2/kwayland-integration-5.10.2.tar.xz"; - sha256 = "1fna7llnimcqvzhmxb93m92gvicjiddqxd9lwqgyv7fww6bhsj3a"; - name = "kwayland-integration-5.10.2.tar.xz"; + url = "${mirror}/stable/plasma/5.10.3/kwayland-integration-5.10.3.tar.xz"; + sha256 = "1gfx5mxy1zan5shhddi4b6k578l19rkld2zkfa4g97hhvc0h83s9"; + name = "kwayland-integration-5.10.3.tar.xz"; }; }; kwin = { - version = "5.10.2"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.2/kwin-5.10.2.tar.xz"; - sha256 = "1gvby6k865snh6hsrnk53hwhb3242iamclz9nq9fzgy23a6g8mzj"; - name = "kwin-5.10.2.tar.xz"; + url = "${mirror}/stable/plasma/5.10.3/kwin-5.10.3.tar.xz"; + sha256 = "0vbrf7vm8s7hrzkgsjsqggswadvrr1k2g85y7w1pb781way7xwj3"; + name = "kwin-5.10.3.tar.xz"; }; }; kwrited = { - version = "5.10.2"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.2/kwrited-5.10.2.tar.xz"; - sha256 = "1hz6p6il839c28bkf2bn9fqjpipiqdxk603v0h0iqvspfj00z7n8"; - name = "kwrited-5.10.2.tar.xz"; + url = "${mirror}/stable/plasma/5.10.3/kwrited-5.10.3.tar.xz"; + sha256 = "0cjyvz5wg37dbnacsf3hz05bkwzpbznmlsy5plhqxr6wmq6q6l9q"; + name = "kwrited-5.10.3.tar.xz"; }; }; libkscreen = { - version = "5.10.2"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.2/libkscreen-5.10.2.tar.xz"; - sha256 = "0w1adz5c32si1kcmxy015wzjxkln68f0inya2499jag2v9hd3vhn"; - name = "libkscreen-5.10.2.tar.xz"; + url = "${mirror}/stable/plasma/5.10.3/libkscreen-5.10.3.tar.xz"; + sha256 = "02hcsfmjzajbpki2pmpdycgccjqadd98vzam56sihsvivgxykw4h"; + name = "libkscreen-5.10.3.tar.xz"; }; }; libksysguard = { - version = "5.10.2"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.2/libksysguard-5.10.2.tar.xz"; - sha256 = "1x13mb3c5bzbi5nw3ahgy12x1df50qirr2h4c7igacxrv4m3zrih"; - name = "libksysguard-5.10.2.tar.xz"; + url = "${mirror}/stable/plasma/5.10.3/libksysguard-5.10.3.tar.xz"; + sha256 = "13s7j53jjyhd5kryyd1sy6yrx69h5smi7xg49d8as8zbf3rki08h"; + name = "libksysguard-5.10.3.tar.xz"; }; }; milou = { - version = "5.10.2"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.2/milou-5.10.2.tar.xz"; - sha256 = "06c4pb3gls1bgk1sffh6vj035i5vhiy04rmifypcp8gps98j6izw"; - name = "milou-5.10.2.tar.xz"; + url = "${mirror}/stable/plasma/5.10.3/milou-5.10.3.tar.xz"; + sha256 = "18bgwpxfv5n4nxvs6xj6ihk22bpmb1b4cs9dxhfn931r8lnzzixb"; + name = "milou-5.10.3.tar.xz"; }; }; oxygen = { - version = "5.10.2"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.2/oxygen-5.10.2.tar.xz"; - sha256 = "08d3rdj5vabrxrrlbzhw3ixnb3msm99idbhnpyzdkaw00l444f1p"; - name = "oxygen-5.10.2.tar.xz"; + url = "${mirror}/stable/plasma/5.10.3/oxygen-5.10.3.tar.xz"; + sha256 = "07jqm9nl84b2s9i461mz4b8i1x22376k9n1g9prcjzxyy3494flv"; + name = "oxygen-5.10.3.tar.xz"; }; }; plasma-desktop = { - version = "5.10.2"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.2/plasma-desktop-5.10.2.tar.xz"; - sha256 = "1mjz52n6jm1vi3v7432g9v9rh6bbgcwkrg12yahpzlz026hsyxrn"; - name = "plasma-desktop-5.10.2.tar.xz"; + url = "${mirror}/stable/plasma/5.10.3/plasma-desktop-5.10.3.tar.xz"; + sha256 = "1vwls9gavcipv8k2fwx9kzzldfcxch3g61nsc77dw0lrhcaf301d"; + name = "plasma-desktop-5.10.3.tar.xz"; }; }; plasma-integration = { - version = "5.10.2"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.2/plasma-integration-5.10.2.tar.xz"; - sha256 = "0gzrv3plcn35rkwr7izn0363zbp91rdjw9k8n9s50p9rdx3rx8ly"; - name = "plasma-integration-5.10.2.tar.xz"; + url = "${mirror}/stable/plasma/5.10.3/plasma-integration-5.10.3.tar.xz"; + sha256 = "1vpgwzvqjcr6hgrh57777i21fbmixl6vrlyscdyk0912mdzplf5n"; + name = "plasma-integration-5.10.3.tar.xz"; }; }; plasma-nm = { - version = "5.10.2"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.2/plasma-nm-5.10.2.tar.xz"; - sha256 = "0bw5vyzzvpklhgq02yhcq1sv7pz00kffvgvfjkgk45g5x47h7hw1"; - name = "plasma-nm-5.10.2.tar.xz"; + url = "${mirror}/stable/plasma/5.10.3/plasma-nm-5.10.3.tar.xz"; + sha256 = "1d8kncwcxw601n73m7igr2h09mk54qa2zgshrbd0h3496dw4xzxq"; + name = "plasma-nm-5.10.3.tar.xz"; }; }; plasma-pa = { - version = "5.10.2"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.2/plasma-pa-5.10.2.tar.xz"; - sha256 = "1bbmlp5i2k4ygcn76frijjxzy88v3m5cpydslv7i5y41apm8bvip"; - name = "plasma-pa-5.10.2.tar.xz"; + url = "${mirror}/stable/plasma/5.10.3/plasma-pa-5.10.3.tar.xz"; + sha256 = "1dhkkfl39x17bd0hv3w0lclzlsialg7a7zydcjm345izpdgd11vx"; + name = "plasma-pa-5.10.3.tar.xz"; }; }; plasma-sdk = { - version = "5.10.2"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.2/plasma-sdk-5.10.2.tar.xz"; - sha256 = "0npccg4zzrd2cx4qa5qi0yr722x2yh8v0zd8dv76znqf8lsgwpj4"; - name = "plasma-sdk-5.10.2.tar.xz"; + url = "${mirror}/stable/plasma/5.10.3/plasma-sdk-5.10.3.tar.xz"; + sha256 = "0m426fj5d07bqj0n1gxcn7brjwf7xrsj50hy14hky246wchvqh43"; + name = "plasma-sdk-5.10.3.tar.xz"; }; }; plasma-tests = { - version = "5.10.2"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.2/plasma-tests-5.10.2.tar.xz"; - sha256 = "1kyah0r138x3i35glb2slacwivdwbwvq19xp1hz2zrmiy52zq65i"; - name = "plasma-tests-5.10.2.tar.xz"; + url = "${mirror}/stable/plasma/5.10.3/plasma-tests-5.10.3.tar.xz"; + sha256 = "04pn5bzhs0y6msir2px985jghhswas9zn37jb4zdy0sxd9yhabqb"; + name = "plasma-tests-5.10.3.tar.xz"; }; }; plasma-workspace = { - version = "5.10.2"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.2/plasma-workspace-5.10.2.tar.xz"; - sha256 = "11q1p3ifs2fwrhm8ylvqacshz746dhl68w0s4dfykvr2r7mqqqf2"; - name = "plasma-workspace-5.10.2.tar.xz"; + url = "${mirror}/stable/plasma/5.10.3/plasma-workspace-5.10.3.tar.xz"; + sha256 = "0wfzdjpgd9fwycy4ww2j7xryh82wg4jfipnh9hicq2mss0x53mv9"; + name = "plasma-workspace-5.10.3.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.10.2"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.2/plasma-workspace-wallpapers-5.10.2.tar.xz"; - sha256 = "1hsm731fckv5bnl7faz7bbizi80df5zb35hmiz90fhdz4x2i7krp"; - name = "plasma-workspace-wallpapers-5.10.2.tar.xz"; + url = "${mirror}/stable/plasma/5.10.3/plasma-workspace-wallpapers-5.10.3.tar.xz"; + sha256 = "0vhdypkkcranpb7zv2ghh0d5x5698d7vvyv1k7xcgsd1bwf3037f"; + name = "plasma-workspace-wallpapers-5.10.3.tar.xz"; }; }; plymouth-kcm = { - version = "5.10.2"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.2/plymouth-kcm-5.10.2.tar.xz"; - sha256 = "1fxz15yc081i6y3qvpxqy8ca6khm492hxxmji87ds30634d0033a"; - name = "plymouth-kcm-5.10.2.tar.xz"; + url = "${mirror}/stable/plasma/5.10.3/plymouth-kcm-5.10.3.tar.xz"; + sha256 = "0ss5wkqa729f2bs8s9ss4bslpj0946kylbg2g2vmfzzr5a68ri6d"; + name = "plymouth-kcm-5.10.3.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.10.2"; + version = "1-5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.2/polkit-kde-agent-1-5.10.2.tar.xz"; - sha256 = "04s9338c8y7krqsp5k812vrwphx0ibplh5gg0w6n38m8am78cxnz"; - name = "polkit-kde-agent-1-5.10.2.tar.xz"; + url = "${mirror}/stable/plasma/5.10.3/polkit-kde-agent-1-5.10.3.tar.xz"; + sha256 = "0csllzr47f173f8dymfhhplig7w55j3kfqr14i12lc3yhy5g5ns6"; + name = "polkit-kde-agent-1-5.10.3.tar.xz"; }; }; powerdevil = { - version = "5.10.2"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.2/powerdevil-5.10.2.tar.xz"; - sha256 = "1gw9swqi2wsdb8wbjf3ns7j4bj3a1mc06ynk7xklb7wan5psa9my"; - name = "powerdevil-5.10.2.tar.xz"; + url = "${mirror}/stable/plasma/5.10.3/powerdevil-5.10.3.tar.xz"; + sha256 = "0xjk8andskvygmb8ll0hxk8spc9ac0v3kyzyrd444va3q617zbi7"; + name = "powerdevil-5.10.3.tar.xz"; }; }; sddm-kcm = { - version = "5.10.2"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.2/sddm-kcm-5.10.2.tar.xz"; - sha256 = "10pg414ddx86nx46zkhl3fbvsijk4sifsh5cim17rp4b5wjay38y"; - name = "sddm-kcm-5.10.2.tar.xz"; + url = "${mirror}/stable/plasma/5.10.3/sddm-kcm-5.10.3.tar.xz"; + sha256 = "1gcla1lk8idxj4j4sr13wv3q2v6c4ylhgjqj1ik9qr9rk7r2ny8c"; + name = "sddm-kcm-5.10.3.tar.xz"; }; }; systemsettings = { - version = "5.10.2"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.2/systemsettings-5.10.2.tar.xz"; - sha256 = "1p6jg1vaa9svz4liqpb2435wbirdhjsqd6l1qd1lsp1r5szmwpz8"; - name = "systemsettings-5.10.2.tar.xz"; + url = "${mirror}/stable/plasma/5.10.3/systemsettings-5.10.3.tar.xz"; + sha256 = "0mfcyvzl5z3yqq0bbpwzhphir0vjjhvpifp17ra4w80j3f2c14jh"; + name = "systemsettings-5.10.3.tar.xz"; }; }; user-manager = { - version = "5.10.2"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.2/user-manager-5.10.2.tar.xz"; - sha256 = "1ac10z44y7d2n618j04r00cnklxglyk7xdh5vp0pl4zfcm4cx98w"; - name = "user-manager-5.10.2.tar.xz"; + url = "${mirror}/stable/plasma/5.10.3/user-manager-5.10.3.tar.xz"; + sha256 = "10iis34bpi0vic3x4r6gss8frfxg4zv9v8mg1rpbmrrs5q8799fn"; + name = "user-manager-5.10.3.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.10.2"; + version = "5.10.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.2/xdg-desktop-portal-kde-5.10.2.tar.xz"; - sha256 = "16qdvds3k4cjv3dvvxr26r5rjnysqabv4zqf18g52z9lsbc46imv"; - name = "xdg-desktop-portal-kde-5.10.2.tar.xz"; + url = "${mirror}/stable/plasma/5.10.3/xdg-desktop-portal-kde-5.10.3.tar.xz"; + sha256 = "1hnbw211fn6aayx46h92nmjvdc0ar1bsy1dn1lg2a5575kq2lzgd"; + name = "xdg-desktop-portal-kde-5.10.3.tar.xz"; }; }; } diff --git a/pkgs/development/beam-modules/build-hex.nix b/pkgs/development/beam-modules/build-hex.nix index ff6e47e5a80..27ce64582f3 100644 --- a/pkgs/development/beam-modules/build-hex.nix +++ b/pkgs/development/beam-modules/build-hex.nix @@ -1,13 +1,14 @@ { stdenv, buildRebar3, fetchHex }: { name, version, sha256 +, builder ? buildRebar3 , hexPkg ? name , ... }@attrs: with stdenv.lib; let - pkg = self: buildRebar3 (attrs // { + pkg = self: builder (attrs // { src = fetchHex { pkg = hexPkg; diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 1fd899c53c9..fa748da0031 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -1,16 +1,68 @@ -{ stdenv, pkgs }: +{ stdenv, pkgs, erlang }: let - self = rec { - hexPackages = import ./hex-packages.nix { stdenv = stdenv; callPackage = self.callPackage; pkgs = pkgs; }; - callPackage = pkgs.lib.callPackageWith (pkgs // self // hexPackages); - buildRebar3 = callPackage ./build-rebar3.nix {}; - buildHex = callPackage ./build-hex.nix {}; - buildErlangMk = callPackage ./build-erlang-mk.nix {}; - buildMix = callPackage ./build-mix.nix {}; + inherit (stdenv.lib) getVersion versionAtLeast makeExtensible; - ## Non hex packages - hex = callPackage ./hex {}; - webdriver = callPackage ./webdriver {}; - }; -in self // self.hexPackages + lib = pkgs.callPackage ./lib.nix {}; + + # FIXME: add support for overrideScope + callPackageWithScope = scope: drv: args: stdenv.lib.callPackageWith scope drv args; + mkScope = scope: pkgs // scope; + + packages = self: + let + defaultScope = mkScope self; + callPackage = drv: args: callPackageWithScope defaultScope drv args; + in + import ./hex-packages.nix { + inherit pkgs stdenv callPackage; + } // rec { + inherit callPackage erlang; + beamPackages = self; + + rebar = callPackage ../tools/build-managers/rebar { }; + rebar3-open = callPackage ../tools/build-managers/rebar3 { + hermeticRebar3 = false; + }; + rebar3 = callPackage ../tools/build-managers/rebar3 { + hermeticRebar3 = true; + }; + + hexRegistrySnapshot = callPackage ./hex-registry-snapshot.nix { }; + fetchHex = callPackage ./fetch-hex.nix { }; + + buildRebar3 = callPackage ./build-rebar3.nix {}; + buildHex = callPackage ./build-hex.nix {}; + buildErlangMk = callPackage ./build-erlang-mk.nix {}; + buildMix = callPackage ./build-mix.nix {}; + + # BEAM-based languages. + elixir = elixir_1_4; + + elixir_1_5_rc = lib.callElixir ../interpreters/elixir/1.5.nix { + inherit rebar erlang; + debugInfo = true; + }; + + elixir_1_4 = lib.callElixir ../interpreters/elixir/1.4.nix { + inherit rebar erlang; + debugInfo = true; + }; + + elixir_1_3 = lib.callElixir ../interpreters/elixir/1.3.nix { + inherit rebar erlang; + debugInfo = true; + }; + + lfe = lfe_1_2; + lfe_1_2 = lib.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; }; + + # Non hex packages + hex = callPackage ./hex {}; + webdriver = callPackage ./webdriver {}; + + hex2nix = callPackage ../tools/erlang/hex2nix {}; + cuter = callPackage ../tools/erlang/cuter {}; + relxExe = callPackage ../tools/erlang/relx-exe {}; + }; +in makeExtensible packages diff --git a/pkgs/development/beam-modules/lib.nix b/pkgs/development/beam-modules/lib.nix index ae2705613f0..26d868a8e7c 100644 --- a/pkgs/development/beam-modules/lib.nix +++ b/pkgs/development/beam-modules/lib.nix @@ -1,4 +1,4 @@ -{ pkgs }: +{ pkgs, stdenv }: rec { @@ -34,4 +34,48 @@ rec { mkDerivation = pkgs.makeOverridable builder; }; + /* Uses generic-builder to evaluate provided drv containing Elixir version + specific data. + + drv: package containing version-specific args; + builder: generic builder for all Erlang versions; + args: arguments merged into version-specific args, used mostly to customize + dependencies; + + Arguments passed to the generic-builder are overridable. + + Please note that "mkDerivation" defined here is the one called from 1.4.nix + and similar files. + */ + callElixir = drv: args: + let + inherit (stdenv.lib) versionAtLeast; + builder = callPackage ../interpreters/elixir/generic-builder.nix args; + in + callPackage drv { + mkDerivation = pkgs.makeOverridable builder; + }; + + /* Uses generic-builder to evaluate provided drv containing Elixir version + specific data. + + drv: package containing version-specific args; + builder: generic builder for all Erlang versions; + args: arguments merged into version-specific args, used mostly to customize + dependencies; + + Arguments passed to the generic-builder are overridable. + + Please note that "mkDerivation" defined here is the one called from 1.2.nix + and similar files. + */ + callLFE = drv: args: + let + inherit (stdenv.lib) versionAtLeast; + builder = callPackage ../interpreters/lfe/generic-builder.nix args; + in + callPackage drv { + mkDerivation = pkgs.makeOverridable builder; + }; + } diff --git a/pkgs/development/beam-modules/mix-bootstrap b/pkgs/development/beam-modules/mix-bootstrap index c4a1b364daa..6c9a20c6de2 100755 --- a/pkgs/development/beam-modules/mix-bootstrap +++ b/pkgs/development/beam-modules/mix-bootstrap @@ -3,18 +3,16 @@ %%! -smp enable %%% --------------------------------------------------------------------------- %%% @doc -%%% The purpose of this command is to prepare a rebar3 project so that -%%% rebar3 understands that the dependencies are all already -%%% installed. If you want a hygienic build on nix then you must run -%%% this command before running rebar3. I suggest that you add a -%%% `Makefile` to your project and have the bootstrap command be a -%%% dependency of the build commands. See the nix documentation for +%%% The purpose of this command is to prepare a mix project so that mix +%%% understands that the dependencies are all already installed. If you want a +%%% hygienic build on nix then you must run this command before running mix. I +%%% suggest that you add a `Makefile` to your project and have the bootstrap +%%% command be a dependency of the build commands. See the nix documentation for %%% more information. %%% -%%% This command designed to have as few dependencies as possible so -%%% that it can be a dependency of root level packages like rebar3. To -%%% that end it does many things in a fairly simplistic way. That is -%%% by design. +%%% This command designed to have as few dependencies as possible so that it can +%%% be a dependency of root level packages like mix. To that end it does many +%%% things in a fairly simplistic way. That is by design. %%% %%% ### Assumptions %%% @@ -37,7 +35,7 @@ main(Args) -> %% @doc %% This takes an app name in the standard OTP - format -%% and returns just the app name. Why? because rebar is doesn't +%% and returns just the app name. Why? Because rebar doesn't %% respect OTP conventions in some cases. -spec fixup_app_name(file:name()) -> string(). fixup_app_name(Path) -> diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index 3e1784424e3..76caf12ffd3 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -68,6 +68,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" echo -e '#!/bin/sh\n'"$out/share/ccl-installation/${CCL_RUNTIME}"' "$@"\n' > "$out"/bin/"${CCL_RUNTIME}" chmod a+x "$out"/bin/"${CCL_RUNTIME}" + ln -s "$out"/bin/"${CCL_RUNTIME}" "$out"/bin/ccl ''; meta = with stdenv.lib; { diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix index 8086a9f9749..f519776b689 100644 --- a/pkgs/development/compilers/compcert/default.nix +++ b/pkgs/development/compilers/compcert/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { configurePhase = '' substituteInPlace ./configure --replace '{toolprefix}gcc' '{toolprefix}cc' ./configure -clightgen -prefix $out -toolprefix ${tools}/bin/ '' + - (if stdenv.isDarwin then "ia32-macosx" else "ia32-linux"); + (if stdenv.isDarwin then "x86_64-macosx" else "x86_64-linux"); installTargets = "documentation install"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { mkdir -p $lib/share/doc/compcert mv doc/html $lib/share/doc/compcert/ mkdir -p $lib/lib/coq/${coq.coq-version}/user-contrib/compcert/ - mv backend cfrontend common cparser driver flocq x86 x86_32 lib \ + mv backend cfrontend common cparser driver flocq x86 x86_64 lib \ $lib/lib/coq/${coq.coq-version}/user-contrib/compcert/ ''; diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 8bad8f6f4d3..115c686d7de 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm_39, makeWrapper }: +{ stdenv, fetchurl, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm_4, makeWrapper }: stdenv.mkDerivation rec { - version = "0.22.0"; + version = "0.23.0"; name = "crystal-${version}-1"; arch = { @@ -14,20 +14,20 @@ stdenv.mkDerivation rec { url = "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-1-${arch}.tar.gz"; sha256 = { - "x86_64-linux" = "03c1nmjibz8f7yhrczd49gmccx4ivqz121c64hl384w69227p7bq"; - "i686-linux" = "1s8gpmxa9wpcc2a9csl205lcpipn1i7gwybapby3q34y7xnq9160"; - "x86_64-darwin" = "1bnfxb0hbkx4qlkc1l88sdhcnhacqzy31hh7ksz0prah83g6vbxa"; + "x86_64-linux" = "0nhs7swbll8hrk15kmmywngkhij80x62axiskb1gjmiwvzhlh0qx"; + "i686-linux" = "03xp8d3lqflzzm26lpdn4yavj87qzgd6xyrqxp2pn9ybwrq8fx8a"; + "x86_64-darwin" = "1prz6c1gs8z7dgpdy2id2mjn1c8f5p2bf9b39985bav448njbyjz"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); }; src = fetchurl { url = "https://github.com/crystal-lang/crystal/archive/${version}.tar.gz"; - sha256 = "0iw5i4hjzfxykwfdyzix23pgm3gxd79r9yss3abvva8cf7ci37sv"; + sha256 = "05ymwmjkl1b4m888p725kybpiap5ag2vj8l07d59j02inm5r0rcv"; }; # crystal on Darwin needs libiconv to build buildInputs = [ - boehmgc libatomic_ops pcre libevent llvm_39 makeWrapper + boehmgc libatomic_ops pcre libevent llvm_4 makeWrapper ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; @@ -86,6 +86,8 @@ stdenv.mkDerivation rec { install -Dm644 etc/completion.bash $out/share/bash-completion/completions/crystal install -Dm644 etc/completion.zsh $out/share/zsh/site-functions/_crystal + install -Dm644 man/crystal.1 $out/share/man/man1/crystal.1 + install -Dm644 LICENSE $out/share/licenses/crystal/LICENSE ''; diff --git a/pkgs/development/compilers/dale/default.nix b/pkgs/development/compilers/dale/default.nix index 6d9adaa1518..3538f85a75f 100644 --- a/pkgs/development/compilers/dale/default.nix +++ b/pkgs/development/compilers/dale/default.nix @@ -23,6 +23,8 @@ in stdenv.mkDerivation { buildInputs = [ cmake pkgconfig libffi llvm_35 ] ++ stdenv.lib.optional doCheck perl; + patches = [ ./link-llvm.patch ]; + inherit doCheck; checkTarget = "tests"; diff --git a/pkgs/development/compilers/dale/link-llvm.patch b/pkgs/development/compilers/dale/link-llvm.patch new file mode 100644 index 00000000000..3facec91874 --- /dev/null +++ b/pkgs/development/compilers/dale/link-llvm.patch @@ -0,0 +1,10 @@ +--- dale-39e16d8e89fa070de65a673d4462e783d530f95a-src.org/CMakeLists.txt 2017-06-22 08:01:05.839531242 +0100 ++++ dale-39e16d8e89fa070de65a673d4462e783d530f95a-src/CMakeLists.txt 2017-06-22 07:59:11.777566801 +0100 +@@ -78,6 +78,7 @@ + execute_process (COMMAND ${LLVM_CONFIG} --libs + OUTPUT_VARIABLE LLVM_LIBS + OUTPUT_STRIP_TRAILING_WHITESPACE) ++STRING(REGEX REPLACE " " ";" LLVM_LIBS "${LLVM_LIBS}") + if (${D_LLVM_VERSION_MINOR} GREATER 4) + execute_process (COMMAND ${LLVM_CONFIG} --system-libs + OUTPUT_VARIABLE LLVM_SYSTEM_LIBS diff --git a/pkgs/development/compilers/gambit/bootstrap.nix b/pkgs/development/compilers/gambit/bootstrap.nix new file mode 100644 index 00000000000..65fb20aa260 --- /dev/null +++ b/pkgs/development/compilers/gambit/bootstrap.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, autoconf, ... }: + +stdenv.mkDerivation rec { + name = "gambit-bootstrap-${version}"; + version = "4.8.8"; + tarball_version = "v4_8_8"; + + src = fetchurl { + url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-${tarball_version}-devel.tgz"; + sha256 = "075k2z04d6svxqf9paj3xvp0mm0xzy0vbma1y61s0lkywdim8xjz"; + }; + + buildInputs = [ autoconf ]; + + configurePhase = '' + ./configure --prefix=$out --enable-single-host + ''; + + buildPhase = '' + # Copy the (configured) sources now, not later, so we don't have to filter out + # all the intermediate build products. + mkdir -p $out ; cp -rp . $out/ + + # build the gsc-boot* compiler + make bootstrap + ''; + + installPhase = '' + cp -fa ./ $out/ + ''; + + forceShare = [ "info" ]; + + meta = { + description = "Optimizing Scheme to C compiler, bootstrap step"; + homepage = "http://gambitscheme.org"; + license = stdenv.lib.licenses.lgpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin fare ]; + }; +} diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix index 7e17cee9abd..58b08ebd4fb 100644 --- a/pkgs/development/compilers/gambit/default.nix +++ b/pkgs/development/compilers/gambit/default.nix @@ -1,31 +1,75 @@ -{ stdenv, fetchurl, openssl }: +{ stdenv, fetchurl, fetchgit, git, openssl, autoconf, pkgs }: stdenv.mkDerivation rec { name = "gambit-${version}"; - version = "4.8.6"; - devver = "4_8_6"; + version = "4.8.8-f3ffeb6"; + bootstrap = import ./bootstrap.nix ( pkgs ); - src = fetchurl { - url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-v${devver}-devel.tgz"; - sha256 = "0j3ka76cfb007rlcc3nv5p1s6vh31cwp87hwwabawf16vs1jb7bl"; +# devver = "4_8_8"; +# src = fetchurl { +# url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-v${version}-devel.tgz"; +# sha256 = "0j3ka76cfb007rlcc3nv5p1s6vh31cwp87hwwabawf16vs1jb7bl"; +# }; + src = fetchgit { + url = "https://github.com/feeley/gambit.git"; + rev = "f3ffeb695aeea80c18c1b9ef276b57898c780dca"; + sha256 = "1lqixsrgk9z2gj6z1nkys0pfd3m5zjxrp3gvqn2wpr9h7hjb8x06"; }; - configureFlags = [ - "--enable-single-host" - "--enable-shared" - "--enable-absolute-shared-libs" - "--enable-c-opt=-O6" "--enable-gcc-opts" "--enable-inline-jumps" - "--enable-thread-system=posix" "--enable-dynamic-tls" - "--enable-openssl" - ]; + buildInputs = [ openssl git autoconf bootstrap ]; - buildInputs = [ openssl ]; + configurePhase = '' + options=( + --prefix=$out + --enable-single-host + --enable-c-opt=-O2 + --enable-gcc-opts + --enable-shared + --enable-absolute-shared-libs # Yes, NixOS will want an absolute path, and fix it. + --enable-poll + --enable-openssl + + #--enable-multiple-versions # Nope, NixOS already does version multiplexing + #--enable-guide + #--enable-track-scheme + #--enable-high-res-timing + #--enable-max-processors=4 + #--enable-multiple-vms + #--enable-dynamic-tls + #--enable-multiple-vms + #--enable-multiple-threaded-vms ## when SMP branch is merged in + #--enable-thread-system=posix ## default when --enable-multiple-vms is on. + #--enable-profile + #--enable-coverage + #--enable-inline-jumps + #--enable-char-size=1" ; default is 4 + ) + ./configure ''${options[@]} + ''; + + buildPhase = '' + # Make bootstrap compiler, from release bootstrap + mkdir -p boot/wip-compiler && + cp -rp ${bootstrap}/. boot/wip-compiler/. && + chmod -R u+w boot && + cd boot/wip-compiler && \ + cp ../../gsc/makefile.in ../../gsc/*.scm gsc && \ + (cd gsc && make bootclean ) && + make bootstrap && + cd ../.. && + cp boot/wip-compiler/gsc/gsc gsc-boot && + + # Now use the bootstrap compiler to build the real thing! + make -j2 from-scratch + ''; + + doCheck = true; meta = { description = "Optimizing Scheme to C compiler"; homepage = "http://gambitscheme.org"; license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin ]; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin fare ]; }; } diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index 67981ad1056..69197b923c3 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -283,7 +283,7 @@ stdenv.mkDerivation ({ NM_FOR_TARGET = "${targetPlatform.config}-nm"; CXX_FOR_TARGET = "${targetPlatform.config}-g++"; # If we are making a cross compiler, cross != null - NIX_CC_CROSS = if targetPlatform == hostPlatform then "${stdenv.ccCross}" else ""; + NIX_CC_CROSS = optionalString (targetPlatform == hostPlatform) builtins.toString stdenv.cc; dontStrip = true; configureFlags = '' ${if enableMultilib then "" else "--disable-multilib"} diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index de9d3165b55..38ff23f86a6 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -401,7 +401,7 @@ stdenv.mkDerivation ({ NM_FOR_TARGET = "${targetPlatform.config}-nm"; CXX_FOR_TARGET = "${targetPlatform.config}-g++"; # If we are making a cross compiler, cross != null - NIX_CC_CROSS = if targetPlatform == hostPlatform then "${stdenv.ccCross}" else ""; + NIX_CC_CROSS = optionalString (targetPlatform == hostPlatform) builtins.toString stdenv.cc; dontStrip = true; configureFlags = '' ${if enableMultilib then "" else "--disable-multilib"} diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index c5bebdf3300..04e67e44f77 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -407,7 +407,7 @@ stdenv.mkDerivation ({ NM_FOR_TARGET = "${targetPlatform.config}-nm"; CXX_FOR_TARGET = "${targetPlatform.config}-g++"; # If we are making a cross compiler, cross != null - NIX_CC_CROSS = if targetPlatform == hostPlatform then "${stdenv.ccCross}" else ""; + NIX_CC_CROSS = optionalString (targetPlatform == hostPlatform) builtins.toString stdenv.cc; dontStrip = true; configureFlags = '' ${if enableMultilib then "" else "--disable-multilib"} diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index b4a74300d36..e95ef92c3f6 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -35,6 +35,7 @@ , cloog # unused; just for compat with gcc4, as we override the parameter on some places , darwin ? null , buildPlatform, hostPlatform, targetPlatform +, buildPackages }: assert langJava -> zip != null && unzip != null @@ -312,6 +313,7 @@ stdenv.mkDerivation ({ ++ (optionals langJava [ boehmgc zip unzip ]) ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) ++ (optionals (targetPlatform != hostPlatform) [binutils]) + ++ (optionals (buildPlatform != hostPlatform) [buildPackages.stdenv.cc]) ++ (optionals langAda [gnatboot]) ++ (optionals langVhdl [gnat]) @@ -422,7 +424,7 @@ stdenv.mkDerivation ({ NM_FOR_TARGET = "${targetPlatform.config}-nm"; CXX_FOR_TARGET = "${targetPlatform.config}-g++"; # If we are making a cross compiler, cross != null - NIX_CC_CROSS = if targetPlatform == hostPlatform then "${stdenv.ccCross}" else ""; + NIX_CC_CROSS = optionalString (targetPlatform == hostPlatform) builtins.toString stdenv.cc; dontStrip = true; configureFlags = '' ${if enableMultilib then "" else "--disable-multilib"} @@ -449,6 +451,8 @@ stdenv.mkDerivation ({ ) } ${if langAda then " --enable-libada" else ""} + --build=${buildPlatform.config} + --host=${hostPlatform.config} --target=${targetPlatform.config} ${xwithArch} ${xwithCpu} diff --git a/pkgs/development/compilers/gcc/6/darwin-const-correct.patch b/pkgs/development/compilers/gcc/6/darwin-const-correct.patch deleted file mode 100644 index a9b9b85acab..00000000000 --- a/pkgs/development/compilers/gcc/6/darwin-const-correct.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 5972cd58bde3bc8bacfe994e5b127c411241f255 Mon Sep 17 00:00:00 2001 -From: law -Date: Tue, 3 Jan 2017 05:36:40 +0000 -Subject: [PATCH] * config/darwin-driver.c (darwin_driver_init): - Const-correctness fixes for first_period and second_period variables. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@244010 138bc75d-0d04-0410-961f-82ee72b054a4 ---- -diff --git a/gcc/config/darwin-driver.c b/gcc/config/darwin-driver.c -index 0c4f0cd..e3ed79d 100644 ---- a/gcc/config/darwin-driver.c -+++ b/gcc/config/darwin-driver.c -@@ -299,10 +299,10 @@ darwin_driver_init (unsigned int *decoded_options_count, - if (vers_string != NULL) - { - char *asm_major = NULL; -- char *first_period = strchr(vers_string, '.'); -+ const char *first_period = strchr(vers_string, '.'); - if (first_period != NULL) - { -- char *second_period = strchr(first_period+1, '.'); -+ const char *second_period = strchr(first_period+1, '.'); - if (second_period != NULL) - asm_major = xstrndup (vers_string, second_period-vers_string); - else diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 057acf9794e..b091fd1ae37 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -58,7 +58,7 @@ assert langGo -> langCC; with stdenv.lib; with builtins; -let version = "6.3.0"; +let version = "6.4.0"; # Whether building a cross-compiler for GNU/Hurd. crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu"; @@ -72,8 +72,7 @@ let version = "6.3.0"; # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its # target libraries and tools. ++ optional langAda ../gnat-cflags.patch - ++ optional langFortran ../gfortran-driving.patch - ++ optional hostPlatform.isDarwin ./darwin-const-correct.patch; # Kill this after 6.3.0 + ++ optional langFortran ../gfortran-driving.patch; javaEcj = fetchurl { # The `$(top_srcdir)/ecj.jar' file is automatically picked up at @@ -213,8 +212,8 @@ stdenv.mkDerivation ({ builder = ../builder.sh; src = fetchurl { - url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2"; - sha256 = "17xjz30jb65hcf714vn9gcxvrrji8j20xm7n33qg1ywhyzryfsph"; + url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.xz"; + sha256 = "1m0lr7938lw5d773dkvwld90hjlcq2282517d1gwvrfzmwgg42w5"; }; inherit patches; @@ -404,7 +403,7 @@ stdenv.mkDerivation ({ NM_FOR_TARGET = "${targetPlatform.config}-nm"; CXX_FOR_TARGET = "${targetPlatform.config}-g++"; # If we are making a cross compiler, cross != null - NIX_CC_CROSS = if targetPlatform == hostPlatform then "${stdenv.ccCross}" else ""; + NIX_CC_CROSS = optionalString (targetPlatform == hostPlatform) builtins.toString stdenv.cc; dontStrip = true; configureFlags = '' ${if enableMultilib then "" else "--disable-multilib"} diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix index bb2c9d8a5c0..f3d8d27d90c 100644 --- a/pkgs/development/compilers/gcc/snapshot/default.nix +++ b/pkgs/development/compilers/gcc/snapshot/default.nix @@ -405,7 +405,7 @@ stdenv.mkDerivation ({ NM_FOR_TARGET = "${targetPlatform.config}-nm"; CXX_FOR_TARGET = "${targetPlatform.config}-g++"; # If we are making a cross compiler, cross != null - NIX_CC_CROSS = if targetPlatform == hostPlatform then "${stdenv.ccCross}" else ""; + NIX_CC_CROSS = optionalString (targetPlatform == hostPlatform) builtins.toString stdenv.cc; dontStrip = true; configureFlags = '' ${if enableMultilib then "" else "--disable-multilib"} diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix index 7ea403715a5..22047b663d0 100644 --- a/pkgs/development/compilers/gerbil/default.nix +++ b/pkgs/development/compilers/gerbil/default.nix @@ -1,15 +1,22 @@ -{ stdenv, fetchurl, fetchgit, gambit, openssl, zlib, coreutils, rsync, bash }: +{ stdenv, fetchurl, fetchgit, gambit, + coreutils, rsync, bash, + openssl, zlib, sqlite, libxml2, libyaml, libmysql, lmdb, leveldb }: stdenv.mkDerivation rec { name = "gerbil-${version}"; - version = "0.11"; - src = fetchurl { - url = "https://github.com/vyzo/gerbil/archive/v${version}.tar.gz"; - sha256 = "0mqg6cqdcf5qr7vk79x5zkls7z2wm8i3lhwn0b7i0g1m6yyyyff7"; + version = "0.12-DEV"; + src = fetchgit { + url = "https://github.com/vyzo/gerbil.git"; + rev = "3657b6e940ea248e0b312f276590e38ff68997e7"; + sha256 = "11ys7082ghkm4yikz4qxmv3jpxcr42jfi0jhjw1mpzbqdg6004w2"; }; - buildInputs = [ gambit openssl zlib coreutils rsync bash ]; + buildInputs = [ + gambit openssl + coreutils rsync bash + zlib openssl zlib sqlite libxml2 libyaml libmysql lmdb leveldb + ]; postPatch = '' patchShebangs . @@ -21,7 +28,13 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild + + # Enable all optional libraries + substituteInPlace "src/std/build-features.ss" --replace '#f' '#t' + + # Build, replacing make by build.sh ( cd src && sh build.sh ) + runHook postBuild ''; diff --git a/pkgs/development/compilers/ghc/8.2.1.nix b/pkgs/development/compilers/ghc/8.2.1.nix index 6b0cdf4fbdc..92014200c61 100644 --- a/pkgs/development/compilers/ghc/8.2.1.nix +++ b/pkgs/development/compilers/ghc/8.2.1.nix @@ -9,8 +9,8 @@ let inherit (bootPkgs) ghc; - version = "8.2.1-rc2"; - preReleaseName = "ghc-8.2.0.20170507"; + version = "8.2.1-rc3"; + preReleaseName = "ghc-8.2.0.20170704"; commonBuildInputs = [ alex autoconf automake ghc happy hscolour perl python3 sphinx ]; commonPreConfigure = '' sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure @@ -27,7 +27,7 @@ in stdenv.mkDerivation (rec { src = fetchurl { url = "https://downloads.haskell.org/~ghc/${version}/${preReleaseName}-src.tar.xz"; - sha256 = "1hy3l6nzkyhzwy9mii4zs51jv048zwvdqk1q3188jznz35392zrn"; + sha256 = "0ccfybbjrmd8yzqbfdqvb6clz2kd005wi8sx3mfjmbkmxv0l4jry"; }; postPatch = "patchShebangs ."; diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 3e1aada22eb..f199048353c 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -15,8 +15,6 @@ let version = "8.1.20170106"; rev = "b4f2afe70ddbd0576b4eba3f82ba1ddc52e9b3bd"; - outputs = [ "out" "doc" ]; - commonPreConfigure = '' echo ${version} >VERSION echo ${rev} >GIT_COMMIT_ID @@ -77,6 +75,8 @@ in stdenv.mkDerivation (rec { done ''; + outputs = [ "out" "doc" ]; + passthru = { inherit bootPkgs; } // stdenv.lib.optionalAttrs (targetPlatform != buildPlatform) { @@ -101,26 +101,26 @@ in stdenv.mkDerivation (rec { ''; configureFlags = [ - "CC=${stdenv.ccCross}/bin/${cross.config}-cc" - "LD=${stdenv.binutils}/bin/${cross.config}-ld" - "AR=${stdenv.binutils}/bin/${cross.config}-ar" - "NM=${stdenv.binutils}/bin/${cross.config}-nm" - "RANLIB=${stdenv.binutils}/bin/${cross.config}-ranlib" + "CC=${stdenv.cc}/bin/${cross.config}-cc" + "LD=${stdenv.cc}/bin/${cross.config}-ld" + "AR=${stdenv.cc}/bin/${cross.config}-ar" + "NM=${stdenv.cc}/bin/${cross.config}-nm" + "RANLIB=${stdenv.cc}/bin/${cross.config}-ranlib" "--target=${cross.config}" "--enable-bootstrap-with-devel-snapshot" ] ++ # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ lib.optional (cross.config or null == "aarch64-apple-darwin14") "--disable-large-address-space"; - buildInputs = commonBuildInputs ++ [ stdenv.ccCross stdenv.binutils ]; + buildInputs = commonBuildInputs; - dontSetConfigureCross = true; + configurePlatforms = []; passthru = { inherit bootPkgs cross; - cc = "${stdenv.ccCross}/bin/${cross.config}-cc"; + cc = "${stdenv.cc}/bin/${cross.config}-cc"; - ld = "${stdenv.binutils}/bin/${cross.config}-ld"; + ld = "${stdenv.cc}/bin/${cross.config}-ld"; }; }) diff --git a/pkgs/development/compilers/go/1.6.nix b/pkgs/development/compilers/go/1.6.nix index 4a777d7b4f1..61408c0ebb3 100644 --- a/pkgs/development/compilers/go/1.6.nix +++ b/pkgs/development/compilers/go/1.6.nix @@ -113,6 +113,7 @@ stdenv.mkDerivation rec { patches = [ ./remove-tools-1.5.patch ./creds-test.patch + ./fix-systime-1.6.patch # This test checks for the wrong thing with recent tzdata. It's been fixed in master but the patch # actually works on old versions too. diff --git a/pkgs/development/compilers/go/fix-systime-1.6.patch b/pkgs/development/compilers/go/fix-systime-1.6.patch new file mode 100644 index 00000000000..e4a3932001e --- /dev/null +++ b/pkgs/development/compilers/go/fix-systime-1.6.patch @@ -0,0 +1,45 @@ +diff --git a/src/runtime/sys_darwin_amd64.s b/src/runtime/sys_darwin_amd64.s +index e09b906ba5..fa8ff2f65c 100644 +--- a/src/runtime/sys_darwin_amd64.s ++++ b/src/runtime/sys_darwin_amd64.s +@@ -157,6 +157,7 @@ systime: + // Fall back to system call (usually first call in this thread). + MOVQ SP, DI + MOVQ $0, SI ++ MOVQ $0, DX // required as of Sierra; Issue 16570 + MOVL $(0x2000000+116), AX + SYSCALL + CMPQ AX, $0 +diff --git a/src/syscall/syscall_darwin_amd64.go b/src/syscall/syscall_darwin_amd64.go +index 70b53b87f4..79083117b6 100644 +--- a/src/syscall/syscall_darwin_amd64.go ++++ b/src/syscall/syscall_darwin_amd64.go +@@ -26,14 +26,21 @@ func NsecToTimeval(nsec int64) (tv Timeval) { + } + + //sysnb gettimeofday(tp *Timeval) (sec int64, usec int32, err error) +-func Gettimeofday(tv *Timeval) (err error) { +- // The tv passed to gettimeofday must be non-nil +- // but is otherwise unused. The answers come back +- // in the two registers. ++func Gettimeofday(tv *Timeval) error { ++ // The tv passed to gettimeofday must be non-nil. ++ // Before macOS Sierra (10.12), tv was otherwise unused and ++ // the answers came back in the two registers. ++ // As of Sierra, gettimeofday return zeros and populates ++ // tv itself. + sec, usec, err := gettimeofday(tv) +- tv.Sec = sec +- tv.Usec = usec +- return err ++ if err != nil { ++ return err ++ } ++ if sec != 0 || usec != 0 { ++ tv.Sec = sec ++ tv.Usec = usec ++ } ++ return nil + } + + func SetKevent(k *Kevent_t, fd, mode, flags int) { diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index 684c6d25daa..ca41545eb45 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -1,40 +1,82 @@ -{ stdenv, fetchgit, ocaml, zlib, pcre, neko, camlp4 }: +{ stdenv, fetchgit, bash, coreutils, ocaml, zlib, pcre, neko, camlp4 }: -stdenv.mkDerivation { - name = "haxe-3.4.2"; +let + generic = { version, sha256, prePatch }: + stdenv.mkDerivation rec { + name = "haxe-${version}"; - buildInputs = [ocaml zlib pcre neko camlp4]; + buildInputs = [ocaml zlib pcre neko camlp4]; - src = fetchgit { - url = "https://github.com/HaxeFoundation/haxe.git"; - sha256 = "1m5fp183agqv8h3ynhxw4kndkpq2d6arysmirv3zl3vz5crmpwqd"; - fetchSubmodules = true; + src = fetchgit { + url = https://github.com/HaxeFoundation/haxe.git; + inherit sha256; + fetchSubmodules = true; + rev = "refs/tags/${version}"; + }; - # Tag 3.4.2 - rev = "890f8c70cf23ce6f9fe0fdd0ee514a9699433ca7"; + inherit prePatch; + + buildFlags = [ "all" "tools" ]; + + installPhase = '' + install -vd "$out/bin" "$out/lib/haxe/std" + cp -vr haxe haxelib std "$out/lib/haxe" + + # make wrappers which provide a temporary HAXELIB_PATH with symlinks to multiple repositories HAXELIB_PATH may point to + for name in haxe haxelib; do + cat > $out/bin/$name < docs/license.txt + maintainers = [ maintainers.marcweber ]; + platforms = platforms.linux ++ platforms.darwin; + }; + }; +in { + # this old version is required to compile some libraries + haxe_3_2 = generic { + version = "3.2.1"; + sha256 = "1x9ay5a2llq46fww3k07jxx8h1vfpyxb522snc6702a050ki5vz3"; + prePatch = '' + sed -i -e 's|"/usr/lib/haxe/std/";|"'"$out/lib/haxe/std/"'";\n&|g' main.ml + sed -i -e 's|"neko"|"${neko}/bin/neko"|g' extra/haxelib_src/src/tools/haxelib/Main.hx + ''; }; - - prePatch = '' - sed -i -e 's|"/usr/lib/haxe/std/";|"'"$out/lib/haxe/std/"'";\n&|g' src/main.ml - ''; - - buildFlags = [ "all" "tools" ]; - - installPhase = '' - install -vd "$out/bin" "$out/lib/haxe/std" - install -vt "$out/bin" haxe haxelib - cp -vr std "$out/lib/haxe" - ''; - - setupHook = ./setup-hook.sh; - - dontStrip = true; - - meta = with stdenv.lib; { - description = "Programming language targeting JavaScript, Flash, NekoVM, PHP, C++"; - homepage = https://haxe.org; - license = with licenses; [ gpl2 bsd2 /*?*/ ]; # -> docs/license.txt - maintainers = [ maintainers.marcweber ]; - platforms = platforms.linux ++ platforms.darwin; + haxe_3_4 = generic { + version = "3.4.2"; + sha256 = "1m5fp183agqv8h3ynhxw4kndkpq2d6arysmirv3zl3vz5crmpwqd"; + prePatch = '' + sed -i -e 's|"/usr/lib/haxe/std/";|"'"$out/lib/haxe/std/"'";\n&|g' src/main.ml + sed -i -e 's|"neko"|"${neko}/bin/neko"|g' extra/haxelib_src/src/haxelib/client/Main.hx + ''; }; } diff --git a/pkgs/development/compilers/haxe/hxcpp.nix b/pkgs/development/compilers/haxe/hxcpp.nix deleted file mode 100644 index 56b43fc128e..00000000000 --- a/pkgs/development/compilers/haxe/hxcpp.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv, fetchzip, haxe, neko, pcre, sqlite, zlib }: - -stdenv.mkDerivation rec { - name = "hxcpp-3.2.27"; - - src = let - zipFile = stdenv.lib.replaceChars ["."] [","] name; - in fetchzip { - inherit name; - url = "http://lib.haxe.org/files/3.0/${zipFile}.zip"; - sha256 = "1hw4kr1f8q7f4fkzis7kvkm7h1cxhv6cf5v1iq7rvxs2fxiys7fr"; - }; - - NIX_LDFLAGS = "-lpcre -lz -lsqlite3"; - - outputs = [ "out" "lib" ]; - - patchPhase = '' - rm -rf bin lib project/thirdparty project/libs/sqlite/sqlite3.[ch] - find . -name '*.n' -delete - sed -i -re '/(PCRE|ZLIB)_DIR|\/d' project/Build.xml - sed -i -e 's/mFromFile = "@";/mFromFile = "";/' tools/hxcpp/Linker.hx - sed -i -e '/dll_ext/s,HX_CSTRING("./"),HX_CSTRING("'"$lib"'/"),' \ - src/hx/Lib.cpp - ''; - - buildInputs = [ haxe neko pcre sqlite zlib ]; - - targetArch = "linux-m${if stdenv.is64bit then "64" else "32"}"; - - buildPhase = '' - haxe -neko project/build.n -cp tools/build -main Build - haxe -neko run.n -cp tools/run -main RunMain - haxe -neko hxcpp.n -cp tools/hxcpp -main BuildTool - (cd project && neko build.n "ndll-$targetArch") - ''; - - installPhase = '' - for i in bin/Linux*/*.dso; do - install -vD "$i" "$lib/$(basename "$i")" - done - find *.n toolchain/*.xml build-tool/BuildCommon.xml src include \ - -type f -exec install -vD -m 0644 {} "$out/lib/haxe/hxcpp/{}" \; - ''; - - meta = { - homepage = "http://lib.haxe.org/p/hxcpp"; - description = "Runtime support library for the Haxe C++ backend"; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/compilers/haxe/setup-hook.sh b/pkgs/development/compilers/haxe/setup-hook.sh index a29e04a989b..21cc0206859 100644 --- a/pkgs/development/compilers/haxe/setup-hook.sh +++ b/pkgs/development/compilers/haxe/setup-hook.sh @@ -1,5 +1,7 @@ addHaxeLibPath() { + if [ ! -d "$1/lib/haxe/std" ]; then addToSearchPath HAXELIB_PATH "$1/lib/haxe" + fi } envHooks+=(addHaxeLibPath) diff --git a/pkgs/development/compilers/julia/0.5.nix b/pkgs/development/compilers/julia/0.5.nix index 1ee4dea51e3..6e379091703 100644 --- a/pkgs/development/compilers/julia/0.5.nix +++ b/pkgs/development/compilers/julia/0.5.nix @@ -155,7 +155,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = true; + doCheck = !stdenv.isDarwin; checkTarget = "testall"; # Julia's tests require read/write access to $HOME preCheck = '' diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix index 64dbaa21dd4..8d40ee3c8aa 100644 --- a/pkgs/development/compilers/llvm/4/clang/default.nix +++ b/pkgs/development/compilers/llvm/4/clang/default.nix @@ -1,6 +1,6 @@ { stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python , fixDarwinDylibNames -, enableManpages ? true +, enableManpages ? false }: let @@ -9,7 +9,7 @@ let name = "clang-${version}"; unpackPhase = '' - unpackFile ${fetch "cfe" "12n99m60aa680cir3ql56s1jsv6lp61hq4w9rabf4c6vpn7gi9ff"} + unpackFile ${fetch "cfe" "16vnv3msnvx33dydd17k2cq0icndi1a06bg5vcxkrhjjb1rqlwv1"} mv cfe-${version}* clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix index 15918f9c1eb..9e5bccff355 100644 --- a/pkgs/development/compilers/llvm/4/default.nix +++ b/pkgs/development/compilers/llvm/4/default.nix @@ -1,8 +1,8 @@ -{ newScope, stdenv, cmake, libxml2, python2, isl, fetchurl, overrideCC, wrapCC, darwin, ccWrapperFun }: +{ lowPrio, newScope, stdenv, cmake, libxml2, python2, isl, fetchurl, overrideCC, wrapCC, darwin, ccWrapperFun }: let callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; }); - release_version = "4.0.0"; + release_version = "4.0.1"; version = release_version; # differentiating these is important for rc's fetch = name: sha256: fetchurl { @@ -10,17 +10,28 @@ let inherit sha256; }; - compiler-rt_src = fetch "compiler-rt" "059ipqq27gd928ay06f1ck3vw6y5h5z4zd766x8k0k7jpqimpwnk"; - clang-tools-extra_src = fetch "clang-tools-extra" "16bwckgcxfn56mbqjlxi7fxja0zm9hjfa6s3ncm3dz98n5zd7ds1"; + compiler-rt_src = fetch "compiler-rt" "0h5lpv1z554szi4r4blbskhwrkd78ir50v3ng8xvk1s86fa7gj53"; + clang-tools-extra_src = fetch "clang-tools-extra" "1dhmp7ccfpr42bmvk3kp37ngjpf3a9m5d4kkpsn7d00hzi7fdl9m"; + + # Add man output without introducing extra dependencies. + overrideManOutput = drv: + let drv-manpages = drv.override { enableManpages = true; }; in + drv // { man = drv-manpages.man; /*outputs = drv.outputs ++ ["man"];*/ }; + + llvm = callPackage ./llvm.nix { + inherit compiler-rt_src stdenv; + }; + + clang-unwrapped = callPackage ./clang { + inherit clang-tools-extra_src stdenv; + }; self = { - llvm = callPackage ./llvm.nix { - inherit compiler-rt_src stdenv; - }; + llvm = overrideManOutput llvm; + clang-unwrapped = overrideManOutput clang-unwrapped; - clang-unwrapped = callPackage ./clang { - inherit clang-tools-extra_src stdenv; - }; + llvm-manpages = lowPrio self.llvm.man; + clang-manpages = lowPrio self.clang-unwrapped.man; clang = wrapCC self.clang-unwrapped; diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix index a43826d7a31..b74d2fb89dc 100644 --- a/pkgs/development/compilers/llvm/4/libc++/default.nix +++ b/pkgs/development/compilers/llvm/4/libc++/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "libc++-${version}"; - src = fetch "libcxx" "15ngfcjc3pjakpwfq7d4n546jj0rgfdv5rpb1qv9xgv9mp236kag"; + src = fetch "libcxx" "0k6cmjcxnp2pyl8xwy1wkyyckkmdrjddim94yf1gzjbjy9qi22jj"; postUnpack = '' unpackFile ${libcxxabi.src} diff --git a/pkgs/development/compilers/llvm/4/libc++abi.nix b/pkgs/development/compilers/llvm/4/libc++abi.nix index 3a0e996fb9a..6a3d9110136 100644 --- a/pkgs/development/compilers/llvm/4/libc++abi.nix +++ b/pkgs/development/compilers/llvm/4/libc++abi.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libc++abi-${version}"; - src = fetch "libcxxabi" "1n416kv27anabg9jsw6331r28ic30xk46p381lx2vbb2jrhwpafw"; + src = fetch "libcxxabi" "0cqvzallxh0nwiijsf6i4d5ds9m5ijfzywg7376ncv50i64if24g"; nativeBuildInputs = [ cmake ]; buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; diff --git a/pkgs/development/compilers/llvm/4/lld.nix b/pkgs/development/compilers/llvm/4/lld.nix index f9cd72b4200..776109ee74d 100644 --- a/pkgs/development/compilers/llvm/4/lld.nix +++ b/pkgs/development/compilers/llvm/4/lld.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { name = "lld-${version}"; - src = fetch "lld" "00km1qawk146pyjqa6aphcdzgkzrmg6cgk0ikg4661ffp5bn9q1k"; + src = fetch "lld" "1v9nkpr158j4yd4zmi6rpnfxkp78r1fapr8wji9s6v176gji1kk3"; nativeBuildInputs = [ cmake ]; buildInputs = [ llvm ]; diff --git a/pkgs/development/compilers/llvm/4/lldb.nix b/pkgs/development/compilers/llvm/4/lldb.nix index a3c46a4c7e9..7d33179913b 100644 --- a/pkgs/development/compilers/llvm/4/lldb.nix +++ b/pkgs/development/compilers/llvm/4/lldb.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { name = "lldb-${version}"; - src = fetch "lldb" "0g83hbw1r4gd0z8hlph9i34xs6dlcc69vz3h2bqwkhb2qq2qzg9d"; + src = fetch "lldb" "0yy43a27zx3r51b6gkv3v2mdiqcq3mf0ngki47ya0i30v3gx4cl4"; patches = [ ./lldb-libedit.patch ]; postPatch = '' diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index 98c24495355..abfac1cce14 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -16,13 +16,13 @@ , compiler-rt_src , libcxxabi , debugVersion ? false -, enableManpages ? true +, enableManpages ? false , enableSharedLibraries ? true , darwin }: let - src = fetch "llvm" "1giklnw71wzsgbqg9wb5x7dxnbj39m6zpfvskvzvhwvfz4fm244d"; + src = fetch "llvm" "0l9bf7kdwhlj0kq1hawpyxhna1062z3h7qcz2y8nfl9dz2qksy6s"; shlib = if stdenv.isDarwin then "dylib" else "so"; # Used when creating a version-suffixed symlink of libLLVM.dylib @@ -64,13 +64,6 @@ in stdenv.mkDerivation rec { + stdenv.lib.optionalString (enableSharedLibraries) '' substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib patch -p1 < ./llvm-outputs.patch - '' - # Remove broken tests: (https://bugs.llvm.org//show_bug.cgi?id=31610) - + '' - rm test/CodeGen/AMDGPU/invalid-opencl-version-metadata1.ll - rm test/CodeGen/AMDGPU/invalid-opencl-version-metadata2.ll - rm test/CodeGen/AMDGPU/invalid-opencl-version-metadata3.ll - rm test/CodeGen/AMDGPU/runtime-metadata.ll ''; # hacky fix: created binaries need to be run before installation @@ -123,11 +116,11 @@ in stdenv.mkDerivation rec { + stdenv.lib.optionalString enableSharedLibraries '' moveToOutput "lib/libLLVM-*" "$lib" moveToOutput "lib/libLLVM.${shlib}" "$lib" - substituteInPlace "$out/lib/cmake/llvm/LLVMExports-release.cmake" \ + substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-" '' + stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) '' - substituteInPlace "$out/lib/cmake/llvm/LLVMExports-release.cmake" \ + substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib" install_name_tool -id $lib/lib/libLLVM.dylib $lib/lib/libLLVM.dylib install_name_tool -change @rpath/libLLVM.dylib $lib/lib/libLLVM.dylib $out/bin/llvm-config diff --git a/pkgs/development/compilers/llvm/4/openmp.nix b/pkgs/development/compilers/llvm/4/openmp.nix index 197e9a78465..0bdf5c71e1f 100644 --- a/pkgs/development/compilers/llvm/4/openmp.nix +++ b/pkgs/development/compilers/llvm/4/openmp.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { name = "openmp-${version}"; - src = fetch "openmp" "09kf41zgv551fnv628kqhlwgqkd2bkiwii9gqi6q12djgdddhmfv"; + src = fetch "openmp" "195dykamd39yhi5az7nqj3ksqhb3wq30l93jnfkxl0061qbknsgc"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ llvm ]; diff --git a/pkgs/development/compilers/mono/5.0.nix b/pkgs/development/compilers/mono/5.0.nix new file mode 100644 index 00000000000..911ba0ae02a --- /dev/null +++ b/pkgs/development/compilers/mono/5.0.nix @@ -0,0 +1,7 @@ +{ stdenv, callPackage, Foundation, libobjc }: + +callPackage ./generic-cmake.nix (rec { + inherit Foundation libobjc; + version = "5.0.1.1"; + sha256 = "064pgsmanpybpbhpam9jv9n8aicx6mlyb7a91yzh3kcksmqsxmj8"; +}) diff --git a/pkgs/development/compilers/mono/generic-cmake.nix b/pkgs/development/compilers/mono/generic-cmake.nix new file mode 100644 index 00000000000..f6e3f5a0100 --- /dev/null +++ b/pkgs/development/compilers/mono/generic-cmake.nix @@ -0,0 +1,93 @@ +{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python, version, sha256, autoconf, libtool, automake, cmake, which }: + +let + llvm = callPackage ./llvm.nix { }; +in +stdenv.mkDerivation rec { + name = "mono-${version}"; + + src = fetchurl { + inherit sha256; + url = "http://download.mono-project.com/sources/mono/${name}.tar.bz2"; + }; + + buildInputs = + [ bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib python autoconf libtool automake cmake which + ] + ++ (stdenv.lib.optionals stdenv.isDarwin [ Foundation libobjc ]); + + propagatedBuildInputs = [glib]; + + NIX_LDFLAGS = if stdenv.isDarwin then "" else "-lgcc_s" ; + + # To overcome the bug https://bugzilla.novell.com/show_bug.cgi?id=644723 + dontDisableStatic = true; + + # In fact I think this line does not help at all to what I + # wanted to achieve: have mono to find libgdiplus automatically + configureFlags = [ + "--x-includes=${libX11.dev}/include" + "--x-libraries=${libX11.out}/lib" + "--with-libgdiplus=${libgdiplus}/lib/libgdiplus.so" + ] + ++ stdenv.lib.optionals withLLVM [ + "--enable-llvm" + "--enable-llvmloaded" + "--with-llvm=${llvm}" + ]; + + configurePhase = '' + patchShebangs ./ + ./autogen.sh --prefix $out + ''; + + # Attempt to fix this error when running "mcs --version": + # The file /nix/store/xxx-mono-2.4.2.1/lib/mscorlib.dll is an invalid CIL image + dontStrip = true; + + # Parallel building doesn't work, as shows http://hydra.nixos.org/build/2983601 + enableParallelBuilding = false; + + # We want pkg-config to take priority over the dlls in the Mono framework and the GAC + # because we control pkg-config + patches = [ ./pkgconfig-before-gac.patch ]; + + # Patch all the necessary scripts. Also, if we're using LLVM, we fix the default + # LLVM path to point into the Mono LLVM build, since it's private anyway. + preBuild = '' + makeFlagsArray=(INSTALL=`type -tp install`) + substituteInPlace mcs/class/corlib/System/Environment.cs --replace /usr/share "$out/share" + '' + stdenv.lib.optionalString withLLVM '' + substituteInPlace mono/mini/aot-compiler.c --replace "llvm_path = g_strdup (\"\")" "llvm_path = g_strdup (\"${llvm}/bin/\")" + ''; + + # Fix mono DLLMap so it can find libX11 and gdiplus to run winforms apps + # Other items in the DLLMap may need to be pointed to their store locations, I don't think this is exhaustive + # http://www.mono-project.com/Config_DllMap + postBuild = '' + find . -name 'config' -type f | xargs \ + sed -i -e "s@libX11.so.6@${libX11.out}/lib/libX11.so.6@g" \ + -e "s@/.*libgdiplus.so@${libgdiplus}/lib/libgdiplus.so@g" \ + ''; + + # Without this, any Mono application attempting to open an SSL connection will throw with + # The authentication or decryption has failed. + # ---> Mono.Security.Protocol.Tls.TlsException: Invalid certificate received from server. + postInstall = '' + echo "Updating Mono key store" + $out/bin/cert-sync ${cacert}/etc/ssl/certs/ca-bundle.crt + '' + # According to [1], gmcs is just mcs + # [1] https://github.com/mono/mono/blob/master/scripts/gmcs.in + + '' + ln -s $out/bin/mcs $out/bin/gmcs + ''; + + meta = { + homepage = http://mono-project.com/; + description = "Cross platform, open source .NET development framework"; + platforms = with stdenv.lib.platforms; darwin ++ linux; + maintainers = with stdenv.lib.maintainers; [ viric thoughtpolice obadz vrthra ]; + license = stdenv.lib.licenses.free; # Combination of LGPL/X11/GPL ? + }; +} diff --git a/pkgs/development/compilers/mono/pkgconfig-before-gac-5x.patch b/pkgs/development/compilers/mono/pkgconfig-before-gac-5x.patch new file mode 100644 index 00000000000..1b9c59402bf --- /dev/null +++ b/pkgs/development/compilers/mono/pkgconfig-before-gac-5x.patch @@ -0,0 +1,65 @@ +diff -Naur mono-5.0.0/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets.old mono-5.0.0/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets +--- mono-5.0.0/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets.old 2017-04-24 23:45:18.348116305 +0200 ++++ mono-5.0.0/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets 2017-04-24 23:45:11.407051755 +0200 +@@ -167,8 +167,8 @@ + $(ReferencePath); + @(AdditionalReferencePath); + {HintPathFromItem}; +- {TargetFrameworkDirectory}; + {PkgConfig}; ++ {TargetFrameworkDirectory}; + {GAC}; + {RawFileName}; + $(OutDir) +diff -Naur mono-5.0.0/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets.old mono-5.0.0/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets +--- mono-5.0.0/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets.old 2017-04-24 23:49:53.019616196 +0200 ++++ mono-5.0.0/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets 2017-04-24 23:50:05.709729585 +0200 +@@ -232,8 +232,8 @@ + $(ReferencePath); + @(AdditionalReferencePath); + {HintPathFromItem}; +- {TargetFrameworkDirectory}; + {PkgConfig}; ++ {TargetFrameworkDirectory}; + {GAC}; + {RawFileName}; + $(OutDir) +diff -Naur mono-5.0.0/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets.old mono-5.0.0/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets +--- mono-5.0.0/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets.old 2017-04-24 23:52:33.200037047 +0200 ++++ mono-5.0.0/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets 2017-04-24 23:52:43.281125802 +0200 +@@ -139,8 +139,8 @@ + $(ReferencePath); + @(AdditionalReferencePath); + {HintPathFromItem}; +- {TargetFrameworkDirectory}; + {PkgConfig}; ++ {TargetFrameworkDirectory}; + {GAC}; + {RawFileName}; + $(OutDir) +diff -Naur mono-5.0.0/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets.old mono-5.0.0/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets +--- mono-5.0.0/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets.old 2017-04-24 23:54:02.585821594 +0200 ++++ mono-5.0.0/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets 2017-04-24 23:54:09.313880438 +0200 +@@ -234,8 +234,8 @@ + $(ReferencePath); + @(AdditionalReferencePath); + {HintPathFromItem}; +- {TargetFrameworkDirectory}; + {PkgConfig}; ++ {TargetFrameworkDirectory}; + {GAC}; + {RawFileName}; + $(OutDir) +diff -Naur mono-5.0.0/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets.old mono-5.0.0/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets +--- mono-5.0.0/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets.old 2017-04-24 23:55:46.244895155 +0200 ++++ mono-5.0.0/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets 2017-04-24 23:55:51.998961342 +0200 +@@ -232,8 +232,8 @@ + $(ReferencePath); + @(AdditionalReferencePath); + {HintPathFromItem}; +- {TargetFrameworkDirectory}; + {PkgConfig}; ++ {TargetFrameworkDirectory}; + {GAC}; + {RawFileName}; + $(OutDir) diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix index 493748d369b..e90f3af704d 100644 --- a/pkgs/development/compilers/neko/default.nix +++ b/pkgs/development/compilers/neko/default.nix @@ -24,6 +24,12 @@ stdenv.mkDerivation rec { + "fe87462d9c7a6ee27e28f5be5e4fc0ac87b34574.patch"; sha256 = "1jbmq6j32vg3qv20dbh82cp54886lgrh7gkcqins8a2y4l4dl3sc"; }) + # https://github.com/HaxeFoundation/neko/pull/165 + (fetchpatch { + url = "https://github.com/HaxeFoundation/neko/commit/" + + "c6d9c6d796200990b3b6a53a4dc716c9192398e6.patch"; + sha256 = "1pq0qhhb9gbhc3zbgylwp0amhwsz0q0ggpj6v2xgv0hfy7d63rcd"; + }) ]; buildInputs = diff --git a/pkgs/development/compilers/ocaml/4.04.nix b/pkgs/development/compilers/ocaml/4.04.nix index a63034d700d..4f49bcf8072 100644 --- a/pkgs/development/compilers/ocaml/4.04.nix +++ b/pkgs/development/compilers/ocaml/4.04.nix @@ -1,8 +1,8 @@ import ./generic.nix { major_version = "4"; minor_version = "04"; - patch_version = "1"; - sha256 = "11f2kcldpad9h5ihi1crad5lvv2501iccb2g4c8m197fnjac8b12"; + patch_version = "2"; + sha256 = "0bhgjzi78l10824qga85nlh18jg9lb6aiamf9dah1cs6jhzfsn6i"; # If the executable is stipped it does not work dontStrip = true; diff --git a/pkgs/development/compilers/ocaml/4.05.nix b/pkgs/development/compilers/ocaml/4.05.nix new file mode 100644 index 00000000000..a63b06a9f62 --- /dev/null +++ b/pkgs/development/compilers/ocaml/4.05.nix @@ -0,0 +1,9 @@ +import ./generic.nix { + major_version = "4"; + minor_version = "05"; + patch_version = "0"; + sha256 = "1y9fw1ci9pwnbbrr9nwr8cq8vypcxwdf4akvxard3mxl2jx2g984"; + + # If the executable is stipped it does not work + dontStrip = true; +} diff --git a/pkgs/development/compilers/openjdk-darwin/8.nix b/pkgs/development/compilers/openjdk-darwin/8.nix index 51effd2c784..691829c7788 100644 --- a/pkgs/development/compilers/openjdk-darwin/8.nix +++ b/pkgs/development/compilers/openjdk-darwin/8.nix @@ -33,7 +33,7 @@ let # any package that depends on the JRE has $CLASSPATH set up # properly. mkdir -p $out/nix-support - echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs + printLines ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/jre/lib/libfontmanager.dylib diff --git a/pkgs/development/compilers/openjdk-darwin/default.nix b/pkgs/development/compilers/openjdk-darwin/default.nix index 10a9eb2b366..8ce0835fcb6 100644 --- a/pkgs/development/compilers/openjdk-darwin/default.nix +++ b/pkgs/development/compilers/openjdk-darwin/default.nix @@ -23,7 +23,7 @@ let # any package that depends on the JRE has $CLASSPATH set up # properly. mkdir -p $out/nix-support - echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs + printLines ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/jre/lib/libfontmanager.dylib diff --git a/pkgs/development/compilers/openjdk/7.nix b/pkgs/development/compilers/openjdk/7.nix index 6dcbb0a330f..9ef7d26b2ef 100644 --- a/pkgs/development/compilers/openjdk/7.nix +++ b/pkgs/development/compilers/openjdk/7.nix @@ -190,7 +190,7 @@ let # any package that depends on the JRE has $CLASSPATH set up # properly. mkdir -p $jre/nix-support - echo -n "${setJavaClassPath}" > $jre/nix-support/propagated-native-build-inputs + printLines ${setJavaClassPath} > $jre/nix-support/propagated-native-build-inputs # Set JAVA_HOME automatically. mkdir -p $out/nix-support diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index e157249fb2f..8dbace8dda1 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -202,7 +202,7 @@ let # any package that depends on the JRE has $CLASSPATH set up # properly. mkdir -p $jre/nix-support - echo -n "${setJavaClassPath}" > $jre/nix-support/propagated-native-build-inputs + printLines ${setJavaClassPath} > $jre/nix-support/propagated-native-build-inputs # Set JAVA_HOME automatically. mkdir -p $out/nix-support diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 8fe775de146..08fd724f773 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -3,6 +3,7 @@ , downloadUrl , sha256_i686 , sha256_x86_64 +, sha256_armv7l , jceName , jceDownloadUrl , sha256JCE @@ -34,10 +35,13 @@ , setJavaClassPath }: -assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; +assert stdenv.system == "i686-linux" + || stdenv.system == "x86_64-linux" + || stdenv.system == "armv7l-linux"; assert swingSupport -> xorg != null; let + abortArch = abort "jdk requires i686-linux, x86_64-linux, or armv7l-linux"; /** * The JRE libraries are in directories that depend on the CPU. @@ -47,8 +51,10 @@ let "i386" else if stdenv.system == "x86_64-linux" then "amd64" + else if stdenv.system == "armv7l-linux" then + "arm" else - abort "jdk requires i686-linux or x86_64 linux"; + abortArch; jce = if installjce then @@ -59,6 +65,14 @@ let } else ""; + + rSubPaths = [ + "lib/${architecture}/jli" + "lib/${architecture}/server" + "lib/${architecture}/xawt" + "lib/${architecture}" + ]; + in let result = stdenv.mkDerivation rec { @@ -78,8 +92,14 @@ let result = stdenv.mkDerivation rec { url = downloadUrl; sha256 = sha256_x86_64; } + else if stdenv.system == "armv7l-linux" then + requireFile { + name = "jdk-${productVersion}u${patchVersion}-linux-arm32-vfp-hflt.tar.gz"; + url = downloadUrl; + sha256 = sha256_armv7l; + } else - abort "jdk requires i686-linux or x86_64 linux"; + abortArch; nativeBuildInputs = [ file ] ++ stdenv.lib.optional installjce unzip; @@ -134,18 +154,6 @@ let result = stdenv.mkDerivation rec { cp -v UnlimitedJCEPolicy*/*.jar $jrePath/lib/security fi - rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}/jli - rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}/server - rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture}/xawt - rpath=$rpath''${rpath:+:}$jrePath/lib/${architecture} - - # set all the dynamic linkers - find $out -type f -perm -0100 \ - -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$rpath" {} \; - - find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \; - if test -z "$pluginSupport"; then rm -f $out/bin/javaws if test -n "$installjdk"; then @@ -157,17 +165,28 @@ let result = stdenv.mkDerivation rec { ln -s $jrePath/lib/${architecture}/libnpjp2.so $jrePath/lib/${architecture}/plugins mkdir -p $out/nix-support - echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs + printLines ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs # Set JAVA_HOME automatically. cat <> $out/nix-support/setup-hook if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi EOF + ''; + + postFixup = '' + rpath+="''${rpath:+:}${stdenv.lib.concatStringsSep ":" (map (a: "$jrePath/${a}") rSubPaths)}" + + # set all the dynamic linkers + find $out -type f -perm -0100 \ + -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "$rpath" {} \; + + find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \; # Oracle Java Mission Control needs to know where libgtk-x11 and related is - if test -n "$installjdk"; then + if test -n "$installjdk" -a -x $out/bin/jmc; then wrapProgram "$out/bin/jmc" \ - --suffix-each LD_LIBRARY_PATH ':' "${rpath}" + --suffix-each LD_LIBRARY_PATH ':' "$rpath" fi ''; @@ -192,7 +211,7 @@ let result = stdenv.mkDerivation rec { meta = with stdenv.lib; { license = licenses.unfree; - platforms = [ "i686-linux" "x86_64-linux" ]; # some inherit jre.meta.platforms + platforms = [ "i686-linux" "x86_64-linux" "armv7l-linux" ]; # some inherit jre.meta.platforms }; }; in result diff --git a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix index 8e93f76ff18..1c761d58603 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8cpu-linux.nix @@ -4,6 +4,7 @@ import ./jdk-linux-base.nix { downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; sha256_i686 = "0m3i1n1im1nlwb06wlsdajv19cd3zhrjkw8zbyjfznydn6qs4s80"; sha256_x86_64 = "0dhj623ya01glcl3iir9ajifcrf6awhvpk936x9cxfj8zfyibck2"; + sha256_armv7l = "0ja97nqn4x0ji16c7r6i9nnnj3745br7qlbj97jg1s8m2wk7f9jd"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix index 8e93f76ff18..1c761d58603 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix @@ -4,6 +4,7 @@ import ./jdk-linux-base.nix { downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; sha256_i686 = "0m3i1n1im1nlwb06wlsdajv19cd3zhrjkw8zbyjfznydn6qs4s80"; sha256_x86_64 = "0dhj623ya01glcl3iir9ajifcrf6awhvpk936x9cxfj8zfyibck2"; + sha256_armv7l = "0ja97nqn4x0ji16c7r6i9nnnj3745br7qlbj97jg1s8m2wk7f9jd"; jceName = "jce_policy-8.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index 6b7f87b1e95..6e393426b7a 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation ( rec { name = "ponyc-${version}"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "ponylang"; repo = "ponyc"; rev = version; - sha256 = "0zzr3mmjp7010d3jfly6lbwaib546praml97kgj92yixahnwz533"; + sha256 = "02hmn066jswaij2ib0faabm2i9cqz562z6s0vakgwnxyrk4qayif"; }; buildInputs = [ llvm makeWrapper which ]; diff --git a/pkgs/development/compilers/ponyc/pony-stable.nix b/pkgs/development/compilers/ponyc/pony-stable.nix index 9bee8e299c0..c91d9d603d5 100644 --- a/pkgs/development/compilers/ponyc/pony-stable.nix +++ b/pkgs/development/compilers/ponyc/pony-stable.nix @@ -1,13 +1,13 @@ {stdenv, fetchFromGitHub, ponyc }: stdenv.mkDerivation { - name = "pony-stable-unstable-2017-03-30"; + name = "pony-stable-unstable-2017-04-20"; src = fetchFromGitHub { - owner = "jemc"; + owner = "ponylang"; repo = "pony-stable"; - rev = "39890c7f11f79009630de6b551bd076868f7f5a2"; - sha256 = "1w15dg4l03zzncpllwww8jhsj7z1wgvhf89n7agr9f1w9m2zpskc"; + rev = "b2ea566b02ec40480f888652b04eaa5f191a241e"; + sha256 = "1bixkxccsrnyip3yp42r14rbhk832pvzwbkh6ash4ip2isxa6b19"; }; buildInputs = [ ponyc ]; diff --git a/pkgs/development/compilers/purescript/psc-package/default.nix b/pkgs/development/compilers/purescript/psc-package/default.nix index 70ef8b63277..306eaa93958 100644 --- a/pkgs/development/compilers/purescript/psc-package/default.nix +++ b/pkgs/development/compilers/purescript/psc-package/default.nix @@ -4,13 +4,13 @@ with lib; mkDerivation rec { pname = "psc-package"; - version = "0.1.1"; + version = "0.2.0"; src = fetchFromGitHub { owner = "purescript"; repo = pname; rev = "v${version}"; - sha256 = "078xjn10yq4i0ff78bxscvxhn29p3s7iwv3pjyqxzlhaymn5949l"; + sha256 = "0vid8vc8n8xj0qa4gnm1any9s18rdh7yn960vgix17r7a3bdndwb"; }; isLibrary = false; diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 7bd4750551f..e364f536c88 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -2,12 +2,12 @@ ocaml, opam, topkg, menhir, merlin_extend, ppx_tools_versioned, utop }: let - version = "1.13.4"; + version = "2.0.0"; src = fetchFromGitHub { owner = "facebook"; repo = "reason"; rev = version; - sha256 = "03r2ciikgwaq1dkzgzc8n7h7y0q95ajh6n9bb2n5bpgfhwkr1wqi"; + sha256 = "0l3lwfvppplah707rq5nqjav2354lq6d7xfflfigkzhn74hlx6iy"; }; meta = with stdenv.lib; { homepage = https://facebook.github.io/reason/; diff --git a/pkgs/development/compilers/rust/nightlyBin.nix b/pkgs/development/compilers/rust/nightlyBin.nix index bdb11bd5b52..af06835c5de 100644 --- a/pkgs/development/compilers/rust/nightlyBin.nix +++ b/pkgs/development/compilers/rust/nightlyBin.nix @@ -7,7 +7,7 @@ let bootstrapHash = if stdenv.system == "x86_64-linux" - then "21f38f46bf16373d3240a38b775e1acff9bb429f1570a4d4da8b3000315d0085" + then "0svlm4bxsdhdn4jsv46f278kid23a9w978q2137qrba4xnyb06kf" else throw "missing bootstrap hash for platform ${stdenv.system}"; src = fetchurl { @@ -15,7 +15,7 @@ let sha256 = bootstrapHash; }; - version = "2017-05-30"; + version = "2017-06-26"; in import ./binaryBuild.nix { inherit stdenv fetchurl makeWrapper cacert zlib buildRustPackage curl; inherit version src platform; diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 4e0d0971cb6..28863e450a7 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -10,6 +10,7 @@ , targetPatches , targetToolchains , doCheck ? true +, buildPlatform, hostPlatform } @ args: let @@ -137,7 +138,7 @@ stdenv.mkDerivation { inherit doCheck; - dontSetConfigureCross = true; + configurePlatforms = []; # https://github.com/NixOS/nixpkgs/pull/21742#issuecomment-272305764 # https://github.com/rust-lang/rust/issues/30181 diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index dcd110954c1..3bd1982baa5 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.3.17"; + version = "1.3.19"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "1bqd39cqcv129zxvp3w3z1x46m9g9nmgslnlrvcsbqwd69vgbfcl"; + sha256 = "0660gw43myikpa6n2qjhjxz61ilqazva4v8shljgwymag99risxm"; }; patchPhase = '' diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index 3ed5a2bef72..714f06d0b53 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -1,30 +1,35 @@ { stdenv, fetchzip, fetchgit, boost, cmake }: -let jsoncpp = fetchzip { - url = https://github.com/open-source-parsers/jsoncpp/archive/1.7.7.tar.gz; - sha256 = "0jz93zv17ir7lbxb3dv8ph2n916rajs8i96immwx9vb45pqid3n0"; -}; in +let + version = "0.4.13"; + rev = "0fb4cb1ab9bb4b6cc72e28cc5a1753ad14781f14"; + sha256 = "0rhrm0bmk5s2358j40yx7dzr1938q17dchzflrxw6y7yvkhscxrm"; + jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.7.7.tar.gz; + jsoncpp = fetchzip { + url = jsoncppURL; + sha256 = "0jz93zv17ir7lbxb3dv8ph2n916rajs8i96immwx9vb45pqid3n0"; + }; +in -let commit = "68ef5810593e7c8092ed41d5f474dd43141624eb"; in - -stdenv.mkDerivation rec { - version = "0.4.11"; +stdenv.mkDerivation { name = "solc-${version}"; # Cannot use `fetchFromGitHub' because of submodules src = fetchgit { url = "https://github.com/ethereum/solidity"; - rev = commit; - sha256 = "13zycybf23yvf3hkf9zgw9gbc1y4ifzxaf7sll69bsn24fcyq961"; + inherit rev sha256; }; patchPhase = '' - echo >commit_hash.txt ${commit} + echo >commit_hash.txt '${rev}' echo >prerelease.txt substituteInPlace deps/jsoncpp.cmake \ - --replace https://github.com/open-source-parsers/jsoncpp/archive/1.7.7.tar.gz ${jsoncpp} + --replace '${jsoncppURL}' ${jsoncpp} substituteInPlace cmake/EthCompilerSettings.cmake \ --replace 'add_compile_options(-Werror)' "" + substituteInPlace cmake/EthDependencies.cmake \ + --replace 'set(Boost_USE_STATIC_LIBS ON)' \ + 'set(Boost_USE_STATIC_LIBS OFF)' ''; buildInputs = [ boost cmake ]; @@ -34,6 +39,7 @@ stdenv.mkDerivation rec { longDescription = "This package also includes `lllc', the LLL compiler."; homepage = https://github.com/ethereum/solidity; license = stdenv.lib.licenses.gpl3; + platforms = with stdenv.lib.platforms; linux ++ darwin; maintainers = [ stdenv.lib.maintainers.dbrock ]; inherit version; }; diff --git a/pkgs/development/compilers/swift/patches/build-script-pax.patch b/pkgs/development/compilers/swift/patches/build-script-pax.patch index 9f1976a2d88..fa2ccdf9d5c 100644 --- a/pkgs/development/compilers/swift/patches/build-script-pax.patch +++ b/pkgs/development/compilers/swift/patches/build-script-pax.patch @@ -1,12 +1,13 @@ --- swift/utils/build-script-impl 2017-01-23 12:47:20.401326309 -0600 +++ swift-pax/utils/build-script-impl 2017-01-23 13:24:10.339366996 -0600 -@@ -1823,6 +1823,16 @@ function set_lldb_xcodebuild_options() { +@@ -1823,6 +1823,17 @@ function set_lldb_xcodebuild_options() { fi } +## XXX: Taken from nixpkgs /pkgs/stdenv/generic/setup.sh +isELF() { + local fn="$1" ++ local fd + local magic + exec {fd}< "$fn" + read -n 4 -u $fd magic diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index c7e3c4b3c67..7e083ffe67b 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -2,10 +2,10 @@ with stdenv.lib; let - date = "20170605"; + date = "20170710"; version = "0.9.27pre-${date}"; - rev = "3e4b7693bfd5b76570b35558c83a935326513eff"; - sha256 = "0m5k1df73kakvg9xz06y3nlac4mwfccni6hdijaf4w8fyy3zz4bg"; + rev = "2acb04f7f2077a4cff103421d79ceee48441918a"; + sha256 = "1rh89dx1myqfm752d4rlzrm8aadfm17fm88ps0q9ibmbxavb45qw"; in stdenv.mkDerivation rec { diff --git a/pkgs/development/compilers/wla-dx/default.nix b/pkgs/development/compilers/wla-dx/default.nix index 13a48aaaa30..2ea2faa3e09 100644 --- a/pkgs/development/compilers/wla-dx/default.nix +++ b/pkgs/development/compilers/wla-dx/default.nix @@ -1,13 +1,14 @@ {stdenv, fetchFromGitHub, cmake}: stdenv.mkDerivation rec { - name = "wla-dx-git-2016-02-27"; + version = "2017-06-05"; + name = "wla-dx-git-${version}"; src = fetchFromGitHub { owner = "vhelin"; repo = "wla-dx"; - rev = "8189fe8d5620584ea16563875ff3c5430527c86a"; - sha256 = "02zgkcyfx7y8j6jvyi12lm29fydnd7m3rxv6g2psv23fyzmpkkir"; + rev = "ae6843f9711cbc2fa6dd8c200877b40bd2bcad7f"; + sha256 = "09c2kz12ld97ad41j6r8r65jknllrak1x8r43fgr26x7hdlxz5c6"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix index 7621aa82bc7..03be4ee8a0b 100644 --- a/pkgs/development/compilers/zulu/default.nix +++ b/pkgs/development/compilers/zulu/default.nix @@ -1,17 +1,28 @@ -{ stdenv, pkgs, fetchurl, unzip, makeWrapper, setJavaClassPath, swingSupport ? true }: - -with pkgs; +{ stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath +, zulu, glib, libxml2, libav_0_8, ffmpeg, libxslt, mesa_noglu, alsaLib +, fontconfig, freetype, gnome2, cairo, gdk_pixbuf, atk, xorg +, swingSupport ? true }: let - version = "8.19.0.1"; - openjdk = "8.0.112"; + version = "8.21.0.1"; + openjdk = "8.0.131"; - sha256_linux = "1icb6in1197n44wk2cqnrxr7w0bd5abxxysfrhbg56jlb9nzmp4x"; - sha256_darwin = "0kxwh62a6kckc9l9jkgakf86lqkqazp3dwfwaxqc4cg5zczgbhmd"; + sha256_linux = "0cr1wvk1ifdq69ia8sr6171yzciba8l5x7dszwa5g2v0vmmqq88p"; + sha256_darwin = "0xq9bdzbdq8wq48gj6j56bw30l2iafz6sy1wdhrf92n9bnz5qmw7"; platform = if stdenv.isDarwin then "macosx" else "linux"; hash = if stdenv.isDarwin then sha256_darwin else sha256_linux; extension = if stdenv.isDarwin then "zip" else "tar.gz"; + + libraries = [ + stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu + xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango + gnome2.gtk cairo gdk_pixbuf atk + ] ++ (lib.optionals swingSupport (with xorg; [ + xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp + xorg.libXt xorg.libXrender stdenv.cc.cc + ])); + in stdenv.mkDerivation rec { inherit version openjdk platform hash extension; @@ -22,7 +33,7 @@ in stdenv.mkDerivation rec { sha256 = hash; }; - buildInputs = [ makeWrapper ] ++ stdenv.lib.optional stdenv.isDarwin [ unzip ]; + buildInputs = [ makeWrapper ] ++ lib.optional stdenv.isDarwin unzip; installPhase = '' mkdir -p $out @@ -43,7 +54,7 @@ in stdenv.mkDerivation rec { find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \; mkdir -p $out/nix-support - echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs + printLines ${setJavaClassPath} > $out/nix-support/propagated-native-build-inputs # Set JAVA_HOME automatically. cat <> $out/nix-support/setup-hook @@ -51,9 +62,6 @@ in stdenv.mkDerivation rec { EOF ''; - libraries = [ stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango gnome2.gtk cairo gdk_pixbuf atk ] - ++ (if swingSupport then [ xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc ] else [ ]); - rpath = stdenv.lib.strings.makeLibraryPath libraries; passthru = { @@ -64,8 +72,11 @@ in stdenv.mkDerivation rec { homepage = https://www.azul.com/products/zulu/; license = licenses.gpl2; description = "Certified builds of OpenJDK"; - longDescription = "Certified builds of OpenJDK that can be deployed across multiple operating systems, containers, hypervisors and Cloud platforms"; - maintainers = with maintainers; [ nequissimus ]; + longDescription = '' + Certified builds of OpenJDK that can be deployed across multiple + operating systems, containers, hypervisors and Cloud platforms. + ''; + maintainers = with maintainers; [ nequissimus fpletz ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/development/coq-modules/CoLoR/default.nix b/pkgs/development/coq-modules/CoLoR/default.nix new file mode 100644 index 00000000000..c7aaf2a2e32 --- /dev/null +++ b/pkgs/development/coq-modules/CoLoR/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, coq }: + +stdenv.mkDerivation { + name = "coq${coq.coq-version}-CoLoR-1.3.0"; + + src = fetchurl { + url = https://gforge.inria.fr/frs/download.php/file/36399/color.1.3.0.tar.gz; + sha256 = "0n7431mc4a5bn9fsyk5167j2vnbxz4vgggjch4pm0x58lda8mxv1"; + }; + + buildInputs = [ coq ]; + enableParallelBuilding = true; + + installPhase = '' + make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install + ''; + + meta = with stdenv.lib; { + homepage = http://color.inria.fr/; + description = "CoLoR is a library of formal mathematical definitions and proofs of theorems on rewriting theory and termination whose correctness has been mechanically checked by the Coq proof assistant."; + maintainers = with maintainers; [ jwiegley ]; + platforms = coq.meta.platforms; + }; +} diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index 8fc12e5759d..80cdcfec287 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -1,16 +1,16 @@ {stdenv, fetchgit, coq, coqPackages}: -let revision = "04785ee692036e7ba9f4c4e380b1995128a97bf8"; in +let revision = "ee436635a34873c79f49c3d2d507194216f6e8e9"; in stdenv.mkDerivation rec { name = "coq-QuickChick-${coq.coq-version}-${version}"; - version = "20170422-${builtins.substring 0 7 revision}"; + version = "20170710-${builtins.substring 0 7 revision}"; src = fetchgit { url = git://github.com/QuickChick/QuickChick.git; rev = revision; - sha256 = "1x5idk9d9r5mj1w54676a5j92wr1id7c9dmknkpmnh78rgrqzy5j"; + sha256 = "0sq14j1kl4m4plyxj2dbkfwa6iqipmf9w7mxxxcbsm718m0xf1gr"; }; buildInputs = [ coq.ocaml coq.camlp5 ]; diff --git a/pkgs/development/coq-modules/autosubst/0001-changes-to-work-with-Coq-8.6.patch b/pkgs/development/coq-modules/autosubst/0001-changes-to-work-with-Coq-8.6.patch new file mode 100644 index 00000000000..dde0e2e03eb --- /dev/null +++ b/pkgs/development/coq-modules/autosubst/0001-changes-to-work-with-Coq-8.6.patch @@ -0,0 +1,134 @@ +From 5b40a32e35fe446cda20ed34c756a010856f39ce Mon Sep 17 00:00:00 2001 +From: Theo Giannakopoulos +Date: Wed, 5 Apr 2017 15:48:55 -0400 +Subject: [PATCH] changes to work with Coq 8.6 + +--- + theories/Autosubst_Derive.v | 12 ++++++++++++ + theories/Autosubst_MMap.v | 3 ++- + 2 files changed, 14 insertions(+), 1 deletion(-) + +diff --git a/theories/Autosubst_Derive.v b/theories/Autosubst_Derive.v +index 61995de..cf87f67 100644 +--- a/theories/Autosubst_Derive.v ++++ b/theories/Autosubst_Derive.v +@@ -18,6 +18,7 @@ Hint Extern 0 (Ids _) => derive_Ids : derive. + + Ltac derive_Rename := + match goal with [ |- Rename ?term ] => ++ let inst := fresh "inst" in + hnf; fix inst 2; change _ with (Rename term) in inst; + intros xi s; change (annot term s); destruct s; + match goal with +@@ -66,6 +67,7 @@ Ltac has_var s := + Ltac derive_Subst := + match goal with [ |- Subst ?term ] => + require_instance (Rename term); ++ let inst := fresh "inst" in + hnf; fix inst 2; change _ with (Subst term) in inst; + intros sigma s; change (annot term s); destruct s; + match goal with +@@ -107,6 +109,7 @@ Hint Extern 0 (Subst _) => derive_Subst : derive. + Ltac derive_HSubst := + match goal with [ |- HSubst ?inner ?outer ] => + require_instance (Subst inner); ++ let inst := fresh "inst" in + hnf; fix inst 2; change _ with (HSubst inner outer) in inst; + intros sigma s; change (annot outer s); destruct s; + match goal with +@@ -327,6 +330,7 @@ Ltac derive_SubstLemmas := + assert (up_upren_n : + forall xi n, upn n (ren xi) = ren (iterate upren n xi)) by + (apply up_upren_n_internal, up_upren); ++ let ih := fresh "ih" in + fix ih 2; intros xi s; destruct s; try reflexivity; simpl; f_equal; + try apply mmap_ext; intros; rewrite ?up_upren, ?up_upren_n; apply ih); + +@@ -337,6 +341,7 @@ Ltac derive_SubstLemmas := + (apply up_id_internal; reflexivity); + assert (up_id_n : forall n, upn n ids = ids) by + (apply up_id_n_internal, up_id); ++ let ih := fresh "ih" in + fix ih 1; intros s; destruct s; simpl; f_equal; try reflexivity; + rewrite ?up_id, ?up_id_n; try apply mmap_id_ext; intros; apply ih); + +@@ -344,6 +349,7 @@ Ltac derive_SubstLemmas := + + assert (ren_subst_comp : + forall xi sigma (s : term), (rename xi s).[sigma] = s.[xi >>> sigma]) by( ++ let ih := fresh "ih" in + fix ih 3; intros xi sigma s; destruct s; try reflexivity; simpl; f_equal; + rewrite ?up_comp_ren_subst, ?up_comp_ren_subst_n, ?mmap_comp; + try apply mmap_ext; intros; apply ih); +@@ -357,6 +363,7 @@ Ltac derive_SubstLemmas := + assert (up_comp_subst_ren_n : + forall sigma xi n, upn n (sigma >>> rename xi) = upn n sigma >>> rename (iterate upren n xi)) + by (apply up_comp_subst_ren_n_internal; apply up_comp_subst_ren); ++ let ih := fresh "ih" in + fix ih 3; intros sigma xi s; destruct s; try reflexivity; simpl; + f_equal; rewrite ?up_comp_subst_ren, ?up_comp_subst_ren_n, ?mmap_comp; + try (rewrite hcomp_ren_internal; [|apply rename_subst]); +@@ -368,6 +375,7 @@ Ltac derive_SubstLemmas := + by (apply up_comp_internal; [reflexivity|apply ren_subst_comp|apply subst_ren_comp]); + assert (up_comp_n : forall sigma tau n, upn n (sigma >> tau) = upn n sigma >> upn n tau) + by (apply up_comp_n_internal; apply up_comp); ++ let ih := fresh "ih" in + fix ih 3; intros sigma tau s; destruct s; try reflexivity; simpl; f_equal; + rewrite ?up_comp, ?up_comp_n, ?mmap_comp, ?hcomp_dist_internal; + try apply mmap_ext; intros; apply ih); +@@ -382,6 +390,7 @@ Ltac derive_HSubstLemmas := + let ids := constr:(ids : var -> inner) in + + assert (hsubst_id : forall (s : outer), s.|[ids] = s) by ( ++ let ih := fresh "ih" in + fix ih 1; intros s; destruct s; try reflexivity; simpl; f_equal; + rewrite ?up_id, ?up_id_n; try apply mmap_id_ext; intros; + (apply subst_id || apply ih) +@@ -390,6 +399,7 @@ Ltac derive_HSubstLemmas := + assert (hsubst_comp : forall (theta eta : var -> inner) (s : outer), + s.|[theta].|[eta] = s.|[theta >> eta]) + by ( ++ let ih := fresh "ih" in + fix ih 3; intros sigma tau s; destruct s; try reflexivity; simpl; f_equal; + rewrite <- ?up_comp, <- ?up_comp_n, ?mmap_comp; try apply mmap_ext; intros; + (apply subst_comp || apply ih) +@@ -405,6 +415,7 @@ Ltac derive_SubstHSubstComp := + assert (ren_hsubst_comp : forall xi (theta : var -> inner) (s : outer), + rename xi s.|[theta] = (rename xi s).|[theta] + ) by ( ++ let ih := fresh "ih" in + fix ih 3; intros xi theta s; destruct s; try reflexivity; simpl; f_equal; + rewrite ?mmap_comp; try apply mmap_ext; intros; simpl; apply ih + ); +@@ -421,6 +432,7 @@ Ltac derive_SubstHSubstComp := + apply up_hcomp_n_internal; apply up_hcomp + ); + ++ let ih := fresh "ih" in + fix ih 3; intros sigma tau s; destruct s; try reflexivity; simpl; f_equal; + rewrite ?up_hcomp, ?up_hcomp_n, ?hcomp_lift_n_internal, ?mmap_comp; + try apply mmap_ext; intros; apply ih +diff --git a/theories/Autosubst_MMap.v b/theories/Autosubst_MMap.v +index f8387e7..7af7902 100644 +--- a/theories/Autosubst_MMap.v ++++ b/theories/Autosubst_MMap.v +@@ -23,7 +23,7 @@ Arguments mmap {A B _} f !s /. + Class MMapExt (A B : Type) `{MMap A B} := + mmap_ext : forall f g, + (forall t, f t = g t) -> forall s, mmap f s = mmap g s. +-Arguments mmap_ext {A B _ _ f g} H s. ++Arguments mmap_ext {A B H' _ f g} H s : rename. + + Class MMapLemmas (A B : Type) `{MMap A B} := { + mmap_id x : mmap id x = x; +@@ -123,6 +123,7 @@ Tactic Notation "msimpl" "in" "*" := (in_all msimplH); msimpl. + + Ltac derive_MMap := + hnf; match goal with [ |- (?A -> ?A) -> ?B -> ?B ] => ++ let map := fresh "map" in + intros f; fix map 1; intros xs; change (annot B xs); destruct xs; + match goal with + | [ |- annot _ ?ys ] => +-- +2.13.2 + diff --git a/pkgs/development/coq-modules/autosubst/default.nix b/pkgs/development/coq-modules/autosubst/default.nix new file mode 100644 index 00000000000..d27ba005299 --- /dev/null +++ b/pkgs/development/coq-modules/autosubst/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchgit, coq, mathcomp }: + +stdenv.mkDerivation rec { + + name = "coq-autosubst-${coq.coq-version}-${version}"; + version = "5b40a32e"; + + src = fetchgit { + url = git://github.com/uds-psl/autosubst.git; + rev = "1c3bb3bbf5477e3b33533a0fc090399f45fe3034"; + sha256 = "1wqfzc9az85fvx71xxfii502jgc3mp0r3xwfb8vnb03vkk625ln0"; + }; + + propagatedBuildInputs = [ mathcomp ]; + + patches = [./0001-changes-to-work-with-Coq-8.6.patch]; + + installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; + + meta = with stdenv.lib; { + homepage = https://www.ps.uni-saarland.de/autosubst/; + description = "Automation for de Bruijn syntax and substitution in Coq"; + maintainers = with maintainers; [ jwiegley ]; + platforms = coq.meta.platforms; + }; + +} diff --git a/pkgs/development/coq-modules/math-classes/default.nix b/pkgs/development/coq-modules/math-classes/default.nix index e12327a347f..0e7549623e7 100644 --- a/pkgs/development/coq-modules/math-classes/default.nix +++ b/pkgs/development/coq-modules/math-classes/default.nix @@ -1,15 +1,20 @@ -{ stdenv, fetchFromGitHub, coq }: +{ stdenv, fetchurl, coq }: stdenv.mkDerivation { - name = "coq${coq.coq-version}-math-classes-2016-06-08"; + name = "coq${coq.coq-version}-math-classes-1.0.6"; - src = fetchFromGitHub { - owner = "math-classes"; - repo = "math-classes"; - rev = "751e63b260bd2f78b280f2566c08a18034bd40b3"; - sha256 = "0kjc2wzb6n9hcqb2ijx2pckn8jk5g09crrb87yb4s9m0mrw79smr"; + src = fetchurl { + url = https://github.com/math-classes/math-classes/archive/1.0.6.tar.gz; + sha256 = "071hgjk4bz2ybci7dp2mw7xqmxmm2zph7kj28xcdg28iy796lf02"; }; + # src = fetchFromGitHub { + # owner = "math-classes"; + # repo = "math-classes"; + # rev = "1d426a08c2fbfd68bd1b3622fe8f31dd03712e6c"; + # sha256 = "3kjc2wzb6n9hcqb2ijx2pckn8jk5g09crrb87yb4s9m0mrw79smr"; + # }; + buildInputs = [ coq ]; enableParallelBuilding = true; installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; @@ -17,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = https://math-classes.github.io; description = "A library of abstract interfaces for mathematical structures in Coq."; - maintainers = with maintainers; [ siddharthist ]; + maintainers = with maintainers; [ siddharthist jwiegley ]; platforms = coq.meta.platforms; }; } diff --git a/pkgs/development/coq-modules/paco/default.nix b/pkgs/development/coq-modules/paco/default.nix index 98d447d21d3..93ef7c14f1f 100644 --- a/pkgs/development/coq-modules/paco/default.nix +++ b/pkgs/development/coq-modules/paco/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "coq-paco-${coq.coq-version}-${version}"; - version = "1.2.7"; + version = "1.2.8"; src = fetchurl { url = "http://plv.mpi-sws.org/paco/paco-${version}.zip"; - sha256 = "010fs74c0cmb9sz5dmrgzg4pmb2mgwia4gm0g9l7j2fq5xxcschb"; + sha256 = "1lcmdr0y2d7gzyvr8dal3pi7fibbd60bpi1l32fw89xiyrgqhsqy"; }; buildInputs = [ coq.ocaml coq.camlp5 unzip ]; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 464ea25aee1..8fa2cbcf713 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -37,6 +37,7 @@ self: super: { hasql-postgres = dontCheck super.hasql-postgres; hspec-expectations = dontCheck super.hspec-expectations; hspec = super.hspec.override { stringbuilder = dontCheck super.stringbuilder; }; + hspec-core = super.hspec-core.override { silently = dontCheck super.silently; temporary = dontCheck super.temporary; }; HTTP = dontCheck super.HTTP; nanospec = dontCheck super.nanospec; options = dontCheck super.options; @@ -62,14 +63,16 @@ self: super: { # The Hackage tarball is purposefully broken, because it's not intended to be, like, useful. # https://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/ - git-annex = ((overrideCabal super.git-annex (drv: { + git-annex = (overrideCabal (super.git-annex.overrideScope (self: super: { + optparse-applicative = self.optparse-applicative_0_14_0_0; + })) (drv: { src = pkgs.fetchgit { name = "git-annex-${drv.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + drv.version; sha256 = "1psyklfyjf4zqh3qxjn11sp2jiwvp8mfxqvsi1wggqpidfmk39jx"; }; - }))).override { + })).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null; hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify; @@ -195,6 +198,8 @@ self: super: { ''; })) pkgs.libcxx; + inline-java = addBuildDepend super.inline-java pkgs.jdk; + # tests don't compile for some odd reason jwt = dontCheck super.jwt; @@ -269,7 +274,6 @@ self: super: { cabal-bounds = dontCheck super.cabal-bounds; # http://hydra.cryp.to/build/496935/nixlog/1/raw cabal-meta = dontCheck super.cabal-meta; # http://hydra.cryp.to/build/497892/log/raw camfort = dontCheck super.camfort; - cautious-file = dontCheck super.cautious-file; # http://hydra.cryp.to/build/499730/log/raw cjk = dontCheck super.cjk; CLI = dontCheck super.CLI; # Upstream has no issue tracker. command-qq = dontCheck super.command-qq; # http://hydra.cryp.to/build/499042/log/raw @@ -371,7 +375,6 @@ 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; - symengine = dontCheck super.symengine; tar = dontCheck super.tar; #http://hydra.nixos.org/build/25088435/nixlog/2 (fails only on 32-bit) th-printf = dontCheck super.th-printf; thumbnail-plus = dontCheck super.thumbnail-plus; @@ -667,7 +670,7 @@ self: super: { haste-compiler = markBroken (self.callPackage ../tools/haskell/haste/haste-compiler.nix { inherit overrideCabal; super-haste-compiler = super.haste-compiler; }); # tinc is a new build driver a la Stack that's not yet available from Hackage. - tinc = self.callPackage ../tools/haskell/tinc {}; + tinc = self.callPackage ../tools/haskell/tinc { inherit (pkgs) cabal-install cabal2nix; }; # Tools that use gtk2hs-buildtools now depend on them in a custom-setup stanza cairo = addBuildTool super.cairo self.gtk2hs-buildtools; @@ -868,4 +871,10 @@ self: super: { postInstall = "rm $out/bin/mkReadme && rmdir $out/bin"; }); + # Needs a newer version of hsyslog than lts-8.x provides. + logging-facade-syslog = super.logging-facade-syslog.override { hsyslog = self.hsyslog_5_0_1; }; + + # Has a dependency on outdated versions of directory. + cautious-file = doJailbreak (dontCheck super.cautious-file); + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix index 58a3002b035..c2a7e001405 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix @@ -80,4 +80,8 @@ self: super: { # Needs nats on pre 7.6.x compilers. semigroups = addBuildDepend super.semigroups self.nats; + # Newer versions don't compile any longer. + network_2_6_3_1 = dontCheck super.network_2_6_3_1; + network = self.network_2_6_3_1; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix index b3f78e5b753..911fb8640f4 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix @@ -72,13 +72,14 @@ self: super: { # Newer versions require bytestring >=0.10. tar = super.tar_0_4_1_0; - # Needs void on pre 7.10.x compilers. + # These builds need additional dependencies on old compilers. conduit = addBuildDepend super.conduit self.void; - - # Needs tagged on pre 7.6.x compilers. reflection = addBuildDepend super.reflection self.tagged; - - # Needs nats on pre 7.6.x compilers. semigroups = addBuildDepend super.semigroups self.nats; + optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups; + + # Newer versions don't compile any longer. + network_2_6_3_1 = dontCheck super.network_2_6_3_1; + network = self.network_2_6_3_1; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix index 3b61b7bc065..8a6d22bcc7e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix @@ -97,8 +97,13 @@ self: super: { # Needs tagged on pre 7.6.x compilers. reflection = addBuildDepend super.reflection self.tagged; - # These builds Need additional dependencies on pre 7.6.x compilers. + # These builds need additional dependencies on old compilers. semigroups = addBuildDepends super.semigroups (with self; [nats bytestring-builder tagged unordered-containers transformers]); QuickCheck = addBuildDepends super.QuickCheck (with self; [nats semigroups]); + optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups; + + # Newer versions don't compile any longer. + network_2_6_3_1 = dontCheck super.network_2_6_3_1; + network = self.network_2_6_3_1; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix index 4ef1aa56211..43ec45bf821 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -93,12 +93,13 @@ self: super: { # Needs void on pre 7.10.x compilers. conduit = addBuildDepend super.conduit self.void; - # Needs additional inputs on pre 7.10.x compilers. + # Needs additional inputs on old compilers. semigroups = addBuildDepends super.semigroups (with self; [bytestring-builder nats tagged unordered-containers transformers]); lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]); distributive = addBuildDepend super.distributive self.semigroups; QuickCheck = addBuildDepend super.QuickCheck self.semigroups; void = addBuildDepends super.void (with self; [hashable semigroups]); + optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups; # Need a newer version of Cabal to interpret their build instructions. cmdargs = addSetupDepend super.cmdargs self.Cabal_1_24_2_0; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix index 1a151efcf38..a97cbfde4fc 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -143,12 +143,13 @@ self: super: { hashable = dontCheck super.hashable; unordered-containers = dontCheck super.unordered-containers; - # Needs additional inputs on pre 7.10.x compilers. + # Needs additional inputs on old compilers. semigroups = addBuildDepends super.semigroups (with self; [nats tagged unordered-containers]); lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]); distributive = addBuildDepend super.distributive self.semigroups; QuickCheck = addBuildDepends super.QuickCheck (with self; [nats semigroups]); void = addBuildDepends super.void (with self; [hashable semigroups]); + optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups; # Haddock doesn't cope with the new markup. bifunctors = dontHaddock super.bifunctors; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index d91d25b8d31..83efa6b0b5a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -55,5 +55,9 @@ self: super: { # https://github.com/thoughtbot/yesod-auth-oauth2/pull/77 yesod-auth-oauth2 = doJailbreak super.yesod-auth-oauth2; + # https://github.com/nominolo/ghc-syb/issues/20 + ghc-syb-utils = dontCheck super.ghc-syb-utils; + # Newer versions require ghc>=8.2 + apply-refact = super.apply-refact_0_3_0_1; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix index e1bdfb776f3..8e18435c0c4 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -39,8 +39,8 @@ self: super: { # cabal-install can use the native Cabal library. cabal-install = super.cabal-install.override { Cabal = null; }; - # jailbreak-cabal can use the native Cabal library. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; }; + # jailbreak-cabal doesn't seem to work right with the native Cabal version. + jailbreak-cabal = pkgs.haskellPackages.jailbreak-cabal; # https://github.com/bmillwood/applicative-quoters/issues/6 applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch { @@ -56,5 +56,20 @@ self: super: { # https://github.com/thoughtbot/yesod-auth-oauth2/pull/77 yesod-auth-oauth2 = doJailbreak super.yesod-auth-oauth2; + # https://github.com/nominolo/ghc-syb/issues/20 + ghc-syb-utils = dontCheck super.ghc-syb-utils; + + # Older, LTS-8-based versions don't compile. + base-orphans = self.base-orphans_0_6; + hspec-meta = self.hspec-meta_2_4_4; + lens = self.lens_4_15_3; + primitive = self.primitive_0_6_2_0; + semigroupoids = self.semigroupoids_5_2; + syb = self.syb_0_7; + vector = super.vector_0_12_0_1; + + # Work around overly restrictive constraints on the version of 'base'. + ChasingBottoms = doJailbreak super.ChasingBottoms; + hashable = doJailbreak super.hashable; } diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index fd7f15008d2..7efb75c3329 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -150,6 +150,17 @@ self: super: http2 = addBuildDepends super.http2 [ self.aeson self.aeson-pretty self.hex self.unordered-containers self.vector self.word8 ]; # ghcjsBoot uses async 2.0.1.6, protolude wants 2.1.* + # These are the correct dependencies specified when calling `cabal2nix --compiler ghcjs` + # By default, the `miso` derivation present in hackage-packages.nix + # does not contain dependencies suitable for ghcjs + miso = overrideCabal super.miso (drv: { + libraryHaskellDepends = with self; [ + BoundedChan bytestring containers ghcjs-base aeson base + http-api-data http-types network-uri scientific servant text + transformers unordered-containers vector + ]; + }); + pqueue = overrideCabal super.pqueue (drv: { postPatch = '' sed -i -e '12s|null|Data.PQueue.Internals.null|' Data/PQueue/Internals.hs diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 80b70b9fad3..204a23c6286 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -37,7 +37,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 8.18 + # LTS Haskell 8.23 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Vector ==2.3.2 @@ -58,8 +58,8 @@ default-package-overrides: - aeson-extra ==0.4.0.0 - aeson-generic-compat ==0.0.1.0 - aeson-injector ==1.0.8.0 - - aeson-pretty ==0.8.4 - - aeson-qq ==0.8.1 + - aeson-pretty ==0.8.5 + - aeson-qq ==0.8.2 - aeson-utils ==0.3.0.2 - Agda ==2.5.2 - airship ==0.6.0 @@ -177,10 +177,11 @@ default-package-overrides: - asn1-encoding ==0.9.5 - asn1-parse ==0.9.4 - asn1-types ==0.3.2 + - astro ==0.4.2.0 - async ==2.1.1.1 - async-dejafu ==0.1.3.0 - async-extra ==0.1.0.0 - - async-refresh ==0.2.0 + - async-refresh ==0.2.0.2 - async-refresh-tokens ==0.1.0 - atom-basic ==0.2.5 - atom-conduit ==0.4.0.1 @@ -190,7 +191,7 @@ default-package-overrides: - attoparsec-binary ==0.2 - attoparsec-expr ==0.1.1.2 - attoparsec-iso8601 ==1.0.0.0 - - audacity ==0.0.1.1 + - audacity ==0.0.1.2 - authenticate ==1.3.3.2 - authenticate-oauth ==1.6 - auto ==0.4.3.1 @@ -201,7 +202,7 @@ default-package-overrides: - avers-api-docs ==0.0.18.0 - avers-server ==0.0.18.0 - avwx ==0.3.0.2 - - b9 ==0.5.31 + - b9 ==0.5.32 - backprop ==0.0.3.0 - bake ==0.5 - bank-holidays-england ==0.1.0.5 @@ -217,7 +218,7 @@ default-package-overrides: - base64-string ==0.2 - basic-prelude ==0.6.1.1 - bcrypt ==0.0.10 - - bench ==1.0.4 + - bench ==1.0.5 - benchpress ==0.2.2.9 - bencode ==0.6.0.0 - bento ==0.1.0 @@ -318,7 +319,7 @@ default-package-overrides: - calendar-recycling ==0.0 - call-stack ==0.1.0 - camfort ==0.901 - - carray ==0.1.6.6 + - carray ==0.1.6.7 - cartel ==0.18.0.2 - case-insensitive ==1.2.0.10 - cased ==0.1.0.0 @@ -346,7 +347,7 @@ default-package-overrides: - cheapskate-highlight ==0.1.0.0 - cheapskate-lucid ==0.1.0.0 - check-email ==1.0.2 - - checkers ==0.4.6 + - checkers ==0.4.7 - chell ==0.4.0.1 - choice ==0.2.1 - chunked-data ==0.3.0 @@ -356,7 +357,7 @@ default-package-overrides: - cipher-camellia ==0.0.2 - cipher-des ==0.0.6 - cipher-rc4 ==0.1.4 - - circle-packing ==0.1.0.5 + - circle-packing ==0.1.0.6 - clang-pure ==0.2.0.2 - clash-ghc ==0.7.2 - clash-lib ==0.7.1 @@ -367,7 +368,7 @@ default-package-overrides: - classy-prelude ==1.2.0.1 - classy-prelude-conduit ==1.2.0 - classy-prelude-yesod ==1.2.0 - - clay ==0.12.1 + - clay ==0.12.2 - clckwrks ==0.24.0.3 - clckwrks-cli ==0.2.17.1 - clckwrks-plugin-media ==0.6.16.3 @@ -375,7 +376,7 @@ default-package-overrides: - clckwrks-theme-bootstrap ==0.4.2.1 - cli ==0.1.2 - clientsession ==0.9.1.2 - - Clipboard ==2.3.1.0 + - Clipboard ==2.3.2.0 - clock ==0.7.2 - clock-extras ==0.1.0.2 - clumpiness ==0.17.0.0 @@ -408,7 +409,7 @@ default-package-overrides: - conduit-connection ==0.1.0.3 - conduit-extra ==1.1.16 - conduit-iconv ==0.1.1.1 - - conduit-parse ==0.1.2.0 + - conduit-parse ==0.1.2.1 - ConfigFile ==1.1.4 - configuration-tools ==0.2.15 - configurator ==0.3.0.0 @@ -434,7 +435,7 @@ default-package-overrides: - cookie ==0.4.2.1 - countable ==1.0 - courier ==0.1.1.5 - - cpphs ==1.20.5 + - cpphs ==1.20.8 - cprng-aes ==0.6.1 - cpu ==0.1.2 - cpuinfo ==0.1.0.1 @@ -529,7 +530,7 @@ default-package-overrides: - diagrams-lib ==1.4.1.2 - diagrams-postscript ==1.4 - diagrams-rasterific ==1.4 - - diagrams-solve ==0.1.0.1 + - diagrams-solve ==0.1.1 - diagrams-svg ==1.4.1 - dice ==0.1 - dictionaries ==0.1.0.1 @@ -538,7 +539,7 @@ default-package-overrides: - digest ==0.0.1.2 - digits ==0.3.1 - dimensional ==1.0.1.3 - - direct-sqlite ==2.3.19 + - direct-sqlite ==2.3.20 - directory-tree ==0.12.1 - discount ==0.1.1 - disk-free-space ==0.1.0.1 @@ -548,7 +549,7 @@ default-package-overrides: - distributed-process ==0.6.6 - distributed-process-simplelocalnet ==0.2.3.3 - distributed-static ==0.3.5.0 - - distribution ==1.1.0.0 + - distribution ==1.1.1.0 - distributive ==0.5.2 - diversity ==0.8.0.2 - djinn-ghc ==0.0.2.3 @@ -564,9 +565,9 @@ default-package-overrides: - dockerfile ==0.1.0.1 - docopt ==0.7.0.5 - doctemplates ==0.1.0.2 - - doctest ==0.11.2 + - doctest ==0.11.3 - doctest-discover ==0.1.0.7 - - dotenv ==0.3.3.0 + - dotenv ==0.3.4.0 - dotnet-timespan ==0.0.1.0 - double-conversion ==2.0.2.0 - download ==0.3.2.5 @@ -576,7 +577,7 @@ default-package-overrides: - drifter ==0.2.2 - drifter-postgresql ==0.1.0 - dsp ==0.2.3.1 - - dual-tree ==0.2.0.9 + - dual-tree ==0.2.1 - dvorak ==0.1.0.0 - dynamic-state ==0.2.2.0 - dyre ==0.8.12 @@ -605,14 +606,14 @@ default-package-overrides: - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 - elm-export-persistent ==0.1.2 - - email-validate ==2.2.0 + - email-validate ==2.2.1.1 - emailaddress ==0.2.0.0 - enclosed-exceptions ==1.0.2 - encoding-io ==0.0.1 - engine-io ==1.2.16 - engine-io-wai ==1.0.6 - EntrezHTTP ==1.0.3 - - entropy ==0.3.7 + - entropy ==0.3.8 - enummapset ==0.5.2.1 - enummapset-th ==0.6.1.1 - enumset ==0.0.4 @@ -626,7 +627,7 @@ default-package-overrides: - erf ==2.0.0.0 - errors ==2.1.3 - ersatz ==0.3.1 - - esqueleto ==2.5.2 + - esqueleto ==2.5.3 - etc ==0.0.0.2 - etcd ==1.0.5 - ether ==0.4.2.0 @@ -647,9 +648,9 @@ default-package-overrides: - expiring-cache-map ==0.0.6.1 - explicit-exception ==0.1.9 - extensible ==0.3.7 - - extensible-effects ==1.11.0.4 + - extensible-effects ==1.11.1.0 - extensible-exceptions ==0.1.1.4 - - extra ==1.5.2 + - extra ==1.5.3 - extract-dependencies ==0.2.0.1 - fail ==4.9.0.0 - farmhash ==0.1.0.5 @@ -669,7 +670,7 @@ default-package-overrides: - feature-flags ==0.1.0.1 - feed ==0.3.12.0 - FenwickTree ==0.1.2.1 - - fft ==0.1.8.5 + - fft ==0.1.8.6 - fgl ==5.5.3.1 - fgl-arbitrary ==0.2.0.3 - file-embed ==0.0.10 @@ -697,15 +698,15 @@ default-package-overrides: - fold-debounce ==0.2.0.5 - fold-debounce-conduit ==0.1.0.5 - foldl ==1.2.5 - - foldl-statistics ==0.1.4.4 + - foldl-statistics ==0.1.4.6 - folds ==0.7.3 - - FontyFruity ==0.5.3.2 + - FontyFruity ==0.5.3.3 - force-layout ==0.4.0.6 - foreign-store ==0.2 - format-numbers ==0.1.0.0 - formatting ==6.2.4 - fortran-src ==0.1.0.4 - - foundation ==0.0.10 + - foundation ==0.0.13 - Frames ==0.1.9 - free ==4.12.4 - free-vl ==0.1.4 @@ -740,7 +741,7 @@ default-package-overrides: - ghc-mod ==5.7.0.0 - ghc-paths ==0.1.0.9 - ghc-prof ==1.3.0.2 - - ghc-syb-utils < 0.3 + - ghc-syb-utils ==0.2.3.2 - ghc-tcplugins-extra ==0.2 - ghc-typelits-extra ==0.2.3 - ghc-typelits-knownnat ==0.2.4 @@ -918,7 +919,7 @@ default-package-overrides: - hackage-security ==0.5.2.2 - hackernews ==1.1.2.0 - haddock-library ==1.4.3 - - hailgun ==0.4.1.3 + - hailgun ==0.4.1.4 - hailgun-simple ==0.1.0.0 - hakyll ==4.9.7.0 - half ==0.2.2.3 @@ -936,15 +937,15 @@ default-package-overrides: - happy ==1.19.5 - HaRe ==0.8.4.0 - harp ==0.4.2 - - hasbolt ==0.1.1.2 - - hashable ==1.2.6.0 + - hasbolt ==0.1.2.1 + - hashable ==1.2.6.1 - hashable-time ==0.2.0.1 - hashmap ==1.3.2 - hashtables ==1.2.1.1 - haskeline ==0.7.4.0 - haskell-gi ==0.20.2 - haskell-gi-base ==0.20.3 - - haskell-import-graph ==1.0.1 + - haskell-import-graph ==1.0.2 - haskell-lexer ==1.0.1 - haskell-names ==0.8.0 - haskell-neo4j-client ==0.3.2.4 @@ -975,7 +976,7 @@ default-package-overrides: - hatex-guide ==1.3.1.6 - haxl ==0.5.0.0 - haxl-amazonka ==0.1.1 - - HaXml ==1.25.3 + - HaXml ==1.25.4 - haxr ==3000.11.2 - hbeanstalk ==0.2.4 - Hclip ==3.0.0.4 @@ -994,7 +995,7 @@ default-package-overrides: - heterocephalus ==1.0.5.0 - hex ==0.1.2 - hexml ==0.3.2 - - hexpat ==0.20.10 + - hexpat ==0.20.13 - hexstring ==0.11.1 - hflags ==0.4.2 - hformat ==0.1.0.1 @@ -1033,7 +1034,7 @@ default-package-overrides: - holy-project ==0.2.0.1 - hOpenPGP ==2.5.5 - hopenpgp-tools ==0.19.4 - - hopfli ==0.2.1.1 + - hopfli ==0.2.2.1 - hosc ==0.15 - hostname ==1.0 - hostname-validate ==1.0.0 @@ -1042,7 +1043,7 @@ default-package-overrides: - hPDB ==1.2.0.9 - hPDB-examples ==1.2.0.7 - HPDF ==1.4.10 - - hpio ==0.8.0.9 + - hpio ==0.8.0.10 - hpp ==0.4.0 - hpqtypes ==1.5.1.1 - hquantlib ==0.0.4.0 @@ -1104,9 +1105,9 @@ default-package-overrides: - http-api-data ==0.3.7.1 - http-client ==0.5.7.0 - http-client-openssl ==0.2.0.5 - - http-client-tls ==0.3.5 + - http-client-tls ==0.3.5.1 - http-common ==0.8.2.0 - - http-conduit ==2.2.3.1 + - http-conduit ==2.2.3.2 - http-date ==0.0.6.1 - http-link-header ==1.0.3 - http-media ==0.6.4 @@ -1159,7 +1160,7 @@ default-package-overrides: - imm ==1.1.0.0 - immortal ==0.2.2 - include-file ==0.1.0.3 - - incremental-parser ==0.2.5 + - incremental-parser ==0.2.5.1 - indentation-core ==0.0 - indentation-parsec ==0.0 - indents ==0.4.0.0 @@ -1224,7 +1225,7 @@ default-package-overrides: - json-rpc-generic ==0.2.1.2 - json-schema ==0.7.4.1 - json-stream ==0.4.1.3 - - JuicyPixels ==3.2.8.1 + - JuicyPixels ==3.2.8.2 - JuicyPixels-extra ==0.1.1 - JuicyPixels-scale-dct ==0.1.1.2 - jvm ==0.1.2 @@ -1233,7 +1234,7 @@ default-package-overrides: - kan-extensions ==5.0.2 - kansas-comet ==0.4 - katip ==0.3.1.5 - - katip-elasticsearch ==0.3.0.2 + - katip-elasticsearch ==0.3.1.0 - kawhi ==0.2.3 - kdt ==0.2.4 - keter ==1.4.3.2 @@ -1249,7 +1250,7 @@ default-package-overrides: - language-c ==0.5.0 - language-c-quote ==0.11.7.3 - language-dockerfile ==0.3.6.0 - - language-ecmascript ==0.17.1.0 + - language-ecmascript ==0.17.2.0 - language-fortran ==0.5.1 - language-glsl ==0.2.0 - language-haskell-extract ==0.2.4 @@ -1291,7 +1292,7 @@ default-package-overrides: - LibZip ==1.0.1 - licensor ==0.2.0 - lift-generics ==0.1.1 - - lifted-async ==0.9.1.1 + - lifted-async ==0.9.3 - lifted-base ==0.2.3.11 - line ==2.2.0 - linear ==1.20.6 @@ -1308,10 +1309,10 @@ default-package-overrides: - lmdb ==0.2.5 - loch-th ==0.2.1 - log ==0.7 - - log-base ==0.7.1 - - log-domain ==0.11 + - log-base ==0.7.1.1 + - log-domain ==0.11.1 - log-elasticsearch ==0.7 - - log-postgres ==0.7 + - log-postgres ==0.7.0.1 - logfloat ==0.13.3.3 - logger-thread ==0.1.0.2 - logging-effect ==1.1.3 @@ -1319,7 +1320,7 @@ default-package-overrides: - logict ==0.6.0.2 - loop ==0.3.0 - lrucache ==1.2.0.0 - - lrucaching ==0.3.1 + - lrucaching ==0.3.2 - lucid ==2.9.8.1 - lucid-svg ==0.7.0.0 - lzma-conduit ==1.1.3.1 @@ -1345,7 +1346,7 @@ default-package-overrides: - matplotlib ==0.4.5 - matrices ==0.4.4 - matrix ==0.3.5.0 - - matrix-market-attoparsec ==0.1.0.7 + - matrix-market-attoparsec ==0.1.0.8 - maximal-cliques ==0.1.1 - mbox ==0.3.3 - mbox-utility ==0.0.1 @@ -1356,7 +1357,7 @@ default-package-overrides: - mega-sdist ==0.3.0.2 - megaparsec ==5.2.0 - memory ==0.14.6 - - MemoTrie ==0.6.7 + - MemoTrie ==0.6.8 - mersenne-random ==1.0.0.1 - mersenne-random-pure64 ==0.2.2.0 - messagepack ==0.5.4 @@ -1370,11 +1371,11 @@ default-package-overrides: - microlens-aeson ==2.2.0.1 - microlens-contra ==0.1.0.1 - microlens-ghc ==0.4.8.0 - - microlens-mtl ==0.1.10.0 - - microlens-platform ==0.3.8.0 + - microlens-mtl ==0.1.11.0 + - microlens-platform ==0.3.9.0 - microlens-th ==0.4.1.1 - midi ==0.2.2.1 - - midi-music-box ==0.0.0.3 + - midi-music-box ==0.0.0.4 - mighty-metropolis ==1.2.0 - mime-mail ==0.4.13.1 - mime-mail-ses ==0.3.2.3 @@ -1385,12 +1386,13 @@ default-package-overrides: - missing-foreign ==0.1.1 - MissingH ==1.4.0.1 - mixed-types-num ==0.1.0.1 + - mltool ==0.1.0.2 - mmap ==0.5.9 - mmorph ==1.0.9 - mnist-idx ==0.1.2.8 - - mockery ==0.3.4 + - mockery ==0.3.5 - modify-fasta ==0.8.2.3 - - monad-control ==1.0.1.0 + - monad-control ==1.0.2.1 - monad-coroutine ==0.9.0.3 - monad-extras ==0.6.0 - monad-http ==0.1.0.0 @@ -1423,10 +1425,10 @@ default-package-overrides: - mono-traversable ==1.0.2 - mono-traversable-instances ==0.1.0.0 - monoid-extras ==0.4.2 - - monoid-subclasses ==0.4.3.1 + - monoid-subclasses ==0.4.3.2 - monoid-transformer ==0.0.3 - monoidal-containers ==0.3.0.1 - - morte ==1.6.7 + - morte ==1.6.9 - mountpoints ==1.0.2 - mstate ==0.2.7 - mtl ==2.2.1 @@ -1514,8 +1516,9 @@ default-package-overrides: - old-locale ==1.0.0.7 - old-time ==1.1.0.3 - once ==0.2 - - one-liner ==0.9 + - one-liner ==0.9.1 - OneTuple ==0.2.1 + - Only ==0.1 - oo-prototypes ==0.1.0.0 - opaleye ==0.5.3.0 - opaleye-trans ==0.3.5 @@ -1558,7 +1561,7 @@ default-package-overrides: - parsers ==0.12.5 - partial-handler ==1.0.2 - partial-isomorphisms ==0.2.2.1 - - patat ==0.5.2.0 + - patat ==0.5.2.2 - path ==0.5.13 - path-extra ==0.0.3 - path-io ==1.2.2 @@ -1578,7 +1581,7 @@ default-package-overrides: - persistable-record ==0.4.1.1 - persistable-types-HDBC-pg ==0.0.1.4 - persistent ==2.6.1 - - persistent-mysql ==2.6.0.2 + - persistent-mysql ==2.6.1 - persistent-postgresql ==2.6.1 - persistent-redis ==2.5.2 - persistent-refs ==0.4 @@ -1588,13 +1591,13 @@ default-package-overrides: - phantom-state ==0.2.1.2 - picedit ==0.2.3.0 - picoparsec ==0.1.2.3 - - pid1 ==0.1.0.1 + - pid1 ==0.1.2.0 - pinboard ==0.9.12.4 - pinch ==0.3.2.0 - pinchot ==0.24.0.0 - pipes ==4.3.4 - pipes-attoparsec ==0.5.1.5 - - pipes-bytestring ==2.1.4 + - pipes-bytestring ==2.1.6 - pipes-cacophony ==0.4.1 - pipes-category ==0.2.0.1 - pipes-concurrency ==2.0.7 @@ -1631,7 +1634,7 @@ default-package-overrides: - post-mess-age ==0.2.1.0 - postgresql-binary ==0.9.3 - postgresql-libpq ==0.9.3.1 - - postgresql-schema ==0.1.10 + - postgresql-schema ==0.1.11 - postgresql-simple ==0.5.3.0 - postgresql-simple-migration ==0.1.9.0 - postgresql-simple-url ==0.2.0.0 @@ -1653,11 +1656,16 @@ default-package-overrides: - pretty-simple ==2.0.0.0 - pretty-types ==0.2.3.1 - prettyclass ==1.0.0.0 + - prettyprinter ==1.1 + - prettyprinter-ansi-terminal ==1.1 + - prettyprinter-compat-annotated-wl-pprint ==1 + - prettyprinter-compat-ansi-wl-pprint ==1.0.1 + - prettyprinter-compat-wl-pprint ==1.0.0.1 - primes ==0.2.1.0 - primitive ==0.6.1.0 - printcess ==0.1.0.3 - probability ==0.2.5.1 - - process-extras ==0.7.1 + - process-extras ==0.7.2 - product-profunctors ==0.7.1.0 - profiteur ==0.4.3.0 - profunctor-extras ==4.0 @@ -1668,20 +1676,20 @@ default-package-overrides: - prometheus-metrics-ghc ==0.1.1 - prompt ==0.1.1.2 - proto-lens ==0.2.1.0 - - proto-lens-arbitrary ==0.1.0.2 + - proto-lens-arbitrary ==0.1.0.3 - proto-lens-combinators ==0.1.0.7 - proto-lens-descriptors ==0.2.1.0 - - proto-lens-optparse ==0.1.0.2 + - proto-lens-optparse ==0.1.0.3 - proto-lens-protoc ==0.2.1.0 - protobuf ==0.2.1.1 - protobuf-simple ==0.1.0.4 - - protocol-buffers ==2.4.0 - - protocol-buffers-descriptor ==2.4.0 + - protocol-buffers ==2.4.2 + - protocol-buffers-descriptor ==2.4.2 - protolude ==0.1.10 - proxied ==0.2 - psql-helpers ==0.1.0.0 - PSQueue ==1.1 - - psqueues ==0.2.2.3 + - psqueues ==0.2.3.0 - publicsuffix ==0.20170109 - pure-cdb ==0.1.2 - pure-io ==0.2.1 @@ -1698,8 +1706,8 @@ default-package-overrides: - quickcheck-assertions ==0.3.0 - quickcheck-instances ==0.3.12 - quickcheck-io ==0.1.4 - - quickcheck-simple ==0.1.0.1 - - quickcheck-special ==0.1.0.4 + - quickcheck-simple ==0.1.0.2 + - quickcheck-special ==0.1.0.5 - quickcheck-text ==0.1.2.1 - quickcheck-unicode ==1.0.1.0 - raaz ==0.1.1 @@ -1731,7 +1739,7 @@ default-package-overrides: - ReadArgs ==1.2.3 - readline ==1.0.3.0 - rebase ==1.0.8 - - recursion-schemes ==5.0.1 + - recursion-schemes ==5.0.2 - redis-io ==0.7.0 - redis-resp ==0.4.0 - reducers ==3.12.1 @@ -1804,8 +1812,8 @@ default-package-overrides: - runmemo ==1.0.0.1 - rvar ==0.2.0.3 - s3-signer ==0.3.0.0 - - safe ==0.3.14 - - safe-exceptions ==0.1.5.0 + - safe ==0.3.15 + - safe-exceptions ==0.1.6.0 - safe-exceptions-checked ==0.1.0 - safecopy ==0.9.3.2 - SafeSemaphore ==0.10.1 @@ -1819,7 +1827,7 @@ default-package-overrides: - scalpel ==0.5.1 - scalpel-core ==0.5.1 - scanner ==0.2 - - scientific ==0.3.4.15 + - scientific ==0.3.5.1 - scotty ==0.11.0 - scrape-changes ==0.1.0.5 - scrypt ==0.5.0 @@ -1849,7 +1857,7 @@ default-package-overrides: - servant-elm ==0.4.0.1 - servant-foreign ==0.9.1.1 - servant-js ==0.9.3 - - servant-JuicyPixels ==0.3.0.2 + - servant-JuicyPixels ==0.3.0.3 - servant-lucid ==0.7.1 - servant-mock ==0.8.1.1 - servant-purescript ==0.6.0.0 @@ -1868,7 +1876,7 @@ default-package-overrides: - set-cover ==0.0.8 - set-monad ==0.2.0.0 - setenv ==0.1.1.3 - - setlocale ==1.0.0.4 + - setlocale ==1.0.0.5 - sets ==0.0.5.2 - SHA ==1.6.4.2 - shake ==0.15.11 @@ -1920,11 +1928,11 @@ default-package-overrides: - sourcemap ==0.1.6 - sparkle ==0.4.0.2 - sparse-linear-algebra ==0.2.9.7 - - spdx ==0.2.1.0 + - spdx ==0.2.2.0 - speculation ==1.5.0.3 - speedy-slice ==0.3.0 - sphinx ==0.6.0.2 - - Spintax ==0.3.1 + - Spintax ==0.3.2 - splice ==0.6.1.1 - split ==0.2.3.2 - Spock ==0.12.0.0 @@ -1935,16 +1943,16 @@ default-package-overrides: - Spock-worker ==0.3.1.0 - spool ==0.1 - spoon ==0.3.1 - - spreadsheet ==0.1.3.4 + - spreadsheet ==0.1.3.5 - sql-words ==0.1.5.0 - - sqlite-simple ==0.4.13.0 + - sqlite-simple ==0.4.14.0 - sqlite-simple-errors ==0.6.0.0 - srcloc ==0.5.1.1 - stache ==0.2.2 - stack-run-auto ==0.1.1.4 - stack-type ==0.1.0.0 - stackage-curator ==0.14.5 - - stackage-query ==0.1.0 + - stackage-query ==0.1.1 - stackage-types ==1.2.0 - state-plus ==0.1.3 - stateref ==0.3 @@ -1975,7 +1983,7 @@ default-package-overrides: - store ==0.4.3.1 - store-core ==0.4.1 - Strafunski-StrategyLib ==5.0.0.10 - - stratosphere ==0.4.2 + - stratosphere ==0.4.4 - streaming ==0.1.4.5 - streaming-bytestring ==0.1.4.6 - streaming-commons ==0.1.17 @@ -2006,7 +2014,7 @@ default-package-overrides: - svg-tree ==0.6.1 - SVGFonts ==1.6.0.1 - swagger ==0.3.0 - - swagger2 ==2.1.4 + - swagger2 ==2.1.4.1 - syb ==0.6 - syb-with-class ==0.6.1.7 - symbol ==0.2.4 @@ -2029,7 +2037,7 @@ default-package-overrides: - tar ==0.5.0.3 - tar-conduit ==0.1.1 - tardis ==0.4.1.0 - - tasty ==0.11.2.1 + - tasty ==0.11.2.2 - tasty-ant-xml ==1.0.5 - tasty-auto ==0.1.0.2 - tasty-dejafu ==0.3.0.2 @@ -2037,7 +2045,7 @@ default-package-overrides: - tasty-expected-failure ==0.11.0.4 - tasty-fail-fast ==0.0.2 - tasty-golden ==2.3.1.1 - - tasty-hspec ==1.1.3.1 + - tasty-hspec ==1.1.3.2 - tasty-html ==0.4.1.1 - tasty-hunit ==0.9.2 - tasty-kat ==0.0.3 @@ -2058,7 +2066,7 @@ default-package-overrides: - tdigest-Chart ==0 - telegram-api ==0.6.3.0 - template ==0.2.0.10 - - temporary ==1.2.0.4 + - temporary ==1.2.1 - temporary-rc ==1.2.0.3 - termcolor ==0.2.0.0 - terminal-progress-bar ==0.1.1.1 @@ -2067,13 +2075,13 @@ default-package-overrides: - test-fixture ==0.5.0.1 - test-framework ==0.8.1.1 - test-framework-hunit ==0.3.0.2 - - test-framework-quickcheck2 < 0.4 + - test-framework-quickcheck2 ==0.3.0.4 - test-framework-smallcheck ==0.2 - test-framework-th ==0.2.4 - test-invariant ==0.4.5.0 - test-simple ==0.1.9 - testing-feat ==0.4.0.3 - - texmath ==0.9.4 + - texmath ==0.9.4.1 - text ==1.2.2.1 - text-all ==0.3.1.0 - text-binary ==0.2.1.1 @@ -2094,15 +2102,16 @@ default-package-overrides: - textlocal ==0.1.0.5 - tf-random ==0.5 - tfp ==1.0.0.2 - - th-data-compat ==0.0.2.2 + - th-abstraction ==0.2.3.0 + - th-data-compat ==0.0.2.4 - th-desugar ==1.6 - th-expand-syns ==0.4.3.0 - th-extras ==0.0.0.4 - th-lift ==0.7.7 - th-lift-instances ==0.1.11 - th-orphans ==0.13.3 - - th-reify-compat ==0.0.1.1 - - th-reify-many ==0.1.6 + - th-reify-compat ==0.0.1.2 + - th-reify-many ==0.1.7 - th-to-exp ==0.0.1.0 - th-utilities ==0.2.0.1 - these ==0.7.3 @@ -2129,8 +2138,9 @@ default-package-overrides: - tinylog ==0.14.0 - tinytemplate ==0.1.2.0 - titlecase ==0.1.0.3 - - tls ==1.3.10 + - tls ==1.3.11 - tls-debug ==0.4.4 + - tls-session-manager ==0.0.0.0 - token-bucket ==0.1.0.1 - tostring ==0.2.1.1 - tracy ==0.1.4.0 @@ -2149,7 +2159,7 @@ default-package-overrides: - tuple ==0.3.0.2 - tuple-th ==0.2.5 - tuples-homogenous-h98 ==0.1.1.0 - - turtle ==1.3.5 + - turtle ==1.3.6 - turtle-options ==0.1.0.4 - twitter-feed ==0.2.0.11 - twitter-types ==0.7.2.2 @@ -2172,7 +2182,7 @@ default-package-overrides: - typography-geometry ==1.0.0.1 - tz ==0.1.2.1 - tzdata ==0.1.20161123.0 - - ua-parser ==0.7.3 + - ua-parser ==0.7.4 - uglymemo ==0.1.0.1 - unagi-chan ==0.4.0.0 - unbound ==0.5.1 @@ -2180,7 +2190,7 @@ default-package-overrides: - unbounded-delays ==0.1.1.0 - uncertain ==0.3.1.0 - unexceptionalio ==0.3.0 - - unfoldable ==0.9.3 + - unfoldable ==0.9.4 - unfoldable-restricted ==0.0.3 - unicode ==0.0 - unicode-show ==0.1.0.2 @@ -2236,7 +2246,7 @@ default-package-overrides: - vector-algorithms ==0.7.0.1 - vector-binary-instances ==0.2.3.5 - vector-buffer ==0.4.1 - - vector-fftw ==0.1.3.7 + - vector-fftw ==0.1.3.8 - vector-instances ==3.4 - vector-sized ==0.5.1.0 - vector-space ==0.10.4 @@ -2258,10 +2268,10 @@ default-package-overrides: - wai-conduit ==3.0.0.3 - wai-cors ==0.2.5 - wai-eventsource ==3.0.0 - - wai-extra ==3.0.19.1 + - wai-extra ==3.0.20.0 - wai-handler-launch ==3.0.2.2 - wai-logger ==2.3.0 - - wai-middleware-auth ==0.1.2.0 + - wai-middleware-auth ==0.1.2.1 - wai-middleware-caching ==0.1.0.2 - wai-middleware-caching-lru ==0.1.0.0 - wai-middleware-caching-redis ==0.2.0.0 @@ -2283,13 +2293,13 @@ default-package-overrides: - wai-transformers ==0.0.7 - wai-websockets ==3.0.1.1 - waitra ==0.0.4.0 - - warp ==3.2.12 - - warp-tls ==3.2.3 + - warp ==3.2.13 + - warp-tls ==3.2.4 - wave ==0.1.5 - wavefront ==0.7.1 - wavefront-obj ==0.1.0.1 - web-plugins ==0.2.9 - - web-routes ==0.27.11 + - web-routes ==0.27.12 - web-routes-boomerang ==0.28.4.2 - web-routes-happstack ==0.23.10 - web-routes-hsp ==0.24.6.1 @@ -2349,14 +2359,14 @@ default-package-overrides: - xdg-basedir ==0.2.2 - xeno ==0.1 - xenstore ==0.1.1 - - xhtml ==3000.2.1 + - xhtml ==3000.2.2 - xlsior ==0.1.0.1 - xlsx ==0.4.3 - xlsx-tabular ==0.2.2 - xml ==1.3.14 - xml-basic ==0.1.2 - xml-conduit ==1.4.0.4 - - xml-conduit-parse ==0.3.1.0 + - xml-conduit-parse ==0.3.1.1 - xml-conduit-writer ==0.1.1.1 - xml-hamlet ==0.4.1 - xml-html-qq ==0.1.0.1 @@ -2372,7 +2382,7 @@ default-package-overrides: - xss-sanitize ==0.3.5.7 - yackage ==0.8.1 - yahoo-finance-api ==0.2.0.2 - - yaml ==0.8.23 + - yaml ==0.8.23.3 - Yampa ==0.10.6 - YampaSynth ==0.2 - yes-precure5-command ==5.5.3 @@ -2386,7 +2396,7 @@ default-package-overrides: - yesod-eventsource ==1.4.1 - yesod-fay ==0.8.0 - yesod-form ==1.4.12 - - yesod-form-richtext ==0.1.0.0 + - yesod-form-richtext ==0.1.0.1 - yesod-gitrepo ==0.2.1.0 - yesod-gitrev ==0.1.0.0 - yesod-markdown ==0.11.4 @@ -2396,28 +2406,28 @@ default-package-overrides: - yesod-static ==1.5.3 - yesod-static-angular ==0.1.8 - yesod-table ==2.0.3 - - yesod-test ==1.5.6 + - yesod-test ==1.5.7 - yesod-websockets ==0.2.6 - - yi-core ==0.13.5 - - yi-frontend-vty ==0.13.5 - - yi-fuzzy-open ==0.13.5 - - yi-ireader ==0.13.5 - - yi-keymap-cua ==0.13.5 - - yi-keymap-emacs ==0.13.5 - - yi-keymap-vim ==0.13.5 - - yi-language ==0.13.5 - - yi-misc-modes ==0.13.5 - - yi-mode-haskell ==0.13.5 - - yi-mode-javascript ==0.13.5 + - yi-core ==0.13.7 + - yi-frontend-vty ==0.13.7 + - yi-fuzzy-open ==0.13.7 + - yi-ireader ==0.13.7 + - yi-keymap-cua ==0.13.7 + - yi-keymap-emacs ==0.13.7 + - yi-keymap-vim ==0.13.7 + - yi-language ==0.13.7 + - yi-misc-modes ==0.13.7 + - yi-mode-haskell ==0.13.7 + - yi-mode-javascript ==0.13.7 - yi-rope ==0.8 - - yi-snippet ==0.13.5 + - yi-snippet ==0.13.7 - yjtools ==0.9.18 - yoga ==0.0.0.1 - youtube ==0.2.1 - zero ==0.1.4 - - zeromq4-haskell ==0.6.5 + - zeromq4-haskell ==0.6.7 - zip ==0.1.11 - - zip-archive ==0.3.1 + - zip-archive ==0.3.1.1 - zippers ==0.2.3 - ziptastic-client ==0.3.0.3 - ziptastic-core ==0.2.0.3 @@ -2431,6 +2441,7 @@ extra-packages: - aeson < 0.8 # newer versions don't work with GHC 7.6.x or earlier - aeson < 1 # required by liquidhaskell-0.8.0.0 - aeson-pretty < 0.8 # required by elm compiler + - apply-refact < 0.4 # newer versions don't work with GHC 8.0.x - binary > 0.7 && < 0.8 # keep a 7.x major release around for older compilers - binary > 0.8 && < 0.9 # keep a 8.x major release around for older compilers - Cabal == 1.18.* # required for cabal-install et al on old GHC versions @@ -2448,6 +2459,7 @@ extra-packages: - hpack < 0.18 # required by stack-1.4.0 - 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 + - network == 2.6.3.1 # newer versions don't compile with GHC 7.4.x and below - 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 @@ -2688,6 +2700,7 @@ dont-distribute-packages: air-th: [ i686-linux, x86_64-linux, x86_64-darwin ] ajhc: [ i686-linux, x86_64-linux, x86_64-darwin ] AlanDeniseEricLauren: [ i686-linux, x86_64-linux, x86_64-darwin ] + alerta: [ i686-linux, x86_64-linux, x86_64-darwin ] alex-meta: [ i686-linux, x86_64-linux, x86_64-darwin ] alfred: [ i686-linux, x86_64-linux, x86_64-darwin ] alga: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2820,6 +2833,7 @@ dont-distribute-packages: 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 ] + arrowp-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] ArrowVHDL: [ i686-linux, x86_64-linux, x86_64-darwin ] artery: [ i686-linux, x86_64-linux, x86_64-darwin ] ascii85-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2944,6 +2958,7 @@ dont-distribute-packages: beam-th: [ 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 ] + beeminder-api: [ 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 ] bench: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3065,6 +3080,7 @@ dont-distribute-packages: blip: [ i686-linux, x86_64-linux, x86_64-darwin ] bliplib: [ i686-linux, x86_64-linux, x86_64-darwin ] Blobs: [ i686-linux, x86_64-linux, x86_64-darwin ] + blockchain: [ i686-linux, x86_64-linux, x86_64-darwin ] blockhash: [ i686-linux, x86_64-linux, x86_64-darwin ] Blogdown: [ i686-linux, x86_64-linux, x86_64-darwin ] blogination: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3110,6 +3126,7 @@ dont-distribute-packages: bson-mapping: [ i686-linux, x86_64-linux, x86_64-darwin ] btree-concurrent: [ i686-linux, x86_64-linux, x86_64-darwin ] b-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] + btree: [ i686-linux, x86_64-linux, x86_64-darwin ] buchhaltung: [ i686-linux, x86_64-linux, x86_64-darwin ] buffer-builder-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] buffer-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3120,6 +3137,7 @@ dont-distribute-packages: 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 ] + burnt-explorer: [ i686-linux, x86_64-linux, x86_64-darwin ] burst-detection: [ 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 ] @@ -3385,6 +3403,7 @@ dont-distribute-packages: cmdtheline: [ i686-linux, x86_64-linux, x86_64-darwin ] cmonad: [ i686-linux, x86_64-linux, x86_64-darwin ] cmph: [ i686-linux, x86_64-linux, x86_64-darwin ] + cmv: [ 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 ] @@ -3780,6 +3799,7 @@ dont-distribute-packages: dgim: [ i686-linux, x86_64-linux, x86_64-darwin ] dgs: [ i686-linux, x86_64-linux, x86_64-darwin ] dhall-check: [ i686-linux, x86_64-linux, x86_64-darwin ] + dhcp-lease-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] dia-functions: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-boolean: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3833,6 +3853,7 @@ dont-distribute-packages: discogs-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] discord-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] discordian-calendar: [ i686-linux, x86_64-linux, x86_64-darwin ] + discord-rest: [ i686-linux, x86_64-linux, x86_64-darwin ] discount: [ i686-linux, x86_64-linux, x86_64-darwin ] DiscussionSupportSystem: [ i686-linux, x86_64-linux, x86_64-darwin ] Dish: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4126,6 +4147,7 @@ dont-distribute-packages: fclabels-monadlib: [ 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 ] + feature-flipper-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ] fedora-packages: [ 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 ] @@ -4282,6 +4304,7 @@ dont-distribute-packages: fsh-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] fsmActions: [ i686-linux, x86_64-linux, x86_64-darwin ] fsutils: [ i686-linux, x86_64-linux, x86_64-darwin ] + fswait: [ i686-linux, x86_64-linux, x86_64-darwin ] fswatcher: [ i686-linux, x86_64-linux, x86_64-darwin ] ftdi: [ i686-linux, x86_64-linux, x86_64-darwin ] FTGL-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4334,6 +4357,7 @@ dont-distribute-packages: 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 ] + Gene-CluEDO: [ 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 ] @@ -4408,6 +4432,7 @@ dont-distribute-packages: ghc-session: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-syb: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-syb-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-usage: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-vis: [ i686-linux, x86_64-linux, x86_64-darwin ] ght: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4418,6 +4443,8 @@ dont-distribute-packages: gi-gstaudio: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gstbase: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gst: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-gstpbutils: [ i686-linux, x86_64-linux, x86_64-darwin ] + gi-gsttag: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gstvideo: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gtk-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] gi-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4518,6 +4545,7 @@ dont-distribute-packages: goat: [ i686-linux, x86_64-linux, x86_64-darwin ] gofer-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] gogol-containerbuilder: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-dataflow: [ i686-linux, x86_64-linux, x86_64-darwin ] gogol-firebase-dynamiclinks: [ i686-linux, x86_64-linux, x86_64-darwin ] gogol-iam: [ i686-linux, x86_64-linux, x86_64-darwin ] gogol-language: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4528,7 +4556,9 @@ dont-distribute-packages: gogol-servicecontrol: [ i686-linux, x86_64-linux, x86_64-darwin ] gogol-servicemanagement: [ i686-linux, x86_64-linux, x86_64-darwin ] gogol-sheets: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-shopping-content: [ i686-linux, x86_64-linux, x86_64-darwin ] gogol-slides: [ i686-linux, x86_64-linux, x86_64-darwin ] + gogol-youtube: [ i686-linux, x86_64-linux, x86_64-darwin ] gooey: [ i686-linux, x86_64-linux, x86_64-darwin ] GoogleDirections: [ i686-linux, x86_64-linux, x86_64-darwin ] google-drive: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4564,6 +4594,7 @@ dont-distribute-packages: graceful: [ i686-linux, x86_64-linux, x86_64-darwin ] grammar-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] GrammarProducts: [ i686-linux, x86_64-linux, x86_64-darwin ] + grammatical-parsers: [ 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 ] @@ -5384,6 +5415,7 @@ dont-distribute-packages: hsns: [ i686-linux, x86_64-linux, x86_64-darwin ] hsnsq: [ i686-linux, x86_64-linux, x86_64-darwin ] hsntp: [ i686-linux, x86_64-linux, x86_64-darwin ] + HSoM: [ i686-linux, x86_64-linux, x86_64-darwin ] HsOpenSSL: [ i686-linux, x86_64-linux, x86_64-darwin ] HsOpenSSL-x509-system: [ i686-linux, x86_64-linux, x86_64-darwin ] hsoptions: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5400,6 +5432,7 @@ dont-distribute-packages: hspec-hedgehog: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-jenkins: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-monad-control: [ i686-linux, x86_64-linux, x86_64-darwin ] + hspec-pg-transact: [ 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 ] hspec-test-sandbox: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5418,6 +5451,8 @@ dont-distribute-packages: hsqml-demo-manic: [ i686-linux, x86_64-linux, x86_64-darwin ] hsqml-demo-morris: [ i686-linux, x86_64-linux, x86_64-darwin ] hsqml-demo-notes: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsqml-demo-samples: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsqml: [ i686-linux, x86_64-linux, x86_64-darwin ] hsqml-morris: [ i686-linux, x86_64-linux, x86_64-darwin ] hsreadability: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-re: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5544,6 +5579,7 @@ dont-distribute-packages: hydrogen-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] hydrogen-data: [ i686-linux, x86_64-linux, x86_64-darwin ] hydrogen: [ i686-linux, x86_64-linux, x86_64-darwin ] + Hydrogen: [ i686-linux, x86_64-linux, x86_64-darwin ] hydrogen-multimap: [ 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 ] @@ -6153,6 +6189,7 @@ dont-distribute-packages: loris: [ i686-linux, x86_64-linux, x86_64-darwin ] loshadka: [ i686-linux, x86_64-linux, x86_64-darwin ] lostcities: [ i686-linux, x86_64-linux, x86_64-darwin ] + loup: [ i686-linux, x86_64-linux, x86_64-darwin ] lowgl: [ i686-linux, x86_64-linux, x86_64-darwin ] lp-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] lp-diagrams-svg: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6903,6 +6940,7 @@ dont-distribute-packages: pgsql-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] pg-store: [ i686-linux, x86_64-linux, x86_64-darwin ] pgstream: [ i686-linux, x86_64-linux, x86_64-darwin ] + pg-transact: [ i686-linux, x86_64-linux, x86_64-darwin ] phasechange: [ i686-linux, x86_64-linux, x86_64-darwin ] phone-numbers: [ i686-linux, x86_64-linux, x86_64-darwin ] phone-push: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7014,11 +7052,13 @@ dont-distribute-packages: posix-waitpid: [ i686-linux, x86_64-linux, x86_64-darwin ] postcodes: [ i686-linux, x86_64-linux, x86_64-darwin ] PostgreSQL: [ i686-linux, x86_64-linux, x86_64-darwin ] + postgresql-named: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-orm: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-query: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-schema: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-simple-bind: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-simple-opts: [ i686-linux, x86_64-linux, x86_64-darwin ] + postgresql-simple-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-simple-sop: [ 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 ] @@ -7052,6 +7092,7 @@ dont-distribute-packages: press: [ i686-linux, x86_64-linux, x86_64-darwin ] presto-hdbc: [ i686-linux, x86_64-linux, x86_64-darwin ] pretty-error: [ i686-linux, x86_64-linux, x86_64-darwin ] + prettyprinter-vty: [ i686-linux, x86_64-linux, x86_64-darwin ] pretty-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] PrimitiveArray: [ i686-linux, x86_64-linux, x86_64-darwin ] PrimitiveArray-Pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7100,6 +7141,7 @@ dont-distribute-packages: proto-lens-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] proto-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] proto-lens-optparse: [ i686-linux, x86_64-linux, x86_64-darwin ] + proto-lens-protobuf-types: [ i686-linux, x86_64-linux, x86_64-darwin ] proto-lens-protoc: [ i686-linux, x86_64-linux, x86_64-darwin ] protolude-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] proton-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7224,6 +7266,7 @@ dont-distribute-packages: Range: [ i686-linux, x86_64-linux, x86_64-darwin ] rangemin: [ i686-linux, x86_64-linux, x86_64-darwin ] range-space: [ i686-linux, x86_64-linux, x86_64-darwin ] + rank2classes: [ i686-linux, x86_64-linux, x86_64-darwin ] Ranka: [ i686-linux, x86_64-linux, x86_64-darwin ] rasa-example-config: [ i686-linux, x86_64-linux, x86_64-darwin ] rasa-ext-bufs: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7412,6 +7455,8 @@ dont-distribute-packages: rhythm-game-tutorial: [ i686-linux, x86_64-linux, x86_64-darwin ] riak: [ i686-linux, x86_64-linux, x86_64-darwin ] RichConditional: [ i686-linux, x86_64-linux, x86_64-darwin ] + ridley-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] + ridley: [ i686-linux, x86_64-linux, x86_64-darwin ] riff: [ 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 ] @@ -7635,6 +7680,9 @@ dont-distribute-packages: servant-smsc-ru: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-subscriber: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-zeppelin-client: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-zeppelin-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-zeppelin-swagger: [ i686-linux, x86_64-linux, x86_64-darwin ] server-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] serversession-backend-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ] serversession-backend-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7694,6 +7742,7 @@ dont-distribute-packages: shikensu: [ i686-linux, x86_64-linux, x86_64-darwin ] shoap: [ i686-linux, x86_64-linux, x86_64-darwin ] shorten-strings: [ i686-linux, x86_64-linux, x86_64-darwin ] + ShortestPathProblems: [ 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: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8137,6 +8186,7 @@ dont-distribute-packages: telegram-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] telegram: [ i686-linux, x86_64-linux, x86_64-darwin ] teleport: [ i686-linux, x86_64-linux, x86_64-darwin ] + teleshell: [ i686-linux, x86_64-linux, x86_64-darwin ] tellbot: [ 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 ] @@ -8201,6 +8251,7 @@ dont-distribute-packages: text-position: [ i686-linux, x86_64-linux, x86_64-darwin ] text-register-machine: [ i686-linux, x86_64-linux, x86_64-darwin ] text-render: [ i686-linux, x86_64-linux, x86_64-darwin ] + text-short: [ i686-linux, x86_64-linux, x86_64-darwin ] text-show: [ i686-linux, x86_64-linux, x86_64-darwin ] text-show-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] textual: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8285,6 +8336,7 @@ dont-distribute-packages: tld: [ i686-linux, x86_64-linux, x86_64-darwin ] tldr: [ i686-linux, x86_64-linux, x86_64-darwin ] tls-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] + tmp-postgres: [ i686-linux, x86_64-linux, x86_64-darwin ] tn: [ i686-linux, x86_64-linux, x86_64-darwin ] toboggan: [ i686-linux, x86_64-linux, x86_64-darwin ] todos: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8296,6 +8348,7 @@ dont-distribute-packages: tokyocabinet-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] toml: [ i686-linux, x86_64-linux, x86_64-darwin ] toolshed: [ i686-linux, x86_64-linux, x86_64-darwin ] + top: [ 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 ] @@ -8331,6 +8384,7 @@ dont-distribute-packages: transient-universe-tls: [ i686-linux, x86_64-linux, x86_64-darwin ] translatable-intset: [ i686-linux, x86_64-linux, x86_64-darwin ] translate: [ i686-linux, x86_64-linux, x86_64-darwin ] + trasa-client: [ i686-linux, x86_64-linux, x86_64-darwin ] trasa-reflex: [ i686-linux, x86_64-linux, x86_64-darwin ] travis-meta-yaml: [ i686-linux, x86_64-linux, x86_64-darwin ] trawl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8892,6 +8946,7 @@ dont-distribute-packages: yhccore: [ i686-linux, x86_64-linux, x86_64-darwin ] yices: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] + yi-dynamic-configuration: [ i686-linux, x86_64-linux, x86_64-darwin ] yi: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-keymap-cua: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-keymap-emacs: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8923,6 +8978,7 @@ dont-distribute-packages: 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 ] + zeromq4-conduit: [ 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 ] diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 58ab8024369..7b9dbcdaa79 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -129,8 +129,8 @@ self: super: builtins.intersectAttrs super { gtksourceview2 = addPkgconfigDepend super.gtksourceview2 pkgs.gtk2; # Need WebkitGTK, not just webkit. - webkit = super.webkit.override { webkit = pkgs.webkitgtk2; }; - websnap = super.websnap.override { webkit = pkgs.webkitgtk24x; }; + webkit = super.webkit.override { webkit = pkgs.webkitgtk24x-gtk2; }; + websnap = super.websnap.override { webkit = pkgs.webkitgtk24x-gtk3; }; hs-mesos = overrideCabal super.hs-mesos (drv: { # Pass _only_ mesos; the correct protobuf is propagated. @@ -461,4 +461,10 @@ self: super: builtins.intersectAttrs super { liquid-fixpoint = disableSharedExecutables super.liquid-fixpoint; liquidhaskell = dontCheck (disableSharedExecutables super.liquidhaskell); + # Haskell OpenCV bindings need contrib code enabled in the C++ library. + opencv = super.opencv.override { opencv3 = pkgs.opencv3.override { enableContrib = true; }; }; + + # Without this override, the builds lacks pkg-config. + opencv-extra = addPkgconfigDepend super.opencv-extra (pkgs.opencv3.override { enableContrib = true; }); + } diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index 6b5812cd07f..32fa46f111d 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -3,6 +3,8 @@ , packageSetConfig ? (self: super: {}) , overrides ? (self: super: {}) , initialPackages ? import ./hackage-packages.nix +, configurationCommon ? import ./configuration-common.nix +, configurationNix ? import ./configuration-nix.nix }: let @@ -15,8 +17,8 @@ let inherit ghc extensible-self; }; - commonConfiguration = import ./configuration-common.nix { inherit pkgs; }; - nixConfiguration = import ./configuration-nix.nix { inherit pkgs; }; + commonConfiguration = configurationCommon { inherit pkgs; }; + nixConfiguration = configurationNix { inherit pkgs; }; extensible-self = makeExtensible (extends overrides diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 38d74178e2e..e097fd5af33 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -34,7 +34,7 @@ , license , maintainers ? [] , doCoverage ? false -, doHaddock ? (!ghc.isHaLVM or true) +, doHaddock ? !(ghc.isHaLVM or false) , passthru ? {} , pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [], benchmarkPkgconfigDepends ? [] , testDepends ? [], testHaskellDepends ? [], testSystemDepends ? [] @@ -311,7 +311,7 @@ stdenv.mkDerivation ({ ${optionalString isGhcjs '' for exeDir in "$out/bin/"*.jsexe; do exe="''${exeDir%.jsexe}" - printf '%s\n' '#!${nodejs}/bin/node' > "$exe" + printLines '#!${nodejs}/bin/node' > "$exe" cat "$exeDir/all.js" >> "$exe" chmod +x "$exe" done diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 3ad53530c40..8c361341960 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1411,13 +1411,25 @@ self: { }) {}; "BiobaseBlast" = callPackage - ({ mkDerivation, array, base, BiobaseXNA, containers }: + ({ mkDerivation, aeson, attoparsec, base, binary, BiobaseTypes + , BiobaseXNA, bytestring, cereal, containers, deepseq, directory + , filepath, PrimitiveArray, split, tasty, tasty-quickcheck + , tasty-silver, tasty-th, vector, vector-th-unbox + }: mkDerivation { pname = "BiobaseBlast"; - version = "0.0.0.1"; - sha256 = "1p7f2azq92shmxvs3n683mr5965qkmijbj4ya6333cd7nilwgl0f"; - libraryHaskellDepends = [ array base BiobaseXNA containers ]; - homepage = "http://www.tbi.univie.ac.at/~choener/"; + version = "0.2.0.0"; + sha256 = "0x4skz0akhhxplwk7v7jnyfgih4iwv8p5lkfh2cn1dm79bkbyj53"; + libraryHaskellDepends = [ + aeson attoparsec base binary BiobaseTypes BiobaseXNA bytestring + cereal containers deepseq directory PrimitiveArray vector + vector-th-unbox + ]; + testHaskellDepends = [ + base bytestring containers filepath split tasty tasty-quickcheck + tasty-silver tasty-th + ]; + homepage = "https://github.com/choener/BiobaseBlast"; description = "BLAST-related tools"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -1528,18 +1540,23 @@ self: { "BiobaseNewick" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, cereal - , cereal-text, containers, fgl, ForestStructures, QuickCheck - , test-framework, test-framework-quickcheck2, test-framework-th - , text, text-binary, vector + , cereal-text, cmdargs, containers, fgl, ForestStructures + , QuickCheck, test-framework, test-framework-quickcheck2 + , test-framework-th, text, text-binary, vector }: mkDerivation { pname = "BiobaseNewick"; - version = "0.0.0.1"; - sha256 = "0izhxk24zjf767ng0gcjmcjfnngk0zh01a2sbd6icmmb45zaw75s"; + version = "0.0.0.2"; + sha256 = "1g8kdmraxv0qf3nzm7hi36nhw0j8kyjmjlwslp7a5n2zly2gcck4"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson attoparsec base binary cereal cereal-text containers fgl ForestStructures QuickCheck text text-binary vector ]; + executableHaskellDepends = [ + base cmdargs ForestStructures text vector + ]; testHaskellDepends = [ aeson base binary cereal QuickCheck test-framework test-framework-quickcheck2 test-framework-th @@ -2806,8 +2823,8 @@ self: { ({ mkDerivation, base, directory, unix, utf8-string, X11 }: mkDerivation { pname = "Clipboard"; - version = "2.3.1.0"; - sha256 = "1qsky3gh99l4csswd8w5iwx81v4cvg89h1wbr74ys0gswgiqbfyx"; + version = "2.3.2.0"; + sha256 = "1dr5ifmy5azib140bri9rzlq69jic430v9cv372jb42r78cci0iz"; libraryHaskellDepends = [ base directory unix utf8-string X11 ]; homepage = "http://haskell.org/haskellwiki/Clipboard"; description = "System clipboard interface"; @@ -2866,8 +2883,8 @@ self: { ({ mkDerivation, array, base, libdevil }: mkDerivation { pname = "Codec-Image-DevIL"; - version = "0.2.3"; - sha256 = "1kv3hns9f0bhfb723nj9szyz3zfqpvy02azzsiymzjz4ajhqmrsz"; + version = "0.2.4"; + sha256 = "1kzphhzh0ad2mf76mr67b6pl77yrapyakvrwlkvhcx8gp5afy4zk"; libraryHaskellDepends = [ array base ]; librarySystemDepends = [ libdevil ]; description = "An FFI interface to the DevIL library"; @@ -5452,8 +5469,8 @@ self: { }: mkDerivation { pname = "FontyFruity"; - version = "0.5.3.2"; - sha256 = "05f558p3288qfg8prfvb28cc7mwd5nk07ias87xflq5x81pnw6c7"; + version = "0.5.3.3"; + sha256 = "0p02w0v93y11f7rzsc1im2rvld6h0pgrhmd827ypzamibry6xl5h"; libraryHaskellDepends = [ base binary bytestring containers deepseq directory filepath text vector xml @@ -5484,19 +5501,19 @@ self: { "ForestStructures" = callPackage ({ mkDerivation, base, containers, criterion, fgl, QuickCheck - , test-framework, test-framework-quickcheck2, test-framework-th - , unordered-containers, vector, vector-th-unbox + , tasty, tasty-quickcheck, tasty-th, unordered-containers, vector + , vector-th-unbox }: mkDerivation { pname = "ForestStructures"; - version = "0.0.0.1"; - sha256 = "04yiag6dwp2k4679b1ardccqayrq7503wxzy7y9a9pf2s558f7j5"; + version = "0.0.0.2"; + sha256 = "0gv9hvwbql015k28xvphx4dllpfp5dgi36l3bkg48630xrzhcx7y"; libraryHaskellDepends = [ - base containers fgl unordered-containers vector vector-th-unbox + base containers fgl QuickCheck unordered-containers vector + vector-th-unbox ]; testHaskellDepends = [ - base QuickCheck test-framework test-framework-quickcheck2 - test-framework-th + base containers QuickCheck tasty tasty-quickcheck tasty-th vector ]; benchmarkHaskellDepends = [ base criterion ]; homepage = "https://github.com/choener/ForestStructures"; @@ -6198,6 +6215,7 @@ self: { homepage = "https://github.com/choener/Gene-CluEDO"; description = "Hox gene clustering"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GeneralTicTacToe" = callPackage @@ -7120,6 +7138,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "HDBC-session_0_1_1_1" = callPackage + ({ mkDerivation, base, HDBC }: + mkDerivation { + pname = "HDBC-session"; + version = "0.1.1.1"; + sha256 = "16ffb6fd6y3qxms6pf4qyc2b03pvnz62bbzrlszp7j48z1alwp15"; + libraryHaskellDepends = [ base HDBC ]; + homepage = "http://khibino.github.io/haskell-relational-record/"; + description = "Bracketed connection for HDBC"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "HDBC-sqlite3" = callPackage ({ mkDerivation, base, bytestring, HDBC, mtl, sqlite, utf8-string }: @@ -8323,6 +8354,7 @@ self: { homepage = "http://www.euterpea.com"; description = "Library for computer music education"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HSoundFile" = callPackage @@ -8753,6 +8785,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "HaTeX_3_17_3_0" = callPackage + ({ mkDerivation, base, bytestring, containers, hashable, matrix + , parsec, QuickCheck, tasty, tasty-quickcheck, text, transformers + , wl-pprint-extras + }: + mkDerivation { + pname = "HaTeX"; + version = "3.17.3.0"; + sha256 = "1p1nimr7cjn7iizdkpxfr97c8ycz6gpn6jm6qgyllmwp3bnzkial"; + libraryHaskellDepends = [ + base bytestring containers hashable matrix parsec QuickCheck text + transformers wl-pprint-extras + ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-quickcheck text + ]; + homepage = "https://github.com/Daniel-Diaz/HaTeX/blob/master/README.md"; + description = "The Haskell LaTeX library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "HaTeX-meta" = callPackage ({ mkDerivation, base, Cabal, containers, directory, filepath, ghc , haddock, haskell-src-exts, mtl, parsec @@ -8814,8 +8868,8 @@ self: { }: mkDerivation { pname = "HaXml"; - version = "1.25.3"; - sha256 = "1iq74dnxvannx9x1whqc3ixn93r4v5z7b4yv21n9q5963kpafj34"; + version = "1.25.4"; + sha256 = "1d8xq37h627im5harybhsn08qjdaf6vskldm03cqbfjmr2w6fx6p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -9205,8 +9259,8 @@ self: { }: mkDerivation { pname = "Hastodon"; - version = "0.0.2"; - sha256 = "1w55kiqbg1qz402xiydkj71h9qqz4fd40xa702ai18047a84s7pf"; + version = "0.1.0"; + sha256 = "012b8f2jb297bnx7sgsvz0vw0ic0xmlrr0b7fs65y6ycll6ih2zw"; libraryHaskellDepends = [ aeson base bytestring http-conduit http-types MissingH text ]; @@ -9412,6 +9466,19 @@ self: { license = "unknown"; }) {}; + "Hipmunk-Utils" = callPackage + ({ mkDerivation, base, Hipmunk, linear, StateVar }: + mkDerivation { + pname = "Hipmunk-Utils"; + version = "0.1.0.0"; + sha256 = "0bybsm350fkqiwsmyd0x4ck4jrnzs1i0cdvww70dcbd2m4r099mm"; + libraryHaskellDepends = [ base Hipmunk linear StateVar ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/suzumiyasmith/Hipmunk-Utils#readme"; + description = "Useful functions for Hipmunk"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "HipmunkPlayground" = callPackage ({ mkDerivation, base, containers, GLFW, Hipmunk, OpenGL, StateVar , transformers @@ -9971,6 +10038,7 @@ self: { homepage = "https://github.com/iqsf/Hydrogen.git"; description = "The library for generating a WebGL scene for the web"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "IDynamic" = callPackage @@ -10502,23 +10570,6 @@ self: { }) {}; "JuicyPixels" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl - , primitive, transformers, vector, zlib - }: - mkDerivation { - pname = "JuicyPixels"; - version = "3.2.8.1"; - sha256 = "013il9pnglb2mbiz5bbk1wg4mw2yvyi07fjv2zvmmml7p18fs9dk"; - libraryHaskellDepends = [ - base binary bytestring containers deepseq mtl primitive - transformers vector zlib - ]; - homepage = "https://github.com/Twinside/Juicy.Pixels"; - description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "JuicyPixels_3_2_8_2" = callPackage ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl , primitive, transformers, vector, zlib }: @@ -10533,7 +10584,6 @@ self: { homepage = "https://github.com/Twinside/Juicy.Pixels"; description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "JuicyPixels-canvas" = callPackage @@ -11888,8 +11938,8 @@ self: { ({ mkDerivation, base, newtype-generics }: mkDerivation { pname = "MemoTrie"; - version = "0.6.7"; - sha256 = "0whnqibl1has9s3dnkf4l5aimma8flxl7b2467fq5scl2gf07ayd"; + version = "0.6.8"; + sha256 = "194x8a1x8ch5xwpxaagrmpsjca92x1zjiq6dlqdgckyr49blknaz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base newtype-generics ]; @@ -16127,6 +16177,7 @@ self: { homepage = "https://github.com/choener/ShortestPathProblems"; description = "grammars for TSP and SHP"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ShowF" = callPackage @@ -16251,8 +16302,8 @@ self: { }: mkDerivation { pname = "SimpleServer"; - version = "0.1.1.1"; - sha256 = "1d6ydca54cw0cppvzd6axl5yamafgvcn93vqhchl8v46mmbdbwz3"; + version = "0.1.1.2"; + sha256 = "0nb8j2sgbmf0nk4fbs2y4a4kdiv3vxc7qqaczl40b11l60qz4ab3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -16535,20 +16586,6 @@ self: { }) {}; "Spintax" = callPackage - ({ mkDerivation, attoparsec, base, extra, mtl, mwc-random, text }: - mkDerivation { - pname = "Spintax"; - version = "0.3.1"; - sha256 = "08f51y9zgib3nfyk30bfllspq0730klqn9grnjbkr8d099ai6pik"; - libraryHaskellDepends = [ - attoparsec base extra mtl mwc-random text - ]; - homepage = "https://github.com/MichelBoucey/spintax"; - description = "Random text generation based on spintax"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Spintax_0_3_2" = callPackage ({ mkDerivation, attoparsec, base, extra, mtl, mwc-random, text }: mkDerivation { pname = "Spintax"; @@ -16560,7 +16597,6 @@ self: { homepage = "https://github.com/MichelBoucey/spintax"; description = "Random text generation based on spintax"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Spock" = callPackage @@ -17974,20 +18010,20 @@ self: { , case-insensitive, clock, containers, data-default-class , directory, filepath, http-client, http-client-tls, http-types , mtl, network-uri, optparse-applicative, parsec, pipes, pipes-http - , pretty-show, regexpr, split, taglib, tagsoup, text, time + , pretty-show, regexpr, scientific, split, tagsoup, text, time , utf8-string, vector }: mkDerivation { pname = "VKHS"; - version = "1.7.3"; - sha256 = "151ib508i8wf5c63c46ic1sy5lif8s4dx5s8jhwcwv8305bbsiiy"; + version = "1.9.1"; + sha256 = "1jhllxylsclshs027vinx5p3rql3964dy4p37q916g4g58ml83j6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty base bytestring case-insensitive clock containers data-default-class directory filepath http-client http-client-tls http-types mtl network-uri optparse-applicative - parsec pipes pipes-http pretty-show split taglib tagsoup time + parsec pipes pipes-http pretty-show scientific split tagsoup time utf8-string vector ]; executableHaskellDepends = [ regexpr text ]; @@ -20631,6 +20667,8 @@ self: { pname = "active"; version = "0.2.0.13"; sha256 = "1yw029rh0gb63bhwwjynbv173mny14is4cyjkrlvzvxwb0fi96jx"; + revision = "2"; + editedCabalFile = "1ml42hbvfhqzpdi1y5q6dqp4wq6zqb30f15r34n9ip9iv44qjwwf"; libraryHaskellDepends = [ base lens linear semigroupoids semigroups vector ]; @@ -21462,28 +21500,6 @@ self: { }) {}; "aeson-pretty" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring - , cmdargs, scientific, text, unordered-containers, vector - }: - mkDerivation { - pname = "aeson-pretty"; - version = "0.8.4"; - sha256 = "028527bymhvvry5knaqwjj32x3v15flj6d1c9zqy6gwqp87ji3zx"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base base-compat bytestring scientific text - unordered-containers vector - ]; - executableHaskellDepends = [ - aeson attoparsec base bytestring cmdargs - ]; - homepage = "http://github.com/informatikr/aeson-pretty"; - description = "JSON pretty-printing library and command-line tool"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "aeson-pretty_0_8_5" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring , cmdargs, scientific, text, unordered-containers, vector }: @@ -21503,32 +21519,9 @@ self: { homepage = "http://github.com/informatikr/aeson-pretty"; description = "JSON pretty-printing library and command-line tool"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-qq" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat, ghc-prim - , haskell-src-meta, hspec, parsec, scientific, template-haskell - , text, vector - }: - mkDerivation { - pname = "aeson-qq"; - version = "0.8.1"; - sha256 = "1z8kh3qjc4khadz1ijdqm7fbk7dh17sisqhpwd3c9aibj2927k9d"; - libraryHaskellDepends = [ - aeson attoparsec base base-compat haskell-src-meta parsec - scientific template-haskell text vector - ]; - testHaskellDepends = [ - aeson attoparsec base base-compat ghc-prim haskell-src-meta hspec - parsec scientific template-haskell text vector - ]; - homepage = "http://github.com/zalora/aeson-qq"; - description = "JSON quasiquoter for Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "aeson-qq_0_8_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, ghc-prim , haskell-src-meta, hspec, parsec, scientific, template-haskell , text, vector @@ -21548,7 +21541,6 @@ self: { homepage = "https://github.com/sol/aeson-qq#readme"; description = "JSON quasiquoter for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-quick" = callPackage @@ -22076,14 +22068,14 @@ self: { "aivika" = callPackage ({ mkDerivation, array, base, binary, containers, deepseq, mtl - , random, vector + , mwc-random, random, vector }: mkDerivation { pname = "aivika"; - version = "5.1"; - sha256 = "1mmpqmcvsx3qygwm8iszhcdnafp09vbnnklkskd1qsg55nisp0ps"; + version = "5.2"; + sha256 = "19d9bshjf5sivgzcbb0yl00i1z1kq3jr6xr7gddikh9wl0flnp9r"; libraryHaskellDepends = [ - array base binary containers deepseq mtl random vector + array base binary containers deepseq mtl mwc-random random vector ]; homepage = "http://www.aivikasoft.com"; description = "A multi-method simulation library"; @@ -22092,14 +22084,14 @@ self: { "aivika-branches" = callPackage ({ mkDerivation, aivika, aivika-transformers, base, containers, mtl - , random + , mwc-random, random }: mkDerivation { pname = "aivika-branches"; - version = "0.2"; - sha256 = "0riavp8jvsxmlqxjljm0dsijvrc0vknhkrjgf9g501g5yypd6byy"; + version = "0.3"; + sha256 = "1xb7l92vhaccfx9n83x6viamnkxy97c6a3plcf7gllijzrc4i1pf"; libraryHaskellDepends = [ - aivika aivika-transformers base containers mtl random + aivika aivika-transformers base containers mtl mwc-random random ]; homepage = "http://www.aivikasoft.com"; description = "Nested discrete event simulation module for the Aivika library"; @@ -22108,16 +22100,16 @@ self: { "aivika-distributed" = callPackage ({ mkDerivation, aivika, aivika-transformers, base, binary - , containers, distributed-process, exceptions, mtl, random, stm - , time + , containers, distributed-process, exceptions, mtl, mwc-random + , random, stm, time }: mkDerivation { pname = "aivika-distributed"; - version = "0.5"; - sha256 = "0ghsnq1a9jfrdgaf4gqplka53ywnr8jbabz4ikdzvrh80nnf3gpc"; + version = "0.6"; + sha256 = "02i557qians780vzi6fvffwm967j4k2p0iphvj423lk6qywyvdy5"; libraryHaskellDepends = [ aivika aivika-transformers base binary containers - distributed-process exceptions mtl random stm time + distributed-process exceptions mtl mwc-random random stm time ]; homepage = "http://www.aivikasoft.com"; description = "Parallel distributed discrete event simulation module for the Aivika library"; @@ -22192,16 +22184,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aivika-gpss" = callPackage + ({ mkDerivation, aivika, aivika-transformers, base, containers + , hashable, mtl, unordered-containers + }: + mkDerivation { + pname = "aivika-gpss"; + version = "0.3"; + sha256 = "00pmkhyyk12di9kc1z9zsab44sprra9j5l0byb0h74526jrrcq2b"; + libraryHaskellDepends = [ + aivika aivika-transformers base containers hashable mtl + unordered-containers + ]; + homepage = "http://www.aivikasoft.com"; + description = "GPSS-like DSL for Aivika"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "aivika-lattice" = callPackage ({ mkDerivation, aivika, aivika-transformers, base, containers, mtl - , random + , mwc-random, random }: mkDerivation { pname = "aivika-lattice"; - version = "0.2"; - sha256 = "0bd3xwga4cq2qibywq20rnl7fhhxs7ax1dl13ylcaxbg0sxyd0cj"; + version = "0.3"; + sha256 = "1770w2jbfyvcrdsvlh00l7861ckxk37yk4qc27fmigd060gbz552"; libraryHaskellDepends = [ - aivika aivika-transformers base containers mtl random + aivika aivika-transformers base containers mtl mwc-random random ]; homepage = "http://www.aivikasoft.com"; description = "Nested discrete event simulation module for the Aivika library using lattice"; @@ -22210,15 +22219,15 @@ self: { "aivika-realtime" = callPackage ({ mkDerivation, aivika, aivika-transformers, async, base - , containers, mtl, random, stm, time + , containers, mtl, mwc-random, random, stm, time, vector }: mkDerivation { pname = "aivika-realtime"; - version = "0.2"; - sha256 = "0dbbhf55w1i2wfr8lw3y5k2a51kw3223gnfhbamzz2283g5n80pg"; + version = "0.3"; + sha256 = "1qprmkklyna16n56zxkaryy0fawvc9mjws0mcw87bcl56m18npcm"; libraryHaskellDepends = [ - aivika aivika-transformers async base containers mtl random stm - time + aivika aivika-transformers async base containers mtl mwc-random + random stm time vector ]; homepage = "http://www.aivikasoft.com"; description = "Soft real-time simulation module for the Aivika library"; @@ -22226,15 +22235,15 @@ self: { }) {}; "aivika-transformers" = callPackage - ({ mkDerivation, aivika, array, base, containers, mtl, random - , vector + ({ mkDerivation, aivika, array, base, containers, mtl, mwc-random + , random, vector }: mkDerivation { pname = "aivika-transformers"; - version = "5.1"; - sha256 = "0ihwgql0ilavwx81f3z902r51p180b4facicd4sximnyg6qankdr"; + version = "5.2"; + sha256 = "1mz5wa66xazhh5x2wm01d7ixqg82zxls0ggkbixcjdm23a0560c1"; libraryHaskellDepends = [ - aivika array base containers mtl random vector + aivika array base containers mtl mwc-random random vector ]; homepage = "http://www.aivikasoft.com"; description = "Transformers for the Aivika simulation library"; @@ -22330,6 +22339,7 @@ self: { homepage = "https://github.com/mjhopkins/alerta-client"; description = "Bindings to the alerta REST API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "alex" = callPackage @@ -24827,7 +24837,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "amqp_0_15_0" = callPackage + "amqp_0_15_1" = callPackage ({ mkDerivation, base, binary, bytestring, clock, connection , containers, data-binary-ieee754, hspec, hspec-expectations , monad-control, network, network-uri, split, stm, text, vector @@ -24835,8 +24845,8 @@ self: { }: mkDerivation { pname = "amqp"; - version = "0.15.0"; - sha256 = "1chxcc9r9cyk8jhrb2vyh0k374hhw8ia6bbq92yw9dlp1y5fvxfi"; + version = "0.15.1"; + sha256 = "17pgwa810w8f3kqhxp850hwkr9yqi0sydy4sc6wxxfi4pwy5xvld"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -24863,8 +24873,8 @@ self: { }: mkDerivation { pname = "amqp-conduit"; - version = "0.2.0.0"; - sha256 = "1mlapyp22bbnkz7ny2rs2da6a6nbs41j8ljsjlxv1x9cfnjzjayb"; + version = "0.3.0.0"; + sha256 = "0w4i8jk7s8j341nx6qsmvlj7n2nnpwy3vzvkfnbzkphy0abyg0yn"; libraryHaskellDepends = [ amqp base conduit exceptions lifted-base monad-control mtl resourcet text transformers transformers-base @@ -26205,6 +26215,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "apply-refact_0_3_0_1" = callPackage + ({ mkDerivation, base, containers, directory, filemanip, filepath + , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact + , silently, syb, tasty, tasty-expected-failure, tasty-golden + , temporary, transformers, unix-compat + }: + mkDerivation { + pname = "apply-refact"; + version = "0.3.0.1"; + sha256 = "0578ql80fzkbjiw589v4498qd9jd7l2sz626imkdybxr1lqbsm0p"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory filemanip ghc ghc-exactprint mtl process + refact syb temporary transformers unix-compat + ]; + executableHaskellDepends = [ + base containers directory filemanip filepath ghc ghc-exactprint mtl + optparse-applicative process refact syb temporary transformers + unix-compat + ]; + testHaskellDepends = [ + base containers directory filemanip filepath ghc ghc-exactprint mtl + optparse-applicative process refact silently syb tasty + tasty-expected-failure tasty-golden temporary transformers + unix-compat + ]; + description = "Perform refactorings specified by the refact library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "apply-refact" = callPackage ({ mkDerivation, base, containers, directory, filemanip, filepath , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact @@ -26781,7 +26823,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "arithmoi_0_5_0_0" = callPackage + "arithmoi_0_5_0_1" = callPackage ({ mkDerivation, array, base, containers, criterion, exact-pi , ghc-prim, integer-gmp, integer-logarithms, mtl, QuickCheck , random, smallcheck, tasty, tasty-hunit, tasty-quickcheck @@ -26789,8 +26831,8 @@ self: { }: mkDerivation { pname = "arithmoi"; - version = "0.5.0.0"; - sha256 = "0gja9x6y2nprlg5d2wjycjvxgc7bb4p6y8d4fg3dxxzzwgqgrrab"; + version = "0.5.0.1"; + sha256 = "1hny1xnkwi0ahzdw4d1pfskdi416wl6k6p4pfzqssj79bhlpp6vg"; configureFlags = [ "-f-llvm" ]; libraryHaskellDepends = [ array base containers exact-pi ghc-prim integer-gmp @@ -26863,12 +26905,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) arpack;}; - "array_0_5_1_1" = callPackage + "array_0_5_2_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "array"; - version = "0.5.1.1"; - sha256 = "08r2rq4blvc737mrg3xhlwiw13jmsz5dlf2fd0ghb9cdaxc6kjc9"; + version = "0.5.2.0"; + sha256 = "12v83s2imxb3p2crnlzrpjh0nk6lpysw9bdk9yahs6f37csa5jaj"; libraryHaskellDepends = [ base ]; description = "Mutable and immutable arrays"; license = stdenv.lib.licenses.bsd3; @@ -27022,6 +27064,7 @@ self: { homepage = "http://www.haskell.org/arrows/"; description = "quasiquoter translating arrow notation into Haskell 98"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "arrows" = callPackage @@ -27370,6 +27413,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aspell-pipe" = callPackage + ({ mkDerivation, base, process, text }: + mkDerivation { + pname = "aspell-pipe"; + version = "0.3"; + sha256 = "1jl332g0v3zsjx4c340y5cw8rfpi527gki86y14zps6rb9b9nvzi"; + libraryHaskellDepends = [ base process text ]; + description = "Pipe-based interface to the Aspell program"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "assembler" = callPackage ({ mkDerivation, base, containers, ghc-binary, parsec }: mkDerivation { @@ -27501,6 +27555,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "astro" = callPackage + ({ mkDerivation, base, HUnit, matrix, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2, time + }: + mkDerivation { + pname = "astro"; + version = "0.4.2.0"; + sha256 = "1bj7zmgr4i23ig5jwc9w2sc967569325gdjwyrf6xm100hzw5zc6"; + libraryHaskellDepends = [ base matrix time ]; + testHaskellDepends = [ + base HUnit QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 time + ]; + homepage = "https://github.com/alexander-ignatyev/astro"; + description = "Amateur astronomical computations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "astview" = callPackage ({ mkDerivation, astview-utils, base, bytestring, containers , directory, filepath, glade, glib, Glob, gtk, gtksourceview2, hint @@ -27670,17 +27742,17 @@ self: { }) {}; "async-refresh" = callPackage - ({ mkDerivation, base, criterion, formatting, HUnit, lens - , lifted-async, monad-control, monad-logger, safe-exceptions, stm - , test-framework, test-framework-hunit, text + ({ mkDerivation, base, criterion, formatting, HUnit, lifted-async + , microlens, microlens-th, monad-control, monad-logger + , safe-exceptions, stm, test-framework, test-framework-hunit, text }: mkDerivation { pname = "async-refresh"; - version = "0.2.0"; - sha256 = "075v54j8fivzchkrj4pnxpj0v36qd7q1yfslvvr0dm5k6qr0p498"; + version = "0.2.0.2"; + sha256 = "1hq1h9ngvg12rwn2xbby69w9y19gm4qaqzdfc1iv5019l5kqncls"; libraryHaskellDepends = [ - base formatting lens lifted-async monad-control monad-logger - safe-exceptions stm text + base formatting lifted-async microlens microlens-th monad-control + monad-logger safe-exceptions stm text ]; testHaskellDepends = [ base criterion HUnit monad-logger stm test-framework @@ -27714,6 +27786,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "async-refresh-tokens_0_2_0_0" = callPackage + ({ mkDerivation, async-refresh, base, bytestring, criterion + , formatting, HUnit, lifted-async, microlens, microlens-th + , monad-control, monad-logger, safe-exceptions, stm, test-framework + , test-framework-hunit, text + }: + mkDerivation { + pname = "async-refresh-tokens"; + version = "0.2.0.0"; + sha256 = "1inpl44hmk4g5y0p09wdg85k921174zz5f5kn0z69b13gfrhncw6"; + libraryHaskellDepends = [ + async-refresh base bytestring formatting lifted-async microlens + microlens-th monad-control monad-logger safe-exceptions stm text + ]; + testHaskellDepends = [ + base criterion HUnit monad-logger stm test-framework + test-framework-hunit + ]; + homepage = "https://github.com/mtesseract/async-refresh-tokens#readme"; + description = "Package implementing core logic for refreshing of expiring access tokens"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "async-timer" = callPackage ({ mkDerivation, base, containers, criterion, HUnit, lifted-async , lifted-base, monad-control, safe-exceptions, test-framework @@ -28447,28 +28543,6 @@ self: { }) {}; "audacity" = callPackage - ({ mkDerivation, base, bytestring, deepseq, directory - , explicit-exception, filepath, non-empty, storable-record - , storablevector, tagchup, transformers, utility-ht, xml-basic - }: - mkDerivation { - pname = "audacity"; - version = "0.0.1.1"; - sha256 = "1hmb87h4ynlzcgspqw3g9jzjkfwf5l5n96dws3jppbvhkbhk7lzi"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring deepseq directory explicit-exception filepath - non-empty storable-record storablevector tagchup transformers - utility-ht xml-basic - ]; - homepage = "http://hub.darcs.net/thielema/audacity"; - description = "Interchange with the Audacity sound signal editor"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "audacity_0_0_1_2" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory , explicit-exception, filepath, non-empty, storable-record , storablevector, tagchup, transformers, utility-ht, xml-basic @@ -28895,8 +28969,8 @@ self: { pname = "avers"; version = "0.0.17.1"; sha256 = "1x96fvx0z7z75c39qcggw70qvqnw7kzjf0qqxb3jwg3b0fmdhi8v"; - revision = "11"; - editedCabalFile = "0panmqlzp0mq004fc0rm6fywrmc07cgwsp2567g4v1ay8g812ls2"; + revision = "12"; + editedCabalFile = "0qkaww4mvkhc56vkfqi6a7i0hkdy6zwshlqyd0cnw2p1b6cv6zy1"; libraryHaskellDepends = [ aeson attoparsec base bytestring clock containers cryptonite filepath inflections memory MonadRandom mtl network network-uri @@ -28984,6 +29058,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "avers-server_0_0_19_0" = callPackage + ({ mkDerivation, aeson, avers, avers-api, base, base64-bytestring + , bytestring, bytestring-conversion, containers, cookie, cryptonite + , either, http-types, memory, mtl, resource-pool + , rethinkdb-client-driver, servant, servant-server, stm, text, time + , transformers, wai, wai-websockets, websockets + }: + mkDerivation { + pname = "avers-server"; + version = "0.0.19.0"; + sha256 = "0qvfswp9ph96iy809q2jqg45j9msanpcvmh04dc12h86mlcwldg7"; + libraryHaskellDepends = [ + aeson avers avers-api base base64-bytestring bytestring + bytestring-conversion containers cookie cryptonite either + http-types memory mtl resource-pool rethinkdb-client-driver servant + servant-server stm text time transformers wai wai-websockets + websockets + ]; + homepage = "http://github.com/wereHamster/avers-server"; + description = "Server implementation of the Avers API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aviation-cessna172-diagrams" = callPackage ({ mkDerivation, aviation-cessna172-weight-balance, aviation-units , aviation-weight-balance, base, colour, diagrams-cairo @@ -29817,8 +29915,8 @@ self: { }: mkDerivation { pname = "b9"; - version = "0.5.31"; - sha256 = "15bw30n89yhdskngsr8nfi78ks07fsy0n1mgq6h76vwgm1l9pk4d"; + version = "0.5.32"; + sha256 = "0d3ymgk83kfxzfd0a9x97sjcax4vd27p2dskpfiykqsn7wgylhhw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -30671,6 +30769,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "basic-cpuid" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "basic-cpuid"; + version = "0.1.0.0"; + sha256 = "0gz4jpdp0zjn5yils4wplrg2mghpmxsh9f9yv07n81qb8mxwhg5p"; + libraryHaskellDepends = [ base ]; + description = "A small package to access the cpuid instruction directly"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "basic-lens" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -31084,6 +31193,7 @@ self: { ]; description = "Bindings to the beeminder.com JSON API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bein" = callPackage @@ -31110,25 +31220,6 @@ self: { }) {}; "bench" = callPackage - ({ mkDerivation, base, criterion, optparse-applicative, silently - , text, turtle - }: - mkDerivation { - pname = "bench"; - version = "1.0.4"; - sha256 = "1q376q5jy3i99smx06dma4d05jdxmcfyfskjkj7bmm3g84fdwxas"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base criterion optparse-applicative silently text turtle - ]; - homepage = "http://github.com/Gabriel439/bench"; - description = "Command-line benchmark tool"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "bench_1_0_5" = callPackage ({ mkDerivation, base, criterion, optparse-applicative, silently , text, turtle }: @@ -31855,8 +31946,8 @@ self: { }: mkDerivation { pname = "binary-ext"; - version = "1.0"; - sha256 = "0ds8l02l6nyrqpyfxjjgxp7qg8cs4rkbravf0k7hhnif9mylqyqb"; + version = "1.0.8.5.1"; + sha256 = "166c0wvmjpgpsm5s93clkp0ba50xyxinma4bkjxwqz3x1iv0gvzb"; libraryHaskellDepends = [ array base binary bytestring containers ]; @@ -31982,6 +32073,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "binary-orphans_0_1_7_0" = callPackage + ({ mkDerivation, aeson, base, binary, case-insensitive, hashable + , QuickCheck, quickcheck-instances, scientific, tagged, tasty + , tasty-quickcheck, text, text-binary, time, unordered-containers + , vector, vector-binary-instances + }: + mkDerivation { + pname = "binary-orphans"; + version = "0.1.7.0"; + sha256 = "1pv10g4a9sxjrsp2fj0w4n1sklxk2nf5w9q6na308smngbx3k1f9"; + revision = "1"; + editedCabalFile = "0k0griirhzac9h5wcf1331dmpxn32qdzx8pablaf1ny9r6pbjigy"; + libraryHaskellDepends = [ + aeson base binary case-insensitive hashable scientific tagged text + text-binary time unordered-containers vector + vector-binary-instances + ]; + testHaskellDepends = [ + aeson base binary case-insensitive hashable QuickCheck + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "binary-parser" = callPackage ({ mkDerivation, base-prelude, bytestring, success, text , transformers @@ -32187,8 +32306,8 @@ self: { pname = "binary-tagged"; version = "0.1.4.2"; sha256 = "1167rlb2lnib1vin9p75hp7fzcjqxljlw56bhmkwn05c5f6an7ri"; - revision = "6"; - editedCabalFile = "02fw1994ln0f63v77qfr9zwsfzhl3pmmsck9dzcv43895jkq55pi"; + revision = "7"; + editedCabalFile = "04l05gfbf3hf0pnkjpclyfqb9jaa665z4f89kf43lmd19qml6h04"; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers generics-sop hashable nats scientific semigroups SHA tagged text @@ -33384,6 +33503,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bit-stream" = callPackage + ({ mkDerivation, base, criterion, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, tasty-smallcheck, vector + }: + mkDerivation { + pname = "bit-stream"; + version = "0.1.0.0"; + sha256 = "1nn7yb15a1nlqjjmz0i4r53gh5wravp07faygn0hrvzvhwghgx1s"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base vector ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck + vector + ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/Bodigrim/bit-stream#readme"; + description = "Lazy, infinite, compact stream of 'Bool' with O(1) indexing"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bit-vector" = callPackage ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck , tasty-th, vector @@ -33508,37 +33648,45 @@ self: { "bitcoin-payment-channel" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring - , bytestring, cereal, criterion, deepseq, errors, haskoin-core - , hexstring, hspec, monad-time, mtl, QuickCheck, random, rbpcp-api - , scientific, semigroups, string-conversions, tagged - , test-framework, test-framework-quickcheck2, text, tf-random, time + , blockchain-restful-address-index-api, bytestring, cereal + , criterion, data-default-class, deepseq, either, errors + , haskoin-core, hexstring, hspec, hspec-discover, monad-time, mtl + , QuickCheck, random, rbpcp-api, scientific, semigroups + , string-conversions, tagged, test-framework + , test-framework-quickcheck2, text, tf-random, time, transformers }: mkDerivation { pname = "bitcoin-payment-channel"; - version = "1.0.1.0"; - sha256 = "18hg95jgmjpmpak2rspb0l5602j112gya9ydv9xm2gpx13wc88xp"; + version = "1.2.0.0"; + sha256 = "022wkygx76557cqkw0rvkmv3111n6hiyk3vwym3ampbkr2dv998f"; libraryHaskellDepends = [ - aeson base base16-bytestring bytestring cereal deepseq errors - haskoin-core hexstring hspec monad-time QuickCheck rbpcp-api + aeson base base16-bytestring blockchain-restful-address-index-api + bytestring cereal data-default-class deepseq either errors + haskoin-core hexstring hspec monad-time mtl QuickCheck rbpcp-api scientific semigroups string-conversions tagged text time + transformers ]; testHaskellDepends = [ - aeson base base16-bytestring base64-bytestring bytestring cereal - deepseq errors haskoin-core hexstring hspec monad-time mtl - QuickCheck random rbpcp-api scientific semigroups - string-conversions tagged test-framework test-framework-quickcheck2 - text tf-random time + aeson base base16-bytestring base64-bytestring + blockchain-restful-address-index-api bytestring cereal + data-default-class deepseq either errors haskoin-core hexstring + hspec hspec-discover monad-time mtl QuickCheck random rbpcp-api + scientific semigroups string-conversions tagged test-framework + test-framework-quickcheck2 text tf-random time transformers ]; benchmarkHaskellDepends = [ - aeson base base16-bytestring bytestring cereal criterion deepseq - errors haskoin-core hexstring hspec monad-time QuickCheck rbpcp-api - scientific semigroups string-conversions tagged text time + aeson base base16-bytestring blockchain-restful-address-index-api + bytestring cereal criterion data-default-class deepseq either + errors haskoin-core hexstring hspec monad-time mtl QuickCheck + rbpcp-api scientific semigroups string-conversions tagged text time + transformers ]; homepage = "https://github.com/runeksvendsen/bitcoin-payment-channel"; description = "Instant, two-party Bitcoin payments"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + broken = true; + }) {blockchain-restful-address-index-api = null;}; "bitcoin-rpc" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal @@ -34639,6 +34787,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "blockchain" = callPackage + ({ mkDerivation, aeson, async, base, byteable, bytestring + , cryptonite, deepseq, either, errors, hashable, hspec, memory, mtl + , QuickCheck, quickcheck-instances, text, time, transformers + , unordered-containers + }: + mkDerivation { + pname = "blockchain"; + version = "0.0.3"; + sha256 = "0hyyg4gpp8wijisvh176pjkjzrvb3v8v0gaws7j6cpirkpjgi895"; + libraryHaskellDepends = [ + aeson base byteable bytestring cryptonite either errors hashable + memory mtl text time transformers unordered-containers + ]; + testHaskellDepends = [ + aeson async base byteable bytestring cryptonite deepseq either + errors hashable hspec memory mtl QuickCheck quickcheck-instances + text time transformers unordered-containers + ]; + homepage = "https://github.com/TGOlson/blockchain"; + description = "Generic blockchain implementation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "blockhash" = callPackage ({ mkDerivation, base, bytestring, JuicyPixels , optparse-applicative, primitive, vector, vector-algorithms @@ -34983,6 +35156,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "bno055-haskell" = callPackage + ({ mkDerivation, base, bytestring, cereal, h2c, mtl, resourcet }: + mkDerivation { + pname = "bno055-haskell"; + version = "0.1.0"; + sha256 = "1n4s0ljlgf1qrlyzaj161nbx7sa162v26p0i2i17n12m8zwjkp3s"; + libraryHaskellDepends = [ + base bytestring cereal h2c mtl resourcet + ]; + homepage = "https://bitbucket.org/fmapE/bno055-haskell"; + description = "Library for communication with the Bosch BNO055 orientation sensor"; + license = stdenv.lib.licenses.mit; + }) {}; + "board-games" = callPackage ({ mkDerivation, array, base, cgi, containers, html, httpd-shed , network-uri, QuickCheck, random, transformers, utility-ht @@ -35100,8 +35287,8 @@ self: { }: mkDerivation { pname = "bond"; - version = "0.9.0.0"; - sha256 = "020a8hydpmxm7xppxr12ks52b47vssxggziw6qahzkkx8f2lq1bm"; + version = "0.10.0.0"; + sha256 = "1f7vfh9pcg6za8rcdpq1lbvyn2z7plcb70d5r1xj330akvl626jw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -35348,8 +35535,8 @@ self: { }: mkDerivation { pname = "boomange"; - version = "0.1.3.2"; - sha256 = "0sc003xcqv8qdfjrn2mil81f3dspwjzdg9jj0mnffrws66mkw38a"; + version = "0.1.3.3"; + sha256 = "0am2b5f6a47khka31mxynl9j2fisa6zyfk3ca8yna02hdkw3rlf6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -35837,21 +36024,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "brick_0_18" = callPackage + "brick_0_20_1" = callPackage ({ mkDerivation, base, containers, contravariant, data-clist , deepseq, dlist, microlens, microlens-mtl, microlens-th, stm , template-haskell, text, text-zipper, transformers, vector, vty + , word-wrap }: mkDerivation { pname = "brick"; - version = "0.18"; - sha256 = "1qk3ds8h1krqhl8gk3c6akblybq2zvs9686ispj14im88mzjma8r"; + version = "0.20.1"; + sha256 = "1yhxs2p83nrv9b5lw9cd21f6r735sjxkamhmc2vv8d63z2fncz0f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers contravariant data-clist deepseq dlist microlens microlens-mtl microlens-th stm template-haskell text text-zipper - transformers vector vty + transformers vector vty word-wrap ]; homepage = "https://github.com/jtdaugherty/brick/"; description = "A declarative terminal user interface library"; @@ -36053,6 +36241,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "btree" = callPackage + ({ mkDerivation, base, clock, compact-mutable, containers, ghc-prim + , hashable, prim-array, primitive, smallcheck, tasty, tasty-hunit + , tasty-smallcheck, transformers + }: + mkDerivation { + pname = "btree"; + version = "0.2"; + sha256 = "02qypsanm4pnc7jiwjwak9xi7mfz4dlmfirdwvbxnjz48nqch7x2"; + libraryHaskellDepends = [ + base compact-mutable ghc-prim prim-array primitive + ]; + testHaskellDepends = [ + base compact-mutable containers hashable prim-array primitive + smallcheck tasty tasty-hunit tasty-smallcheck transformers + ]; + benchmarkHaskellDepends = [ + base clock compact-mutable ghc-prim hashable + ]; + homepage = "https://github.com/andrewthad/b-plus-tree#readme"; + description = "B-Tree on the compact heap"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "btree-concurrent" = callPackage ({ mkDerivation, array, base, base64-bytestring, bytestring, cereal , containers, directory, filepath, hashable, mtl, QuickCheck @@ -36386,6 +36599,7 @@ self: { homepage = "https://gitlab.com/KrzysiekJ/burnt-explorer"; description = "List OP_RETURN cryptocurrency transaction outputs"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "burst-detection" = callPackage @@ -37145,8 +37359,8 @@ self: { }: mkDerivation { pname = "c-mosquitto"; - version = "0.1.0.0"; - sha256 = "0gyd0h905mi23a8xmg1cyhl3yj6qcq1gqr2yyiv3xav8hf1crszm"; + version = "0.1.0.1"; + sha256 = "0scghhz6d9i3rbdl95dvfc03ds99nx0hgmsx29n1d8v8bvvmkpz4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -37463,8 +37677,8 @@ self: { }: mkDerivation { pname = "cabal-debian"; - version = "4.35.6"; - sha256 = "1pp4wyii4gb585nvy8zzylpaxbmhxw6r0v28qdsm825kqldhvy4f"; + version = "4.35.9"; + sha256 = "1d7xd9v8gc0ahyx557470dw01s3zs6vz594a4hy95bgx5d45s357"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38080,8 +38294,8 @@ self: { ({ mkDerivation, base, Cabal, QuickCheck }: mkDerivation { pname = "cabal-test-quickcheck"; - version = "0.1.7"; - sha256 = "0886vbd0z6svydd1c5hjz9zlf1xfi6nmxlvsk0ksalgmb9h793m4"; + version = "0.1.8"; + sha256 = "11i7726z7ic7xb3ssx69938ipanqasrdl055ym2swm9s2jmc9k6x"; libraryHaskellDepends = [ base Cabal QuickCheck ]; homepage = "https://github.com/zmthy/cabal-test-quickcheck"; description = "QuickCheck for Cabal"; @@ -38189,34 +38403,37 @@ self: { "cabal2nix" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal - , containers, deepseq, directory, distribution-nixpkgs, doctest - , filepath, hackage-db, language-nix, lens, monad-par - , monad-par-extras, mtl, optparse-applicative, pretty, process, SHA - , split, text, time, transformers, utf8-string, yaml + , cabal-doctest, containers, deepseq, directory + , distribution-nixpkgs, doctest, filepath, hackage-db, hopenssl + , language-nix, lens, monad-par, monad-par-extras, mtl + , optparse-applicative, pretty, process, split, text, time + , transformers, utf8-string, yaml }: mkDerivation { pname = "cabal2nix"; - version = "2.2.1"; - sha256 = "1hw3x3dk1gc2am3w1cxxsb1rdz976vc35zrjabdlx52ncb2lmfx7"; + version = "2.3.1"; + sha256 = "0xi4mj8gyb2k9a43dp49wc84sbxpv9sfa8cmzfp0mkak0alwqahj"; isLibrary = true; isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson ansi-wl-pprint base bytestring Cabal containers deepseq - directory distribution-nixpkgs filepath hackage-db language-nix - lens optparse-applicative pretty process SHA split text + directory distribution-nixpkgs filepath hackage-db hopenssl + language-nix lens optparse-applicative pretty process split text transformers yaml ]; executableHaskellDepends = [ aeson ansi-wl-pprint base bytestring Cabal containers deepseq - directory distribution-nixpkgs filepath hackage-db language-nix - lens monad-par monad-par-extras mtl optparse-applicative pretty - process SHA split text time transformers utf8-string yaml + directory distribution-nixpkgs filepath hackage-db hopenssl + language-nix lens monad-par monad-par-extras mtl + optparse-applicative pretty process split text time transformers + utf8-string yaml ]; testHaskellDepends = [ aeson ansi-wl-pprint base bytestring Cabal containers deepseq - directory distribution-nixpkgs doctest filepath hackage-db - language-nix lens optparse-applicative pretty process SHA split - text transformers yaml + directory distribution-nixpkgs doctest filepath hackage-db hopenssl + language-nix lens optparse-applicative pretty process split text + transformers yaml ]; homepage = "https://github.com/nixos/cabal2nix#readme"; description = "Convert Cabal files into Nix build instructions"; @@ -38473,6 +38690,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cacophony_0_10_0" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, base16-bytestring + , bytestring, criterion, cryptonite, deepseq, directory, exceptions + , free, hlint, lens, memory, monad-coroutine, mtl, safe-exceptions + , text, transformers + }: + mkDerivation { + pname = "cacophony"; + version = "0.10.0"; + sha256 = "1hjxzpbnp5qzbjl9m0hyvlr7yflfgxr5kqbviamhpgc0lj5igizv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring cryptonite exceptions free lens memory + monad-coroutine mtl safe-exceptions transformers + ]; + testHaskellDepends = [ + aeson attoparsec base base16-bytestring bytestring directory hlint + text + ]; + benchmarkHaskellDepends = [ + async base base16-bytestring bytestring criterion deepseq + ]; + homepage = "https://github.com/centromere/cacophony#readme"; + description = "A library implementing the Noise protocol"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "caf" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -39212,23 +39458,6 @@ self: { }) {}; "carray" = callPackage - ({ mkDerivation, array, base, binary, bytestring, ix-shapable - , QuickCheck, syb - }: - mkDerivation { - pname = "carray"; - version = "0.1.6.6"; - sha256 = "1h22n68qpk6zfx0yfyj66ccwhxisw6ijziy5jmqqx9g605n16l4z"; - libraryHaskellDepends = [ - array base binary bytestring ix-shapable QuickCheck syb - ]; - testHaskellDepends = [ array base ix-shapable QuickCheck ]; - benchmarkHaskellDepends = [ array base ]; - description = "A C-compatible array library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "carray_0_1_6_7" = callPackage ({ mkDerivation, array, base, binary, bytestring, ix-shapable , QuickCheck, syb }: @@ -39243,7 +39472,6 @@ self: { benchmarkHaskellDepends = [ array base ]; description = "A C-compatible array library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "carte" = callPackage @@ -39844,6 +40072,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cassava-conduit_0_4_0_0" = callPackage + ({ mkDerivation, array, base, bifunctors, bytestring, cassava + , conduit, conduit-extra, containers, criterion, mtl, QuickCheck + , text + }: + mkDerivation { + pname = "cassava-conduit"; + version = "0.4.0.0"; + sha256 = "1pl3vbkyjvgz08ijm75rdxnxx5h27mya7bgzi9jpws7v2dwxlg22"; + libraryHaskellDepends = [ + array base bifunctors bytestring cassava conduit conduit-extra + containers mtl text + ]; + testHaskellDepends = [ + base bytestring cassava conduit conduit-extra QuickCheck text + ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/domdere/cassava-conduit"; + description = "Conduit interface for cassava package"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cassava-megaparsec" = callPackage ({ mkDerivation, base, bytestring, cassava, containers, hspec , hspec-megaparsec, megaparsec, unordered-containers, vector @@ -40311,6 +40562,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {gtk2 = pkgs.gnome2.gtk;}; + "celtchar" = callPackage + ({ mkDerivation, base, directory, file-embed, filepath, hspec + , megaparsec, mtl, ogmarkup, optparse-generic, pandoc + , raw-strings-qq, shakespeare, text, yaml + }: + mkDerivation { + pname = "celtchar"; + version = "0.1.0.1"; + sha256 = "19br3ygxn6r4qvix3d9dy71w5nwfxhy5h7qavpkk6k3nl6jmawaj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base filepath megaparsec mtl ogmarkup pandoc shakespeare text yaml + ]; + executableHaskellDepends = [ + base directory file-embed filepath optparse-generic text + ]; + testHaskellDepends = [ base hspec raw-strings-qq ]; + homepage = "https://github.com/ogma-project/celtchar#readme"; + description = "A tool to build a novel"; + license = stdenv.lib.licenses.mit; + }) {}; + "cerberus" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, cmdargs , conduit-extra, ekg, ekg-core, hslogger, http-client @@ -40923,36 +41197,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "chart-unit_0_3_1" = callPackage - ({ mkDerivation, ad, base, colour, containers, data-default - , diagrams, diagrams-core, diagrams-lib, diagrams-svg, foldl - , formatting, HUnit, lens, linear, ListLike, mwc-probability - , mwc-random, numhask, numhask-range, primitive, protolude - , QuickCheck, reflection, smallcheck, SVGFonts, tasty, tasty-hspec - , tasty-hunit, tasty-quickcheck, tasty-smallcheck, tdigest, text + "chart-unit_0_3_2" = callPackage + ({ mkDerivation, ad, base, colour, diagrams-lib, diagrams-svg + , foldl, formatting, lens, linear, mwc-probability, mwc-random + , numhask, numhask-range, primitive, protolude, reflection, tasty + , tasty-hspec, tdigest, text }: mkDerivation { pname = "chart-unit"; - version = "0.3.1"; - sha256 = "0z7f604y08d8bki6fjx5fz2b1c9lrhalxdjlx1wmhlxz320dpm2w"; + version = "0.3.2"; + sha256 = "06yilm8ldkf59vxycydfhn990x6lmykgma2nwc87mxnqc6820a22"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base colour containers data-default diagrams diagrams-core - diagrams-lib diagrams-svg foldl formatting lens linear numhask - numhask-range protolude QuickCheck SVGFonts text + base colour diagrams-lib diagrams-svg foldl formatting lens linear + numhask numhask-range text ]; executableHaskellDepends = [ - ad base containers diagrams diagrams-core diagrams-lib diagrams-svg - foldl formatting lens linear ListLike mwc-probability mwc-random - numhask numhask-range primitive protolude reflection SVGFonts - tdigest text - ]; - testHaskellDepends = [ - base data-default diagrams-lib HUnit numhask numhask-range - protolude QuickCheck smallcheck tasty tasty-hspec tasty-hunit - tasty-quickcheck tasty-smallcheck + ad base foldl mwc-probability mwc-random numhask primitive + protolude reflection tdigest text ]; + testHaskellDepends = [ base numhask tasty tasty-hspec ]; homepage = "https://github.com/tonyday567/chart-unit"; description = "A set of native haskell charts"; license = stdenv.lib.licenses.bsd3; @@ -41062,6 +41327,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "chatwork" = callPackage + ({ mkDerivation, aeson, aeson-casing, base, bytestring, connection + , data-default-class, hspec, http-api-data, http-client + , http-client-tls, http-types, req, servant-server, text, warp + }: + mkDerivation { + pname = "chatwork"; + version = "0.1.1.0"; + sha256 = "0xslzn94qhzidayv0nd8rfm9jvfi38dygvwd1lj7vwjgd4yrxy1m"; + libraryHaskellDepends = [ + aeson aeson-casing base bytestring connection data-default-class + http-api-data http-client http-client-tls http-types req text + ]; + testHaskellDepends = [ + aeson aeson-casing base bytestring connection data-default-class + hspec http-api-data http-client http-client-tls http-types req + servant-server text warp + ]; + homepage = "https://github.com/matsubara0507/chatwork#readme"; + description = "The ChatWork API in Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "cheapskate" = callPackage ({ mkDerivation, base, blaze-html, bytestring, containers , data-default, mtl, syb, text, uniplate, xss-sanitize @@ -41191,8 +41479,8 @@ self: { ({ mkDerivation, array, base, QuickCheck, random }: mkDerivation { pname = "checkers"; - version = "0.4.6"; - sha256 = "03wpvxl03rj8v8f17jjmkfi94wvm8h1icyfgvgw7np6cpz99rp1a"; + version = "0.4.7"; + sha256 = "15rb9j7hsdpnf57nw115z74bbk794x705bha8kz0qgb1rlpwpngr"; libraryHaskellDepends = [ array base QuickCheck random ]; description = "Check properties on standard classes and data structures"; license = stdenv.lib.licenses.bsd3; @@ -41338,8 +41626,8 @@ self: { }: mkDerivation { pname = "chorale"; - version = "0.1.7"; - sha256 = "0p8y4lg53gp4wbvb23l9bjy6hn1w1kpwwil02np9acjrxvifjyjw"; + version = "0.1.8"; + sha256 = "0k7xavjscl0xpjrz0w3nh473clkaw58126xch66qykm3l361zgc4"; libraryHaskellDepends = [ base containers safe ]; testHaskellDepends = [ base containers HUnit ieee754 QuickCheck safe test-framework @@ -41590,6 +41878,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "church-pair" = callPackage + ({ mkDerivation, base, bifunctors, semigroups, transformers }: + mkDerivation { + pname = "church-pair"; + version = "0.1.0.1"; + sha256 = "1vrbfmzsysfqdxfah54w9kw0j9qaa0f514yz7qzflp8qgah6rckk"; + libraryHaskellDepends = [ + base bifunctors semigroups transformers + ]; + description = "Church encoded pair"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cielo" = callPackage ({ mkDerivation, aeson, base, bytestring, convertible, data-default , hspec, http-client, http-types, lens, mtl, pretty-show @@ -41847,8 +42148,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "circle-packing"; - version = "0.1.0.5"; - sha256 = "17sw5wy76hdk34nldcd44sqbf5fdhwii0racpd3zfrkad77d26h4"; + version = "0.1.0.6"; + sha256 = "06z8irwrjxxgk5xqlpy6a9mjl44kp9pgx2xpslhgxrd31nll9vk4"; libraryHaskellDepends = [ base ]; description = "Simple heuristic for packing discs of varying radii in a circle"; license = stdenv.lib.licenses.bsd3; @@ -42235,8 +42536,8 @@ self: { pname = "clash-lib"; version = "0.7.1"; sha256 = "1mml3f10mdirlihjnbzjh3jjnmvgcqfqs16k22a13m8pd4whcw88"; - revision = "1"; - editedCabalFile = "00vdln8qysx9m7br6mcszgkw810dglry6irfs9d24r0vrwfvfrig"; + revision = "2"; + editedCabalFile = "1b8d63wisrizirkyrl58840bfnknjy049sm43zhhr9nbw6fn2c51"; libraryHaskellDepends = [ aeson attoparsec base bytestring clash-prelude concurrent-supply containers data-binary-ieee754 deepseq directory errors fgl @@ -42251,12 +42552,16 @@ self: { }) {}; "clash-multisignal" = callPackage - ({ mkDerivation, base, clash-prelude, QuickCheck }: + ({ mkDerivation, base, clash-prelude, deepseq + , ghc-typelits-knownnat, QuickCheck + }: mkDerivation { pname = "clash-multisignal"; - version = "0.1.0.0"; - sha256 = "0hb9pxggdw8sg5g4227sghf366b2psl7l83c9mcy5dcxlng3znl4"; - libraryHaskellDepends = [ base clash-prelude QuickCheck ]; + version = "0.2.0.0"; + sha256 = "0jqlz3h226ql641z4kzwf921f5sb0zf9zh2c9gli4bbw7csn93nd"; + libraryHaskellDepends = [ + base clash-prelude deepseq ghc-typelits-knownnat QuickCheck + ]; homepage = "https://github.com/ra1u/clash-multisignal"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -42273,8 +42578,8 @@ self: { pname = "clash-prelude"; version = "0.11.2"; sha256 = "1ccbcqkqcq5kyfjfvpkis2z40ishc4yqjjjswfsg92qrklk38wcl"; - revision = "1"; - editedCabalFile = "1ckr7vjww2qfbgvqyxdg5j2pzca0nridwh17ydvpsmzchf4xdrqp"; + revision = "2"; + editedCabalFile = "16ak462j0722lvy8ajn2yv400z9jgv8c3l151pmfwh893q6b0i3l"; libraryHaskellDepends = [ array base constraints data-binary-ieee754 data-default deepseq ghc-prim ghc-typelits-extra ghc-typelits-knownnat @@ -42487,20 +42792,6 @@ self: { }) {}; "clay" = callPackage - ({ mkDerivation, base, hspec, hspec-expectations, mtl, text }: - mkDerivation { - pname = "clay"; - version = "0.12.1"; - sha256 = "0yl65gjg2g99g2wz8l825514821dky990968zs8y899ksrnp5qzd"; - libraryHaskellDepends = [ base mtl text ]; - testHaskellDepends = [ base hspec hspec-expectations mtl text ]; - homepage = "http://fvisser.nl/clay"; - description = "CSS preprocessor as embedded Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "clay_0_12_2" = callPackage ({ mkDerivation, base, hspec, hspec-expectations, mtl, text }: mkDerivation { pname = "clay"; @@ -43179,6 +43470,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cloud-seeder" = callPackage + ({ mkDerivation, amazonka, amazonka-cloudformation, amazonka-core + , base, bytestring, deepseq, exceptions, fast-logger, hspec, lens + , monad-control, monad-logger, monad-time, mtl + , optparse-applicative, text, transformers, transformers-base + }: + mkDerivation { + pname = "cloud-seeder"; + version = "0.0.0.0"; + sha256 = "1nh0qmj1fdxkqa2db8xpv7anrlqyl7dcphjd25qgq86gjcdn27bb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + amazonka amazonka-cloudformation amazonka-core base deepseq + exceptions lens monad-control monad-logger monad-time mtl + optparse-applicative text transformers transformers-base + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + amazonka-cloudformation base bytestring deepseq fast-logger hspec + lens monad-logger mtl text transformers + ]; + homepage = "https://github.com/cjdev/cloud-seeder#readme"; + description = "A tool for interacting with AWS CloudFormation"; + license = stdenv.lib.licenses.isc; + }) {}; + "cloudfront-signer" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, base64-bytestring , bytestring, crypto-pubkey-types, old-locale, RSA, time @@ -43722,6 +44040,35 @@ self: { license = "GPL"; }) {}; + "cmv" = callPackage + ({ mkDerivation, aeson, base, BiobaseInfernal, BiobaseTypes + , BiobaseXNA, BioHMM, bytestring, cmdargs, colour, containers + , diagrams-cairo, diagrams-lib, directory, either-unwrap, filepath + , mtl, parsec, ParsecTools, PrimitiveArray, StockholmAlignment + , SVGFonts, template-haskell, text, vector + }: + mkDerivation { + pname = "cmv"; + version = "1.0.2"; + sha256 = "107cwha465c7i2yi1k9m2csf9kdszrix7295d1q0dhklwi0fll8d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base BiobaseInfernal BiobaseTypes BiobaseXNA BioHMM colour + containers diagrams-cairo diagrams-lib directory either-unwrap + filepath mtl parsec ParsecTools PrimitiveArray StockholmAlignment + SVGFonts text vector + ]; + executableHaskellDepends = [ + aeson base BiobaseInfernal BiobaseXNA BioHMM bytestring cmdargs + colour containers diagrams-lib directory either-unwrap filepath + parsec StockholmAlignment template-haskell text vector + ]; + description = "Detailed visualization of CMs, HMMs and their comparisions"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cnc-spec-compiler" = callPackage ({ mkDerivation, ansi-terminal, array, base, binary, bytestring , containers, directory, fgl, filepath, graphviz, HaXml, haxr @@ -43840,6 +44187,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "codec-rpm" = callPackage + ({ mkDerivation, attoparsec, attoparsec-binary, base, bytestring + , conduit, conduit-combinators, conduit-extra, hspec + , hspec-attoparsec, HUnit, mtl, parsec, pretty, resourcet, text + }: + mkDerivation { + pname = "codec-rpm"; + version = "0.1.2"; + sha256 = "15rdraaqzgp7qga8075rfk1vg2w10vj47nnfb584acc66gsc0k8i"; + libraryHaskellDepends = [ + attoparsec attoparsec-binary base bytestring conduit + conduit-combinators conduit-extra mtl parsec pretty resourcet text + ]; + testHaskellDepends = [ + attoparsec base bytestring hspec hspec-attoparsec HUnit text + ]; + homepage = "https://github.com/weldr/codec-rpm"; + description = "A library for manipulating RPM files"; + license = "LGPL"; + }) {}; + "codecov-haskell" = callPackage ({ mkDerivation, aeson, async, base, bytestring, cmdargs , containers, curl, hpc, HUnit, process, regex-posix, retry, safe @@ -44811,6 +45179,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "compact-mutable" = callPackage + ({ mkDerivation, base, containers, ghc-compact, ghc-prim + , prim-array, primitive, transformers + }: + mkDerivation { + pname = "compact-mutable"; + version = "0.1"; + sha256 = "0xc28aflb8cs8cbvp2mimswh0nflwpvzwlrh2dvqsq3qx02cvh36"; + libraryHaskellDepends = [ + base ghc-compact ghc-prim prim-array primitive + ]; + testHaskellDepends = [ + base containers ghc-compact ghc-prim prim-array primitive + transformers + ]; + homepage = "https://github.com/andrewthad/compact-mutable#readme"; + description = "Mutable arrays living on the compact heap"; + license = stdenv.lib.licenses.bsd3; + broken = true; + }) {ghc-compact = null;}; + "compact-socket" = callPackage ({ mkDerivation, base, binary, bytestring, compact, deepseq , directory, filepath, network, unix @@ -44859,8 +45248,8 @@ self: { ({ mkDerivation, base, containers, transformers, vector }: mkDerivation { pname = "compactable"; - version = "0.1.0.1"; - sha256 = "1h09hqxifi5xx25l1d3wz53zd1l51k9bb4cxva9vlzxy6yi0dj37"; + version = "0.1.0.2"; + sha256 = "19ra58dz8wcwx3f5znfqqc0dvnfhldkbd8rg9psc7cynf9xcf93m"; libraryHaskellDepends = [ base containers transformers vector ]; description = "A generalization for containers that can be stripped of Nothings"; license = stdenv.lib.licenses.bsd3; @@ -45114,23 +45503,24 @@ self: { "composite-aeson" = callPackage ({ mkDerivation, aeson, aeson-better-errors, aeson-qq, base , composite-base, containers, contravariant, generic-deriving - , hashable, hspec, lens, profunctors, QuickCheck, scientific - , tagged, template-haskell, text, time, unordered-containers - , vector, vinyl + , hashable, hspec, lens, mmorph, mtl, profunctors, QuickCheck + , scientific, tagged, template-haskell, text, time + , unordered-containers, vector, vinyl }: mkDerivation { pname = "composite-aeson"; - version = "0.4.1.0"; - sha256 = "0sbx0ww1fb5pr39d9ss40zkw74mgv1g3ynxklm46f0pnzyyny6v3"; + version = "0.4.2.0"; + sha256 = "06zaji95znvy5v9qmyczdncqgdmp2jkibqimchziayjs1vcmb8bg"; libraryHaskellDepends = [ aeson aeson-better-errors base composite-base containers - contravariant generic-deriving hashable lens profunctors scientific - tagged template-haskell text time unordered-containers vector vinyl + contravariant generic-deriving hashable lens mmorph mtl profunctors + scientific tagged template-haskell text time unordered-containers + vector vinyl ]; testHaskellDepends = [ aeson aeson-better-errors aeson-qq base composite-base containers - contravariant generic-deriving hashable hspec lens profunctors - QuickCheck scientific tagged template-haskell text time + contravariant generic-deriving hashable hspec lens mmorph mtl + profunctors QuickCheck scientific tagged template-haskell text time unordered-containers vector vinyl ]; homepage = "https://github.com/ConferHealth/composite#readme"; @@ -45140,12 +45530,16 @@ self: { }) {}; "composite-aeson-refined" = callPackage - ({ mkDerivation, base, composite-aeson, refined }: + ({ mkDerivation, aeson-better-errors, base, composite-aeson, mtl + , refined + }: mkDerivation { pname = "composite-aeson-refined"; - version = "0.4.1.0"; - sha256 = "1d4rjhgcxaklq7nbmi45qwi7zk3mhyf6bfzijv7qh9ln3nkg644k"; - libraryHaskellDepends = [ base composite-aeson refined ]; + version = "0.4.2.0"; + sha256 = "1zzqrjvlk6yy2zsx1v325mbwl9qjjwj6qvc42y61acag9n08asv5"; + libraryHaskellDepends = [ + aeson-better-errors base composite-aeson mtl refined + ]; homepage = "https://github.com/ConferHealth/composite#readme"; description = "composite-aeson support for Refined from the refined package"; license = stdenv.lib.licenses.bsd3; @@ -45159,8 +45553,8 @@ self: { }: mkDerivation { pname = "composite-base"; - version = "0.4.1.0"; - sha256 = "16yxc1i75mag3dnw7v62k418fg0visc616g769qj9n8nyr1viyw9"; + version = "0.4.2.0"; + sha256 = "0mfz7xpkl3lxg3pfk83mba7kb9phpcc4cnvimpphfcbwpzx8qcqw"; libraryHaskellDepends = [ base exceptions lens monad-control mtl profunctors template-haskell text transformers transformers-base vinyl @@ -45181,8 +45575,8 @@ self: { }: mkDerivation { pname = "composite-ekg"; - version = "0.4.1.0"; - sha256 = "1xbipy46bvph4h9wm73l68z7m4i8mcxxmgyzcqkyq8rwmrfx3diq"; + version = "0.4.2.0"; + sha256 = "06lb5djs1w9gby7f192wssxwbik2lpigzsfv25z5pchf8iab4f9d"; libraryHaskellDepends = [ base composite-base ekg ekg-core lens text vinyl ]; @@ -45199,8 +45593,8 @@ self: { }: mkDerivation { pname = "composite-opaleye"; - version = "0.4.1.0"; - sha256 = "1jb5garjx1yy4jdznbcfimjipjpmrxy9a1l9yfqbg9mlyz57y4mk"; + version = "0.4.2.0"; + sha256 = "0id817bwss3haskvfpn86bqsva8a0ahwbgbzh5zbyiwc5vqksnkx"; libraryHaskellDepends = [ base bytestring composite-base lens opaleye postgresql-simple product-profunctors profunctors template-haskell text vinyl @@ -45673,8 +46067,8 @@ self: { }: mkDerivation { pname = "concurrent-machines"; - version = "0.3.0"; - sha256 = "1lha3bk98cdd3bsy5kbl92hp3f35x3q1p135j37r9xw9ix4kivy5"; + version = "0.3.1"; + sha256 = "0n04gnnv323fk1h9mp8krqbl2v6ljjv1vzw5df38cxvj2xd64y94"; libraryHaskellDepends = [ async base containers lifted-async machines monad-control semigroups time transformers transformers-base @@ -46176,28 +46570,6 @@ self: { }) {}; "conduit-parse" = callPackage - ({ mkDerivation, base, conduit, dlist, hlint, mtl, parsers - , resourcet, safe, safe-exceptions, tasty, tasty-hunit, text - , transformers - }: - mkDerivation { - pname = "conduit-parse"; - version = "0.1.2.0"; - sha256 = "05yfggq2g8ifwgb4w12i9n7hgjydvyk9i3bkszxk0ba51rmiyqhm"; - libraryHaskellDepends = [ - base conduit dlist mtl parsers safe safe-exceptions text - transformers - ]; - testHaskellDepends = [ - base conduit hlint mtl parsers resourcet safe-exceptions tasty - tasty-hunit - ]; - homepage = "https://github.com/k0ral/conduit-parse"; - description = "Parsing framework based on conduit"; - license = "unknown"; - }) {}; - - "conduit-parse_0_1_2_1" = callPackage ({ mkDerivation, base, conduit, conduit-combinators, dlist, hlint , mtl, parsers, resourcet, safe, safe-exceptions, tasty , tasty-hunit, text, transformers @@ -46217,7 +46589,6 @@ self: { homepage = "https://github.com/k0ral/conduit-parse"; description = "Parsing framework based on conduit"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-resumablesink" = callPackage @@ -47628,10 +47999,8 @@ self: { }: mkDerivation { pname = "copilot"; - version = "2.2.0"; - sha256 = "0ls81h1akdvpzgmicv55qi2w1zjxjsz264wkzdgl6qzvpd465djs"; - revision = "3"; - editedCabalFile = "0v3dmjz234kfjggrk7m2zwh03q6sgnmb3y4mizqc4qd9acnlhrjm"; + version = "2.2.1"; + sha256 = "04bfrxvz04jcc1favl21xb4qbj3gd0par0xg1f11r5s73ldnghb9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47654,8 +48023,8 @@ self: { }: mkDerivation { pname = "copilot-c99"; - version = "2.2.0"; - sha256 = "173ydqyr2y4plhk1a8vlkvagk13yjrk65jd9h0hd08fv899gbfg9"; + version = "2.2.1"; + sha256 = "1wyw1jiicx39x7iscy9rld7pnfpan8xfp8lphn7b658hipw0v4aq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47676,8 +48045,8 @@ self: { }: mkDerivation { pname = "copilot-cbmc"; - version = "2.2.0"; - sha256 = "03mf7kr808ww39a6g1brih8in7q8v4j9gz649kl4p1i8kk4fd7xc"; + version = "2.2.1"; + sha256 = "0xcm6qgylhvnjaih1jbl4dripik10nqm6536rdspj6kzg81qifd9"; libraryHaskellDepends = [ base bytestring copilot-c99 copilot-core copilot-sbv directory pretty process @@ -47693,8 +48062,8 @@ self: { }: mkDerivation { pname = "copilot-core"; - version = "2.2.0"; - sha256 = "18b0y28c40hbx2wpc7xim5dh3ph0g0lh9ksl6sq7jqfnaiwnr6ia"; + version = "2.2.1"; + sha256 = "1mzxb24chxfrkpr4487dxkwbnhaysyxsrv4y38ma76nq141xr105"; libraryHaskellDepends = [ base containers dlist mtl pretty pretty-ncols random ]; @@ -47708,10 +48077,8 @@ self: { }: mkDerivation { pname = "copilot-language"; - version = "2.2.0"; - sha256 = "0z0jpwq5zx6f6fp6xk58n2s66d7r2ngd3xbkiabhd7w1a22wkfrm"; - revision = "1"; - editedCabalFile = "1bshf179n6l1svv86n46rk7pxdlas8nx6haj1fni9xg45ggipdks"; + version = "2.2.1"; + sha256 = "1pv54iwzcyvw46xq6am2l23sw223n8b9fqc910dkf2kjr6y6q6v8"; libraryHaskellDepends = [ array base containers copilot-core copilot-theorem data-reify ghc-prim mtl @@ -47727,12 +48094,12 @@ self: { }: mkDerivation { pname = "copilot-libraries"; - version = "2.2.0"; - sha256 = "0aqbyms7d33vklm702j36a4vw1m674h7zbqkzbkn6yzxnz76gbm6"; + version = "2.2.1"; + sha256 = "0ashnay40kkbysnbz8ay0r7ljzwkx07m4z960kfjnh3y6s5qk6ww"; libraryHaskellDepends = [ array base containers copilot-language mtl parsec ]; - homepage = "https://github.com/leepike/copilot-libraries"; + homepage = "https://github.com/Copilot-Language/copilot-libraries"; description = "Libraries for the Copilot language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -47744,8 +48111,8 @@ self: { }: mkDerivation { pname = "copilot-sbv"; - version = "2.2.0"; - sha256 = "1blxhpv9ipamd2p40cdpbsx6dp27rrzqaj2rn0a6p11wz8378rcd"; + version = "2.2.1"; + sha256 = "00gym2xadw7zi5mrkfrnvxi6cr7c5rgmbwiflrif63j2q7v0z25l"; libraryHaskellDepends = [ base containers copilot-core directory filepath pretty sbv ]; @@ -47760,8 +48127,8 @@ self: { }: mkDerivation { pname = "copilot-theorem"; - version = "2.2.0"; - sha256 = "037kbhl86h6yrfjr3fyvrbxy1mkm5akic4gnxgsrbing5yylhjf2"; + version = "2.2.1"; + sha256 = "1qw46k26f6cisyjmjn0d9g7sjkx67vpydiqm7l9f1hib4dygcznx"; libraryHaskellDepends = [ ansi-terminal base bimap containers copilot-core data-default directory mtl parsec pretty process random smtlib2 transformers xml @@ -48071,6 +48438,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "country" = callPackage + ({ mkDerivation, base, bytestring, ghc-prim, hashable, primitive + , text, unordered-containers + }: + mkDerivation { + pname = "country"; + version = "0.1.1"; + sha256 = "00fmbljb9s1nfhgcv52ka9mavfqp6ljx6nzw5jmy8f1j8rvx49l6"; + libraryHaskellDepends = [ + base bytestring ghc-prim hashable primitive text + unordered-containers + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/andrewthad/country#readme"; + description = "Country data type and functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "country-codes" = callPackage ({ mkDerivation, aeson, base, HTF, HUnit, shakespeare, text }: mkDerivation { @@ -48208,8 +48593,8 @@ self: { }: mkDerivation { pname = "cpphs"; - version = "1.20.5"; - sha256 = "1cx565wv9r60xw8la5mjfpvsry5wxh9h6ai40jbwd727nwq0r8y5"; + version = "1.20.8"; + sha256 = "1bh524asqhk9v1s0wvipl0hgn7l63iy3js867yv0z3h5v2kn8vg5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -49019,7 +49404,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "criterion_1_2_0_0" = callPackage + "criterion_1_2_1_0" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat, binary , bytestring, cassava, code-page, containers, deepseq, directory , exceptions, filepath, Glob, HUnit, js-flot, js-jquery @@ -49030,8 +49415,8 @@ self: { }: mkDerivation { pname = "criterion"; - version = "1.2.0.0"; - sha256 = "0rbmfjgxba7qsp79lj7k00yzphmknimqh5r20nw1bc6i1v4civ6f"; + version = "1.2.1.0"; + sha256 = "0hbhm6fcbvh38m8hazlzjh3z09adjrzcv5jq63792bvnm24bpx6r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -49203,6 +49588,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "cron_0_6_0" = callPackage + ({ mkDerivation, attoparsec, base, criterion, data-default-class + , generics-sop, mtl, mtl-compat, old-locale, quickcheck-instances + , semigroups, tasty, tasty-hunit, tasty-quickcheck, text, time + , transformers-compat + }: + mkDerivation { + pname = "cron"; + version = "0.6.0"; + sha256 = "0s40b0dlkrwhx3sqbca0a883wd54xbkgqfz4w0ncmsb06x3sdx04"; + libraryHaskellDepends = [ + attoparsec base data-default-class mtl mtl-compat old-locale + semigroups text time + ]; + testHaskellDepends = [ + attoparsec base generics-sop quickcheck-instances semigroups tasty + tasty-hunit tasty-quickcheck text time transformers-compat + ]; + benchmarkHaskellDepends = [ attoparsec base criterion text time ]; + 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 ({ mkDerivation, attoparsec, base, cron, derive, hspec , hspec-expectations, mtl, mtl-compat, old-locale, QuickCheck, text @@ -49259,6 +49669,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "crypt-sha512" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, cryptohash-sha512 + , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "crypt-sha512"; + version = "0"; + sha256 = "1wsma9frdrn39i506zydlzlk1ir6jh1pidqfjms8rwqjpx965gn2"; + libraryHaskellDepends = [ + attoparsec base bytestring cryptohash-sha512 + ]; + testHaskellDepends = [ + base bytestring quickcheck-instances tasty tasty-hunit + tasty-quickcheck + ]; + homepage = "https://github.com/phadej/crypt-sha512"; + description = "Pure Haskell implelementation for GNU SHA512 crypt algorithm"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "crypto-api" = callPackage ({ mkDerivation, base, bytestring, cereal, entropy, tagged , transformers @@ -49626,6 +50056,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cryptoconditions" = callPackage + ({ mkDerivation, aeson, aeson-quick, asn1-encoding, asn1-parse + , asn1-types, base, base16-bytestring, base64-bytestring + , bytestring, containers, cryptonite, memory, tasty, tasty-hunit + , text, transformers + }: + mkDerivation { + pname = "cryptoconditions"; + version = "0.1.0.0"; + sha256 = "0dbhlv7nh0awnvi1rwg3s25ksbxgvdlci543bwqp5ilkqdl3vlh0"; + libraryHaskellDepends = [ + asn1-encoding asn1-parse asn1-types base base64-bytestring + bytestring containers cryptonite memory text + ]; + testHaskellDepends = [ + aeson aeson-quick asn1-encoding base base16-bytestring + base64-bytestring bytestring cryptonite tasty tasty-hunit text + transformers + ]; + homepage = "https://github.com/libscott/cryptoconditions-hs"; + description = "Interledger Crypto-Conditions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cryptohash" = callPackage ({ mkDerivation, base, byteable, bytestring, criterion, cryptonite , ghc-prim, HUnit, memory, QuickCheck, tasty, tasty-hunit @@ -49822,15 +50276,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "cryptonite_0_23" = callPackage + "cryptonite_0_24" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, foundation , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit , tasty-kat, tasty-quickcheck }: mkDerivation { pname = "cryptonite"; - version = "0.23"; - sha256 = "1680dxgmnjgj083jhsw3rlljwaw0zqi5099m59x6kwqkxhn1qjpf"; + version = "0.24"; + sha256 = "11js3fg1rbrgy17i0nq19v9w4w28s80zglb6fnlbz6zg8cik3hqp"; libraryHaskellDepends = [ base bytestring deepseq foundation ghc-prim integer-gmp memory ]; @@ -51545,6 +51999,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "data-basic" = callPackage + ({ mkDerivation, aeson, base, basic, binary, bytestring, cases + , containers, hssqlppp, lens, lens-aeson, mtl, overload + , postgresql-simple, simple-effects, string-conv, template-haskell + , text, time + }: + mkDerivation { + pname = "data-basic"; + version = "0.2.0.3"; + sha256 = "0xmc9cj22nw90c4l9ava7da14d2y3pvip81admgjx8cqgz93255k"; + libraryHaskellDepends = [ + aeson base binary bytestring cases containers hssqlppp lens + lens-aeson mtl overload postgresql-simple simple-effects + string-conv template-haskell text time + ]; + testHaskellDepends = [ base basic lens postgresql-simple time ]; + homepage = "https://gitlab.com/haskell-hr/basic"; + description = "A database library with a focus on ease of use, type safety and useful error messages"; + license = stdenv.lib.licenses.mit; + broken = true; + }) {basic = null;}; + "data-binary-ieee754" = callPackage ({ mkDerivation, base, binary }: mkDerivation { @@ -51635,8 +52111,8 @@ self: { ({ mkDerivation, base, deepseq, QuickCheck }: mkDerivation { pname = "data-clist"; - version = "0.1.1.0"; - sha256 = "1dkd2qshc2srfafhbhqnq70hks74ngnqbmzdiiaccylx2cpbs2ms"; + version = "0.1.2.0"; + sha256 = "09hn47fa2y3gpbl6zdahi0qdn4m17kfg7bwc4ch6024kir73fg6f"; libraryHaskellDepends = [ base deepseq QuickCheck ]; homepage = "https://github.com/sw17ch/data-clist"; description = "Simple functional ring type"; @@ -51917,6 +52393,37 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "data-diverse" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim + , hspec, tagged + }: + mkDerivation { + pname = "data-diverse"; + version = "0.8.1.0"; + sha256 = "1lav14j4p01wym8s7j3haliiaj16lyglw5bbp7gn2xk3xg7z1k3p"; + libraryHaskellDepends = [ + base containers deepseq ghc-prim tagged + ]; + testHaskellDepends = [ base hspec tagged ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/louispan/data-diverse#readme"; + description = "Extensible records and polymorphic variants"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "data-diverse-lens" = callPackage + ({ mkDerivation, base, data-diverse, hspec, lens, tagged }: + mkDerivation { + pname = "data-diverse-lens"; + version = "0.1.1.0"; + sha256 = "0arwpab3a88jdpcg1pnj96dfdhfnnzf5za3l8cfwzbsjrc5ddl44"; + libraryHaskellDepends = [ base data-diverse lens tagged ]; + testHaskellDepends = [ base data-diverse hspec lens tagged ]; + homepage = "https://github.com/louispan/data-diverse-lens#readme"; + description = "Isos & Lens for Data.Diverse.Many and Prisms for Data.Diverse.Which"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "data-dword" = callPackage ({ mkDerivation, base, data-bword, ghc-prim, hashable, tasty , tasty-quickcheck, template-haskell @@ -54013,21 +54520,21 @@ self: { ({ mkDerivation, base, bytestring, bzlib, containers, directory , either, exceptions, filepath, HaXml, HUnit, ListLike, mtl , network, network-uri, old-locale, parsec, pretty, process - , process-extras, pureMD5, regex-compat, regex-tdfa + , process-extras, pureMD5, regex-compat, regex-tdfa, SHA , template-haskell, text, time, unix, Unixutils, utf8-string, zlib }: mkDerivation { pname = "debian"; - version = "3.91.2"; - sha256 = "0mhd5q2lx8x6ldijfk1w8ghpgncism10yyar5d39an7gcbalmc8n"; + version = "3.93.2"; + sha256 = "1a1brh07lvrchdll0aabmzikv7inlbaspx0nv3xa94cmzkgvr30l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring bzlib containers directory either exceptions filepath HaXml HUnit ListLike mtl network network-uri old-locale parsec pretty process process-extras pureMD5 regex-compat - regex-tdfa template-haskell text time unix Unixutils utf8-string - zlib + regex-tdfa SHA template-haskell text time unix Unixutils + utf8-string zlib ]; executableHaskellDepends = [ base directory filepath HaXml pretty process unix @@ -55469,19 +55976,23 @@ self: { homepage = "https://github.com/andrewthad/dhcp-lease-parser#readme"; description = "Parse a DHCP lease file"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "di" = callPackage - ({ mkDerivation, base, stm, text, time, transformers }: + ({ mkDerivation, base, bytestring, QuickCheck, stm, tasty + , tasty-hunit, tasty-quickcheck, time, transformers + }: mkDerivation { pname = "di"; - version = "0.1"; - sha256 = "06vy2x4v5h4pnidqjyi2s8rk13zp9anx61z251dphmbv510rlfw8"; - revision = "1"; - editedCabalFile = "08fmgc1dsvwipd0dnwbnmc9f16abzfhxk4kkcf535kykxxc621qc"; - libraryHaskellDepends = [ base stm text time transformers ]; + version = "0.2"; + sha256 = "1vmhd8zph5ai13n2cfrjaxcdifwqv7wiggqbfi5ifhancxwlfq7p"; + libraryHaskellDepends = [ base stm time transformers ]; + testHaskellDepends = [ + base bytestring QuickCheck stm tasty tasty-hunit tasty-quickcheck + ]; homepage = "https://github.com/k0001/di"; - description = "Easy and powerful typeful logging without monad towers"; + description = "Easy, powerful, structured and typeful logging without monad towers"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -55647,6 +56158,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "diagrams-contrib_1_4_1" = callPackage + ({ mkDerivation, base, circle-packing, colour, containers + , cubicbezier, data-default, data-default-class, diagrams-core + , diagrams-lib, diagrams-solve, force-layout, hashable, HUnit, lens + , linear, mfsolve, MonadRandom, monoid-extras, mtl, mtl-compat + , parsec, QuickCheck, random, semigroups, split, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + }: + mkDerivation { + pname = "diagrams-contrib"; + version = "1.4.1"; + sha256 = "1apbgicaq7qaij42hwh5aiy67si2fjd0m4lah1hw4vz0cqfxxs2v"; + libraryHaskellDepends = [ + base circle-packing colour containers cubicbezier data-default + data-default-class diagrams-core diagrams-lib diagrams-solve + force-layout hashable lens linear mfsolve MonadRandom monoid-extras + mtl mtl-compat parsec random semigroups split text + ]; + testHaskellDepends = [ + base containers diagrams-lib HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 + ]; + homepage = "http://projects.haskell.org/diagrams/"; + description = "Collection of user contributions to diagrams EDSL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diagrams-core" = callPackage ({ mkDerivation, adjunctions, base, containers, distributive , dual-tree, lens, linear, monoid-extras, mtl, profunctors @@ -55780,6 +56319,8 @@ self: { pname = "diagrams-lib"; version = "1.4.1.2"; sha256 = "0w16cljv9jcvn46hd19qvw1bfvxijlak286nap9qbvyavq2qhvjb"; + revision = "3"; + editedCabalFile = "14ni87kwmjhbphcihiivvz0nxga355263q36wvbyvvjmxvbdj98n"; libraryHaskellDepends = [ active adjunctions array base bytestring cereal colour containers data-default-class diagrams-core diagrams-solve directory @@ -55956,12 +56497,17 @@ self: { }) {}; "diagrams-solve" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, deepseq, tasty, tasty-hunit + , tasty-quickcheck + }: mkDerivation { pname = "diagrams-solve"; - version = "0.1.0.1"; - sha256 = "1piv8mi5182b2ggr28fnr4mda4vbk4mzasvy0nfp3517ii63mrbi"; + version = "0.1.1"; + sha256 = "17agchqkmj14b17sw50kzxq4hm056g5d8yy0wnqn5w8h1d0my7x4"; libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base deepseq tasty tasty-hunit tasty-quickcheck + ]; homepage = "http://projects.haskell.org/diagrams"; description = "Pure Haskell solver routines used by diagrams"; license = stdenv.lib.licenses.bsd3; @@ -55977,6 +56523,8 @@ self: { pname = "diagrams-svg"; version = "1.4.1"; sha256 = "11vzcsqgkc8jzm5dw82swgqzahck541mz2l9jkkwfdaq09w16sff"; + revision = "1"; + editedCabalFile = "12cp0898pplap5skhq43xsxh0m2ilv5lz9zw2fhkkjmnr4pbl2dx"; libraryHaskellDepends = [ base base64-bytestring bytestring colour containers diagrams-core diagrams-lib filepath hashable JuicyPixels lens monoid-extras mtl @@ -56674,6 +57222,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dimensions" = callPackage + ({ mkDerivation, base, Cabal, ghc-prim, QuickCheck }: + mkDerivation { + pname = "dimensions"; + version = "0.3.0.0"; + sha256 = "00932v3j629ik2n4flq74zcxvvqxgsl88sifyn2ppdwvp535cmhm"; + libraryHaskellDepends = [ base ghc-prim ]; + testHaskellDepends = [ base Cabal QuickCheck ]; + homepage = "https://github.com/achirkin/easytensor#readme"; + description = "Safe type-level dimensionality for multidimensional data"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dingo-core" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-builder, blaze-html, blaze-textual, bytestring, conduit @@ -56886,8 +57447,8 @@ self: { }: mkDerivation { pname = "direct-sqlite"; - version = "2.3.19"; - sha256 = "0g7bwv1496qb1lgz15q83zjg8ddw1icpb98i70zrxpcdi2crnzpl"; + version = "2.3.20"; + sha256 = "0wdjmqfs968319nl6ikmrrjqajfcb48k11hmmljwg81n1sbdydbf"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base base16-bytestring bytestring directory HUnit temporary text @@ -57097,6 +57658,7 @@ self: { homepage = "https://github.com/jano017/Discord.hs"; description = "An API wrapper for Discord in Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "discord-types" = callPackage @@ -57243,6 +57805,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "diskhash" = callPackage + ({ mkDerivation, base, bytestring, directory, HUnit, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , test-framework-th + }: + mkDerivation { + pname = "diskhash"; + version = "0.0.1.2"; + sha256 = "10fmh48xndy3bs1aphm9y9rh8lax4spyysr675d69gabhxm3qcvb"; + revision = "1"; + editedCabalFile = "10kck6rz2x0c0vnzr916qy9ss5aq6fr2jq7c8mpking3668j3ann"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ + base bytestring directory HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 test-framework-th + ]; + description = "Disk-based hash table"; + license = stdenv.lib.licenses.mit; + }) {}; + "display-haskell-do" = callPackage ({ mkDerivation, aeson, base, text }: mkDerivation { @@ -57874,8 +58456,8 @@ self: { ({ mkDerivation, array, base, containers, MonadRandom, random }: mkDerivation { pname = "distribution"; - version = "1.1.0.0"; - sha256 = "03l1aki8cvpqx0b11923nkcpp32afwk0k5cgv7hc74yzbwmniqnv"; + version = "1.1.1.0"; + sha256 = "1cc16020b8jifcqb2k61g9rv100i8iga7dfsi8jf502myvpgilpx"; libraryHaskellDepends = [ array base containers MonadRandom random ]; @@ -58091,6 +58673,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dlist_0_8_0_3" = callPackage + ({ mkDerivation, base, Cabal, deepseq, QuickCheck + , quickcheck-instances + }: + mkDerivation { + pname = "dlist"; + version = "0.8.0.3"; + sha256 = "0brgai4vs7xz29p06kd6gzg5bpa8iy3k7yzgcc44izspd74q4rw7"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ + base Cabal QuickCheck quickcheck-instances + ]; + homepage = "https://github.com/spl/dlist"; + description = "Difference lists"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dlist-instances" = callPackage ({ mkDerivation, base, dlist, semigroups }: mkDerivation { @@ -58103,6 +58703,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dlist-nonempty" = callPackage + ({ mkDerivation, base, base-compat, Cabal, criterion, deepseq + , dlist, dlist-instances, QuickCheck, quickcheck-instances + , semigroupoids + }: + mkDerivation { + pname = "dlist-nonempty"; + version = "0.1"; + sha256 = "13nkf2kgm8pd1vicd2lm2z99m04bs65pm1kjn4k4a2259h3hd0m8"; + libraryHaskellDepends = [ + base base-compat deepseq dlist semigroupoids + ]; + testHaskellDepends = [ + base Cabal QuickCheck quickcheck-instances + ]; + benchmarkHaskellDepends = [ + base base-compat criterion dlist dlist-instances + ]; + homepage = "https://github.com/phadej/dlist-nonempty"; + description = "Non-empty difference lists"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dmc" = callPackage ({ mkDerivation, base, hspec, process, QuickCheck }: mkDerivation { @@ -58345,24 +58968,26 @@ self: { , lens-aeson, monad-control, mtl, network, process, QuickCheck , resourcet, scientific, tar, tasty, tasty-hunit, tasty-quickcheck , temporary, text, time, tls, transformers, transformers-base - , unordered-containers, uuid, x509, x509-store, x509-system, zlib + , unordered-containers, uuid, vector, x509, x509-store, x509-system + , zlib }: mkDerivation { pname = "docker"; - version = "0.4.0.0"; - sha256 = "0fcgy6fbhwwvdv93i5xggzkagnzlyccnciy7n8jxdrrm2fg8xxk1"; + version = "0.4.0.1"; + sha256 = "1nf860admbdhrbyyj8m7ymd9c390rnrn2nqb2gr3i8dk4rcm4hsf"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit conduit-combinators conduit-extra containers data-default-class directory exceptions filemanip filepath http-client http-conduit http-types monad-control mtl network resourcet scientific tar temporary text time tls transformers transformers-base unordered-containers uuid - x509 x509-store x509-system zlib + vector x509 x509-store x509-system zlib ]; testHaskellDepends = [ aeson base bytestring connection containers http-client http-client-tls http-types lens lens-aeson process QuickCheck tasty tasty-hunit tasty-quickcheck text transformers unordered-containers + vector ]; homepage = "https://github.com/denibertovic/docker-hs"; description = "An API client for docker written in Haskell"; @@ -58457,33 +59082,6 @@ self: { }) {}; "doctest" = callPackage - ({ mkDerivation, base, base-compat, code-page, deepseq, directory - , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process - , QuickCheck, setenv, silently, stringbuilder, syb, transformers - , with-location - }: - mkDerivation { - pname = "doctest"; - version = "0.11.2"; - sha256 = "12wlc7qxpr8i46inj8jgq6s224l4h5vka3zw7ibpjhddligdwlh7"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base base-compat code-page deepseq directory filepath ghc ghc-paths - process syb transformers - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base base-compat code-page deepseq directory filepath ghc ghc-paths - hspec HUnit mockery process QuickCheck setenv silently - stringbuilder syb transformers with-location - ]; - homepage = "https://github.com/sol/doctest#readme"; - description = "Test interactive Haskell examples"; - license = stdenv.lib.licenses.mit; - }) {}; - - "doctest_0_11_3" = callPackage ({ mkDerivation, base, base-compat, code-page, deepseq, directory , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process , QuickCheck, setenv, silently, stringbuilder, syb, transformers @@ -58508,7 +59106,6 @@ self: { homepage = "https://github.com/sol/doctest#readme"; description = "Test interactive Haskell examples"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "doctest-discover" = callPackage @@ -58791,33 +59388,6 @@ self: { }) {}; "dotenv" = callPackage - ({ mkDerivation, base, base-compat, exceptions, hspec - , hspec-megaparsec, megaparsec, optparse-applicative, process, text - , transformers - }: - mkDerivation { - pname = "dotenv"; - version = "0.3.3.0"; - sha256 = "1n6klccf3rd5l6m0nbbdb6abwgfrjyi19x2g3sjxh3fhqqb1qigg"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base base-compat exceptions megaparsec text transformers - ]; - executableHaskellDepends = [ - base base-compat megaparsec optparse-applicative process text - transformers - ]; - testHaskellDepends = [ - base base-compat exceptions hspec hspec-megaparsec megaparsec text - transformers - ]; - homepage = "https://github.com/stackbuilders/dotenv-hs"; - description = "Loads environment variables from dotenv files"; - license = stdenv.lib.licenses.mit; - }) {}; - - "dotenv_0_3_4_0" = callPackage ({ mkDerivation, base, base-compat, exceptions, hspec , hspec-megaparsec, megaparsec, optparse-applicative, process, text , transformers @@ -58842,7 +59412,6 @@ self: { homepage = "https://github.com/stackbuilders/dotenv-hs"; description = "Loads environment variables from dotenv files"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dotfs" = callPackage @@ -59685,12 +60254,19 @@ self: { }) {}; "dual-tree" = callPackage - ({ mkDerivation, base, monoid-extras, newtype, semigroups }: + ({ mkDerivation, base, monoid-extras, newtype-generics, QuickCheck + , semigroups, testing-feat + }: mkDerivation { pname = "dual-tree"; - version = "0.2.0.9"; - sha256 = "193ncl8l186gxrfj5pszbmlwjw4gljlkziddql0dyqhr8yxhlzay"; - libraryHaskellDepends = [ base monoid-extras newtype semigroups ]; + version = "0.2.1"; + sha256 = "06azc2lwli9aw81a23g82yxiann2qjc3bk7cdyh9kiwimdyj8r94"; + libraryHaskellDepends = [ + base monoid-extras newtype-generics semigroups + ]; + testHaskellDepends = [ + base monoid-extras QuickCheck semigroups testing-feat + ]; description = "Rose trees with cached and accumulating monoidal annotations"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -59704,8 +60280,8 @@ self: { }: mkDerivation { pname = "duckling"; - version = "0.1.0.0"; - sha256 = "16h07ny99a6vndpwy5m3iiikkc0ygrsg1a9l9aklmlcydprlcmvq"; + version = "0.1.1.0"; + sha256 = "0c81cjah5iy3p2p9g4z1k0mxwg1256l93m53bnk7pr37439vwnx6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -60319,6 +60895,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ease" = callPackage + ({ mkDerivation, base, data-default }: + mkDerivation { + pname = "ease"; + version = "0.1.0.0"; + sha256 = "17zj7s0qq3y4w6qd06hi4fc54m4j1f07wxm7yfnc47lsg5n9f4g0"; + libraryHaskellDepends = [ base data-default ]; + description = "Robert Penner's easing equations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "easy-api" = callPackage ({ mkDerivation, aeson, base, bytestring, either, http-conduit, mtl , resourcet, text @@ -60416,18 +61003,18 @@ self: { }) {}; "easytensor" = callPackage - ({ mkDerivation, base, ghc-prim }: + ({ mkDerivation, base, Cabal, dimensions, ghc-prim, QuickCheck + , time + }: mkDerivation { pname = "easytensor"; - version = "0.1.0.0"; - sha256 = "0cdhy00if38yaqg5n05sg3i8h8gh6shcwlycchgibw4141fj5wkz"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base ghc-prim ]; - executableHaskellDepends = [ base ghc-prim ]; - testHaskellDepends = [ base ]; + version = "0.3.0.0"; + sha256 = "1a6y6lrnc82354jqfrns4bb3pwhiwnidfcgfwzg38wsdmpq5rhg9"; + libraryHaskellDepends = [ base dimensions ghc-prim ]; + testHaskellDepends = [ base Cabal dimensions QuickCheck ]; + benchmarkHaskellDepends = [ base dimensions time ]; homepage = "https://github.com/achirkin/easytensor#readme"; - description = "Initial project template from stack"; + description = "Pure, type-indexed haskell vector, matrix, and tensor library"; license = stdenv.lib.licenses.mit; hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; @@ -61296,8 +61883,8 @@ self: { }: mkDerivation { pname = "ekg-elasticsearch"; - version = "0.3.0.0"; - sha256 = "0xv32kzsvl2g4vs9ygga3xn0x9dqm9vn8zg7hbj8agxrfnvprqvw"; + version = "0.3.1.1"; + sha256 = "0v78xrmnxx6z0lgx8lvc15hmd0zgm2kqibvkf9sj3cdza75vsr1q"; libraryHaskellDepends = [ aeson base bytestring ekg-core hostname http-client lens text time unordered-containers wreq @@ -61463,6 +62050,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "elenco-albero" = callPackage + ({ mkDerivation, base, containers, hspec, QuickCheck }: + mkDerivation { + pname = "elenco-albero"; + version = "1.0.0"; + sha256 = "1plqdvyy4ln1cg2195bx6wpylnscj8b7zvks24qmq6sqskhckspr"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://bitbucket.org/ciezbit/elenco-albero"; + description = "make tree from a list"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "elerea" = callPackage ({ mkDerivation, base, containers, transformers, transformers-base }: @@ -61527,6 +62127,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "eliminators" = callPackage + ({ mkDerivation, base, hspec, singletons }: + mkDerivation { + pname = "eliminators"; + version = "0.1"; + sha256 = "0amd3gwnxhdbpg9afv2zs4c3lhc9s7ri66cpdp4x7vmp5xx6yi3n"; + libraryHaskellDepends = [ base singletons ]; + testHaskellDepends = [ base hspec singletons ]; + homepage = "https://github.com/RyanGlScott/eliminators"; + description = "Dependently typed elimination functions using singletons"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "elision" = callPackage ({ mkDerivation, base, profunctors }: mkDerivation { @@ -62005,24 +62618,41 @@ self: { }) {}; "email-validate" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, ghc-prim, HUnit - , QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2 + ({ mkDerivation, attoparsec, base, bytestring, HUnit, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { pname = "email-validate"; - version = "2.2.0"; - sha256 = "0sfbv4l5h13h9shgf2fgm1a7sxbcy633abvwwr5bqnq15kqd6zxa"; - libraryHaskellDepends = [ attoparsec base bytestring ghc-prim ]; + version = "2.2.1.1"; + sha256 = "18q1n0x79mii4d3hdm671ziswh1283mwl1xj47vcvizz4mi6vhh7"; + libraryHaskellDepends = [ attoparsec base bytestring ]; testHaskellDepends = [ base bytestring HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; - homepage = "http://porg.es/blog/email-address-validation-simpler-faster-more-correct"; - description = "Validating an email address string against RFC 5322"; + homepage = "https://github.com/Porges/email-validate-hs"; + description = "Email address validation"; license = stdenv.lib.licenses.bsd3; }) {}; + "email-validate_2_3" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec + , QuickCheck, template-haskell + }: + mkDerivation { + pname = "email-validate"; + version = "2.3"; + sha256 = "1zm6sqvaa3r412cz5ga7hcjl3b26hi4l8fc8z5im476rsjib8jf1"; + libraryHaskellDepends = [ + attoparsec base bytestring template-haskell + ]; + testHaskellDepends = [ base bytestring doctest hspec QuickCheck ]; + homepage = "https://github.com/Porges/email-validate-hs"; + description = "Email address validation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "email-validate-json" = callPackage ({ mkDerivation, aeson, base, email-validate, text }: mkDerivation { @@ -62427,10 +63057,8 @@ self: { }: mkDerivation { pname = "entropy"; - version = "0.3.7"; - sha256 = "1vzg9fi597dbrcbjsr71y47rvmhiih7lg5rjnb297fzdlbmj1w0z"; - revision = "1"; - editedCabalFile = "01lyh4cbpqlcj1y8mnkw6vk4vid5rzqg1vcf9kwxwd88zj86cgjg"; + version = "0.3.8"; + sha256 = "1l3lfigqvdlmxkz1wl7zdkmc0i2r5p6z4xzhiw8xdsbsw7aljfkl"; setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ base bytestring unix ]; homepage = "https://github.com/TomMD/entropy"; @@ -63356,8 +63984,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "2.5.2"; - sha256 = "1hbwb6vzd5ykqg6v6f1jmbpbdin1hpjgghgnz1c986d9n6skm6wf"; + version = "2.5.3"; + sha256 = "10n49rzqmblky7pwjnysalyy6nacmxfms8dqbsdv6hlyzr8pb69x"; libraryHaskellDepends = [ base blaze-html bytestring conduit monad-logger persistent resourcet tagged text transformers unordered-containers @@ -63941,21 +64569,22 @@ self: { }) {}; "eventful-core" = callPackage - ({ mkDerivation, aeson, base, containers, hlint, hspec - , http-api-data, HUnit, path-pieces, sum-type-boilerplate + ({ mkDerivation, aeson, base, containers, contravariant, hlint + , hspec, http-api-data, HUnit, path-pieces, sum-type-boilerplate , template-haskell, text, transformers, uuid }: mkDerivation { pname = "eventful-core"; - version = "0.1.2"; - sha256 = "0vlhn54qiwi6cvvf9r4nwgnlp747y3i1nh9y2dxr8g9zkpj0wcyn"; + version = "0.1.3"; + sha256 = "1lify1ama6a479w0mcvr4qmp0mrfgwf6nsy902hrx20sn5ik02h9"; libraryHaskellDepends = [ - aeson base containers http-api-data path-pieces + aeson base containers contravariant http-api-data path-pieces sum-type-boilerplate template-haskell text transformers uuid ]; testHaskellDepends = [ - aeson base containers hlint hspec http-api-data HUnit path-pieces - sum-type-boilerplate template-haskell text transformers uuid + aeson base containers contravariant hlint hspec http-api-data HUnit + path-pieces sum-type-boilerplate template-haskell text transformers + uuid ]; homepage = "https://github.com/jdreaver/eventful#readme"; description = "Core module for eventful"; @@ -63970,8 +64599,8 @@ self: { }: mkDerivation { pname = "eventful-dynamodb"; - version = "0.1.2"; - sha256 = "0q8wvnxcprh4gz74d4jsia5ripgn87lb2mw037mrf817g0w63dgl"; + version = "0.1.3"; + sha256 = "1ymzryyz77705vwb05nhjhw6sz2ksjfpld5g569pnbdlr03m257y"; libraryHaskellDepends = [ aeson amazonka amazonka-dynamodb base bytestring conduit eventful-core lens safe text unordered-containers vector @@ -63994,8 +64623,8 @@ self: { }: mkDerivation { pname = "eventful-memory"; - version = "0.1.2"; - sha256 = "0kq8f6x7q19vlwgfz7mwlisik0j5wi8pxwlliyv2ispa37rlmvgx"; + version = "0.1.3"; + sha256 = "0r35bg40j4bdpf5ibxi5acjnmdl9piaysyzswapwcjq4jyibcdk9"; libraryHaskellDepends = [ base containers eventful-core mtl safe stm ]; @@ -64015,8 +64644,8 @@ self: { }: mkDerivation { pname = "eventful-postgresql"; - version = "0.1.2"; - sha256 = "0aim6907mkjxlwiwkhmjmmfcbagkaq7z633447xr4mw931v8k84l"; + version = "0.1.3"; + sha256 = "0vc36qfi2q1im60nwzb9ivpsz7kk2y83rbzbbv4b2mjk3cvvjnyr"; libraryHaskellDepends = [ aeson base bytestring eventful-core eventful-sql-common mtl persistent text @@ -64038,8 +64667,8 @@ self: { }: mkDerivation { pname = "eventful-sql-common"; - version = "0.1.2"; - sha256 = "05q1v64l007saazflvp70sz4579dpzpr08qcgzhg2b1m2ga3pwhn"; + version = "0.1.3"; + sha256 = "0mddqciaiq90cgf0syw0y1qvvkpvqbx0lkx8mwz3g8zf57h98awc"; libraryHaskellDepends = [ aeson base bytestring eventful-core mtl persistent persistent-template text uuid @@ -64056,8 +64685,8 @@ self: { }: mkDerivation { pname = "eventful-sqlite"; - version = "0.1.2"; - sha256 = "191c8fcw7wyr9bvviz1h9nbwcyrh5sl31arv4s9b3rjw847zg50j"; + version = "0.1.3"; + sha256 = "08xk3kyxm23843kr2y9l39d9d9ykcahz2q2730c1skgnwcd3y0c2"; libraryHaskellDepends = [ aeson base bytestring eventful-core eventful-sql-common mtl persistent text uuid @@ -64074,14 +64703,14 @@ self: { "eventful-test-helpers" = callPackage ({ mkDerivation, aeson, aeson-casing, base, eventful-core, extra - , hspec, monad-logger + , hspec, monad-logger, text }: mkDerivation { pname = "eventful-test-helpers"; - version = "0.1.2"; - sha256 = "17i55zi9npjj7c97lc6fzad5aak46agcr73d5lv3yycm4lk2hj1g"; + version = "0.1.3"; + sha256 = "16ba3184niy3dsh6h08czj7x0bd4abx7ji2aaddd5pvxra9494xl"; libraryHaskellDepends = [ - aeson aeson-casing base eventful-core extra hspec monad-logger + aeson aeson-casing base eventful-core extra hspec monad-logger text ]; homepage = "https://github.com/jdreaver/eventful#readme"; description = "Common module used for eventful tests"; @@ -64094,8 +64723,8 @@ self: { }: mkDerivation { pname = "eventloop"; - version = "0.8.2.4"; - sha256 = "01zzvd751bxy1mbfimqxn5ck172cc54lp7ch7p0yxln9ss2ngzj2"; + version = "0.8.2.5"; + sha256 = "0vl9kc0grhp72rlx922khvf5833qshyx4danismf8n5r3i9f7qr0"; libraryHaskellDepends = [ aeson base bytestring concurrent-utilities deepseq network stm suspend text timers websockets @@ -64227,6 +64856,42 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "eventstore_0_15_0_1" = callPackage + ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring + , cereal, clock, connection, containers, dns, dotnet-timespan + , ekg-core, exceptions, fast-logger, hashable, http-client + , interpolate, lifted-async, lifted-base, machines, monad-control + , monad-logger, mono-traversable, mtl, protobuf, random + , safe-exceptions, semigroups, stm, stm-chans, tasty, tasty-hspec + , tasty-hunit, text, text-format, time, transformers-base + , unordered-containers, uuid + }: + mkDerivation { + pname = "eventstore"; + version = "0.15.0.1"; + sha256 = "0h6747m8xc1w37wqwjxy3w549cpmivjhrnmcfc3i7yn54rcyn3lv"; + libraryHaskellDepends = [ + aeson array base bifunctors bytestring cereal clock connection + containers dns dotnet-timespan ekg-core exceptions fast-logger + hashable http-client interpolate lifted-async lifted-base machines + monad-control monad-logger mono-traversable mtl protobuf random + safe-exceptions semigroups stm stm-chans text text-format time + transformers-base unordered-containers uuid + ]; + testHaskellDepends = [ + aeson async base bytestring cereal connection containers + dotnet-timespan exceptions fast-logger hashable lifted-async + lifted-base monad-control mono-traversable protobuf safe-exceptions + semigroups stm stm-chans tasty tasty-hspec tasty-hunit text time + transformers-base unordered-containers uuid + ]; + homepage = "https://github.com/YoEight/eventstore#readme"; + description = "EventStore TCP Client"; + license = stdenv.lib.licenses.bsd3; + platforms = [ "x86_64-darwin" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "every" = callPackage ({ mkDerivation, async, base, stm }: mkDerivation { @@ -65123,8 +65788,8 @@ self: { }: mkDerivation { pname = "extensible-effects"; - version = "1.11.0.4"; - sha256 = "04vr4bwm7vz0r5i0j3rk80qz3m08d3gv99s1adhlyhflk6lgp4mg"; + version = "1.11.1.0"; + sha256 = "1z2k79pxy73rh7fxp70zbnzrcnqs9kchwm6hciyl2wr66bf58v4b"; libraryHaskellDepends = [ base transformers transformers-base type-aligned void ]; @@ -65180,8 +65845,8 @@ self: { }: mkDerivation { pname = "extra"; - version = "1.5.2"; - sha256 = "0qz0h2nckd0sqzx264q2j0dw66i5glp2vfih3wlm0a2kxcnw1p27"; + version = "1.5.3"; + sha256 = "0w4csmpzj88vkgyngyw4i91f9hfali50xqrqyycr4jh0qyq5sjx4"; libraryHaskellDepends = [ base clock directory filepath process time unix ]; @@ -65688,13 +66353,13 @@ self: { }: mkDerivation { pname = "fast-tagsoup"; - version = "1.0.13"; - sha256 = "11h9d9a3wk87vw1xwc309cxhind1xbwhbvrqx6648dxf3nj5h1i5"; + version = "1.0.14"; + sha256 = "08vxz22iilai542h4g5c8xdawib9b0r7jlfmiga8ys7aq7nvgcsj"; libraryHaskellDepends = [ base bytestring containers tagsoup text text-icu ]; homepage = "https://github.com/vshabanov/fast-tagsoup"; - description = "Fast parser for tagsoup package"; + description = "Fast parsing and extracting information from (possibly malformed) HTML/XML documents"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -66274,6 +66939,7 @@ self: { homepage = "https://github.com/toddmohney/flipper-postgres#readme"; description = "A minimally obtrusive feature flag library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fec" = callPackage @@ -66746,23 +67412,6 @@ self: { }) {}; "fft" = callPackage - ({ mkDerivation, array, base, carray, fftw, fftwFloat, ix-shapable - , QuickCheck, storable-complex, syb, transformers - }: - mkDerivation { - pname = "fft"; - version = "0.1.8.5"; - sha256 = "07xab7lw5k01s41sf20v50dxwayg8nlsal6lx0vn4d9ggr6hlags"; - libraryHaskellDepends = [ - array base carray ix-shapable storable-complex syb transformers - ]; - libraryPkgconfigDepends = [ fftw fftwFloat ]; - testHaskellDepends = [ base carray QuickCheck storable-complex ]; - description = "Bindings to the FFTW library"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) fftw; inherit (pkgs) fftwFloat;}; - - "fft_0_1_8_6" = callPackage ({ mkDerivation, array, base, carray, fftw, fftwFloat, ix-shapable , QuickCheck, storable-complex, syb, transformers }: @@ -66777,7 +67426,6 @@ self: { testHaskellDepends = [ base carray QuickCheck storable-complex ]; description = "Bindings to the FFTW library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) fftw; inherit (pkgs) fftwFloat;}; "fftwRaw" = callPackage @@ -67068,6 +67716,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "file-templates" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, directory, filepath + , foundation, transformers, unordered-containers + }: + mkDerivation { + pname = "file-templates"; + version = "1.1.0.0"; + sha256 = "0vh83vpcfz5yringls1w8ydl3xr5jawgnzyvj8nn28m1qgwaz29v"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + attoparsec base bytestring directory filepath foundation + transformers unordered-containers + ]; + homepage = "https://github.com/anfelor/file-templates#readme"; + description = "Use templates for files and directories"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "filecache" = callPackage ({ mkDerivation, base, directory, exceptions, hashable, hinotify , lens, mtl, stm, strict-base-types, temporary @@ -67194,6 +67861,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fileplow" = callPackage + ({ mkDerivation, base, binary-search, bytestring, hspec, mtl + , QuickCheck, temporary, vector + }: + mkDerivation { + pname = "fileplow"; + version = "0.1.0.0"; + sha256 = "017f3f3w69fvlhdagivb5xp72vwzmimcjd94zw9l9ylp5jv7vp4x"; + libraryHaskellDepends = [ base binary-search bytestring vector ]; + testHaskellDepends = [ + base bytestring hspec mtl QuickCheck temporary + ]; + homepage = "https://github.com/agrafix/fileplow#readme"; + description = "Library to process and search large files or a collection of files"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "filestore" = callPackage ({ mkDerivation, base, bytestring, containers, Diff, directory , filepath, HUnit, mtl, old-locale, parsec, process, split, time @@ -67272,6 +67956,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "filter-logger" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base + , bytestring, data-default, fast-logger, http-types, HUnit, scotty + , semigroups, time, wai, wai-extra, wai-logger + }: + mkDerivation { + pname = "filter-logger"; + version = "0.6.0.0"; + sha256 = "089gcirir6dwp2p61349dyvgk596cb8vgswkydzpy2lmar01513q"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal base bytestring data-default + fast-logger http-types semigroups time wai wai-extra wai-logger + ]; + executableHaskellDepends = [ aeson base bytestring scotty ]; + testHaskellDepends = [ base bytestring HUnit ]; + homepage = "https://github.com/caneroj1/filter-logger#readme"; + description = "Filterable request logging wai middleware. Change how data is logged and when."; + license = stdenv.lib.licenses.mit; + }) {}; + "filtrable" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -67313,29 +68019,27 @@ self: { }) {}; "find-clumpiness" = callPackage - ({ mkDerivation, aeson, base, bytestring, clumpiness, containers - , optparse-applicative, text, text-show, tree-fun - , unordered-containers, vector + ({ mkDerivation, aeson, base, BiobaseNewick, bytestring, clumpiness + , containers, listsafe, optparse-applicative, text, text-show + , tree-fun, unordered-containers, vector }: mkDerivation { pname = "find-clumpiness"; - version = "0.2.0.1"; - sha256 = "08nsfhhlr2f32wafbbl6jd8r4rpgjm7gc0xcb4glhqi6380jmnw7"; - revision = "1"; - editedCabalFile = "1vq5xvv01xr8p56pzkj6ksw1w6rf8iaxbd2zssf9sy31j5dyp1la"; + version = "0.2.1.3"; + sha256 = "08jkzkq7xw9nfv30qc9xh5nf31lqbd92smx95an6ch74hf7jb7p7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base clumpiness containers text text-show tree-fun - unordered-containers vector + aeson base BiobaseNewick bytestring clumpiness containers listsafe + text text-show tree-fun unordered-containers vector ]; executableHaskellDepends = [ - aeson base bytestring clumpiness containers optparse-applicative - text tree-fun unordered-containers + aeson base BiobaseNewick bytestring clumpiness containers + optparse-applicative text tree-fun unordered-containers ]; homepage = "http://github.com/GregorySchwartz/find-clumpiness#readme"; description = "Find the clumpiness of labels in a tree"; - license = stdenv.lib.licenses.gpl2; + license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -67957,6 +68661,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fizzbuzz-as-a-service" = callPackage + ({ mkDerivation, async, base, bytestring, network-simple + , optparse-applicative + }: + mkDerivation { + pname = "fizzbuzz-as-a-service"; + version = "0.1.0.0"; + sha256 = "1h7spka2igi1yz1dwl1192i4g74wlxp3m011mi6s6j35xpvll99l"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + async base bytestring network-simple optparse-applicative + ]; + homepage = "https://github.com/chris-martin/haskell-libraries"; + description = "FizzBuzz as a service"; + license = stdenv.lib.licenses.asl20; + }) {}; + "flac" = callPackage ({ mkDerivation, base, bytestring, containers, data-default-class , directory, exceptions, filepath, FLAC, hspec, mtl, temporary @@ -68542,8 +69264,8 @@ self: { }: mkDerivation { pname = "fltkhs"; - version = "0.5.2.7"; - sha256 = "03x9322rqafviaxfwkiq2g1jlsqh6hw6q4x9ywa6pi7s45d2rm78"; + version = "0.5.3.4"; + sha256 = "066czbpbjk893q3npghmz94w9pqd0k89p8xxrmgd4g8gqqr1fii6"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -68706,15 +69428,15 @@ self: { ({ mkDerivation, base, base16-bytestring, base64-bytestring , bytestring, containers, criterion, deepseq, formatting, hspec , interpolate, microlens, neat-interpolation, text, text-format - , vector + , time, time-locale-compat, vector }: mkDerivation { pname = "fmt"; - version = "0.2.0.0"; - sha256 = "1yg4wkb7irhvy6vzpbzj9aibb0kjl9xqaamn2cnq77f5znvwgpwh"; + version = "0.3.0.0"; + sha256 = "1dihbcawpf082maxw3g6gsp1n8cmfdil4llqa3wmf37dqyi2bvjm"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring containers - microlens text text-format + microlens text text-format time time-locale-compat ]; testHaskellDepends = [ base bytestring containers hspec neat-interpolation text vector @@ -68883,31 +69605,6 @@ self: { }) {}; "foldl-statistics" = callPackage - ({ mkDerivation, base, criterion, foldl, math-functions, mwc-random - , profunctors, quickcheck-instances, semigroups, statistics, tasty - , tasty-quickcheck, vector - }: - mkDerivation { - pname = "foldl-statistics"; - version = "0.1.4.4"; - sha256 = "1lihrkc3k3h8mdkbvlwvq0xf9cbhszy50ykshg7yv1y4zdcwqk0q"; - libraryHaskellDepends = [ - base foldl math-functions profunctors semigroups - ]; - testHaskellDepends = [ - base foldl profunctors quickcheck-instances semigroups statistics - tasty tasty-quickcheck vector - ]; - benchmarkHaskellDepends = [ - base criterion foldl mwc-random statistics vector - ]; - homepage = "http://github.com/Data61/foldl-statistics#readme"; - description = "Statistical functions from the statistics package implemented as Folds"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; - }) {}; - - "foldl-statistics_0_1_4_6" = callPackage ({ mkDerivation, base, criterion, foldl, math-functions, mwc-random , profunctors, quickcheck-instances, statistics, tasty , tasty-quickcheck, vector @@ -68927,7 +69624,7 @@ self: { homepage = "http://github.com/Data61/foldl-statistics#readme"; description = "Statistical functions from the statistics package implemented as Folds"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "foldl-transduce" = callPackage @@ -69021,8 +69718,8 @@ self: { ({ mkDerivation, base, xml }: mkDerivation { pname = "folgerhs"; - version = "0.1.0.0"; - sha256 = "1gvsvy17n2dk7j9kd6k7h1q2a4sn8xz80sv9mcrvz9qhrsinvbzv"; + version = "0.1.0.1"; + sha256 = "0kn89abvbk7faynhsyg177rayxddvwnkgsjb5cng8044n9glw9sb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base xml ]; @@ -69172,6 +69869,8 @@ self: { pname = "force-layout"; version = "0.4.0.6"; sha256 = "17956k3mab2xhrmfy7fj5gh08h43yjlsryi5acjhnkmin5arhwpp"; + revision = "1"; + editedCabalFile = "1ydj5ng7wsi9jg6xw9bg8c7wrsg2jpnvjkjvzxaf6n8sjs0gxhvw"; libraryHaskellDepends = [ base containers data-default-class lens linear ]; @@ -69295,10 +69994,8 @@ self: { }: mkDerivation { pname = "forma"; - version = "0.1.0"; - sha256 = "10aqvr12hn6knzx0byz56ash4c3ss4r2bb80szl0dj2brasfzsaa"; - revision = "2"; - editedCabalFile = "00xy3385aw4xic7xv5ysfsvcxcn4bsbg9hj7sss4d7gx77ci0lf2"; + version = "0.2.0"; + sha256 = "05rd0v908imlfvp5m3lb5mc629790yyazsj79rpx0svhnxgsgl00"; libraryHaskellDepends = [ aeson base containers data-default-class mtl text unordered-containers @@ -69642,27 +70339,8 @@ self: { }: mkDerivation { pname = "foundation"; - version = "0.0.10"; - sha256 = "0ihrdgsn4ivpyhck0qqcfqx2xza1spqv81sd071i151yfyvl1a5p"; - libraryHaskellDepends = [ base ghc-prim ]; - testHaskellDepends = [ - base mtl QuickCheck tasty tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ base criterion ]; - homepage = "https://github.com/haskell-foundation/foundation"; - description = "Alternative prelude with batteries and no dependencies"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "foundation_0_0_12" = callPackage - ({ mkDerivation, base, criterion, ghc-prim, mtl, QuickCheck, tasty - , tasty-hunit, tasty-quickcheck - }: - mkDerivation { - pname = "foundation"; - version = "0.0.12"; - sha256 = "1dlrknx0rhi1vjiw8pb25n5ml5rfahhhvwj64svdg51zm3m3aiyr"; + version = "0.0.13"; + sha256 = "0pvmq3lkbdzj861l7jkf5xsib77j756y0vml8kgr2rckpz5qashh"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base mtl QuickCheck tasty tasty-hunit tasty-quickcheck @@ -70781,8 +71459,8 @@ self: { }: mkDerivation { pname = "fswait"; - version = "1.0.0"; - sha256 = "0w29f6qwks54zxi8x9wd9s4k5ryb6fz9flip9clm4l53vkx1s3b0"; + version = "1.1.0"; + sha256 = "1iqnawsxrx21q9g34dc1pp451z9s37m7z3fswrwd8bs3fw9mgbb3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -70792,6 +71470,7 @@ self: { homepage = "https://github.com/ixmatus/fswait"; description = "Wait and observe events on the filesystem for a path, with a timeout"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fswatcher" = callPackage @@ -72005,6 +72684,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gen-passwd" = callPackage + ({ mkDerivation, base, bytestring, optparse-applicative, random + , vector + }: + mkDerivation { + pname = "gen-passwd"; + version = "1.1.0.0"; + sha256 = "16ql67p4knkwas4kfa1mikqqxq6kvzcnrbza5y7kk3gi0haiaj1s"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring optparse-applicative random vector + ]; + homepage = "https://github.com/anfelor/gen-passwd#readme"; + description = "Create wordlist-based passwords easily"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gencheck" = callPackage ({ mkDerivation, base, combinat, containers, ieee754, memoize , random, template-haskell, transformers @@ -72494,8 +73191,8 @@ self: { pname = "generics-sop-lens"; version = "0.1.2.1"; sha256 = "0p2ji955hy9r6c1wmiziga9pbbli24my3vmx19gf4i8db36d8jaf"; - revision = "1"; - editedCabalFile = "0rsdfd4nxmy2casi4v8z4i93vfy3vba5kpb98v9ksgw16q286a7f"; + revision = "2"; + editedCabalFile = "1zavix9vzj6qnr6izfmq1ggsdzsqzz41dlmh228lpvfm2mddx6w2"; libraryHaskellDepends = [ base generics-sop lens ]; homepage = "https://github.com/phadej/generics-sop-lens#readme"; description = "Lenses for types in generics-sop"; @@ -74022,6 +74719,7 @@ self: { homepage = "http://github.com/nominolo/ghc-syb"; description = "Scrap Your Boilerplate utilities for the GHC API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-tcplugins-extra" = callPackage @@ -74056,6 +74754,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-timers" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "ghc-timers"; + version = "0.1.0.0"; + sha256 = "074pvam1mb5sranh04i6xcs55vgk3h45vg0mdxnbxc3jmmv76lgi"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/bitonic/ghc-timers#readme"; + description = "Provides bindings to functions starting and stopping the RTS timers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ghc-typelits-extra" = callPackage ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp @@ -74377,8 +75087,8 @@ self: { ({ mkDerivation, base, ghcjs-dom-jsaddle, text, transformers }: mkDerivation { pname = "ghcjs-dom"; - version = "0.9.0.0"; - sha256 = "0z55qfvnyq5z22ynmnrxdymq6jgcs7ps04bznqna4fbcvlqy0zm9"; + version = "0.9.1.1"; + sha256 = "1932qq067cfl0g87457qgk4zdxxr4fx2an37z8l0zw1x221yi696"; libraryHaskellDepends = [ base ghcjs-dom-jsaddle text transformers ]; @@ -74414,8 +75124,8 @@ self: { ({ mkDerivation, jsaddle-dom }: mkDerivation { pname = "ghcjs-dom-jsaddle"; - version = "0.9.0.0"; - sha256 = "0ghk8nvfhwm5zwwiws2621gk08x73w11v0cab5nsdpyz1qn0dl5j"; + version = "0.9.1.0"; + sha256 = "120i3j07lk75lk59gi6pg56dka35r0vh97kj22cj4472qz0ix3sp"; libraryHaskellDepends = [ jsaddle-dom ]; doHaddock = false; description = "DOM library that supports both GHCJS and GHC using jsaddle"; @@ -74427,8 +75137,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "ghcjs-dom-jsffi"; - version = "0.9.0.0"; - sha256 = "1q04gibg5jlqs287vwig43bxyi9gpy951mfpmv17qky8b50sxkmc"; + version = "0.9.1.1"; + sha256 = "1hx8w7x5j2gznkk32yplnnm657hyfk41lcxl4iinsjkm0lrlq54i"; description = "DOM library using JSFFI and GHCJS"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -74880,6 +75590,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GStreamer Plugins Base Utils bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {gstreamer-pbutils = null;}; "gi-gsttag" = callPackage @@ -74901,6 +75612,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GStreamer Tag bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {gstreamer-tag = null;}; "gi-gstvideo" = callPackage @@ -75015,7 +75727,7 @@ self: { "gi-javascriptcore" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi - , haskell-gi-base, text, transformers, webkitgtk24x + , haskell-gi-base, text, transformers, webkitgtk24x-gtk3 }: mkDerivation { pname = "gi-javascriptcore"; @@ -75026,13 +75738,13 @@ self: { base bytestring containers haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ webkitgtk24x ]; + libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "JavaScriptCore bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) webkitgtk24x;}; + }) {inherit (pkgs) webkitgtk24x-gtk3;}; "gi-javascriptcore_4_0_12" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi @@ -75241,7 +75953,7 @@ self: { ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject , gi-gtk, gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base - , text, transformers, webkitgtk24x + , text, transformers, webkitgtk24x-gtk3 }: mkDerivation { pname = "gi-webkit"; @@ -75253,13 +75965,13 @@ self: { gi-gio gi-glib gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ webkitgtk24x ]; + libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "WebKit bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) webkitgtk24x;}; + }) {inherit (pkgs) webkitgtk24x-gtk3;}; "gi-webkit2" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk @@ -75372,26 +76084,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ginger_0_5_1_3" = callPackage + "ginger_0_5_3_0" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, filepath , http-types, mtl, parsec, safe, scientific, tasty, tasty-hunit , tasty-quickcheck, text, time, transformers, unordered-containers - , utf8-string, vector, wryte + , utf8-string, vector }: mkDerivation { pname = "ginger"; - version = "0.5.1.3"; - sha256 = "06dywl7wi2qy2apc9gwcf5j9mxckyjbjpqddqdqgnj47wbssrmiz"; + version = "0.5.3.0"; + sha256 = "049ys725scrrkxc2q4wx085hbzdnjpm1jd9wqraqg5fa23vpfy34"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring data-default filepath http-types mtl parsec safe scientific text time transformers unordered-containers - utf8-string vector wryte + utf8-string vector ]; executableHaskellDepends = [ aeson base bytestring data-default text transformers - unordered-containers wryte + unordered-containers ]; testHaskellDepends = [ aeson base bytestring data-default mtl tasty tasty-hunit @@ -75836,25 +76548,25 @@ self: { "git-repair" = callPackage ({ mkDerivation, async, base, bytestring, Cabal, containers , data-default, directory, exceptions, filepath, hslogger, IfElse - , MissingH, mtl, network, network-uri, optparse-applicative - , process, QuickCheck, text, time, transformers, unix, unix-compat + , mtl, network, network-uri, optparse-applicative, process + , QuickCheck, split, text, time, transformers, unix, unix-compat , utf8-string }: mkDerivation { pname = "git-repair"; - version = "1.20161118"; - sha256 = "0vjssbmkd8bld7c3c4md9f2cj05s0gia0xks3wfhagq399n5fk6j"; + version = "1.20170626"; + sha256 = "0np6jd1d8qwr0ay6hx50fb35149ji67576nk7ds906hna8fjnkcb"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ base bytestring Cabal data-default directory exceptions filepath - hslogger IfElse MissingH mtl process unix unix-compat + hslogger IfElse mtl process split unix unix-compat ]; executableHaskellDepends = [ - async base bytestring containers directory exceptions filepath - hslogger IfElse MissingH mtl network network-uri - optparse-applicative process QuickCheck text time transformers unix - unix-compat utf8-string + async base bytestring containers data-default directory exceptions + filepath hslogger IfElse mtl network network-uri + optparse-applicative process QuickCheck split text time + transformers unix unix-compat utf8-string ]; homepage = "http://git-repair.branchable.com/"; description = "repairs a damanged git repisitory"; @@ -76457,13 +77169,13 @@ self: { }: mkDerivation { pname = "gitter"; - version = "0.1"; - sha256 = "0jijcqnmwap22lgvwkzqclhp51p30b1fsqih3s0hkmhmcc2720v4"; + version = "0.3.0"; + sha256 = "13mi1c4z80nmj00adikbkdjijkciy2zkkyqbvf10r5zilqhdbaw1"; libraryHaskellDepends = [ aeson base bytestring exceptions lens lens-aeson mtl text wreq ]; description = "Gitter.im API client"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -76894,24 +77606,24 @@ self: { "glirc" = callPackage ({ mkDerivation, async, attoparsec, base, base64-bytestring , bytestring, Cabal, config-schema, config-value, containers - , directory, filepath, gitrev, hashable, hookup, HsOpenSSL, HUnit - , irc-core, kan-extensions, lens, network, process, regex-tdfa - , semigroupoids, socks, split, stm, text, time, transformers, unix - , unordered-containers, vector, vty + , directory, filepath, free, gitrev, hashable, hookup, HsOpenSSL + , HUnit, irc-core, kan-extensions, lens, network, process + , regex-tdfa, semigroupoids, socks, split, stm, template-haskell + , text, time, transformers, unix, unordered-containers, vector, vty }: mkDerivation { pname = "glirc"; - version = "2.22"; - sha256 = "02kfxarddlb7yjj17slvn28pz49m27l7ag06milxjg0k157dxkpi"; + version = "2.23"; + sha256 = "0iv4n6i63f1x1808a3dvrbxyibi7jd1c8barsqbf9h1bqwazgsah"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; libraryHaskellDepends = [ async attoparsec base base64-bytestring bytestring config-schema - config-value containers directory filepath gitrev hashable hookup - HsOpenSSL irc-core kan-extensions lens network process regex-tdfa - semigroupoids socks split stm text time transformers unix - unordered-containers vector vty + config-value containers directory filepath free gitrev hashable + hookup HsOpenSSL irc-core kan-extensions lens network process + regex-tdfa semigroupoids socks split stm template-haskell text time + transformers unix unordered-containers vector vty ]; executableHaskellDepends = [ base lens text vty ]; testHaskellDepends = [ base HUnit ]; @@ -77324,8 +78036,8 @@ self: { }: mkDerivation { pname = "glue-common"; - version = "0.4.9"; - sha256 = "15cxrm7bnc4p6ayykpba6rgzb27d3rhd0cw437x6id5a0daxr0sc"; + version = "0.5"; + sha256 = "0wza8cmschfh6kk21wm2bz12ly3in7kf0cv6jma0a78fiphdwg2q"; libraryHaskellDepends = [ base hashable lifted-base monad-control text time transformers transformers-base unordered-containers @@ -77348,8 +78060,8 @@ self: { }: mkDerivation { pname = "glue-core"; - version = "0.4.9"; - sha256 = "035x4fx4c1168gqmrgc60xyzz670pa9v7qi0qfp91vkl5xwa5i2n"; + version = "0.5"; + sha256 = "0x89h04j8z58nd1cx6rxn0hgjgb24kdzgl21m2xrlj7h1fp9fwfi"; libraryHaskellDepends = [ base glue-common hashable lifted-base monad-control text time transformers transformers-base unordered-containers @@ -77372,8 +78084,8 @@ self: { }: mkDerivation { pname = "glue-ekg"; - version = "0.4.9"; - sha256 = "0gr0887dz3527xbcdrf70ww0z7mqh63733ia0d7vqgmsmj95fg1p"; + version = "0.5"; + sha256 = "0ckbmjizfclpdyzrc85l9hh79yl82rmbkim5gq543qnppi1pn4h6"; libraryHaskellDepends = [ base ekg-core glue-common hashable lifted-base monad-control text time transformers transformers-base unordered-containers @@ -77395,8 +78107,8 @@ self: { }: mkDerivation { pname = "glue-example"; - version = "0.4.9"; - sha256 = "0z4pkdrzdjs6xkx8wi314jadhiyyf1nqmd2jwh3h3c422l951sib"; + version = "0.5"; + sha256 = "10nw8bzxbcghyy9xyb69ka3a3w66fysczhhgrshy462ihpw8p8bw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -77519,8 +78231,8 @@ self: { }: mkDerivation { pname = "gnss-converters"; - version = "0.2.9"; - sha256 = "083simwpm3d9jk1iaymb2sbkaa98yxg3ngg0rmvl8vk015p7hcxr"; + version = "0.2.10"; + sha256 = "1x5libj6rwrf39m1ksz5gzqldd7xy07glgk47cvjlszs9l5cq5i2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -77811,7 +78523,7 @@ self: { license = "unknown"; }) {}; - "gogol_0_2_0" = callPackage + "gogol_0_3_0" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive, conduit , conduit-extra, cryptonite, directory, exceptions, filepath , gogol-core, http-client, http-conduit, http-media, http-types @@ -77821,8 +78533,8 @@ self: { }: mkDerivation { pname = "gogol"; - version = "0.2.0"; - sha256 = "13vci3bb7kh3mq4vb2b4zayl4cjvfxy64qsjwpaqjy563hbn5k2w"; + version = "0.3.0"; + sha256 = "0cb4kbdw8gyd8h0wkw8h55jabd7i1q523ki9ssjn19inb5pgjwv2"; libraryHaskellDepends = [ aeson base bytestring case-insensitive conduit conduit-extra cryptonite directory exceptions filepath gogol-core http-client @@ -77848,12 +78560,12 @@ self: { license = "unknown"; }) {}; - "gogol-adexchange-buyer_0_2_0" = callPackage + "gogol-adexchange-buyer_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-adexchange-buyer"; - version = "0.2.0"; - sha256 = "1x1wqy2bbiw0kyni2swr8mcwpbqjvin5j8vxnc7vl4qiw8rkz1rx"; + version = "0.3.0"; + sha256 = "1hn2cn3p7jkqvpy0qq3hakcnrns4j2j961zg4xbb8z4mjjj3fgm8"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Ad Exchange Buyer SDK"; @@ -77873,12 +78585,12 @@ self: { license = "unknown"; }) {}; - "gogol-adexchange-seller_0_2_0" = callPackage + "gogol-adexchange-seller_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-adexchange-seller"; - version = "0.2.0"; - sha256 = "1gpkksklsn0py5ih25gncrl988j4c06z6swqjx5v1mh297d35pj7"; + version = "0.3.0"; + sha256 = "1r8pvad01qjdv040agfisnj0183la74p44hvppa0zzbjsybv5n99"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Ad Exchange Seller SDK"; @@ -77898,12 +78610,12 @@ self: { license = "unknown"; }) {}; - "gogol-admin-datatransfer_0_2_0" = callPackage + "gogol-admin-datatransfer_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-admin-datatransfer"; - version = "0.2.0"; - sha256 = "0apglzdmcdivc2s2ig1msx6ymzras0ppznb0k0xpm384sc60p5jh"; + version = "0.3.0"; + sha256 = "1qjlhg4kgfy93rl2nzivvdhjpyaf4csm4nl097ny649dmxjjf1q9"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Admin Data Transfer SDK"; @@ -77923,12 +78635,12 @@ self: { license = "unknown"; }) {}; - "gogol-admin-directory_0_2_0" = callPackage + "gogol-admin-directory_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-admin-directory"; - version = "0.2.0"; - sha256 = "0wh7nb6w7qyljm4lp9d66wzy6aaf9q7wai5l1bjh62b5az9cw16z"; + version = "0.3.0"; + sha256 = "0pb3ymvx6hw46i1iwrvc4zv7mkmjwjk8w4q6h91jph7kv98kpmpk"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Admin Directory SDK"; @@ -77948,12 +78660,12 @@ self: { license = "unknown"; }) {}; - "gogol-admin-emailmigration_0_2_0" = callPackage + "gogol-admin-emailmigration_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-admin-emailmigration"; - version = "0.2.0"; - sha256 = "1ljq9f7z510y2jch4rd4dmic13smmz5jm5gh27lykryalvx6fwmk"; + version = "0.3.0"; + sha256 = "1d7w4fv4v54mja7yx8rf29ms1hbjnkjgly54fqx5h4xyfgypymca"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Email Migration API v2 SDK"; @@ -77973,6 +78685,19 @@ self: { license = "unknown"; }) {}; + "gogol-admin-reports_0_3_0" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-admin-reports"; + version = "0.3.0"; + sha256 = "0fms60bb7vyn3kkrg5j53x7f2r5111xy922w7a3i7xb04lsbxv3j"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Admin Reports SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-adsense" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -77985,12 +78710,12 @@ self: { license = "unknown"; }) {}; - "gogol-adsense_0_2_0" = callPackage + "gogol-adsense_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-adsense"; - version = "0.2.0"; - sha256 = "0k6vljav25pvdhhp7sab9f3qr398lx14mx9dqinp99lbkh9r7zcn"; + version = "0.3.0"; + sha256 = "0dispksc95m3ig409f44fl57jz4lqnhljhk6y957d520sf1arv53"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google AdSense Management SDK"; @@ -78010,12 +78735,12 @@ self: { license = "unknown"; }) {}; - "gogol-adsense-host_0_2_0" = callPackage + "gogol-adsense-host_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-adsense-host"; - version = "0.2.0"; - sha256 = "1cvk1i7c86c5hjbfylfi0l2r3samqbkpd12278czsyz0npwcfbzm"; + version = "0.3.0"; + sha256 = "1rvglzr4a2lilknrdjla0s47gdkp5n2z6kpwcl0gfgdr00fbrcrw"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google AdSense Host SDK"; @@ -78035,12 +78760,12 @@ self: { license = "unknown"; }) {}; - "gogol-affiliates_0_2_0" = callPackage + "gogol-affiliates_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-affiliates"; - version = "0.2.0"; - sha256 = "11s3v77ap9p79cq1b4s1j3m8s9h1kbzqwygx65p2fpr935fdddw3"; + version = "0.3.0"; + sha256 = "1h7kx1ra0vz8pgvcjvj5ip44h077s9q5m7ixplq5vzrr4wdbrvvf"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Affiliate Network SDK"; @@ -78060,12 +78785,12 @@ self: { license = "unknown"; }) {}; - "gogol-analytics_0_2_0" = callPackage + "gogol-analytics_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-analytics"; - version = "0.2.0"; - sha256 = "1ni9yhd06g0ifqwlcxczd792vgrnd5hy4zsiqnyxqrvq2jdzqm1q"; + version = "0.3.0"; + sha256 = "0myggz1cxq88q3s1sbw5v5zhcmrybjkqj9zd0ap6x4sa7qrp7dys"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Analytics SDK"; @@ -78085,12 +78810,12 @@ self: { license = "unknown"; }) {}; - "gogol-android-enterprise_0_2_0" = callPackage + "gogol-android-enterprise_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-android-enterprise"; - version = "0.2.0"; - sha256 = "1snm8npkvsk1jc2wyn0c6k39cfv606nwpil0j4hiwm57mv7iyxp1"; + version = "0.3.0"; + sha256 = "0lnliq42ykmizlr8g43ic99lzk5rc7j1l3dl81xbymw0dq0frbcm"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Play EMM SDK"; @@ -78110,12 +78835,12 @@ self: { license = "unknown"; }) {}; - "gogol-android-publisher_0_2_0" = callPackage + "gogol-android-publisher_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-android-publisher"; - version = "0.2.0"; - sha256 = "18qd7361hnps7i7fsjjm66civ28y2spwgynng5x0g7x2qmpv8zf2"; + version = "0.3.0"; + sha256 = "1cf449zz6ahnqa71fqa25brj5h11xhbq4chw4hn2vczjwz8s6vrv"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Play Developer SDK"; @@ -78135,12 +78860,12 @@ self: { license = "unknown"; }) {}; - "gogol-appengine_0_2_0" = callPackage + "gogol-appengine_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-appengine"; - version = "0.2.0"; - sha256 = "1r9msaj6z0afiv7vkl19pah3px8zjp8wb9x1y6sc6f8bjhwad77m"; + version = "0.3.0"; + sha256 = "131m4hqf84j4r2xjdbpsp95iww4sbxyw3lvn80pnddrzmvaj52hr"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google App Engine Admin SDK"; @@ -78160,12 +78885,12 @@ self: { license = "unknown"; }) {}; - "gogol-apps-activity_0_2_0" = callPackage + "gogol-apps-activity_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-apps-activity"; - version = "0.2.0"; - sha256 = "1229hkj6vpvra1cwci5kj83hpg4kpn2f4z52lg6knphnaid8vjxm"; + version = "0.3.0"; + sha256 = "0ci85yml0sjjkwxcyfnb1xsw93zkvll0n6fb35kci1h07ywvl8d2"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Apps Activity SDK"; @@ -78185,12 +78910,12 @@ self: { license = "unknown"; }) {}; - "gogol-apps-calendar_0_2_0" = callPackage + "gogol-apps-calendar_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-apps-calendar"; - version = "0.2.0"; - sha256 = "1bpw9zz6py1wyp6p9ipp5qv26y19papp2g2gxwdgskq8q72p45qv"; + version = "0.3.0"; + sha256 = "0gjill8hdkhp385i0ay6isb8rm6zcxh6ymdb7389wv6nhzpf5p3x"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Calendar SDK"; @@ -78210,12 +78935,12 @@ self: { license = "unknown"; }) {}; - "gogol-apps-licensing_0_2_0" = callPackage + "gogol-apps-licensing_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-apps-licensing"; - version = "0.2.0"; - sha256 = "11kaqj55s70kdl1iaymhcrhvlzpixrf1k2m52i0kmmw1z6c8fmhx"; + version = "0.3.0"; + sha256 = "0l7yknlp4c2qh0a86q504a6h0gnb0s8jd4glii30qsnim52pijhp"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Enterprise License Manager SDK"; @@ -78235,12 +78960,12 @@ self: { license = "unknown"; }) {}; - "gogol-apps-reseller_0_2_0" = callPackage + "gogol-apps-reseller_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-apps-reseller"; - version = "0.2.0"; - sha256 = "02zn3sjdm2v8q26a741n7v1zkl2iv81n5glddd60sk8304yxikwp"; + version = "0.3.0"; + sha256 = "119mlxr6yxmym9pgcmhix9m2s1s9i5zgh2pa3zzayk0jnqjjdpn4"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Enterprise Apps Reseller SDK"; @@ -78260,12 +78985,12 @@ self: { license = "unknown"; }) {}; - "gogol-apps-tasks_0_2_0" = callPackage + "gogol-apps-tasks_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-apps-tasks"; - version = "0.2.0"; - sha256 = "178phj5iml51qkih8k19vw2lzn3bfigkb5ikfb1kz547v1ixk42h"; + version = "0.3.0"; + sha256 = "0mcnz2qiymjriqplypzl3gycn9cyc362a38962b4ci7g718wx74v"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Tasks SDK"; @@ -78285,12 +79010,12 @@ self: { license = "unknown"; }) {}; - "gogol-appstate_0_2_0" = callPackage + "gogol-appstate_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-appstate"; - version = "0.2.0"; - sha256 = "1bn4b2b87rccw5261hl0jfw16xkwms2j8akh56s6z3p76r09gkqg"; + version = "0.3.0"; + sha256 = "129f5gdiq5gbdi6dg6ddz1cq2m0jjp48q7vk5lkxrr82iig05jkw"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google App State SDK"; @@ -78310,12 +79035,12 @@ self: { license = "unknown"; }) {}; - "gogol-autoscaler_0_2_0" = callPackage + "gogol-autoscaler_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-autoscaler"; - version = "0.2.0"; - sha256 = "173p6kmx38dvkzf9lz0xnd1h6zb7dc0ib5i58m3kpkcfqxfzbpcr"; + version = "0.3.0"; + sha256 = "0insf84wrnn98yqfm6scfmzjnxdj9hikz7wy0cg0vk25dpc2mhp0"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Compute Engine Autoscaler SDK"; @@ -78335,12 +79060,12 @@ self: { license = "unknown"; }) {}; - "gogol-bigquery_0_2_0" = callPackage + "gogol-bigquery_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-bigquery"; - version = "0.2.0"; - sha256 = "1glqis8m21bhq0jxmviwvkh2xm7ikdca83yrb6nnwprpfxb3mkn3"; + version = "0.3.0"; + sha256 = "1zs497pxcpd87rhblg02bvi0wsqj16ym74v3kgm2mhwfw4spqv9z"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google BigQuery SDK"; @@ -78360,12 +79085,12 @@ self: { license = "unknown"; }) {}; - "gogol-billing_0_2_0" = callPackage + "gogol-billing_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-billing"; - version = "0.2.0"; - sha256 = "1sgk3fx87p307m15iwrfn04ig0m9h2mpj4rqwjgvvb6jl36ngn2j"; + version = "0.3.0"; + sha256 = "12scf28cj2rr0r4z1g0y4ik22gd3yh5sy2wdllydi05qv1cffqbf"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Billing SDK"; @@ -78385,12 +79110,12 @@ self: { license = "unknown"; }) {}; - "gogol-blogger_0_2_0" = callPackage + "gogol-blogger_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-blogger"; - version = "0.2.0"; - sha256 = "012zpc0b81pdjs3izq5v2h8dxxy0jjjpmjxxwzg5azsxpdcv2raa"; + version = "0.3.0"; + sha256 = "08p1hjm29xsmvbb9dj7krr7i1wapn32g9wh283ia2zajys6zscl7"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Blogger SDK"; @@ -78410,12 +79135,12 @@ self: { license = "unknown"; }) {}; - "gogol-books_0_2_0" = callPackage + "gogol-books_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-books"; - version = "0.2.0"; - sha256 = "0373fv46mblw1c2mls8z2281n1j57df9wc57kf01ic5f8f4m42xx"; + version = "0.3.0"; + sha256 = "08g2ah36fk3a6val2p1wczd9b3h7zqp1a4ka7nrn3f9m04say5hs"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Books SDK"; @@ -78435,12 +79160,12 @@ self: { license = "unknown"; }) {}; - "gogol-civicinfo_0_2_0" = callPackage + "gogol-civicinfo_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-civicinfo"; - version = "0.2.0"; - sha256 = "1hskyvwqym6d4865pvgrxpcbngissxiyixn6aimn7nlfmxzg2cvc"; + version = "0.3.0"; + sha256 = "0sgw2jgwki4nmyg9igavf8g2myxr8qnf4nif00jn236rg26pfr2d"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Civic Information SDK"; @@ -78460,12 +79185,12 @@ self: { license = "unknown"; }) {}; - "gogol-classroom_0_2_0" = callPackage + "gogol-classroom_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-classroom"; - version = "0.2.0"; - sha256 = "0c5jyz0rhhg4ab05nzkj736iddgn975qpm21vhb16pnb7da03cdp"; + version = "0.3.0"; + sha256 = "1bij8szdrxlcfz8xl5472k8rfl10ffnq7hlq38za2pmm9jfhn2dn"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Classroom SDK"; @@ -78485,12 +79210,12 @@ self: { license = "unknown"; }) {}; - "gogol-cloudmonitoring_0_2_0" = callPackage + "gogol-cloudmonitoring_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-cloudmonitoring"; - version = "0.2.0"; - sha256 = "1407agqnr99cifxbb31q8kf7cx5rl7z2rf0hxzmb82p5lwl7hmp2"; + version = "0.3.0"; + sha256 = "01mfc8f6vl3n499p4f70inak68g83yxc5pci485sxgwvfx078glx"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Monitoring SDK"; @@ -78510,12 +79235,12 @@ self: { license = "unknown"; }) {}; - "gogol-cloudtrace_0_2_0" = callPackage + "gogol-cloudtrace_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-cloudtrace"; - version = "0.2.0"; - sha256 = "0aslcpxmf8dwpgw20f62p53fsayjqrqfi9zd81qcwgz9pzza369p"; + version = "0.3.0"; + sha256 = "1r2whm4s5dwhg9davw9qpcabwhpasyfd7qkjw471xnpnwrq4vcb6"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Trace SDK"; @@ -78535,12 +79260,12 @@ self: { license = "unknown"; }) {}; - "gogol-compute_0_2_0" = callPackage + "gogol-compute_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-compute"; - version = "0.2.0"; - sha256 = "0qnzk9xvj39kkdy68iaab59q6qcivrhdbwi2qp2c3s3nbcy78r02"; + version = "0.3.0"; + sha256 = "0v902dgjn0hzf42di0kr159p9scpnsha7wxap4fj933x5pv7c97s"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Compute Engine SDK"; @@ -78560,12 +79285,12 @@ self: { license = "unknown"; }) {}; - "gogol-container_0_2_0" = callPackage + "gogol-container_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-container"; - version = "0.2.0"; - sha256 = "1fxwyc121n8zl98wp1aj6007nja4vfx6w2b7m4mrrkf5dw44id1x"; + version = "0.3.0"; + sha256 = "1vxl3k48mdfn3rnlld5rmgkjv30pfvg9agz6k2v9pbci5i9kbl8i"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Container Engine SDK"; @@ -78577,8 +79302,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-containerbuilder"; - version = "0.2.0"; - sha256 = "1xyizdpmgdqrfl4jwaya19rdzq75zwm0wiwq9ciq4a6nzzswhrjm"; + version = "0.3.0"; + sha256 = "15k8d8b58hggfw5izdmzkl44jkaiv1l0gfx237ciwmjjvaw5fdfy"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Container Builder SDK"; @@ -78611,7 +79336,7 @@ self: { license = "unknown"; }) {}; - "gogol-core_0_2_0_1" = callPackage + "gogol-core_0_3_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring , case-insensitive, conduit, dlist, exceptions, hashable , http-api-data, http-client, http-media, http-types, lens @@ -78620,8 +79345,8 @@ self: { }: mkDerivation { pname = "gogol-core"; - version = "0.2.0.1"; - sha256 = "03ig25l09jgmpyk705if6vdvacklkc7pzhj1jxcskg3lxhv5mrk2"; + version = "0.3.0"; + sha256 = "140chk0fb35zi7y0p908c7irwhqcgdw45iqpmrzzf2p238wlza7z"; libraryHaskellDepends = [ aeson attoparsec base bifunctors bytestring case-insensitive conduit dlist exceptions hashable http-api-data http-client @@ -78647,12 +79372,12 @@ self: { license = "unknown"; }) {}; - "gogol-customsearch_0_2_0" = callPackage + "gogol-customsearch_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-customsearch"; - version = "0.2.0"; - sha256 = "0wjyy5m1hdxkai2g7mi8pva3jly0qgbcinyqyndqb9sjlvqdwv69"; + version = "0.3.0"; + sha256 = "075r7j4z9i1jbw6hznrq3ndb23yrp9xpqmwq64laqmh4mw3c47zj"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google CustomSearch SDK"; @@ -78670,14 +79395,15 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Dataflow SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "gogol-dataflow_0_2_0" = callPackage + "gogol-dataflow_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-dataflow"; - version = "0.2.0"; - sha256 = "1zqjpj0ry25hvj36m4i558k9rhh0xvabgkz60ms76cs550qhana5"; + version = "0.3.0"; + sha256 = "1cvzhvfipjpvprhgw2rdw9xsrkyka7cdfdk9716x4admly221qcx"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Dataflow SDK"; @@ -78697,12 +79423,12 @@ self: { license = "unknown"; }) {}; - "gogol-dataproc_0_2_0" = callPackage + "gogol-dataproc_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-dataproc"; - version = "0.2.0"; - sha256 = "0cq5x9ry0i5xlp1nxa4cg9564xblql6ar0v85sc4giikw3ga0ybv"; + version = "0.3.0"; + sha256 = "1b1s148xslz23ibcrx0gifim6kc5f3fsgfdnwh2n4bp0djvp8zy0"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Dataproc SDK"; @@ -78722,12 +79448,12 @@ self: { license = "unknown"; }) {}; - "gogol-datastore_0_2_0" = callPackage + "gogol-datastore_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-datastore"; - version = "0.2.0"; - sha256 = "0mrqxi7syzpkc92ij6zn86p7301r86j01kma0vjcm8hfm69sdm2w"; + version = "0.3.0"; + sha256 = "0wdxvslimfhfm0nw8qv88av14gxjpfif9rxxp3gv8png0qf1qs25"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Datastore SDK"; @@ -78747,12 +79473,12 @@ self: { license = "unknown"; }) {}; - "gogol-debugger_0_2_0" = callPackage + "gogol-debugger_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-debugger"; - version = "0.2.0"; - sha256 = "1ql2m2b19vkqkc4gfl9j39izv1awnnifb1bvkl1jy7li5bvr6aql"; + version = "0.3.0"; + sha256 = "05qjl7lg62xc5y6yycn98yk6d0qpk60caafw7q9drrgrdz5k7s7v"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Stackdriver Debugger SDK"; @@ -78772,12 +79498,12 @@ self: { license = "unknown"; }) {}; - "gogol-deploymentmanager_0_2_0" = callPackage + "gogol-deploymentmanager_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-deploymentmanager"; - version = "0.2.0"; - sha256 = "00xccnjv5caj2fs358vqg8p5n7lgdiixi8ghmy85za0h9mc3injx"; + version = "0.3.0"; + sha256 = "01lc27xp2gry9fws5ysq46hld30fxh4lfr7p9lw4985ir82llb9s"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Deployment Manager SDK"; @@ -78797,12 +79523,12 @@ self: { license = "unknown"; }) {}; - "gogol-dfareporting_0_2_0" = callPackage + "gogol-dfareporting_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-dfareporting"; - version = "0.2.0"; - sha256 = "091ca105psyxz0n2rbl2flsqkpfj3yzry2bzsx7q2vb9ijbab5cj"; + version = "0.3.0"; + sha256 = "0dhayxwi4pjbj73gxflgk1gp3dvjw4vb07ai9nq22flac1xl1si7"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google DCM/DFA Reporting And Trafficking SDK"; @@ -78822,12 +79548,12 @@ self: { license = "unknown"; }) {}; - "gogol-discovery_0_2_0" = callPackage + "gogol-discovery_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-discovery"; - version = "0.2.0"; - sha256 = "1i4nm1rgc3fsfi1cmhd9annzvpzpzd3ani8q44375llavb094sam"; + version = "0.3.0"; + sha256 = "1j2j3zxqq95cd50cdwsvyn633x61fwlghld8nhn1hy12g9l7xdf8"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google APIs Discovery Service SDK"; @@ -78847,12 +79573,12 @@ self: { license = "unknown"; }) {}; - "gogol-dns_0_2_0" = callPackage + "gogol-dns_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-dns"; - version = "0.2.0"; - sha256 = "11xy0jr8d4z1dgw12fcz0151cjm9k96bl4xlnd4nlcbxgyjxa95z"; + version = "0.3.0"; + sha256 = "18af36fx7w0ybcfiacfih7fyvri0rxlm4920yigmgsx551rgrm5l"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud DNS SDK"; @@ -78872,12 +79598,12 @@ self: { license = "unknown"; }) {}; - "gogol-doubleclick-bids_0_2_0" = callPackage + "gogol-doubleclick-bids_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-doubleclick-bids"; - version = "0.2.0"; - sha256 = "0g5pqihil93yi4yd0anvagzy560ims8jplnngbf6sx8aha1diwhr"; + version = "0.3.0"; + sha256 = "0gqlxdnxf2hqdaczvd0gi3ch3p23lk9mjd0xk03h6lhr8c2mx60c"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google DoubleClick Bid Manager SDK"; @@ -78897,12 +79623,12 @@ self: { license = "unknown"; }) {}; - "gogol-doubleclick-search_0_2_0" = callPackage + "gogol-doubleclick-search_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-doubleclick-search"; - version = "0.2.0"; - sha256 = "1jw7k2b6zqqv5gn80jxfcfpjxhxxi6lc92cksgca421dgiaagkwf"; + version = "0.3.0"; + sha256 = "1wwsv0gbqcjd6xmz7pqjv9hyfg20hwwnxld46yjgiwsyadxrd54d"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google DoubleClick Search SDK"; @@ -78922,12 +79648,12 @@ self: { license = "unknown"; }) {}; - "gogol-drive_0_2_0" = callPackage + "gogol-drive_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-drive"; - version = "0.2.0"; - sha256 = "0v6chs7il6bh10s94w4cjz1mv5drcic9phpvi2a6n6s43qry0s6w"; + version = "0.3.0"; + sha256 = "1l353bwhkw1a3pv2ngjddgiilazq4qds3askkxxyajxzy5f19blz"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Drive SDK"; @@ -78939,8 +79665,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-firebase-dynamiclinks"; - version = "0.2.0"; - sha256 = "07hny6l80d8icv0mgzrxcrzv0pixrhss18iv951hqpkq4rniv8lb"; + version = "0.3.0"; + sha256 = "096rc42f6ajw7biys45zaz4wgwxyqh67js6ihj8aqi4w1b05j3zz"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Firebase Dynamic Links SDK"; @@ -78960,12 +79686,12 @@ self: { license = "unknown"; }) {}; - "gogol-firebase-rules_0_2_0" = callPackage + "gogol-firebase-rules_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-firebase-rules"; - version = "0.2.0"; - sha256 = "0hxxm3r9g7ms26bj277rjvlam73b0xvspxknldf9rs21fdh9gfln"; + version = "0.3.0"; + sha256 = "0mrq1gp3s770lybwlzy126g8fx1kasqfh1qjd8lczga186972pqq"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Firebase Rules SDK"; @@ -78985,12 +79711,12 @@ self: { license = "unknown"; }) {}; - "gogol-fitness_0_2_0" = callPackage + "gogol-fitness_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-fitness"; - version = "0.2.0"; - sha256 = "131x8g52q1zbl64yswjyn5mrlznr38ms073kax0f7hyfscv433xz"; + version = "0.3.0"; + sha256 = "1awl1c1z4bcph8b6wgw34vyly7r6svs9h276h8h97z427006p1mv"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Fitness SDK"; @@ -79010,12 +79736,12 @@ self: { license = "unknown"; }) {}; - "gogol-fonts_0_2_0" = callPackage + "gogol-fonts_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-fonts"; - version = "0.2.0"; - sha256 = "01lz60wsnjq6c8lyixj19mgkn8a81lin6156nzncl6m79qqsx9xl"; + version = "0.3.0"; + sha256 = "0p2ckncnrdgkjqp67l0mygqp80nkp7w3p7plhmraxw2wrjpy15mv"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Fonts Developer SDK"; @@ -79035,12 +79761,12 @@ self: { license = "unknown"; }) {}; - "gogol-freebasesearch_0_2_0" = callPackage + "gogol-freebasesearch_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-freebasesearch"; - version = "0.2.0"; - sha256 = "0py4k01i78lvmgis8gixsqxjniinccw4cfqs9khdc58njwqqczdk"; + version = "0.3.0"; + sha256 = "02m2cpf6jdvd2km3gjvhvhkq3cgy7ijy5abwkrpcwvjzl1hps2vc"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Freebase Search SDK"; @@ -79060,12 +79786,12 @@ self: { license = "unknown"; }) {}; - "gogol-fusiontables_0_2_0" = callPackage + "gogol-fusiontables_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-fusiontables"; - version = "0.2.0"; - sha256 = "0nd1kjkymw0qwiygzzx7nr75vi07w42dliv0yys81skx1nlw1ad8"; + version = "0.3.0"; + sha256 = "0icaa7zdblgs180gww0w4ffffim9fzb4qbl1pwjyvxa6b7vhrks7"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Fusion Tables SDK"; @@ -79085,12 +79811,12 @@ self: { license = "unknown"; }) {}; - "gogol-games_0_2_0" = callPackage + "gogol-games_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-games"; - version = "0.2.0"; - sha256 = "1xbzdixlqbbimbc85fmdq0f2cj1w36drvbxxakipwir427pr7aya"; + version = "0.3.0"; + sha256 = "0r0x1g8wkq6vn4hk655wkl8fpfjlqppb0w9gscz99qsvv1gm16dz"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Play Game Services SDK"; @@ -79110,12 +79836,12 @@ self: { license = "unknown"; }) {}; - "gogol-games-configuration_0_2_0" = callPackage + "gogol-games-configuration_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-games-configuration"; - version = "0.2.0"; - sha256 = "19f6w057a8rawka8zcdqxhbay2iigcvr6xzn57mawc8fc6wbiwjx"; + version = "0.3.0"; + sha256 = "04g2kiyzhnyczxl6648gzl14wfszxiihyajvc7428whp54b3b4yg"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Play Game Services Publishing SDK"; @@ -79135,12 +79861,12 @@ self: { license = "unknown"; }) {}; - "gogol-games-management_0_2_0" = callPackage + "gogol-games-management_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-games-management"; - version = "0.2.0"; - sha256 = "1ih03w6wx064553aq9d2qaxh5b972k8gnvrfr2bpjbrysdxv1rfz"; + version = "0.3.0"; + sha256 = "192phwrhnsnanq3gf7ss3dsflvnkzf058r1jnb9vqf5035mckb4p"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Play Game Services Management SDK"; @@ -79160,12 +79886,12 @@ self: { license = "unknown"; }) {}; - "gogol-genomics_0_2_0" = callPackage + "gogol-genomics_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-genomics"; - version = "0.2.0"; - sha256 = "0mhvxq7d0g3hymkdwrxg3jgj6nnazm1b8rw5q6p3npj705b63vqh"; + version = "0.3.0"; + sha256 = "0d9i4jlv09fc4ry6qsdypkmx3faj6i5m9c6xv3xys1d06v4mzxkf"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Genomics SDK"; @@ -79185,12 +79911,12 @@ self: { license = "unknown"; }) {}; - "gogol-gmail_0_2_0" = callPackage + "gogol-gmail_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-gmail"; - version = "0.2.0"; - sha256 = "1xgs58rvxx8mrz6z4451fng59ia2n0wb800jnzdmilv4p9h255xb"; + version = "0.3.0"; + sha256 = "0h9z55bcdyp0as0jzv5wj89v71fz2n75pg8dhwg90iw1pp3rrg83"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Gmail SDK"; @@ -79210,12 +79936,12 @@ self: { license = "unknown"; }) {}; - "gogol-groups-migration_0_2_0" = callPackage + "gogol-groups-migration_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-groups-migration"; - version = "0.2.0"; - sha256 = "1qmbps5qbpd6k4d9a2rp9cl9idj8bgykn9mh727qgqq8x19p8glk"; + version = "0.3.0"; + sha256 = "0c676dk7x62bdv8nr8wsk1icd7v93060zjbzwzl2xi46q0j59dmk"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Groups Migration SDK"; @@ -79235,12 +79961,12 @@ self: { license = "unknown"; }) {}; - "gogol-groups-settings_0_2_0" = callPackage + "gogol-groups-settings_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-groups-settings"; - version = "0.2.0"; - sha256 = "1rky9vrcingnqq43g8bazhji2s7spf680v4xcg1ivh2b86xrn8x9"; + version = "0.3.0"; + sha256 = "1xy466x9xcbi7scf7fpnc5cy47hgsmdcg17hqzys4bp86sdc6738"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Groups Settings SDK"; @@ -79252,8 +79978,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-iam"; - version = "0.2.0"; - sha256 = "0n3g2gr77ss8r1758422a88h81nxhjdkj8mwkihby7zi1if6d4y7"; + version = "0.3.0"; + sha256 = "1fn8jx5hq4dxh2i1xf4cbmbsbjwxcplxxh7har1ai4z9ya1zghxs"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Identity and Access Management (IAM) SDK"; @@ -79273,12 +79999,12 @@ self: { license = "unknown"; }) {}; - "gogol-identity-toolkit_0_2_0" = callPackage + "gogol-identity-toolkit_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-identity-toolkit"; - version = "0.2.0"; - sha256 = "155w9hcwqg31njkjw6d8r2bnd8wfgxnvdnqc57ac6q1ajimr6pw3"; + version = "0.3.0"; + sha256 = "1mdkzd5gb8nlaf5nj04fsl97ghyzpkmr4w93pcd5vsr8yxy3lkwz"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Identity Toolkit SDK"; @@ -79298,12 +80024,12 @@ self: { license = "unknown"; }) {}; - "gogol-kgsearch_0_2_0" = callPackage + "gogol-kgsearch_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-kgsearch"; - version = "0.2.0"; - sha256 = "08hsrwlnq9y4fj5h1asn2ilqvdaj2vjq9mm72k554qmid5jsk4z6"; + version = "0.3.0"; + sha256 = "0kldw64ff2p8h8mfdfbplxfk3jinxc8ibr33wa1qzpfzixb72v2n"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Knowledge Graph Search SDK"; @@ -79315,8 +80041,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-language"; - version = "0.2.0"; - sha256 = "1kwgq66njn73x1szhhmlh0jjcfl2m8qs4clkwfdk3xpiqickl8w8"; + version = "0.3.0"; + sha256 = "0ny2d5bv9dxn1w8rwzv5m7lr5g8akrxqvfhs15bwk87fxdainz5j"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Natural Language SDK"; @@ -79336,12 +80062,12 @@ self: { license = "unknown"; }) {}; - "gogol-latencytest_0_2_0" = callPackage + "gogol-latencytest_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-latencytest"; - version = "0.2.0"; - sha256 = "156qczrzyvryjkzjar0s12zhjpl7paa72bixfgc2nkw78l6nmsca"; + version = "0.3.0"; + sha256 = "1gdllvcp6s7rf4093xl2fxq3bvqkrysnrs2s4abyppq54p4s6afk"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Network Performance Monitoring SDK"; @@ -79361,12 +80087,12 @@ self: { license = "unknown"; }) {}; - "gogol-logging_0_2_0" = callPackage + "gogol-logging_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-logging"; - version = "0.2.0"; - sha256 = "1bfzhmlwsmsq3zw5qsh3jx2xiymcp3fbn7limkc7zwkj5xnqqbfd"; + version = "0.3.0"; + sha256 = "1i5q2qqr041qxn458a6300z07idbz17srix9kr2sm3mxbvc5h04g"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Stackdriver Logging SDK"; @@ -79378,8 +80104,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-manufacturers"; - version = "0.2.0"; - sha256 = "0dhgvy3vs4n05xx5kma039zk5wiw9s9iba09p0xa4r9kb7902w3x"; + version = "0.3.0"; + sha256 = "0211aq7gjmpkhvcqf7fyrwrhdfsn8k5g1qw9gjsisxq0m873i6w0"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Manufacturer Center SDK"; @@ -79399,12 +80125,12 @@ self: { license = "unknown"; }) {}; - "gogol-maps-coordinate_0_2_0" = callPackage + "gogol-maps-coordinate_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-maps-coordinate"; - version = "0.2.0"; - sha256 = "1d1h7xb4wbisb0q3dwqpgsff4pzkxjlimmrxjafdyy9nkjyh6js1"; + version = "0.3.0"; + sha256 = "1ajgf2g9yad6zwhap8b0qigf0nfsw5k3132ksnzkcrfflz74swvn"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Maps Coordinate SDK"; @@ -79424,12 +80150,12 @@ self: { license = "unknown"; }) {}; - "gogol-maps-engine_0_2_0" = callPackage + "gogol-maps-engine_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-maps-engine"; - version = "0.2.0"; - sha256 = "07zv1fgjrdidj6d29nrhxbl6b5v136s763z8dzw2jwxgvhsl3zma"; + version = "0.3.0"; + sha256 = "15a6z7kxvad3ylr1pkwqlimzbwsk0p8qblfnwgnjbl3mr681xdvv"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Maps Engine SDK"; @@ -79449,12 +80175,12 @@ self: { license = "unknown"; }) {}; - "gogol-mirror_0_2_0" = callPackage + "gogol-mirror_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-mirror"; - version = "0.2.0"; - sha256 = "12s007vw1z3x7h6b902zf06kffwsar47l661dw4njw15cxzk6q0c"; + version = "0.3.0"; + sha256 = "0ckh2bkjd8c7ybc2yc295wgn0z9kmp471kfkxkjl3swb9dab3fhm"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Mirror SDK"; @@ -79466,8 +80192,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-ml"; - version = "0.2.0"; - sha256 = "0k5l59dbvsjxpl0j3rcxrfgpykyxkarc48r4a8x731xs53c2w848"; + version = "0.3.0"; + sha256 = "1qkk8v0yhdyphi5r18x4wawvhn0vwsfbz0gjvrf5mr0sdd80qhav"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Machine Learning SDK"; @@ -79487,12 +80213,12 @@ self: { license = "unknown"; }) {}; - "gogol-monitoring_0_2_0" = callPackage + "gogol-monitoring_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-monitoring"; - version = "0.2.0"; - sha256 = "08dzdj4a4vxb6sj9ns66ag1di2lj4yl15sz8hlyzmhcp3s40bxg0"; + version = "0.3.0"; + sha256 = "03jslg15crnngarylydybb48vwq338hsb260mk4riahkg78kd7ga"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Stackdriver Monitoring SDK"; @@ -79512,12 +80238,12 @@ self: { license = "unknown"; }) {}; - "gogol-oauth2_0_2_0" = callPackage + "gogol-oauth2_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-oauth2"; - version = "0.2.0"; - sha256 = "13sa51rh37cfa6qb4rxdirzyqyq7bpbbm1jgx2bsq2lfypmppnbv"; + version = "0.3.0"; + sha256 = "0fdjq6kvh04csi29g4nagmji5vqprvwra2gas42n79rq2qhxfx5n"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google OAuth2 SDK"; @@ -79537,12 +80263,12 @@ self: { license = "unknown"; }) {}; - "gogol-pagespeed_0_2_0" = callPackage + "gogol-pagespeed_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-pagespeed"; - version = "0.2.0"; - sha256 = "046waxwf53vacam6pvxx6n1r1c02aj74my9cs8hwi8j3i0b3w0z5"; + version = "0.3.0"; + sha256 = "1k6n60w4z77fyy5bnsab8bdgr490zfb753m3ljsc7vxwqqfiqhrx"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google PageSpeed Insights SDK"; @@ -79562,12 +80288,12 @@ self: { license = "unknown"; }) {}; - "gogol-partners_0_2_0" = callPackage + "gogol-partners_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-partners"; - version = "0.2.0"; - sha256 = "0b3j4if5vn98qg9d0j29fss4ww7zd5knlmhdv6q7hyvjzi1kmkiv"; + version = "0.3.0"; + sha256 = "0xhhmsplvfmsi860skrgpzzz3lixa0qcx73w9cv6da679fh0ddfv"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Partners SDK"; @@ -79587,12 +80313,12 @@ self: { license = "unknown"; }) {}; - "gogol-people_0_2_0" = callPackage + "gogol-people_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-people"; - version = "0.2.0"; - sha256 = "1fyrkd03a5i75wj2yyhahh8d6vghwvvh13317kjxib0np7cc7c8q"; + version = "0.3.0"; + sha256 = "0j2frq599kjrv0wl9bpmpglw51wcjid2ysmm50hhlpbv78z55sfv"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google People SDK"; @@ -79612,12 +80338,12 @@ self: { license = "unknown"; }) {}; - "gogol-play-moviespartner_0_2_0" = callPackage + "gogol-play-moviespartner_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-play-moviespartner"; - version = "0.2.0"; - sha256 = "0i4bdl1h1rlihcyzfvfzqqiqjihw2nc9n6qrjzfiq4w1av7hcwir"; + version = "0.3.0"; + sha256 = "0v1cs21y94m4ma414nann6k1mc0jfdyj5ariy9bm6hyqbd3c60zc"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Play Movies Partner SDK"; @@ -79637,12 +80363,12 @@ self: { license = "unknown"; }) {}; - "gogol-plus_0_2_0" = callPackage + "gogol-plus_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-plus"; - version = "0.2.0"; - sha256 = "1nnq935bsdrqfdld05wqzdv2rzick0mdz7pjgvz908ks5p94zxij"; + version = "0.3.0"; + sha256 = "0qwswkjcv0i8m23y7dm9yrk343m3kdckg6srzi9q2jfip6h9hv8v"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google + SDK"; @@ -79662,12 +80388,12 @@ self: { license = "unknown"; }) {}; - "gogol-plus-domains_0_2_0" = callPackage + "gogol-plus-domains_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-plus-domains"; - version = "0.2.0"; - sha256 = "16qaviwhknw9ibgy10by80dkgph184z01wxvrxbyd99p0sg7yjf5"; + version = "0.3.0"; + sha256 = "0d0aijvdl2z9prv6qs6qriw54d6z9ljpl2nc5zwwk3647s62kvvi"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google + Domains SDK"; @@ -79687,12 +80413,12 @@ self: { license = "unknown"; }) {}; - "gogol-prediction_0_2_0" = callPackage + "gogol-prediction_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-prediction"; - version = "0.2.0"; - sha256 = "19wb5qpk3faw49mgvmqail515mg7ni8z3g50wsq0jgiv8w04dhwi"; + version = "0.3.0"; + sha256 = "136jrwlwwygz4icl8c5c1bj1l7j9lypc5qxkygs6azc3x3l8ih6g"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Prediction SDK"; @@ -79712,12 +80438,12 @@ self: { license = "unknown"; }) {}; - "gogol-proximitybeacon_0_2_0" = callPackage + "gogol-proximitybeacon_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-proximitybeacon"; - version = "0.2.0"; - sha256 = "0mhlxy6ybsm6qmn02r2qbv5hmxcy6f9aiy8rbajqzjjry3dmvzsv"; + version = "0.3.0"; + sha256 = "1f54km4v9mgil6p12vvziwv5v00d23l5rvk66yl4h614mh402m2v"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Proximity Beacon SDK"; @@ -79737,12 +80463,12 @@ self: { license = "unknown"; }) {}; - "gogol-pubsub_0_2_0" = callPackage + "gogol-pubsub_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-pubsub"; - version = "0.2.0"; - sha256 = "1lsy3ajp09gq4608mp22smmaizfmfr32fskfawfdhhg3wfznhf34"; + version = "0.3.0"; + sha256 = "1c2qwqmq3bjfcd322kpyyxfdhsbyxq3r2v614v14dm0kr4cxqnik"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Pub/Sub SDK"; @@ -79762,12 +80488,12 @@ self: { license = "unknown"; }) {}; - "gogol-qpxexpress_0_2_0" = callPackage + "gogol-qpxexpress_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-qpxexpress"; - version = "0.2.0"; - sha256 = "04vqpgalh3nd9w2hgwr7r8n1xnv6yxfj69jxnlrjn0s1nrbbnbx6"; + version = "0.3.0"; + sha256 = "10v82f2bkn4i0w8gq79skagksi13p5i3280cb50x206a8cy9j350"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google QPX Express SDK"; @@ -79787,12 +80513,12 @@ self: { license = "unknown"; }) {}; - "gogol-replicapool_0_2_0" = callPackage + "gogol-replicapool_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-replicapool"; - version = "0.2.0"; - sha256 = "0if2vnlgv3gvw5czanjbdfkpxhd0ipyivapxhqfzwnnbz82i2cw2"; + version = "0.3.0"; + sha256 = "1kjkf7bykmz5wzndj7h0yzwfds56m34d0jvq7m1rkhp2qnn1v1jl"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Compute Engine Instance Group Manager SDK"; @@ -79812,12 +80538,12 @@ self: { license = "unknown"; }) {}; - "gogol-replicapool-updater_0_2_0" = callPackage + "gogol-replicapool-updater_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-replicapool-updater"; - version = "0.2.0"; - sha256 = "1f1pj16c8l0pic72k0phy2g285mm4l91w2dx06ak2p3xvhpn8d8d"; + version = "0.3.0"; + sha256 = "14gm5wfay5d079hn39fcjwxfsz8pd02cc60id7jsxxc4jbyxjq42"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Compute Engine Instance Group Updater SDK"; @@ -79837,12 +80563,12 @@ self: { license = "unknown"; }) {}; - "gogol-resourcemanager_0_2_0" = callPackage + "gogol-resourcemanager_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-resourcemanager"; - version = "0.2.0"; - sha256 = "0i947wbnam2n0r9n5cxhljbcawkxq2gji9k73z4yhf4239xm7h9j"; + version = "0.3.0"; + sha256 = "0n2j9liwx5zd2flzmrq2z2hahbbgw2wx53d6nqykvaf5g3vc6l6b"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Resource Manager SDK"; @@ -79862,12 +80588,12 @@ self: { license = "unknown"; }) {}; - "gogol-resourceviews_0_2_0" = callPackage + "gogol-resourceviews_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-resourceviews"; - version = "0.2.0"; - sha256 = "0wf1gg8d8v5jpzfdmzr6v01np3ad5lxxsgm9sjicgs2i59wj907v"; + version = "0.3.0"; + sha256 = "114gjdxzm4kq3ibk32dzy73zvmp9ls9bzb4k7szdkxr922861akp"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Compute Engine Instance Groups SDK"; @@ -79879,8 +80605,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-runtimeconfig"; - version = "0.2.0"; - sha256 = "10d6b2pwicb49fzgmpph12rqy2m36xqr0ihwfjljsz80554jzffl"; + version = "0.3.0"; + sha256 = "004k1zy27gk98xh0h3c7ll3zxk2qif31znwnnyyxi30gmwlg19sj"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud RuntimeConfig SDK"; @@ -79892,8 +80618,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-safebrowsing"; - version = "0.2.0"; - sha256 = "0wd1sgrg796wdbj8rfg7lmcj86grnw24k2y247pk7yfxdxwp5f9j"; + version = "0.3.0"; + sha256 = "0sxhc8l7ck20zbn2h7zgcywkygh0gp3mzg0mkgvx1qs4hp0nryvq"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Safe Browsing APIs SDK"; @@ -79913,12 +80639,12 @@ self: { license = "unknown"; }) {}; - "gogol-script_0_2_0" = callPackage + "gogol-script_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-script"; - version = "0.2.0"; - sha256 = "1js7v9m1h3017lra4khw0hmwm1j2np66bwdggs50rlciflh2wmz2"; + version = "0.3.0"; + sha256 = "1l2bd93zndmi4zy28ygq63cz020q83viz2pyzy1j0hk0inji9k81"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Apps Script Execution SDK"; @@ -79930,8 +80656,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-servicecontrol"; - version = "0.2.0"; - sha256 = "09rwzdvdgi8kcw6v7b7i9wqakcb7ncf1m4cm26xr2n3m162ji50g"; + version = "0.3.0"; + sha256 = "0lfw9592arh01d3swxyp97glxqzc3cvcd3mn6pcm5q6dsjnda1hi"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Service Control SDK"; @@ -79943,8 +80669,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-servicemanagement"; - version = "0.2.0"; - sha256 = "0bbnd8wb7x26b5kgfsaw4747x808hbsfykxkz0pnfm5zyx6na3hb"; + version = "0.3.0"; + sha256 = "0qasq71k1bm9pm298sdivgnnr1sx9701nhmdn82lx8qglnxvd4v3"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Service Management SDK"; @@ -79965,12 +80691,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "gogol-sheets_0_2_0" = callPackage + "gogol-sheets_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-sheets"; - version = "0.2.0"; - sha256 = "1q1pdadk0nchq794z1qsv0y32y91c39w6r0q74iqq4b0s4sdp544"; + version = "0.3.0"; + sha256 = "1kj179262lada2dh3pq129kc6p0rdzppxhmyglin5p2nnlzmkm9d"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Sheets SDK"; @@ -79988,14 +80714,15 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Content API for Shopping SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "gogol-shopping-content_0_2_0" = callPackage + "gogol-shopping-content_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-shopping-content"; - version = "0.2.0"; - sha256 = "0qjncikv3qs428z3w1fg15hy1cdg2518pw2dj3qxpi8qjvfm6jgn"; + version = "0.3.0"; + sha256 = "05q68x2krghnv0j7f7bizhqpjgni2lqm03bp74ydcy7f2y675i55"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Content API for Shopping SDK"; @@ -80015,12 +80742,12 @@ self: { license = "unknown"; }) {}; - "gogol-siteverification_0_2_0" = callPackage + "gogol-siteverification_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-siteverification"; - version = "0.2.0"; - sha256 = "0chazk5ihxdfcrqm2hsrx4xg5g6gy7v03smv3kxgvajvm0ck8x0z"; + version = "0.3.0"; + sha256 = "0pi4ljv20p5xjw11p99hksn8qz284pjv9f36i7hsdlf5bjd3v1dh"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Site Verification SDK"; @@ -80032,8 +80759,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-slides"; - version = "0.2.0"; - sha256 = "0k5csk32d6hz42k7d6yci70mxpgpy0s78jzj7d3hjhd5hny904z5"; + version = "0.3.0"; + sha256 = "1bqyq767c4w8m2w9i78vn6psnv68687l0kwf6kbmn150gvg9c1mb"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Slides SDK"; @@ -80053,12 +80780,12 @@ self: { license = "unknown"; }) {}; - "gogol-spectrum_0_2_0" = callPackage + "gogol-spectrum_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-spectrum"; - version = "0.2.0"; - sha256 = "0zkggda3p7j1j6ja5qc33ilqjq73hpa5dbzvcgzh4mzhn9h3m396"; + version = "0.3.0"; + sha256 = "0b596ajxy6ph28l46wnh03cr264ry4yki197bxls8spvzf8pwf5b"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Spectrum Database SDK"; @@ -80078,12 +80805,12 @@ self: { license = "unknown"; }) {}; - "gogol-sqladmin_0_2_0" = callPackage + "gogol-sqladmin_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-sqladmin"; - version = "0.2.0"; - sha256 = "0lz1vyhpm61gc7w8xmniv0s46gl8b28j9qgl5sqr8xlsca9qbjyp"; + version = "0.3.0"; + sha256 = "164w0sqy75m1dsvi64kyrihy647j2gm0k7kar46m9wvym1gvcr3r"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud SQL Administration SDK"; @@ -80103,12 +80830,12 @@ self: { license = "unknown"; }) {}; - "gogol-storage_0_2_0" = callPackage + "gogol-storage_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-storage"; - version = "0.2.0"; - sha256 = "1nnq2yjwpwxrpz9ix32x12lnlmqm3nfmxl1cgjcaric8fkf2i18m"; + version = "0.3.0"; + sha256 = "18n4grbbwwg0ymh0gp6qhqdw7v9x81y70lxmslql0w9dlirg959v"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Storage JSON SDK"; @@ -80128,12 +80855,12 @@ self: { license = "unknown"; }) {}; - "gogol-storage-transfer_0_2_0" = callPackage + "gogol-storage-transfer_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-storage-transfer"; - version = "0.2.0"; - sha256 = "07izvvdy5zfl3k3rkp447jw8jcxi24bmniyhbiwdd7ldcx49gak4"; + version = "0.3.0"; + sha256 = "0iwal6slja14gbdw2xjs79y3c6l56c1hvv0gyip3b3pz5i2xh4zb"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Storage Transfer SDK"; @@ -80153,12 +80880,12 @@ self: { license = "unknown"; }) {}; - "gogol-tagmanager_0_2_0" = callPackage + "gogol-tagmanager_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-tagmanager"; - version = "0.2.0"; - sha256 = "0gsls15n3d7c7x1nzzr77bvpvsw78yfn1cp1njhikpwsy1i96n7w"; + version = "0.3.0"; + sha256 = "0hsplk3yvkdglv38pl9cckc6csh23adasyvfdzw08kfbk8b1llgp"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Tag Manager SDK"; @@ -80178,12 +80905,12 @@ self: { license = "unknown"; }) {}; - "gogol-taskqueue_0_2_0" = callPackage + "gogol-taskqueue_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-taskqueue"; - version = "0.2.0"; - sha256 = "19mqnnl65i5i0b4nzyw40nw97vzbrh2kxbxl9knpxjls5ab2q5sv"; + version = "0.3.0"; + sha256 = "0irzyv80q2n4jv144rryv5xqbg51gqyws1pnvpdi5lddq90yvjq3"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google TaskQueue SDK"; @@ -80203,12 +80930,12 @@ self: { license = "unknown"; }) {}; - "gogol-translate_0_2_0" = callPackage + "gogol-translate_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-translate"; - version = "0.2.0"; - sha256 = "1k3qbsjhcd6231br44hmmschq0mav3pfgmcl2pcybx6shhjdnrdr"; + version = "0.3.0"; + sha256 = "0bwmymiz1whc2rffxzlkva72j5cq51y8gxfl7lq5bg668p3grcvk"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Translate SDK"; @@ -80228,12 +80955,12 @@ self: { license = "unknown"; }) {}; - "gogol-urlshortener_0_2_0" = callPackage + "gogol-urlshortener_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-urlshortener"; - version = "0.2.0"; - sha256 = "0wl6grqh2a4n47c3gkhsr7ywsrjj0kpd9rhwzzg5ggms117rmckb"; + version = "0.3.0"; + sha256 = "1hmwk3pfxzyv0hxn33jms7c72yl8pnqnbfpza53ljq0abd749fcv"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google URL Shortener SDK"; @@ -80253,12 +80980,12 @@ self: { license = "unknown"; }) {}; - "gogol-useraccounts_0_2_0" = callPackage + "gogol-useraccounts_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-useraccounts"; - version = "0.2.0"; - sha256 = "0rycp4g11crv9hjq9aw3i0xrggmkxyzrj9vnwrga84fvrg1lll4i"; + version = "0.3.0"; + sha256 = "0fzmq082x0vvml8c0pxhb3vrnvizmq9cmh8y30yapkad7xwgx3i9"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud User Accounts SDK"; @@ -80278,12 +81005,12 @@ self: { license = "unknown"; }) {}; - "gogol-vision_0_2_0" = callPackage + "gogol-vision_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-vision"; - version = "0.2.0"; - sha256 = "0wb0hj0mfsjqyrjiyv29zm6labsmzbjxhdhvf14m4mp3fy73b1vc"; + version = "0.3.0"; + sha256 = "1ssdz7cv3v3hz024m3djv4asj6lpd4c7a3dzrnxm9ipfbfmjb5f9"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Vision SDK"; @@ -80303,12 +81030,12 @@ self: { license = "unknown"; }) {}; - "gogol-webmaster-tools_0_2_0" = callPackage + "gogol-webmaster-tools_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-webmaster-tools"; - version = "0.2.0"; - sha256 = "0jx0bmx7yljc7dhks0mr06wkplfqcx6nxdfnlgrclplnyf0k8qq0"; + version = "0.3.0"; + sha256 = "0rkpjwnb064i7256j0q8gnkynny596qrg79h2wviadmifz9gyixp"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Search Console SDK"; @@ -80326,14 +81053,15 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google YouTube Data SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "gogol-youtube_0_2_0" = callPackage + "gogol-youtube_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-youtube"; - version = "0.2.0"; - sha256 = "01chn9bsap4sc2qzsbmm97pb5m3wksvp2f9ky3zw6v89slkaspj2"; + version = "0.3.0"; + sha256 = "1sv7djr2x73n3w0cbxncyzz64kxn7pwydcyznqipni7xv6hi5s1j"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google YouTube Data SDK"; @@ -80353,12 +81081,12 @@ self: { license = "unknown"; }) {}; - "gogol-youtube-analytics_0_2_0" = callPackage + "gogol-youtube-analytics_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-youtube-analytics"; - version = "0.2.0"; - sha256 = "06s518qfiw7p7kc3d2y4ncfm57mic1z1sr3pwl4hjrds7k78v20f"; + version = "0.3.0"; + sha256 = "10888jai56jpw6snssclldmxn2my9vadrqm14dmrhl6sr3mabdbh"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google YouTube Analytics SDK"; @@ -80378,12 +81106,12 @@ self: { license = "unknown"; }) {}; - "gogol-youtube-reporting_0_2_0" = callPackage + "gogol-youtube-reporting_0_3_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-youtube-reporting"; - version = "0.2.0"; - sha256 = "0f9dm434fhb8vslk9x0zhybp31pk2ydvy1yfhmj5kp23nmzlh5pi"; + version = "0.3.0"; + sha256 = "0j8xalrigh3rvxb8z009s6bs34nw68kwjvczm1hlx1fcifgjrp4f"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google YouTube Reporting SDK"; @@ -81143,6 +81871,7 @@ self: { homepage = "https://github.com/blamario/grampa/tree/master/grammatical-parsers"; description = "parsers that can combine into grammars"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "grapefruit-examples" = callPackage @@ -82656,8 +83385,8 @@ self: { }: mkDerivation { pname = "gtk-mac-integration"; - version = "0.3.3.1"; - sha256 = "0fbbf797i36s65sxywqzvkbvnh4cj17w0km5ym31n7hnvd2i4rdg"; + version = "0.3.4.0"; + sha256 = "0irf8smnpsym2lkw6gslk31zibn7alp7g32cmq4062mgnlwlawn4"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ array base containers glib gtk mtl ]; libraryPkgconfigDepends = [ gtk-mac-integration-gtk2 ]; @@ -82912,8 +83641,8 @@ self: { }: mkDerivation { pname = "gtk3-mac-integration"; - version = "0.3.3.1"; - sha256 = "1z709van0llwkfyrpmkqkzpcv82kwz54bw3rwwsqrx3mzi7q5fm5"; + version = "0.3.4.0"; + sha256 = "0cdx0qzmwz3bbg374c9nvwqsxgvc5c2h8i6m0x6d0sm714d8l0ac"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ array base containers glib gtk3 mtl ]; libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ]; @@ -83189,6 +83918,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "h2c" = callPackage + ({ mkDerivation, base, bytestring, mtl, resourcet }: + mkDerivation { + pname = "h2c"; + version = "1.0.0"; + sha256 = "16aljqvzf8n1js0drqii99z3v8xba0468w27c9vmf5w483awkqjb"; + libraryHaskellDepends = [ base bytestring mtl resourcet ]; + homepage = "https://bitbucket.org/fmapE/h2c"; + description = "Bindings to Linux I2C with support for repeated-start transactions"; + license = stdenv.lib.licenses.mit; + }) {}; + "hArduino" = callPackage ({ mkDerivation, base, bytestring, containers, mtl, serialport , time @@ -84502,6 +85243,8 @@ self: { pname = "hackertyper"; version = "0.1.0.1"; sha256 = "17c77f687874bfwahmzcz2v6k8z9p4fv555r5r1f38snsdi825gf"; + revision = "1"; + editedCabalFile = "1slyp8ncpiv204yxb2p7z0kwz4xhqv8czfrx4p78cbbhrlkmgnpm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ]; @@ -84978,13 +85721,14 @@ self: { }: mkDerivation { pname = "hailgun"; - version = "0.4.1.3"; - sha256 = "0x3yjxrjy6yg8b4pj7q8wzfmxxx9j5pzz17why5wyawvpswc3gjp"; + version = "0.4.1.4"; + sha256 = "0qcfhprg5x0wb28zgn80x808a1w6il2hc6mykq8wv0ranmwj1lrx"; libraryHaskellDepends = [ aeson base bytestring email-validate exceptions filepath http-client http-client-tls http-types tagsoup text time transformers ]; + homepage = "https://bitbucket.org/robertmassaioli/hailgun"; description = "Mailgun REST api interface for Haskell"; license = stdenv.lib.licenses.mit; }) {}; @@ -86818,8 +87562,8 @@ self: { }: mkDerivation { pname = "happstack-static-routing"; - version = "0.4.2"; - sha256 = "0g8b94mfhajgs99rgvzfrlc19cxm5a0j6cgrrlrdhgfx7lggc9h2"; + version = "0.6.0.0"; + sha256 = "18r7nb6558yvspc486sxckb8708wsvgqgagaycg1qbdxbfhnshhg"; libraryHaskellDepends = [ base containers happstack-server list-tries transformers ]; @@ -87216,37 +87960,15 @@ self: { "hasbolt" = callPackage ({ mkDerivation, base, binary, bytestring, containers , data-binary-ieee754, data-default, hex, hspec, network - , network-simple, QuickCheck, text, transformers + , QuickCheck, text, transformers }: mkDerivation { pname = "hasbolt"; - version = "0.1.1.2"; - sha256 = "13razc8k8ik008hssxrmypw9a8idr0rm3j37dn8957wklb2634d8"; + version = "0.1.2.1"; + sha256 = "08pa4df4klijdxpbfkqiqfjrcwl3ip3gwg84kx1zg9wpnvdbjn4l"; libraryHaskellDepends = [ base binary bytestring containers data-binary-ieee754 data-default - hex network network-simple text transformers - ]; - testHaskellDepends = [ - base bytestring containers hex hspec QuickCheck text - ]; - homepage = "https://github.com/zmactep/hasbolt#readme"; - description = "Haskell driver for Neo4j 3+ (BOLT protocol)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "hasbolt_0_1_1_3" = callPackage - ({ mkDerivation, base, binary, bytestring, containers - , data-binary-ieee754, data-default, hex, hspec, network - , network-simple, QuickCheck, text, transformers - }: - mkDerivation { - pname = "hasbolt"; - version = "0.1.1.3"; - sha256 = "1ba85bq8p6cjrxajinb3ykqyffq0h2xcsq80q26y9iy18ys7mcbr"; - libraryHaskellDepends = [ - base binary bytestring containers data-binary-ieee754 data-default - hex network network-simple text transformers + hex network text transformers ]; testHaskellDepends = [ base bytestring containers hex hspec QuickCheck text @@ -87427,10 +88149,10 @@ self: { }: mkDerivation { pname = "hashable"; - version = "1.2.6.0"; - sha256 = "0lhadvg4l18iff2hg4d5akn5f3lrg9pfwxpkn1j2zxbsh8y6d6s2"; - revision = "1"; - editedCabalFile = "1psifhc6rx94vh4bikb6zrn4l2ndr7hwfd36cc2fmccgg1xlz2lg"; + version = "1.2.6.1"; + sha256 = "0ymv2mcrrgbdc2w39rib171fwnhg7fgp0sy4h8amrh1vw64qgjll"; + revision = "2"; + editedCabalFile = "0w4756sa04nk2bw3vnysb0y9d09zzg3c77aydkjfxz1hnl1dvnjn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -88121,6 +88843,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-disque" = callPackage + ({ mkDerivation, base, bytestring, hedis, string-conversions + , transformers + }: + mkDerivation { + pname = "haskell-disque"; + version = "0.0.1.1"; + sha256 = "1375phlycnxajfni9yjgskh9a9nxz44jhr5ls508dgslwzvibzv8"; + libraryHaskellDepends = [ + base bytestring hedis string-conversions transformers + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/ArekCzarnik/haskell-disque#readme"; + description = "Client library for the Disque datastore"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskell-docs" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring, Cabal , containers, cryptohash, directory, filepath, ghc, ghc-paths @@ -88385,14 +89124,15 @@ self: { }: mkDerivation { pname = "haskell-import-graph"; - version = "1.0.1"; - sha256 = "14myydivq7dphm2m9wsrwkbc8bn5gnq625mgmq2w4j3yzbaw4267"; + version = "1.0.2"; + sha256 = "17pfvbs6mkv8iv86qzqsnq45f5scry2xkx4b7y3kf9bcj39xx1z6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base classy-prelude ghc graphviz process text transformers ]; executableHaskellDepends = [ base ]; + homepage = "https://github.com/ncaq/haskell-import-graph.git#readme"; description = "create haskell import graph for graphviz"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -88989,14 +89729,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haskell-tools-ast_0_7_0_0" = callPackage + "haskell-tools-ast_0_8_0_0" = callPackage ({ mkDerivation, base, ghc, mtl, references, template-haskell , uniplate }: mkDerivation { pname = "haskell-tools-ast"; - version = "0.7.0.0"; - sha256 = "063r92xzykhh3sr3zx161md2p98qzbsxs741ajs606bi2za52fyv"; + version = "0.8.0.0"; + sha256 = "15d588xnmghq116g4bg0jv10z5xzs54ln4da58dzm0d8241bmcd0"; libraryHaskellDepends = [ base ghc mtl references template-haskell uniplate ]; @@ -89079,18 +89819,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haskell-tools-backend-ghc_0_7_0_0" = callPackage - ({ mkDerivation, base, bytestring, containers, ghc + "haskell-tools-backend-ghc_0_8_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, ghc, ghc-boot-th , haskell-tools-ast, mtl, references, safe, split, template-haskell , transformers, uniplate }: mkDerivation { pname = "haskell-tools-backend-ghc"; - version = "0.7.0.0"; - sha256 = "09f0g0wzfl6979hbcz8qyyf0wwzk88rm83dw7h84by07nglfpxzg"; + version = "0.8.0.0"; + sha256 = "076kb9hcjina0d5dcwslbxhkja3p2m2fyxs88ywyqlciry2wdw2n"; libraryHaskellDepends = [ - base bytestring containers ghc haskell-tools-ast mtl references - safe split template-haskell transformers uniplate + base bytestring containers ghc ghc-boot-th haskell-tools-ast mtl + references safe split template-haskell transformers uniplate ]; homepage = "https://github.com/nboldi/haskell-tools"; description = "Creating the Haskell-Tools AST from GHC's representations"; @@ -89128,7 +89868,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haskell-tools-cli_0_7_0_0" = callPackage + "haskell-tools-cli_0_8_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , directory, filepath, ghc, ghc-paths, haskell-tools-ast , haskell-tools-prettyprint, haskell-tools-refactor, knob, mtl @@ -89136,8 +89876,8 @@ self: { }: mkDerivation { pname = "haskell-tools-cli"; - version = "0.7.0.0"; - sha256 = "1mnghaccwlyk4rc443ixgz760pdlfp1klj9zmhhin8gyldyh97zn"; + version = "0.8.0.0"; + sha256 = "02f5fhb20wb49gchqx8mjc6khdlc3g6lfawxl3v0xr8fargyyiz5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89186,7 +89926,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haskell-tools-daemon_0_7_0_0" = callPackage + "haskell-tools-daemon_0_8_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, Diff , directory, filepath, ghc, ghc-paths, haskell-tools-ast , haskell-tools-prettyprint, haskell-tools-refactor, HUnit, mtl @@ -89194,8 +89934,8 @@ self: { }: mkDerivation { pname = "haskell-tools-daemon"; - version = "0.7.0.0"; - sha256 = "09sccrmdczqdh4qwby79sy31asrhn7jmp7hrrzq59gp02f4v0rzw"; + version = "0.8.0.0"; + sha256 = "0fd9pxyxsfy09ks21nsk6khx97mb73kvjk6hg3wc8qcffxng9m69"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89236,15 +89976,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haskell-tools-debug_0_7_0_0" = callPackage + "haskell-tools-debug_0_8_0_0" = callPackage ({ mkDerivation, base, filepath, ghc, ghc-paths, haskell-tools-ast , haskell-tools-backend-ghc, haskell-tools-prettyprint , haskell-tools-refactor, references, template-haskell }: mkDerivation { pname = "haskell-tools-debug"; - version = "0.7.0.0"; - sha256 = "1iqlr6zhya3gcmlhkhfbrqh9wirhsrkpn1qr6zxab1a3yx9q895i"; + version = "0.8.0.0"; + sha256 = "0j9gd562kmmanqx9kbs1kks68pksnxgf55rghl8ip3j8a3h93smy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89290,7 +90030,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haskell-tools-demo_0_7_0_2" = callPackage + "haskell-tools-demo_0_8_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, ghc, ghc-paths, haskell-tools-ast , haskell-tools-backend-ghc, haskell-tools-prettyprint @@ -89300,8 +90040,8 @@ self: { }: mkDerivation { pname = "haskell-tools-demo"; - version = "0.7.0.2"; - sha256 = "0r8fb1mzf2j92n6xjkxd5kxqi6l9h0haf07l3p8fazqysxdsr1pj"; + version = "0.8.0.0"; + sha256 = "14l8zwzi4nzx1ddq2sbazr5faf0y241ppx9df5q9n0v24aclmxd6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89338,14 +90078,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haskell-tools-prettyprint_0_7_0_0" = callPackage + "haskell-tools-prettyprint_0_8_0_0" = callPackage ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl , references, split, text, uniplate }: mkDerivation { pname = "haskell-tools-prettyprint"; - version = "0.7.0.0"; - sha256 = "0d5ar53qkxyirs1q0p0nxzg9qy8mzsrj615ad1bfqz4lx1i0amsc"; + version = "0.8.0.0"; + sha256 = "19bx0fzgvin78iilw32klmjr0z0c9cw1x0xx1nj8mbi44c5rcb64"; libraryHaskellDepends = [ base containers ghc haskell-tools-ast mtl references split text uniplate @@ -89387,7 +90127,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haskell-tools-refactor_0_7_0_0" = callPackage + "haskell-tools-refactor_0_8_0_0" = callPackage ({ mkDerivation, base, Cabal, containers, directory, either , filepath, ghc, ghc-paths, haskell-tools-ast , haskell-tools-backend-ghc, haskell-tools-prettyprint @@ -89397,8 +90137,8 @@ self: { }: mkDerivation { pname = "haskell-tools-refactor"; - version = "0.7.0.0"; - sha256 = "0nivbkndwwkx32y1dzyqrpbmx8fasnxgq7c3hm7bs7plj4qsb096"; + version = "0.8.0.0"; + sha256 = "1k9mq164v7nm83dykdgmzxfdqmyk5p35lgzvnmw9mh43rrnnw8vd"; libraryHaskellDepends = [ base Cabal containers directory filepath ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc @@ -89441,15 +90181,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haskell-tools-rewrite_0_7_0_0" = callPackage + "haskell-tools-rewrite_0_8_0_0" = callPackage ({ mkDerivation, base, containers, directory, filepath, ghc , haskell-tools-ast, haskell-tools-prettyprint, mtl, references , tasty, tasty-hunit }: mkDerivation { pname = "haskell-tools-rewrite"; - version = "0.7.0.0"; - sha256 = "00gl4f711whfcrfv3i17ilwcj63w5zwq3p8njw8h4wcd06q0f28p"; + version = "0.8.0.0"; + sha256 = "076dc91swh42rs80ijbjrbzab1m9vjdzvy7z9r7znmrhy951ck5c"; libraryHaskellDepends = [ base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl references @@ -91741,16 +92481,18 @@ self: { }) {inherit (pkgs) SDL_mixer;}; "hblas" = callPackage - ({ mkDerivation, base, blas, hspec, liblapack, primitive - , storable-complex, vector + ({ mkDerivation, base, blas, HUnit, liblapack, primitive + , storable-complex, tasty, tasty-hunit, vector }: mkDerivation { pname = "hblas"; - version = "0.4.0.0"; - sha256 = "02kb6qk89sfs3hwq2xygisllpynnw5yn7z14pm6d22zxfmvidgcb"; + version = "0.3.2.1"; + sha256 = "05c2mqhwjq0r8jyaj0cncaxn4n5x27dd8z6lv8g8cdc7r749q59y"; + revision = "2"; + editedCabalFile = "02cxp6nxr2x1ka8bq8zjlx6kjy54lzsc9bdw1zf981f3i8yz9cj8"; libraryHaskellDepends = [ base primitive storable-complex vector ]; librarySystemDepends = [ blas liblapack ]; - testHaskellDepends = [ base hspec primitive vector ]; + testHaskellDepends = [ base HUnit tasty tasty-hunit vector ]; homepage = "http://github.com/wellposed/hblas/"; description = "Human friendly BLAS and Lapack bindings for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -91981,6 +92723,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hcom" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "hcom"; + version = "0.0.0.2"; + sha256 = "1ps6q3sn0dlkhxkwgpq9jj0rklrnsgsrrlk63g9jr8lfris2wlzq"; + doHaddock = false; + description = "Haskell COM support library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hcoord" = callPackage ({ mkDerivation, base, data-default, HUnit, ieee754, mtl , regex-pcre @@ -92522,6 +93275,8 @@ self: { pname = "heap"; version = "1.0.3"; sha256 = "00plmd5b8dlgb8324h1dbd168apfcx3hkv65rhi463a8lff7xmcv"; + revision = "1"; + editedCabalFile = "0j1f0xl3y2vqiyh3m9w5vssxyi62s6qic3zmpkm429vawyh4yad5"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "Heaps in Haskell"; @@ -92631,20 +93386,21 @@ self: { "hedgehog" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring - , concurrent-output, containers, directory, exceptions, mmorph, mtl - , pretty-show, primitive, random, resourcet, stm, template-haskell - , text, th-lift, time, transformers, transformers-base, unix - , wl-pprint-annotated + , concurrent-output, containers, directory, exceptions + , lifted-async, mmorph, monad-control, mtl, pretty-show, primitive + , random, resourcet, stm, template-haskell, text, th-lift, time + , transformers, transformers-base, unix, wl-pprint-annotated }: mkDerivation { pname = "hedgehog"; - version = "0.3"; - sha256 = "0navcrq51wy7040a8vh9izzln61qpk06z4r4g33j7v6qk2hflwb7"; + version = "0.5"; + sha256 = "02dy5fmwmrjgwj6p8rvr53rg362qayavbc184gf2f9q196rgijpk"; libraryHaskellDepends = [ ansi-terminal async base bytestring concurrent-output containers - directory exceptions mmorph mtl pretty-show primitive random - resourcet stm template-haskell text th-lift time transformers - transformers-base unix wl-pprint-annotated + directory exceptions lifted-async mmorph monad-control mtl + pretty-show primitive random resourcet stm template-haskell text + th-lift time transformers transformers-base unix + wl-pprint-annotated ]; testHaskellDepends = [ base containers pretty-show text transformers @@ -92655,6 +93411,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hedgehog-quickcheck" = callPackage + ({ mkDerivation, base, hedgehog, QuickCheck, transformers }: + mkDerivation { + pname = "hedgehog-quickcheck"; + version = "0.1"; + sha256 = "04l4dyk662wf6a0p6bnv9n2x2qi5sqm65ni5bdznakfvzk6mq2k1"; + libraryHaskellDepends = [ base hedgehog QuickCheck transformers ]; + homepage = "https://hedgehog.qa"; + description = "Use QuickCheck generators in Hedgehog and vice versa"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hedis" = callPackage ({ mkDerivation, async, base, bytestring, bytestring-lexing , deepseq, HUnit, mtl, network, resource-pool, scanner @@ -93757,22 +94525,23 @@ self: { }) {}; "hexpat" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, List, text - , transformers, utf8-string + ({ mkDerivation, base, bytestring, containers, deepseq, expat, List + , text, transformers, utf8-string }: mkDerivation { pname = "hexpat"; - version = "0.20.10"; - sha256 = "0bhfbsqw2q53v9qx5pqxxqfhnp1jvs25nyi8qdjk31w01sis3rir"; + version = "0.20.13"; + sha256 = "1l9zfp69r3xaxi2znjwpcrx7xckcqvaahv2c0qgkqq61a7ka1qa6"; libraryHaskellDepends = [ base bytestring containers deepseq List text transformers utf8-string ]; + librarySystemDepends = [ expat ]; homepage = "http://haskell.org/haskellwiki/Hexpat/"; description = "XML parser/formatter based on expat"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {inherit (pkgs) expat;}; "hexpat-iteratee" = callPackage ({ mkDerivation, base, bytestring, containers @@ -94031,8 +94800,8 @@ self: { }: mkDerivation { pname = "hfmt"; - version = "0.1.0"; - sha256 = "13dcywy7i9r8silc6rpm6pqj3zs2cq2zqzpz015563rkbwmi42zy"; + version = "0.1.1"; + sha256 = "0cg5vaihyrdsigpvj82a2xdmq6wj1vbqg10ldcp4c2pxwsgz97mh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -94746,8 +95515,8 @@ self: { }: mkDerivation { pname = "hifi"; - version = "0.1.0.0"; - sha256 = "1pi0zrj43g3zxjmxjhyrfi553fcg1n1r659a8mb8m23fr2263zka"; + version = "0.1.2.0"; + sha256 = "0zhraby44j5zjrvjmqj22sa15qsl5jxhfs07gkggc8zfahvg822d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -94756,7 +95525,7 @@ self: { executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; homepage = "https://gitlab.com/gonz/hifi"; - description = "Initial project template from stack"; + description = "WiFi connection script generator"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -94875,6 +95644,38 @@ self: { hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; + "highlight" = callPackage + ({ mkDerivation, ansi-terminal, base, base-compat, bytestring + , containers, criterion, directory, doctest, filepath, lens, mtl + , mtl-compat, optparse-applicative, pipes, pipes-bytestring + , pipes-group, pipes-safe, process, QuickCheck, regex + , regex-with-pcre, semigroups, system-filepath, tasty, tasty-golden + , text, transformers, transformers-compat, unix + }: + mkDerivation { + pname = "highlight"; + version = "1.0.0.1"; + sha256 = "0xklv4fnhi4dbz33hzw7l4ng5ap1jfhn4qmkshl2k6gn2pkyaikx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base base-compat bytestring containers directory + filepath lens mtl mtl-compat optparse-applicative pipes + pipes-bytestring pipes-group pipes-safe regex regex-with-pcre + semigroups system-filepath text transformers transformers-compat + unix + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base base-compat bytestring directory doctest lens pipes process + QuickCheck tasty tasty-golden transformers transformers-compat unix + ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/cdepillabout/highlight"; + description = "Command line tool for highlighting parts of files matching a regex"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "highlight-versions" = callPackage ({ mkDerivation, ansi-terminal, base, Cabal, containers, hackage-db }: @@ -95821,6 +96622,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hjsonpointer_1_2_0" = callPackage + ({ mkDerivation, aeson, base, hashable, hspec, http-types + , QuickCheck, semigroups, text, unordered-containers, vector + }: + mkDerivation { + pname = "hjsonpointer"; + version = "1.2.0"; + sha256 = "06rppqd9nnch3hmjv1izh7lkdrm54nywjg7p27wfar3ak1saw71g"; + revision = "3"; + editedCabalFile = "0rdnm2fvj2c9pjdrcpizgc2kyl6fivijfzs60z5mkagv3h7pkkq4"; + libraryHaskellDepends = [ + aeson base hashable QuickCheck semigroups text unordered-containers + vector + ]; + testHaskellDepends = [ + aeson base hspec http-types QuickCheck text unordered-containers + vector + ]; + homepage = "https://github.com/seagreen/hjsonpointer"; + description = "JSON Pointer library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hjsonschema" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , directory, file-embed, filepath, hashable, hjsonpointer, hspec @@ -95848,7 +96673,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hjsonschema_1_6_2" = callPackage + "hjsonschema_1_6_3" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , directory, file-embed, filepath, hashable, hjsonpointer, hspec , http-client, http-types, pcre-heavy, profunctors, protolude @@ -95857,8 +96682,8 @@ self: { }: mkDerivation { pname = "hjsonschema"; - version = "1.6.2"; - sha256 = "1kwhfnl7f8jlf3g24yy3kh1cnlrx18klqasqzsdzbynvs0vzccdk"; + version = "1.6.3"; + sha256 = "1phvxkwqxzsi7jzxs4z2zsak7hsgfqvld7m95jk1a0qysxf9gzx3"; libraryHaskellDepends = [ aeson base bytestring containers file-embed filepath hashable hjsonpointer http-client http-types pcre-heavy profunctors @@ -95976,47 +96801,48 @@ self: { }) {}; "hledger" = callPackage - ({ mkDerivation, base, base-compat, bytestring, cmdargs, containers - , criterion, csv, data-default, directory, file-embed, filepath - , hashable, haskeline, here, hledger-lib, html, HUnit, megaparsec - , mtl, mtl-compat, old-time, parsec, pretty-show, process - , regex-tdfa, safe, shakespeare, split, tabular, temporary - , terminfo, test-framework, test-framework-hunit, text, time - , timeit, transformers, unordered-containers, utf8-string, wizards + ({ mkDerivation, ansi-terminal, base, base-compat, bytestring + , cmdargs, containers, criterion, csv, data-default, directory + , file-embed, filepath, hashable, haskeline, here, hledger-lib + , html, HUnit, megaparsec, mtl, mtl-compat, old-time, parsec + , pretty-show, process, regex-tdfa, safe, shakespeare, split + , tabular, temporary, terminfo, test-framework + , test-framework-hunit, text, time, timeit, transformers + , unordered-containers, utf8-string, wizards }: mkDerivation { pname = "hledger"; - version = "1.2"; - sha256 = "18j7h8km15lyqhhglbxj9gqrhk3r2wh6qv8v3cly05lrlkjvmx06"; - revision = "1"; - editedCabalFile = "02ddp8gkx3k36b9n2jywd0pkzvjq8mapc6idxa70az84va3lmnvd"; + version = "1.3"; + sha256 = "0b9gaj68ykx1ak2v4kjif67kkwv1s8rf9nvcijs4garz98781sdd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base base-compat bytestring cmdargs containers csv data-default - directory file-embed filepath hashable haskeline here hledger-lib - HUnit megaparsec mtl mtl-compat old-time pretty-show process - regex-tdfa safe shakespeare split tabular temporary terminfo text - time transformers unordered-containers utf8-string wizards - ]; - executableHaskellDepends = [ - base base-compat bytestring cmdargs containers csv data-default - directory file-embed filepath haskeline here hledger-lib HUnit mtl - mtl-compat old-time parsec pretty-show process regex-tdfa safe - shakespeare split tabular temporary terminfo text time - unordered-containers utf8-string wizards - ]; - testHaskellDepends = [ - base base-compat bytestring cmdargs containers csv data-default - directory file-embed filepath haskeline here hledger-lib HUnit mtl - mtl-compat old-time parsec pretty-show process regex-tdfa safe - shakespeare split tabular temporary terminfo test-framework - test-framework-hunit text time unordered-containers utf8-string + ansi-terminal base base-compat bytestring cmdargs containers csv + data-default directory file-embed filepath hashable haskeline here + hledger-lib HUnit megaparsec mtl mtl-compat old-time pretty-show + process regex-tdfa safe shakespeare split tabular temporary + terminfo text time transformers unordered-containers utf8-string wizards ]; + executableHaskellDepends = [ + ansi-terminal base base-compat bytestring cmdargs containers csv + data-default directory file-embed filepath haskeline here + hledger-lib HUnit mtl mtl-compat old-time parsec pretty-show + process regex-tdfa safe shakespeare split tabular temporary + terminfo text time unordered-containers utf8-string wizards + ]; + testHaskellDepends = [ + ansi-terminal base base-compat bytestring cmdargs containers csv + data-default directory file-embed filepath haskeline here + hledger-lib HUnit mtl mtl-compat old-time parsec pretty-show + process regex-tdfa safe shakespeare split tabular temporary + terminfo test-framework test-framework-hunit text time + unordered-containers utf8-string wizards + ]; benchmarkHaskellDepends = [ - base base-compat criterion directory file-embed filepath here - hledger-lib html pretty-show process tabular temporary time timeit + ansi-terminal base base-compat criterion directory file-embed + filepath here hledger-lib html pretty-show process tabular + temporary time timeit ]; homepage = "http://hledger.org"; description = "Command-line interface for the hledger accounting tool"; @@ -96032,8 +96858,8 @@ self: { }: mkDerivation { pname = "hledger-api"; - version = "1.2"; - sha256 = "0pa2h79qy4a2in8q66q9rqh0sav44q7drdklsgqi3sm7ic65klwq"; + version = "1.3"; + sha256 = "0kl0sc11181bgpz65b5xg9l1hxdaai27icx13x15kwlc01jf9rcc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -96071,8 +96897,8 @@ self: { ({ mkDerivation, base, hledger-lib, text, time }: mkDerivation { pname = "hledger-diff"; - version = "0.2.0.8"; - sha256 = "0yvl102c1jzml2rl1jpb75x9v48v14s8gz63wc2bkm5bjm5f94g6"; + version = "0.2.0.9"; + sha256 = "0ajjiz6jvm45j472f0ypxk33hc47rg0zs9ylkcrkvvk9992x7lnq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base hledger-lib text time ]; @@ -96090,10 +96916,10 @@ self: { }: mkDerivation { pname = "hledger-iadd"; - version = "1.2.1"; - sha256 = "07jrd8cfy9srazad440b1c24m6s6fvla9jzrksr64gz6vkxkc9mw"; - revision = "1"; - editedCabalFile = "114csw9ss3inki8kl2vgb04dpf1nnyp2i5jj3cx6m4d5l3m32yx6"; + version = "1.2.2"; + sha256 = "1d12fjqyrj0wy8iq096h8mq2v76j8ihc2d8j1xc5qckw2g29539a"; + revision = "3"; + editedCabalFile = "12ghp6d74iyd7h4hjnar7gfz3nal4f9z9lv8rwr5hy8a9xsinbfv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -96139,8 +96965,8 @@ self: { }: mkDerivation { pname = "hledger-irr"; - version = "0.1.1.10"; - sha256 = "1m5dfgrs943cqm3ix7iadgyv3j4vlp65s86sas03ll390zvny44q"; + version = "0.1.1.11"; + sha256 = "1rxpv70xfr7z8yn65dcac1a7l4mb2p1z30ld4bw75gr34lkirb1y"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -96152,31 +96978,30 @@ self: { }) {}; "hledger-lib" = callPackage - ({ mkDerivation, array, base, base-compat, blaze-markup, bytestring - , cmdargs, containers, csv, data-default, Decimal, deepseq - , directory, doctest, filepath, Glob, hashtables, HUnit, megaparsec - , mtl, mtl-compat, old-time, parsec, pretty-show, regex-tdfa, safe - , semigroups, split, test-framework, test-framework-hunit, text - , time, transformers, uglymemo, utf8-string + ({ mkDerivation, ansi-terminal, array, base, base-compat + , blaze-markup, bytestring, cmdargs, containers, csv, data-default + , Decimal, deepseq, directory, doctest, filepath, Glob, hashtables + , HUnit, megaparsec, mtl, mtl-compat, old-time, parsec, pretty-show + , regex-tdfa, safe, semigroups, split, test-framework + , test-framework-hunit, text, time, transformers, uglymemo + , utf8-string }: mkDerivation { pname = "hledger-lib"; - version = "1.2"; - sha256 = "15yp89q5im3b7fbjz50inkmrgihq16vgbrfkdd6nnnd9n8vxhzrc"; - revision = "1"; - editedCabalFile = "0alkb7hd6rvfr5fvlqyqy1ma7fbsfnkn36gnx8dcvij75b1ym0a2"; + version = "1.3"; + sha256 = "052ynivzbyabp2yn7y2wfy9dvjly989rpbcla9kx8kvmqij5qdhm"; libraryHaskellDepends = [ - array base base-compat blaze-markup bytestring cmdargs containers - csv data-default Decimal deepseq directory filepath hashtables - HUnit megaparsec mtl mtl-compat old-time parsec pretty-show - regex-tdfa safe semigroups split text time transformers uglymemo - utf8-string + ansi-terminal array base base-compat blaze-markup bytestring + cmdargs containers csv data-default Decimal deepseq directory + filepath hashtables HUnit megaparsec mtl mtl-compat old-time parsec + pretty-show regex-tdfa safe semigroups split text time transformers + uglymemo utf8-string ]; testHaskellDepends = [ - array base base-compat blaze-markup bytestring cmdargs containers - csv data-default Decimal deepseq directory doctest filepath Glob - hashtables HUnit megaparsec mtl mtl-compat old-time parsec - pretty-show regex-tdfa safe split test-framework + ansi-terminal array base base-compat blaze-markup bytestring + cmdargs containers csv data-default Decimal deepseq directory + doctest filepath Glob hashtables HUnit megaparsec mtl mtl-compat + old-time parsec pretty-show regex-tdfa safe split test-framework test-framework-hunit text time transformers uglymemo utf8-string ]; homepage = "http://hledger.org"; @@ -96193,10 +97018,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.2"; - sha256 = "02mhhhkk6zz3bjcv6x0yhp4f2ifhj3pdk1z4wf6qkwm7jqsamqk1"; - revision = "2"; - editedCabalFile = "0w3w4llvb9fmdd555q4823dagw7ibqwas8cycra5pvw50ciia4xd"; + version = "1.3"; + sha256 = "0bixkihc2hcf98xpnb9a8lnqi5rcg2pj6d78w4pzwzd83vkmr1rj"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -96241,10 +97064,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.2"; - sha256 = "1rn5x8h8vn28hk1201v2zzaawc86zkxrlqv8jwiyp2jls3l4m8d3"; - revision = "1"; - editedCabalFile = "1l08fzwdn1wqb1f1788rqdqr0znvgfqyb4r82vbjm62dar8qmzcg"; + version = "1.3"; + sha256 = "01y8djakr4r0jm5wyi6fbp911y3i82r1xmfi4gm9sgf27fi6a3i4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -97073,8 +97894,8 @@ self: { }: mkDerivation { pname = "hnormalise"; - version = "0.4.1.0"; - sha256 = "0mmkd0nidkffp80nn8yn9i1x7cqsi8qs2qyfgp36sjay58y92744"; + version = "0.4.2.0"; + sha256 = "1h38qr8d8dbn81bghh3imb7jink6b06wadbpyg4axfr39s21xvkg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -97157,19 +97978,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hoauth2_1_2_0" = callPackage + "hoauth2_1_3_0" = callPackage ({ mkDerivation, aeson, base, bytestring, exceptions, http-conduit , http-types, microlens, text, unordered-containers, uri-bytestring + , uri-bytestring-aeson }: mkDerivation { pname = "hoauth2"; - version = "1.2.0"; - sha256 = "19f8r0dhm4kmzwfv9zsj2cfqpkkn68ncaxqp2kcz3cvr5habryay"; + version = "1.3.0"; + sha256 = "1aymrl28gs4dlzfxcnglfhnxk9l9ws0va0yvi1a966yfp0ps7w1n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring exceptions http-conduit http-types microlens - text unordered-containers uri-bytestring + text unordered-containers uri-bytestring uri-bytestring-aeson ]; homepage = "https://github.com/freizl/hoauth2"; description = "Haskell OAuth2 authentication client"; @@ -98059,11 +98881,14 @@ self: { }) {}; "hopenssl" = callPackage - ({ mkDerivation, base, bytestring, doctest, HUnit, openssl }: + ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, doctest + , HUnit, openssl + }: mkDerivation { pname = "hopenssl"; - version = "2.2"; - sha256 = "0hypc779yyrf3kgb9ik396zwf83d05x2gvrzr1nhv55pr8m0kvax"; + version = "2.2.1"; + sha256 = "1pxbs1k8sizvvz1nn1zv2i5grn0w11s9g09z07w5f80kbz0slcbh"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ openssl ]; testHaskellDepends = [ base doctest HUnit ]; @@ -98130,20 +98955,6 @@ self: { }) {}; "hopfli" = callPackage - ({ mkDerivation, base, bytestring, hspec, QuickCheck, zlib }: - mkDerivation { - pname = "hopfli"; - version = "0.2.1.1"; - sha256 = "1pqz7f0bvvvmirjrzr1jich4853d6rc99jiwpcj6sb3c75wb5ibc"; - libraryHaskellDepends = [ base bytestring zlib ]; - testHaskellDepends = [ base bytestring hspec QuickCheck zlib ]; - homepage = "https://github.com/ananthakumaran/hopfli"; - description = "Bidings to Google's Zopfli compression library"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "hopfli_0_2_2_1" = callPackage ({ mkDerivation, base, bytestring, hspec, QuickCheck, zlib }: mkDerivation { pname = "hopfli"; @@ -98228,8 +99039,8 @@ self: { }: mkDerivation { pname = "hops"; - version = "0.7.1"; - sha256 = "04hgpvk7lrp1iqw02yjawnh2mvxjnp21h3cd36yzy4hw74am33sp"; + version = "0.7.2"; + sha256 = "16a1ygxv4isw5wiq5dhjn4xdlr67zy1ngn61mwilgwkvwj0cjxc3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -98620,18 +99431,19 @@ self: { "hp2pretty" = callPackage ({ mkDerivation, array, attoparsec, base, containers, filepath - , floatshow, mtl, text + , floatshow, mtl, optparse-applicative, semigroups, text }: mkDerivation { pname = "hp2pretty"; - version = "0.6"; - sha256 = "1bma881ljhwhzirj2q9rqf0bxx9xfy0ng2z9mrhdnaywnw4d8v4c"; + version = "0.8.0.2"; + sha256 = "1j3rn4xjpyqnl8vcsc9pyj03mwpilq20g0z8brh3prsvhjb9gl9g"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - array attoparsec base containers filepath floatshow mtl text + array attoparsec base containers filepath floatshow mtl + optparse-applicative semigroups text ]; - homepage = "http://code.mathr.co.uk/hp2pretty"; + homepage = "https://code.mathr.co.uk/hp2pretty"; description = "generate pretty graphs from heap profiles"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -98675,8 +99487,8 @@ self: { }: mkDerivation { pname = "hpack"; - version = "0.18.0"; - sha256 = "1z738mw0kzic4wx5dpihh1c1gimpjkl14wl6w2nmmdfx2bdjm5rv"; + version = "0.18.1"; + sha256 = "1ssawa6187m0xzn7i5hn154qajq46jlpbvz1s28qk4bigpv38m7k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -98700,29 +99512,29 @@ self: { "hpack-convert" = callPackage ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring , Cabal, containers, deepseq, directory, filepath, Glob, hspec - , interpolate, mockery, pretty, QuickCheck, temporary, text + , interpolate, mockery, pretty, QuickCheck, split, temporary, text , unordered-containers, vector, yaml }: mkDerivation { pname = "hpack-convert"; - version = "1.0.0"; - sha256 = "0l90sc6fn0c5yv653h7gv2k2wx6bcfksfb3zv6b2vkn54c8q4ldm"; + version = "1.0.1"; + sha256 = "1qwrbx22d3gvxa4hr4mk37vw9cms0gq1h8xaqphw7rpgs2iycfkp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base base-compat bytestring Cabal containers deepseq - directory filepath Glob pretty text unordered-containers vector - yaml + directory filepath Glob pretty split text unordered-containers + vector yaml ]; executableHaskellDepends = [ aeson base base-compat bytestring Cabal containers deepseq - directory filepath Glob pretty text unordered-containers vector - yaml + directory filepath Glob pretty split text unordered-containers + vector yaml ]; testHaskellDepends = [ aeson aeson-qq base base-compat bytestring Cabal containers deepseq directory filepath Glob hspec interpolate mockery pretty QuickCheck - temporary text unordered-containers vector yaml + split temporary text unordered-containers vector yaml ]; homepage = "https://github.com/yamadapc/hpack-convert#readme"; description = "Convert Cabal manifests into hpack's package.yamls"; @@ -98986,8 +99798,8 @@ self: { }: mkDerivation { pname = "hpio"; - version = "0.8.0.9"; - sha256 = "1yr86m9zw3kbhb6wl2i3ikkvhzkzrlswgvan8wpyvd5chp4vxjm7"; + version = "0.8.0.10"; + sha256 = "05cpfym6jb27z557i1954jnz9v3ghjg45h4rjfl9ql54cx6bx429"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -99145,10 +99957,8 @@ self: { }: mkDerivation { pname = "hprotoc"; - version = "2.4.0"; - sha256 = "0wrgdz6a2k64kgsp8qfpjpw4wywicjq50bvsr8i1mw11lkwysjkf"; - revision = "1"; - editedCabalFile = "1xfm12nlwyd6gd6b2c4zqjfxlqdsddg4qpy3dw08wlx42jvymrl9"; + version = "2.4.2"; + sha256 = "085imrvkxvw06sg8wcgzba9jw8hficizjf6lmqk4ai6ahpgmml6s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -100133,6 +100943,17 @@ self: { license = "LGPL"; }) {}; + "hsI2C" = callPackage + ({ mkDerivation, base, bytestring, unix }: + mkDerivation { + pname = "hsI2C"; + version = "0.1.2"; + sha256 = "0ma8klvyv4rnfxkag99vm4nvw77yppcv63p6829b4ynsa9vyv9rn"; + libraryHaskellDepends = [ base bytestring unix ]; + description = "I2C access for Haskell and Linux"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hsSqlite3" = callPackage ({ mkDerivation, base, bindings-sqlite3, bytestring, mtl , utf8-string @@ -101295,6 +102116,21 @@ self: { license = stdenv.lib.licenses.isc; }) {}; + "hsinstall_1_6" = callPackage + ({ mkDerivation, base, directory, filepath }: + mkDerivation { + pname = "hsinstall"; + version = "1.6"; + sha256 = "04f86mk2304q9kz37hr18b9jcz66wk04z747xzpxbnnwig390406"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory filepath ]; + executableHaskellDepends = [ base directory filepath ]; + description = "Install Haskell software"; + license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hskeleton" = callPackage ({ mkDerivation, base, Cabal }: mkDerivation { @@ -101795,8 +102631,8 @@ self: { }: mkDerivation { pname = "hsparql"; - version = "0.3.1"; - sha256 = "0a7769mazml334agv6jkr3kwgcyp1y58bakgywa7b5crgznbvkc0"; + version = "0.3.4"; + sha256 = "0nxj9aq59c02sdhz5nz5c3klcsglb4gpchah0b82fjbiphbs8sxb"; libraryHaskellDepends = [ base bytestring HTTP MissingH mtl network network-uri rdf4h text xml @@ -102219,6 +103055,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-meta_2_4_4" = callPackage + ({ mkDerivation, ansi-terminal, array, async, base, call-stack + , deepseq, directory, filepath, hspec-expectations, HUnit + , QuickCheck, quickcheck-io, random, setenv, time, transformers + }: + mkDerivation { + pname = "hspec-meta"; + version = "2.4.4"; + sha256 = "117n4j56wfh48xj02mv0wkp10bkr2xkyvwg7n7r2ynp03wrf9ykm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal array async base call-stack deepseq directory + filepath hspec-expectations HUnit QuickCheck quickcheck-io random + setenv time transformers + ]; + executableHaskellDepends = [ + ansi-terminal array async base call-stack deepseq directory + filepath hspec-expectations HUnit QuickCheck quickcheck-io random + setenv time transformers + ]; + homepage = "http://hspec.github.io/"; + description = "A version of Hspec which is used to test Hspec itself"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-monad-control" = callPackage ({ mkDerivation, base, hspec-core, monad-control, transformers , transformers-base @@ -102250,6 +103113,7 @@ self: { homepage = "https://github.com/jfischoff/pg-transact-hspec#readme"; description = "Helpers for creating database tests with hspec and pg-transact"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-server" = callPackage @@ -102695,6 +103559,7 @@ self: { homepage = "http://www.gekkou.co.uk/software/hsqml/"; description = "Haskell binding for Qt Quick"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {qt5 = null;}; "hsqml-datamodel" = callPackage @@ -102795,6 +103660,7 @@ self: { homepage = "http://www.gekkou.co.uk/software/hsqml/"; description = "HsQML sample programs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsqml-morris" = callPackage @@ -103311,14 +104177,15 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "hsyslog_5" = callPackage - ({ mkDerivation, base, doctest }: + "hsyslog_5_0_1" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, doctest }: mkDerivation { pname = "hsyslog"; - version = "5"; - sha256 = "06prb179djw9fh6fylyjxx5fv76hblyx1crmkqvi8b62rrkwlbsd"; + version = "5.0.1"; + sha256 = "05k0ckgqzjpa3mqamlswi0kpvqxvq40awip0cvhpzjx64240vpl6"; isLibrary = true; isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; homepage = "http://github.com/peti/hsyslog"; @@ -104046,29 +104913,6 @@ self: { }) {}; "http-client-tls" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, connection - , containers, criterion, cryptonite, data-default-class, exceptions - , hspec, http-client, http-types, memory, network, network-uri - , text, tls, transformers - }: - mkDerivation { - pname = "http-client-tls"; - version = "0.3.5"; - sha256 = "1jgwca2dn269c7z14yasj0i1qayz5lvxxqf72m0y62cqwx4hdm5h"; - libraryHaskellDepends = [ - base bytestring case-insensitive connection containers cryptonite - data-default-class exceptions http-client http-types memory network - network-uri text tls transformers - ]; - testHaskellDepends = [ base hspec http-client http-types ]; - benchmarkHaskellDepends = [ base criterion http-client ]; - doCheck = false; - homepage = "https://github.com/snoyberg/http-client"; - description = "http-client backend using the connection package and tls library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "http-client-tls_0_3_5_1" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, connection , containers, criterion, cryptonite, data-default-class, exceptions , hspec, http-client, http-types, memory, network, network-uri @@ -104089,7 +104933,6 @@ self: { homepage = "https://github.com/snoyberg/http-client"; description = "http-client backend using the connection package and tls library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-common" = callPackage @@ -104120,8 +104963,8 @@ self: { }: mkDerivation { pname = "http-conduit"; - version = "2.2.3.1"; - sha256 = "03na2nbm9la0shlijvjyb5mpp1prfskk4jmjy8iz707r0731dbjk"; + version = "2.2.3.2"; + sha256 = "1f0yqka43gp7vhv7yr4q6pqr8qw0qq2yh4y2lnayhc876zpw6ng3"; libraryHaskellDepends = [ aeson base bytestring conduit conduit-extra exceptions http-client http-client-tls http-types lifted-base monad-control mtl resourcet @@ -104385,6 +105228,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "http-media_0_7_1" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , QuickCheck, test-framework, test-framework-quickcheck2 + , utf8-string + }: + mkDerivation { + pname = "http-media"; + version = "0.7.1"; + sha256 = "06b921qchv3avras2i7x0n7fy3rj7lr2dwm82b62fgzhy6riskh6"; + libraryHaskellDepends = [ + base bytestring case-insensitive containers utf8-string + ]; + testHaskellDepends = [ + base bytestring case-insensitive containers QuickCheck + test-framework test-framework-quickcheck2 utf8-string + ]; + homepage = "https://github.com/zmthy/http-media"; + description = "Processing HTTP Content-Type and Accept headers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-monad" = callPackage ({ mkDerivation, base, bytestring, containers, explicit-exception , HTTP, lazyio, network, network-uri, parsec, transformers @@ -108125,17 +108990,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ilist_0_3_0_0" = callPackage - ({ mkDerivation, base, criterion, hspec, lens, transformers, vector + "ilist_0_3_1_0" = callPackage + ({ mkDerivation, base, criterion, hspec, lens, loop, transformers + , vector }: mkDerivation { pname = "ilist"; - version = "0.3.0.0"; - sha256 = "0k3rxifpxq5qrkn6ak2rm379v554c70rq2c13j3df471hb3hs6y8"; + version = "0.3.1.0"; + sha256 = "15zy584mjk85kr69acs1r7dfsr7g2mgy2bbfyrla5rbp23fy3678"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec transformers ]; benchmarkHaskellDepends = [ - base criterion lens transformers vector + base criterion lens loop transformers vector ]; homepage = "http://github.com/aelve/ilist"; description = "Optimised list functions for doing index-related things"; @@ -108780,26 +109646,6 @@ self: { }) {}; "incremental-parser" = callPackage - ({ mkDerivation, base, bytestring, checkers, criterion, deepseq - , monoid-subclasses, QuickCheck, tasty, tasty-quickcheck, text - }: - mkDerivation { - pname = "incremental-parser"; - version = "0.2.5"; - sha256 = "1hbsm1g8avph1n107c32d1r3bbk6kli6rg7a1k03wf3dx04d43vx"; - libraryHaskellDepends = [ base monoid-subclasses ]; - testHaskellDepends = [ - base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - base bytestring criterion deepseq monoid-subclasses text - ]; - homepage = "https://github.com/blamario/incremental-parser"; - description = "Generic parser library capable of providing partial results from partial input"; - license = "GPL"; - }) {}; - - "incremental-parser_0_2_5_1" = callPackage ({ mkDerivation, base, bytestring, checkers, criterion, deepseq , monoid-subclasses, QuickCheck, tasty, tasty-quickcheck, text }: @@ -108817,7 +109663,6 @@ self: { homepage = "https://github.com/blamario/incremental-parser"; description = "Generic parser library capable of providing partial results from partial input"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "incremental-sat-solver" = callPackage @@ -109207,8 +110052,8 @@ self: { }: mkDerivation { pname = "influxdb"; - version = "1.2.1"; - sha256 = "0sgc29kiflgq0b3h1irnnim1ih6sk8h309yk1xd3z9hwyd9c121w"; + version = "1.2.2"; + sha256 = "09fabf4yx0k1rb6i2msmlszvx1v318n35gmc9aakvicnzkvxarrm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -109525,8 +110370,8 @@ self: { pname = "insert-ordered-containers"; version = "0.2.1.0"; sha256 = "1612f455dw37da9g7bsd1s5kyi84mnr1ifnjw69892amyimi47fp"; - revision = "2"; - editedCabalFile = "1sy3rz21sbpigqsn5dc58q4khm2mq8k2pssln21qawlnrz018bwp"; + revision = "3"; + editedCabalFile = "0ik4n32rvamxvlp80ixjrbhskivynli7b89s4hk6401bcy3ykp3g"; libraryHaskellDepends = [ aeson base base-compat hashable lens semigroupoids semigroups text transformers unordered-containers @@ -109797,6 +110642,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "integer-logarithms_1_0_2" = callPackage + ({ mkDerivation, array, base, ghc-prim, integer-gmp, QuickCheck + , smallcheck, tasty, tasty-hunit, tasty-quickcheck + , tasty-smallcheck + }: + mkDerivation { + pname = "integer-logarithms"; + version = "1.0.2"; + sha256 = "0w5mhak181zi6qr5h2zbcs9ymaqacisp9jwk99naz6s8zz5rq1ii"; + libraryHaskellDepends = [ array base ghc-prim integer-gmp ]; + testHaskellDepends = [ + base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck + tasty-smallcheck + ]; + homepage = "https://github.com/phadej/integer-logarithms"; + description = "Integer logarithms"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "integer-pure" = callPackage ({ mkDerivation }: mkDerivation { @@ -110734,8 +111599,8 @@ self: { }: mkDerivation { pname = "ip"; - version = "0.9"; - sha256 = "03kal9yaqcl37zfkng35cl0lnlrdmqigp248lwjak71zcwdrry8r"; + version = "0.9.2"; + sha256 = "0r15mdknz1j85hws9bqfil6l39q88pbbjz0kbky9kl7y675hkzdj"; libraryHaskellDepends = [ aeson attoparsec base bytestring hashable primitive text vector ]; @@ -111082,8 +111947,8 @@ self: { pname = "irc-dcc"; version = "2.0.1"; sha256 = "1pyj4ngh6rw0k1cd9nlrhwb6rr3jmpiwaxs6crik8gbl6f3s4234"; - revision = "2"; - editedCabalFile = "1zw5a6aj2jfl482197v741rjsrc13bsirq0a290qbjsyyib9jjzk"; + revision = "3"; + editedCabalFile = "1kc4yzm5k0s069dhyncj5rmxnbfjjn8ynx182wp9v5qhylgicx98"; libraryHaskellDepends = [ attoparsec base binary bytestring io-streams iproute irc-ctcp mtl network path safe-exceptions transformers utf8-string @@ -111190,8 +112055,8 @@ self: { }: mkDerivation { pname = "ircbot"; - version = "0.6.5"; - sha256 = "1bay1r0x4b8kk07g1p1476p2ppv6jyryiya6q5fn8icn94x77sza"; + version = "0.6.5.1"; + sha256 = "1cam9f7ppxj7yh1am0qjkh8b19haggrqdmkd26xik1ymn7nq9iyd"; libraryHaskellDepends = [ base bytestring containers directory filepath irc mtl network parsec random SafeSemaphore stm time unix @@ -112270,6 +113135,19 @@ self: { license = "GPL"; }) {}; + "japanese-holidays" = callPackage + ({ mkDerivation, base, doctest, hspec, QuickCheck, time }: + mkDerivation { + pname = "japanese-holidays"; + version = "0.1.0.0"; + sha256 = "1phlq2jzvkdr9askpnbryc7aw6mk7121kh2fz5wqr23cs8mg5m6b"; + libraryHaskellDepends = [ base time ]; + testHaskellDepends = [ base doctest hspec QuickCheck time ]; + homepage = "http://github.com/cohei/japanese-holidays#readme"; + description = "Japanese holidays utility"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "jarfind" = callPackage ({ mkDerivation, array, base, binary, bytestring, regex-tdfa , zip-archive @@ -112863,30 +113741,30 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; - "jose_0_6_0_2" = callPackage + "jose_0_6_0_3" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , bytestring, concise, containers, cryptonite, hspec, lens, memory , monad-time, mtl, network-uri, QuickCheck, quickcheck-instances - , safe, tasty, tasty-hspec, tasty-quickcheck, template-haskell - , text, time, unordered-containers, vector, x509 + , safe, semigroups, tasty, tasty-hspec, tasty-quickcheck + , template-haskell, text, time, unordered-containers, vector, x509 }: mkDerivation { pname = "jose"; - version = "0.6.0.2"; - sha256 = "1m6ck60z9lmvc3rb8lpf4h7j3yvzmshwb8dm96s0d1ldhcmk26jy"; + version = "0.6.0.3"; + sha256 = "1d6d2w61v5di6mfd1ss14sx7i29bzvhjn7yplg0q2nmxnba5p2xx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring bytestring concise containers cryptonite lens memory monad-time mtl network-uri - QuickCheck quickcheck-instances safe template-haskell text time - unordered-containers vector x509 + QuickCheck quickcheck-instances safe semigroups template-haskell + text time unordered-containers vector x509 ]; executableHaskellDepends = [ aeson base bytestring lens mtl ]; testHaskellDepends = [ aeson attoparsec base base64-bytestring bytestring concise containers cryptonite hspec lens memory monad-time mtl network-uri - QuickCheck quickcheck-instances safe tasty tasty-hspec + QuickCheck quickcheck-instances safe semigroups tasty tasty-hspec tasty-quickcheck template-haskell text time unordered-containers vector x509 ]; @@ -112989,18 +113867,18 @@ self: { "jsaddle" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , bytestring, containers, deepseq, filepath, ghc-prim, http-types - , lens, primitive, process, ref-tf, scientific, stm, text, time - , transformers, unordered-containers, uuid, uuid-types, vector + , lens, primitive, process, random, ref-tf, scientific, stm, text + , time, transformers, unordered-containers, vector }: mkDerivation { pname = "jsaddle"; - version = "0.9.2.0"; - sha256 = "0ymq70kwwi60f1rgjnjz914xv465zrnbbw5z351439qg572f8mvg"; + version = "0.9.3.0"; + sha256 = "1c96b2zxa8x4p28rxjnj9nz5999d4f8nfwj38yws0h2c3lwsm740"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring bytestring containers - deepseq filepath ghc-prim http-types lens primitive process ref-tf - scientific stm text time transformers unordered-containers uuid - uuid-types vector + deepseq filepath ghc-prim http-types lens primitive process random + ref-tf scientific stm text time transformers unordered-containers + vector ]; description = "Interface for JavaScript that works with GHCJS and GHC"; license = stdenv.lib.licenses.mit; @@ -113028,8 +113906,8 @@ self: { }: mkDerivation { pname = "jsaddle-dom"; - version = "0.9.0.0"; - sha256 = "0yc5m80n3k3l2m429p5icfwk50c6qdfs5h273rgdr9pjb2if5cmm"; + version = "0.9.1.0"; + sha256 = "16dgcdj1x58gpkqvz434f0ysyhwpy1dwqxs6bd24875n1hxjim77"; libraryHaskellDepends = [ base base-compat jsaddle lens text transformers ]; @@ -113057,17 +113935,16 @@ self: { ({ mkDerivation, aeson, base, bytestring, containers, deepseq , doctest, filepath, foreign-store, ghc-prim, http-types, jsaddle , lens, network, primitive, process, QuickCheck, ref-tf, stm, text - , time, transformers, uuid, uuid-types, wai, wai-websockets, warp - , webdriver, websockets + , time, transformers, wai, wai-websockets, warp, webdriver + , websockets }: mkDerivation { pname = "jsaddle-warp"; - version = "0.9.2.0"; - sha256 = "08r9nzx8yvdw7klv7n19znqfp5r5585fvhz9jsk5mcinpkc7yvyv"; + version = "0.9.3.0"; + sha256 = "0lcwg3lgh6bah8zqjzk7hfy8pcjhjlq5a22y83332qn4ms9hfw8l"; libraryHaskellDepends = [ aeson base bytestring containers foreign-store http-types jsaddle - stm text time transformers uuid uuid-types wai wai-websockets warp - websockets + stm text time transformers wai wai-websockets warp websockets ]; testHaskellDepends = [ aeson base bytestring containers deepseq doctest filepath ghc-prim @@ -113794,6 +114671,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "json-tracer" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , ghc-prim, hashable, hspec, hspec-core, hspec-discover + , hspec-expectations, microlens, microlens-ghc, mtl + , template-haskell, text, time, transformers, unordered-containers + }: + mkDerivation { + pname = "json-tracer"; + version = "0.0.1.2"; + sha256 = "1687zjhc5d63qq7kzkq4kcn9qw9kwlb566kgfkh7yr8whp5rhgnd"; + libraryHaskellDepends = [ + aeson base containers ghc-prim hashable microlens microlens-ghc mtl + template-haskell text transformers unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring containers hspec hspec-core + hspec-discover hspec-expectations microlens mtl time + ]; + homepage = "https://github.com/autotaker/json-tracer#readme"; + description = "A polymorphic, type-safe, json-structured tracing library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "json-types" = callPackage ({ mkDerivation, base, containers, text }: mkDerivation { @@ -114728,6 +115628,42 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "katip_0_4_1_0" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-builder + , bytestring, containers, criterion, deepseq, directory, either + , exceptions, hostname, microlens, microlens-th, monad-control, mtl + , old-locale, quickcheck-instances, regex-tdfa, resourcet + , semigroups, string-conv, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, template-haskell, text, time + , time-locale-compat, transformers, transformers-base + , transformers-compat, unagi-chan, unix, unordered-containers + }: + mkDerivation { + pname = "katip"; + version = "0.4.1.0"; + sha256 = "0rhnp6qg19v180nazwghn2f4chc79fwn1g74wr3zdsqg0j211bnp"; + libraryHaskellDepends = [ + aeson async auto-update base bytestring containers either + exceptions hostname microlens microlens-th monad-control mtl + old-locale resourcet semigroups string-conv template-haskell text + time transformers transformers-base transformers-compat unagi-chan + unix unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring directory microlens quickcheck-instances + regex-tdfa tasty tasty-golden tasty-hunit tasty-quickcheck + template-haskell text time time-locale-compat unordered-containers + ]; + benchmarkHaskellDepends = [ + aeson async base blaze-builder criterion deepseq text time + transformers unix + ]; + homepage = "https://github.com/Soostone/katip"; + description = "A structured logging framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "katip-elasticsearch" = callPackage ({ mkDerivation, aeson, async, base, bloodhound, containers , criterion, deepseq, enclosed-exceptions, exceptions, http-client @@ -114738,8 +115674,8 @@ self: { }: mkDerivation { pname = "katip-elasticsearch"; - version = "0.3.0.2"; - sha256 = "1v9r03nwklb203llnda6v91yfcz3fhmhw8bc8mxn5mibbxbf88xw"; + version = "0.3.1.0"; + sha256 = "162ikrqpk0i8zh5gw3isc1lflg4a4bsqk3ci2rpirll0wf1dqgz9"; libraryHaskellDepends = [ aeson async base bloodhound enclosed-exceptions exceptions http-client http-types katip retry scientific stm stm-chans text @@ -117350,20 +118286,18 @@ self: { }) {}; "language-ecmascript" = callPackage - ({ mkDerivation, base, containers, data-default-class, Diff - , directory, filepath, HUnit, mtl, parsec, QuickCheck + ({ mkDerivation, base, charset, containers, data-default-class + , Diff, directory, filepath, HUnit, mtl, parsec, QuickCheck , template-haskell, test-framework, test-framework-hunit , test-framework-quickcheck2, testing-feat, uniplate, wl-pprint }: mkDerivation { pname = "language-ecmascript"; - version = "0.17.1.0"; - sha256 = "0gl82zq50x98jzagkzdb5fgf5gnspvpx6i66g3r25mcn606ky7nz"; - revision = "2"; - editedCabalFile = "0wndi8w3nchzvsmqxy5pbxld4c18a0b3ncffqfail1dpa6i30my6"; + version = "0.17.2.0"; + sha256 = "1szn269x93k7x2r1z6aj0fqraim1f6vyb7qbg5nfkv8l0gcrz10l"; libraryHaskellDepends = [ - base containers data-default-class Diff mtl parsec QuickCheck - template-haskell testing-feat uniplate wl-pprint + base charset containers data-default-class Diff mtl parsec + QuickCheck template-haskell testing-feat uniplate wl-pprint ]; testHaskellDepends = [ base containers data-default-class Diff directory filepath HUnit @@ -117455,6 +118389,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "language-glsl_0_2_1" = callPackage + ({ mkDerivation, base, HUnit, parsec, prettyclass, test-framework + , test-framework-hunit + }: + mkDerivation { + pname = "language-glsl"; + version = "0.2.1"; + sha256 = "08hrl9s8640a61npdshjrw5q3j3b2gvms846cf832j0n19mi24h0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base parsec prettyclass ]; + executableHaskellDepends = [ base parsec prettyclass ]; + testHaskellDepends = [ + base HUnit parsec prettyclass test-framework test-framework-hunit + ]; + description = "GLSL abstract syntax tree, parser, and pretty-printer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-go" = callPackage ({ mkDerivation, array, base, parsec, utf8-string }: mkDerivation { @@ -117874,6 +118828,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "language-sally" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers, text + }: + mkDerivation { + pname = "language-sally"; + version = "0.1.1.0"; + sha256 = "10ddikcavh7ppmm5issii7mv9nagrs0841cngz3alfw0sw6bw47v"; + libraryHaskellDepends = [ + ansi-wl-pprint base bytestring containers text + ]; + description = "AST and pretty printer for Sally"; + license = stdenv.lib.licenses.isc; + }) {}; + "language-sh" = callPackage ({ mkDerivation, base, directory, filepath, mtl, parsec, pcre-light }: @@ -118225,6 +119193,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lattices_1_6_0" = callPackage + ({ mkDerivation, base, base-compat, containers, deepseq, hashable + , QuickCheck, quickcheck-instances, semigroupoids, tagged, tasty + , tasty-quickcheck, transformers, universe-base + , universe-instances-base, universe-reverse-instances + , unordered-containers + }: + mkDerivation { + pname = "lattices"; + version = "1.6.0"; + sha256 = "0v0nl212cawd2pwbka7w8vl0gmrf1r0yv40dmwl5ffq33v5ihxd0"; + libraryHaskellDepends = [ + base base-compat containers deepseq hashable semigroupoids tagged + universe-base universe-reverse-instances unordered-containers + ]; + testHaskellDepends = [ + base base-compat containers QuickCheck quickcheck-instances tasty + tasty-quickcheck transformers universe-instances-base + unordered-containers + ]; + homepage = "http://github.com/phadej/lattices/"; + description = "Fine-grained library for constructing and manipulating lattices"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "launchpad-control" = callPackage ({ mkDerivation, array, base, containers, hmidi, mtl, transformers }: @@ -118514,8 +119508,8 @@ self: { }: mkDerivation { pname = "ldap-client"; - version = "0.1.0"; - sha256 = "18c33jfgwa7vdickxshyhmrqdpndy7ayjd3z0zqkjqa7awd0zcf4"; + version = "0.2.0"; + sha256 = "0vs6n3q9svwhcp6853ipxmw1anmy8qfy3xajjsf7h4pjnqzy7g88"; libraryHaskellDepends = [ asn1-encoding asn1-types async base bytestring connection containers network semigroups stm text @@ -120436,8 +121430,8 @@ self: { }: mkDerivation { pname = "lifted-async"; - version = "0.9.1.1"; - sha256 = "0h4fskcgr053s21z43bh1mlz40i8f5d166d382frng3j6jw49b1i"; + version = "0.9.3"; + sha256 = "0qdlc64kf02g97rzpragm4943ppy2cx74kbjcpbv32jcyc3q75wp"; libraryHaskellDepends = [ async base constraints lifted-base monad-control transformers-base ]; @@ -120826,6 +121820,8 @@ self: { pname = "linear"; version = "1.20.6"; sha256 = "1xcr36g6rr7k0vlzsh6szzxxrdi1f6vb9sxdilcpsb8xjvkk258m"; + revision = "1"; + editedCabalFile = "0jgfgn0i5882yhmbqc1w9g7gk713l5r66xyaxiwg7nmw82smmakk"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ adjunctions base base-orphans binary bytes cereal containers @@ -121837,8 +122833,8 @@ self: { ({ mkDerivation, base, doctest, mtl }: mkDerivation { pname = "list-transformer"; - version = "1.0.1"; - sha256 = "0sjhhvdysfi9a70bkx3iwi81i5fyhak6jzxizlcqvc2x6vd79x95"; + version = "1.0.2"; + sha256 = "081sik71mli28lvai34zymcl58fiqcrbhzxdi6phmjizm5wj4pqi"; libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base doctest ]; homepage = "https://github.com/Gabriel439/Haskell-List-Transformer-Library"; @@ -121958,8 +122954,8 @@ self: { }: mkDerivation { pname = "live-sequencer"; - version = "0.0.5.2"; - sha256 = "1qcjs56mfj62pvgv7ab1c2q7ya6ykaw1sixak43iprpviwa3i3w4"; + version = "0.0.6"; + sha256 = "0gsbixz0cmy9cajqj4s8iaf8mjk42162sd39bpcdp4xqyxfj5g63"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base event-list non-negative ]; @@ -122295,8 +123291,8 @@ self: { }: mkDerivation { pname = "llvm-hs"; - version = "4.1.0.0"; - sha256 = "02692n5vllv025r6c79kc5z52rxcj3m8d1q6b1fsk1i5mkpp6rlh"; + version = "4.2.0"; + sha256 = "12rclc9l85yqh1h0y7m6m65fpb81crzafmkcwq90vl7i5bf1bv1j"; setupHaskellDepends = [ base Cabal containers ]; libraryHaskellDepends = [ array attoparsec base bytestring containers exceptions llvm-hs-pure @@ -122396,8 +123392,8 @@ self: { ({ mkDerivation, base, containers, monadLib, parsec, pretty }: mkDerivation { pname = "llvm-pretty"; - version = "0.7.1.0"; - sha256 = "0q1cbnllxs8xm98glm4brb5yryy8bg8yprdf1qjsv3a0l2vbn1aq"; + version = "0.7.1.1"; + sha256 = "17lb4jfkaxz2ahjfvq2mxnb82k209qg13rhdg76v3j8yahr5z0a2"; libraryHaskellDepends = [ base containers monadLib parsec pretty ]; description = "A pretty printing library inspired by the llvm binding"; license = stdenv.lib.licenses.bsd3; @@ -122410,8 +123406,8 @@ self: { }: mkDerivation { pname = "llvm-pretty-bc-parser"; - version = "0.3.2.0"; - sha256 = "0h0lxp2aavljps08afqa22sl9b73fi02nv91k9x44qy2na2pk2hr"; + version = "0.4.0.0"; + sha256 = "0mj4k4a8xap5gsw7zrnlg6ms65nb1cfmllxq24h7gvd7s9qs9cp8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122821,16 +123817,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "log_0_9_0_0" = callPackage - ({ mkDerivation, aeson, base, bloodhound, bytestring, exceptions - , http-client, http-types, log-base, log-elasticsearch - , log-postgres, process, random, tasty, tasty-hunit, text, time - , transformers + "log_0_9_0_1" = callPackage + ({ mkDerivation, aeson, base, bloodhound, bytestring, ekg + , exceptions, hpqtypes, http-client, http-types, log-base + , log-elasticsearch, log-postgres, process, random, tasty + , tasty-hunit, text, text-show, time, transformers + , transformers-base }: mkDerivation { pname = "log"; - version = "0.9.0.0"; - sha256 = "16hrygsprq55xh69hvgwppf9cx164fza0n7ss2w7nh6k0dg6rb11"; + version = "0.9.0.1"; + sha256 = "1gjh3i0j2q72hc1gnn4knc5qhb2zc7d4pi5a22jd0dqgpkmdaay3"; libraryHaskellDepends = [ base log-base log-elasticsearch log-postgres ]; @@ -122838,6 +123835,10 @@ self: { aeson base bloodhound bytestring exceptions http-client http-types process random tasty tasty-hunit text time transformers ]; + benchmarkHaskellDepends = [ + base ekg hpqtypes random text text-show transformers + transformers-base + ]; homepage = "https://github.com/scrive/log"; description = "Structured logging solution with multiple backends"; license = stdenv.lib.licenses.bsd3; @@ -122851,8 +123852,8 @@ self: { }: mkDerivation { pname = "log-base"; - version = "0.7.1"; - sha256 = "1gx2j33f8nhynm6jhbp5z139bqdgg6rymzpk3inzgf7da5flisv3"; + version = "0.7.1.1"; + sha256 = "0kxng0pvql8sv4wk3x1bx0a0mqjsr3ynbixps9l1zrmsisp01344"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring deepseq exceptions monad-control monad-time mtl semigroups stm text time transformers-base @@ -122864,29 +123865,6 @@ self: { }) {}; "log-domain" = callPackage - ({ mkDerivation, base, binary, bytes, cereal, comonad, deepseq - , directory, distributive, doctest, filepath, generic-deriving - , hashable, safecopy, semigroupoids, semigroups, simple-reflect - , vector - }: - mkDerivation { - pname = "log-domain"; - version = "0.11"; - sha256 = "1js2havkab64qvhw22pkiq7zas7yl7vn9hir7i4ifqwv5ddwsl27"; - libraryHaskellDepends = [ - base binary bytes cereal comonad deepseq distributive hashable - safecopy semigroupoids semigroups vector - ]; - testHaskellDepends = [ - base directory doctest filepath generic-deriving semigroups - simple-reflect - ]; - homepage = "http://github.com/ekmett/log-domain/"; - description = "Log-domain arithmetic"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "log-domain_0_11_1" = callPackage ({ mkDerivation, base, binary, bytes, Cabal, cabal-doctest, cereal , comonad, deepseq, distributive, doctest, generic-deriving , hashable, safecopy, semigroupoids, semigroups, simple-reflect @@ -122907,7 +123885,6 @@ self: { homepage = "http://github.com/ekmett/log-domain/"; description = "Log-domain arithmetic"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "log-effect" = callPackage @@ -122950,7 +123927,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "log-elasticsearch_0_9_0_0" = callPackage + "log-elasticsearch_0_9_0_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring , bloodhound, bytestring, deepseq, http-client, http-client-tls , log-base, semigroups, text, text-show, time, transformers @@ -122958,8 +123935,8 @@ self: { }: mkDerivation { pname = "log-elasticsearch"; - version = "0.9.0.0"; - sha256 = "005r1mkyq0ci3gww1qmp6k9n8739gmhjlbrzpq0ymxra7wd3c98c"; + version = "0.9.0.1"; + sha256 = "01xfr3rq3s1zp7fw60857c4jvlliy6v9dzx6sip3sbzl3b4hcg1x"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bloodhound bytestring deepseq http-client http-client-tls log-base semigroups text @@ -122979,8 +123956,8 @@ self: { }: mkDerivation { pname = "log-postgres"; - version = "0.7"; - sha256 = "0qzrfixdpag4fskzwy7l5hjgag6f2xkcx8lzrz91iw2s37zlwx1k"; + version = "0.7.0.1"; + sha256 = "0gfb7xss31fqjlvxs8pywlhzmckgz98srimwhsp819mb9vrysjrn"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bytestring deepseq hpqtypes http-client lifted-base log-base mtl semigroups split text @@ -123026,8 +124003,8 @@ self: { }: mkDerivation { pname = "log-warper"; - version = "1.1.2"; - sha256 = "0j17ylwga4vw0f0hahpmvm3nhk6s274m0msjv0r9jx6a6jx1wsmn"; + version = "1.1.4"; + sha256 = "1q9n0b0dwdkpvmpk60s65sw8z25k9nbybwnrfv6k0ifdjs86x6lh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -123843,25 +124820,24 @@ self: { "loup" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-swf, base, bytestring - , conduit, lifted-async, lifted-base, monad-control - , optparse-generic, preamble, shakers, time, turtle - , unordered-containers, uuid, yaml + , conduit, lifted-async, lifted-base, optparse-generic, preamble + , shakers, time, turtle, unordered-containers, uuid, yaml }: mkDerivation { pname = "loup"; - version = "0.0.5"; - sha256 = "1c42rp22r37l0fbmd5i463f9pfv7nqchi1rcchv7mcc3wwzyzymq"; + version = "0.0.13"; + sha256 = "03ibb8ddrd7k9mhb8axg3jrbrn68kwi94sz7wnxr21ixiz2cb122"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson amazonka amazonka-swf base bytestring conduit lifted-async - lifted-base monad-control preamble time turtle unordered-containers - uuid yaml + lifted-base preamble time turtle unordered-containers uuid yaml ]; executableHaskellDepends = [ base optparse-generic shakers ]; homepage = "https://github.com/swift-nav/loup"; description = "Amazon Simple Workflow Service Wrapper for Work Pools"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lowgl" = callPackage @@ -123928,27 +124904,6 @@ self: { }) {}; "lrucaching" = callPackage - ({ mkDerivation, base, base-compat, containers, deepseq, hashable - , hspec, psqueues, QuickCheck, transformers, vector - }: - mkDerivation { - pname = "lrucaching"; - version = "0.3.1"; - sha256 = "1mijn42qd938xx3pd2fi3njfk37rag4xw1f19m3mh7vj1nk7wa1g"; - revision = "1"; - editedCabalFile = "0q7hzsc7l64x9gdcxfims25nzqqwammwj91wqv4qjwahgkasmkyn"; - libraryHaskellDepends = [ - base base-compat deepseq hashable psqueues vector - ]; - testHaskellDepends = [ - base containers deepseq hashable hspec QuickCheck transformers - ]; - homepage = "https://github.com/cocreature/lrucaching#readme"; - description = "LRU cache"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lrucaching_0_3_2" = callPackage ({ mkDerivation, base, base-compat, containers, deepseq, hashable , hspec, psqueues, QuickCheck, transformers, vector }: @@ -123965,7 +124920,6 @@ self: { homepage = "https://github.com/cocreature/lrucaching#readme"; description = "LRU cache"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ls-usb" = callPackage @@ -124973,21 +125927,21 @@ self: { }) {}; "madlang" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, composition, containers - , criterion, directory, file-embed, hspec, hspec-megaparsec - , megaparsec, microlens, MonadRandom, mtl, optparse-applicative - , random-shuffle, template-haskell, text + ({ mkDerivation, ansi-wl-pprint, base, composition + , composition-extra, containers, criterion, directory, file-embed + , hspec, hspec-megaparsec, megaparsec, microlens, MonadRandom, mtl + , optparse-applicative, random-shuffle, template-haskell, text }: mkDerivation { pname = "madlang"; - version = "2.3.1.1"; - sha256 = "1ybbf281kpmdwggjvmhpilip0pficsqqg1m1nizgwwlgg76kwnj3"; + version = "2.4.0.1"; + sha256 = "1qldc05017i1dy1mcl79r0ynxx66qqnsyp8f3y5lk4jdgrfz9mb1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-wl-pprint base composition containers directory file-embed - megaparsec microlens MonadRandom mtl optparse-applicative - random-shuffle template-haskell text + ansi-wl-pprint base composition composition-extra containers + directory file-embed megaparsec microlens MonadRandom mtl + optparse-applicative random-shuffle template-haskell text ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -126610,25 +127564,6 @@ self: { }) {}; "matrix-market-attoparsec" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, directory - , exceptions, hspec, QuickCheck, scientific - }: - mkDerivation { - pname = "matrix-market-attoparsec"; - version = "0.1.0.7"; - sha256 = "0cdv5gksmd812fwzf6ki10ksnm5lz1dm8pkjni7niz4gvrf6dhaj"; - libraryHaskellDepends = [ - attoparsec base bytestring exceptions scientific - ]; - testHaskellDepends = [ - base directory exceptions hspec QuickCheck - ]; - homepage = "https://github.com/ocramz/matrix-market-attoparsec"; - description = "Parsing and serialization functions for the NIST Matrix Market format"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "matrix-market-attoparsec_0_1_0_8" = callPackage ({ mkDerivation, attoparsec, base, bytestring, directory , exceptions, hspec, QuickCheck, scientific }: @@ -126645,7 +127580,6 @@ self: { homepage = "https://github.com/ocramz/matrix-market-attoparsec"; description = "Parsing and serialization functions for the NIST Matrix Market format"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "matrix-market-pure" = callPackage @@ -126681,28 +127615,27 @@ self: { }) {}; "matterhorn" = callPackage - ({ mkDerivation, base, base-compat, brick, bytestring, cheapskate - , checkers, config-ini, connection, containers, directory, filepath - , gitrev, hashable, Hclip, mattermost-api, mattermost-api-qc - , microlens-platform, mtl, process, quickcheck-text, stm, strict + ({ mkDerivation, aspell-pipe, base, base-compat, brick, bytestring + , cheapskate, checkers, config-ini, connection, containers + , directory, filepath, gitrev, hashable, Hclip, mattermost-api + , mattermost-api-qc, microlens-platform, mtl, process + , quickcheck-text, skylighting, stm, stm-delay, strict , string-conversions, tasty, tasty-hunit, tasty-quickcheck - , temporary, text, text-zipper, time, transformers, Unique + , temporary, text, text-zipper, time, transformers, Unique, unix , unordered-containers, utf8-string, vector, vty, xdg-basedir }: mkDerivation { pname = "matterhorn"; - version = "30802.1.0"; - sha256 = "0sn8r6yaq2mc034dp9ib5gfcvw30p1a2frqkcmk9f9bjk22r5ix9"; - revision = "2"; - editedCabalFile = "1jrnxx144ckngbvk7sr3sw9im8a2w57dzqwzvdpxr2ql3hanwf2c"; + version = "31000.0.0"; + sha256 = "0kkyalrqfaq851lnj8vbrffyg2yjbr5mhqrh8a2y4hkd8yx1ji36"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base base-compat brick bytestring cheapskate config-ini connection - containers directory filepath gitrev hashable Hclip mattermost-api - microlens-platform mtl process stm strict temporary text - text-zipper time transformers unordered-containers utf8-string - vector vty xdg-basedir + aspell-pipe base base-compat brick bytestring cheapskate config-ini + connection containers directory filepath gitrev hashable Hclip + mattermost-api microlens-platform mtl process skylighting stm + stm-delay strict temporary text text-zipper time transformers unix + unordered-containers utf8-string vector vty xdg-basedir ]; testHaskellDepends = [ base base-compat brick bytestring cheapskate checkers config-ini @@ -126712,35 +127645,33 @@ self: { tasty-quickcheck text text-zipper time transformers Unique unordered-containers vector vty xdg-basedir ]; - description = "Terminal client for the MatterMost chat system"; + description = "Terminal client for the Mattermost chat system"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mattermost-api" = callPackage ({ mkDerivation, aeson, base, bytestring, connection, containers - , cryptonite, gitrev, hashable, HTTP, HUnit, memory, microlens - , microlens-th, mtl, network-uri, pretty-show, process, stm, tasty - , tasty-hunit, template-haskell, text, time, unordered-containers - , websockets + , gitrev, hashable, HTTP, HUnit, memory, microlens, microlens-th + , mtl, network-uri, pretty-show, process, stm, tasty, tasty-hunit + , template-haskell, text, time, unordered-containers, websockets }: mkDerivation { pname = "mattermost-api"; - version = "30802.1.0"; - sha256 = "0bbg37aj6jxrdvy1zx9q143s7gjhx5dnba9y8vyjcfgypyzlggsv"; + version = "31000.0.0"; + sha256 = "1v5m57qsd155rr6nz3y1yzvs2imia4ld3xb2ccha0cnbki6hw6wb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring connection containers cryptonite gitrev - hashable HTTP memory microlens microlens-th network-uri pretty-show - process stm template-haskell text time unordered-containers - websockets + aeson base bytestring connection containers gitrev hashable HTTP + memory microlens microlens-th network-uri pretty-show process stm + template-haskell text time unordered-containers websockets ]; testHaskellDepends = [ aeson base containers HUnit mtl pretty-show stm tasty tasty-hunit text unordered-containers ]; - description = "Client API for MatterMost chat system"; + description = "Client API for Mattermost chat system"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -126751,8 +127682,8 @@ self: { }: mkDerivation { pname = "mattermost-api-qc"; - version = "30802.1.0"; - sha256 = "0rld7i62z66w0c0jfrk6kj7a8ha6hczmavdy3qss14p3z651l8p3"; + version = "31000.0.0"; + sha256 = "1sjw31vg02ygxb61m2cvhl435zgsk6w5gnl4v34qd9ihbq4laa9r"; libraryHaskellDepends = [ base containers mattermost-api QuickCheck text time ]; @@ -127242,6 +128173,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "med-module" = callPackage + ({ mkDerivation, base, bytestring, storable-endian, transformers + , utility-ht + }: + mkDerivation { + pname = "med-module"; + version = "0.1"; + sha256 = "0qln8b2vfmmfx2700vybd895j22a82l4k95nk7kwpkilsf0h6vji"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring storable-endian transformers utility-ht + ]; + description = "Parse song module files from Amiga MED and OctaMED"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "mediabus" = callPackage ({ mkDerivation, array, async, base, binary, bytestring, cereal , conduit, conduit-combinators, conduit-extra, containers @@ -127274,7 +128222,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; - "mediabus_0_4_0_0" = callPackage + "mediabus_0_4_0_1" = callPackage ({ mkDerivation, array, async, base, binary, bytestring, cereal , conduit, conduit-combinators, conduit-extra, containers , data-default, deepseq, hspec, lens, lifted-async, monad-control @@ -127285,8 +128233,8 @@ self: { }: mkDerivation { pname = "mediabus"; - version = "0.4.0.0"; - sha256 = "00aps3hlml830ws4czpabzndwh2dvmyih1hy6k841zj7kzpvmg73"; + version = "0.4.0.1"; + sha256 = "0f0ip2l87a7divqp580iziskx3fkvv6f6vny42vz7v4p77i05p20"; libraryHaskellDepends = [ array async base bytestring cereal conduit conduit-combinators conduit-extra containers data-default deepseq lens lifted-async @@ -127300,7 +128248,7 @@ self: { monad-control mtl QuickCheck singletons spool stm tagged template-haskell text time transformers type-spec vector ]; - homepage = "https://github.com/lindenbaum/mediabus"; + homepage = "https://github.com/sheyll/mediabus"; description = "Multimedia streaming on top of Conduit"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -127374,7 +128322,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; - "mediabus-rtp_0_4_0_0" = callPackage + "mediabus-rtp_0_4_0_1" = callPackage ({ mkDerivation, array, async, base, binary, bytestring, cereal , conduit, conduit-combinators, conduit-extra, containers , data-default, deepseq, hspec, lens, lifted-async, mediabus @@ -127385,8 +128333,8 @@ self: { }: mkDerivation { pname = "mediabus-rtp"; - version = "0.4.0.0"; - sha256 = "0b8nhyb072nqcikq40la226da30vg343cjmp4qjpsr714i2sd3rk"; + version = "0.4.0.1"; + sha256 = "1yfy8aak1z9bbwy676qyfxa7hmk1n94f3dn1x070hvpbvgpgmijb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127407,7 +128355,7 @@ self: { monad-control monad-logger mtl QuickCheck singletons spool stm tagged template-haskell text time transformers type-spec vector ]; - homepage = "https://github.com/lindenbaum/mediabus-rtp"; + homepage = "https://github.com/sheyll/mediabus-rtp"; description = "Receive and Send RTP Packets"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -127555,17 +128503,15 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "megaparsec_5_3_0" = callPackage + "megaparsec_5_3_1" = callPackage ({ mkDerivation, base, bytestring, containers, criterion, deepseq , exceptions, hspec, hspec-expectations, mtl, QuickCheck , scientific, text, transformers, weigh }: mkDerivation { pname = "megaparsec"; - version = "5.3.0"; - sha256 = "0lpf3f24lyid1chb2hrxiw97kciww844wzkp910zj811b6pbm6rs"; - revision = "2"; - editedCabalFile = "1gwvrg5vmxhlycav33g9r9157vq0f6j701bar0p7ck4mszs0v6zk"; + version = "5.3.1"; + sha256 = "06myn8l6jcbd494i3wr6q27npbbxd6c2gfkd2jdzwbjqjqbpv0j8"; libraryHaskellDepends = [ base bytestring containers deepseq exceptions mtl QuickCheck scientific text transformers @@ -128472,22 +129418,6 @@ self: { }) {}; "microlens-mtl" = callPackage - ({ mkDerivation, base, microlens, mtl, transformers - , transformers-compat - }: - mkDerivation { - pname = "microlens-mtl"; - version = "0.1.10.0"; - sha256 = "17dk2i7ggpipyjnb01wdlqcg4fnmgdbq7xhm34zaw97k03qc9pmi"; - libraryHaskellDepends = [ - base microlens mtl transformers transformers-compat - ]; - homepage = "http://github.com/aelve/microlens"; - description = "microlens support for Reader/Writer/State from mtl"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "microlens-mtl_0_1_11_0" = callPackage ({ mkDerivation, base, microlens, mtl, transformers , transformers-compat }: @@ -128501,27 +129431,9 @@ self: { homepage = "http://github.com/aelve/microlens"; description = "microlens support for Reader/Writer/State from mtl"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "microlens-platform" = callPackage - ({ mkDerivation, base, hashable, microlens, microlens-ghc - , microlens-mtl, microlens-th, text, unordered-containers, vector - }: - mkDerivation { - pname = "microlens-platform"; - version = "0.3.8.0"; - sha256 = "113g10zij6afjfm022cdxsmicccp51h17mn5wzj75pidjq85l6z3"; - libraryHaskellDepends = [ - base hashable microlens microlens-ghc microlens-mtl microlens-th - text unordered-containers vector - ]; - homepage = "http://github.com/aelve/microlens"; - description = "Feature-complete microlens"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "microlens-platform_0_3_9_0" = callPackage ({ mkDerivation, base, hashable, microlens, microlens-ghc , microlens-mtl, microlens-th, text, unordered-containers, vector }: @@ -128536,7 +129448,6 @@ self: { homepage = "http://github.com/aelve/microlens"; description = "Feature-complete microlens"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "microlens-th" = callPackage @@ -128698,27 +129609,6 @@ self: { }) {}; "midi-music-box" = callPackage - ({ mkDerivation, base, containers, diagrams-lib - , diagrams-postscript, event-list, midi, non-empty - , optparse-applicative, utility-ht - }: - mkDerivation { - pname = "midi-music-box"; - version = "0.0.0.3"; - sha256 = "0hg199mpy0gd20sgp04djf487970j2wzlvba6xhkbg2nxvzcx676"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base containers diagrams-lib diagrams-postscript event-list midi - non-empty optparse-applicative utility-ht - ]; - homepage = "http://hub.darcs.net/thielema/midi-music-box"; - description = "Convert MIDI file to music box punch tape"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "midi-music-box_0_0_0_4" = callPackage ({ mkDerivation, base, containers, diagrams-lib , diagrams-postscript, event-list, midi, non-empty , optparse-applicative, utility-ht @@ -129492,6 +130382,24 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "miso" = callPackage + ({ mkDerivation, aeson, base, BoundedChan, bytestring, containers + , lucid, text, vector + }: + mkDerivation { + pname = "miso"; + version = "0.2.1.0"; + sha256 = "0z7gl1bxh1c6caxwqbf1cqpgrklx7z7f4qp06pipmvwciggcf30v"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base BoundedChan bytestring containers lucid text vector + ]; + homepage = "http://github.com/dmjio/miso"; + description = "A tasty Haskell front-end framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "missing-foreign" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -129646,6 +130554,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mltool" = callPackage + ({ mkDerivation, ascii-progress, base, deepseq, hmatrix + , hmatrix-gsl, hmatrix-gsl-stats, HUnit, MonadRandom, random + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , vector + }: + mkDerivation { + pname = "mltool"; + version = "0.1.0.2"; + sha256 = "1gzm8a8abz8bnh80ylq0clp3isz2cx05mmyqwsdmh6kf94xsg71p"; + libraryHaskellDepends = [ + ascii-progress base deepseq hmatrix hmatrix-gsl hmatrix-gsl-stats + MonadRandom random vector + ]; + testHaskellDepends = [ + base hmatrix hmatrix-gsl-stats HUnit MonadRandom random + test-framework test-framework-hunit test-framework-quickcheck2 + vector + ]; + homepage = "https://github.com/alexander-ignatyev/mltool"; + description = "Machine Learning Toolbox"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mmap" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -129766,26 +130698,6 @@ self: { }) {}; "mockery" = callPackage - ({ mkDerivation, base, base-compat, bytestring, directory, filepath - , hspec, logging-facade, temporary - }: - mkDerivation { - pname = "mockery"; - version = "0.3.4"; - sha256 = "0f19b057cphfslw3brc690v4hq86xwjlllfc9idbilfgz7s3bzih"; - libraryHaskellDepends = [ - base base-compat bytestring directory filepath logging-facade - temporary - ]; - testHaskellDepends = [ - base base-compat bytestring directory filepath hspec logging-facade - temporary - ]; - description = "Support functions for automated testing"; - license = stdenv.lib.licenses.mit; - }) {}; - - "mockery_0_3_5" = callPackage ({ mkDerivation, base, base-compat, bytestring, directory, filepath , hspec, logging-facade, temporary }: @@ -129803,7 +130715,6 @@ self: { ]; description = "Support functions for automated testing"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "modbus-tcp" = callPackage @@ -130117,14 +131028,14 @@ self: { }: mkDerivation { pname = "mollie-api-haskell"; - version = "0.1.0.2"; - sha256 = "0mg2c24721w1mmdw0azmng2blsad11ghf4i0ynb4jk7bwgqi6j1d"; + version = "0.2.0.0"; + sha256 = "1k2sx65d486dzb9xs2byi3p4ppacj2qjknhqx2kd0020zi7w9s5n"; libraryHaskellDepends = [ aeson base bytestring HsOpenSSL http-client http-client-openssl http-types mtl text time ]; testHaskellDepends = [ base ]; - homepage = "https://github.com/paramanders/mollie-api-haskell"; + homepage = "https://github.com/paramander/mollie-api-haskell"; description = "Mollie API client for Haskell http://www.mollie.com"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -130273,8 +131184,8 @@ self: { }: mkDerivation { pname = "monad-control"; - version = "1.0.1.0"; - sha256 = "1x018gi5irznx5rgzmkr2nrgh26r8cvqwkcfc6n6y05pdjf21c6l"; + version = "1.0.2.1"; + sha256 = "1hjq0d1y18yyw3p4g78r7k88xy92pzxiqchqll7rqj8lnwnwnknc"; libraryHaskellDepends = [ base stm transformers transformers-base transformers-compat ]; @@ -130283,23 +131194,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "monad-control_1_0_2_0" = callPackage - ({ mkDerivation, base, stm, transformers, transformers-base - , transformers-compat - }: - mkDerivation { - pname = "monad-control"; - version = "1.0.2.0"; - sha256 = "1k5lgwdnbqmzzc7y29pfq7a35g428qivsp5cafdv0mbn5kc59aq5"; - libraryHaskellDepends = [ - base stm transformers transformers-base transformers-compat - ]; - homepage = "https://github.com/basvandijk/monad-control"; - description = "Lift control operations, like exception catching, through monad transformers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "monad-control-aligned" = callPackage ({ mkDerivation, base, stm, transformers, transformers-base , transformers-compat @@ -130338,8 +131232,8 @@ self: { }: mkDerivation { pname = "monad-dijkstra"; - version = "0.1.0.0"; - sha256 = "0cgwgjx9h8vwlpzdzc6438flzgsdriaalv277yv5bpchdydyc418"; + version = "0.1.1.0"; + sha256 = "1vchyiaxawjgixxc9b3pssdrdmsy5ji0f3gwwgjr8gp0dp73yki4"; libraryHaskellDepends = [ base free mtl psqueues transformers ]; testHaskellDepends = [ base hlint tasty tasty-hspec ]; homepage = "https://github.com/ennocramer/monad-dijkstra"; @@ -130700,6 +131594,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "monad-mock" = callPackage + ({ mkDerivation, base, constraints, exceptions, haskell-src-exts + , haskell-src-meta, hspec, monad-control, mtl, template-haskell + , th-orphans, transformers-base + }: + mkDerivation { + pname = "monad-mock"; + version = "0.1.1.1"; + sha256 = "1ja9s1z4y1vrk01bgav83cj95hzp8mrwil74b7lmc4fmdmr7a5y3"; + libraryHaskellDepends = [ + base constraints exceptions haskell-src-exts haskell-src-meta + monad-control mtl template-haskell th-orphans transformers-base + ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/cjdev/monad-mock#readme"; + description = "A monad transformer for mocking mtl-style typeclasses"; + license = stdenv.lib.licenses.isc; + }) {}; + "monad-open" = callPackage ({ mkDerivation, base, exceptions, mtl, transformers }: mkDerivation { @@ -130915,8 +131828,8 @@ self: { ({ mkDerivation, base, transformers }: mkDerivation { pname = "monad-st"; - version = "0.2.4"; - sha256 = "1j67s07p5lsr81cjl0ch5d1q7zarmpak5kmnwckhavihg3l5m3bi"; + version = "0.2.4.1"; + sha256 = "025zi9xzliwgyasq5hrfxwzg4ksj3kj0ys2kp62fi1n4ddbih64f"; libraryHaskellDepends = [ base transformers ]; homepage = "http://github.com/ekmett/monad-st"; description = "Provides a MonadST class"; @@ -131578,20 +132491,18 @@ self: { "monky" = callPackage ({ mkDerivation, base, bytestring, cereal, composition, containers , directory, env-locale, formatting, mtl, netlink, network - , optparse-applicative, process, pulseaudio, statvfs, stm + , old-time, optparse-applicative, process, pulseaudio, statvfs, stm , template-haskell, text, time, transformers, unix }: mkDerivation { pname = "monky"; - version = "2.2.0.0"; - sha256 = "1bh86myk4nar4ckq0sly7hvj3bzz022yh2sgmfchr6wb05g92pav"; - revision = "1"; - editedCabalFile = "00666fcv432m8whkmnwpijjvj5w5xa64iv7wrcsrc3dcwq5wy20g"; + version = "2.2.1.0"; + sha256 = "1iw0q2ymddnjq2sbzan03abnj00fwaz8pjadbsn63053wai5axfx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring cereal composition containers directory env-locale - formatting mtl netlink network pulseaudio statvfs stm + formatting mtl netlink network old-time pulseaudio statvfs stm template-haskell text time transformers unix ]; executableHaskellDepends = [ @@ -131687,8 +132598,8 @@ self: { pname = "monoid-extras"; version = "0.4.2"; sha256 = "07r86ip6jfa2ka84dpilap01g1pg8r5bqz2nk7js6mlnbh2lxzqk"; - revision = "1"; - editedCabalFile = "1nmrv2i3lg0rdl0rkxnhxl160j14p1x1ikz1b6jbr00yxxs8zdry"; + revision = "2"; + editedCabalFile = "04h78r48rg2ppi53869vb8y226g135fxgy9ryi1v08nqsiqi1vvw"; libraryHaskellDepends = [ base groups semigroupoids semigroups ]; benchmarkHaskellDepends = [ base criterion ]; description = "Various extra monoid-related definitions and utilities"; @@ -131732,28 +132643,6 @@ self: { }) {}; "monoid-subclasses" = callPackage - ({ mkDerivation, base, bytestring, containers, primes, QuickCheck - , quickcheck-instances, tasty, tasty-quickcheck, text, vector - }: - mkDerivation { - pname = "monoid-subclasses"; - version = "0.4.3.1"; - sha256 = "1kc34w94w59vd3s4ird0mwksv9gqwmb4d4m2gld6155n2rwx0w51"; - revision = "1"; - editedCabalFile = "1fplps682kir8phq2fkzrnbp8qf9i29rgikg47wc5diw70g2wy26"; - libraryHaskellDepends = [ - base bytestring containers primes text vector - ]; - testHaskellDepends = [ - base bytestring containers primes QuickCheck quickcheck-instances - tasty tasty-quickcheck text vector - ]; - homepage = "https://github.com/blamario/monoid-subclasses/"; - description = "Subclasses of Monoid"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "monoid-subclasses_0_4_3_2" = callPackage ({ mkDerivation, base, bytestring, containers, primes, QuickCheck , quickcheck-instances, tasty, tasty-quickcheck, text, vector }: @@ -131771,7 +132660,6 @@ self: { homepage = "https://github.com/blamario/monoid-subclasses/"; description = "Subclasses of Monoid"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monoid-transformer" = callPackage @@ -132048,37 +132936,6 @@ self: { }) {}; "morte" = callPackage - ({ mkDerivation, alex, array, base, binary, code-page, containers - , criterion, deepseq, Earley, http-client, http-client-tls - , microlens, microlens-mtl, mtl, optparse-applicative, pipes - , QuickCheck, system-fileio, system-filepath, tasty, tasty-hunit - , tasty-quickcheck, text, text-format, transformers - }: - mkDerivation { - pname = "morte"; - version = "1.6.7"; - sha256 = "16h33fk02zyjf73xvz73p5aqvvv2i6ax8b42fv87rybabsa3h0j5"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base binary containers deepseq Earley http-client - http-client-tls microlens microlens-mtl pipes system-fileio - system-filepath text text-format transformers - ]; - libraryToolDepends = [ alex ]; - executableHaskellDepends = [ - base code-page optparse-applicative text text-format - ]; - testHaskellDepends = [ - base mtl QuickCheck system-filepath tasty tasty-hunit - tasty-quickcheck text transformers - ]; - benchmarkHaskellDepends = [ base criterion system-filepath text ]; - description = "A bare-bones calculus of constructions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "morte_1_6_9" = callPackage ({ mkDerivation, alex, array, base, binary, code-page, containers , criterion, deepseq, Earley, http-client, http-client-tls , microlens, microlens-mtl, mtl, optparse-applicative, pipes @@ -132107,7 +132964,6 @@ self: { benchmarkHaskellDepends = [ base criterion system-filepath text ]; description = "A bare-bones calculus of constructions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mosaico-lib" = callPackage @@ -134587,6 +135443,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "names-th_0_2_0_3" = callPackage + ({ mkDerivation, base, containers, template-haskell }: + mkDerivation { + pname = "names-th"; + version = "0.2.0.3"; + sha256 = "1ijy7wkmw8y5lv7f1p975jlp17r3yfv5v05csiqrs1zykcpjpghf"; + libraryHaskellDepends = [ base containers template-haskell ]; + homepage = "http://khibino.github.io/haskell-relational-record/"; + description = "Manipulate name strings for TH"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "namespace" = callPackage ({ mkDerivation, base, containers, monoid-extras }: mkDerivation { @@ -135779,6 +136648,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "network_2_6_3_1" = callPackage + ({ mkDerivation, base, bytestring, doctest, HUnit, test-framework + , test-framework-hunit, unix + }: + mkDerivation { + pname = "network"; + version = "2.6.3.1"; + sha256 = "1rl2gl37cf4k0ddsq93q15fwdz1l25nhl4w205krbh7d5dg5y12p"; + libraryHaskellDepends = [ base bytestring unix ]; + testHaskellDepends = [ + base bytestring doctest HUnit test-framework test-framework-hunit + ]; + homepage = "https://github.com/haskell/network"; + description = "Low-level networking interface"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network" = callPackage ({ mkDerivation, base, bytestring, doctest, HUnit, test-framework , test-framework-hunit, unix @@ -135877,8 +136764,8 @@ self: { }: mkDerivation { pname = "network-api-support"; - version = "0.2.2"; - sha256 = "1az26wrfgc8jjvkcrni4i6nr5v6i6gb4193zy858sp90rsln7yiy"; + version = "0.3.0"; + sha256 = "0jjd84wwxjdvj1d17rwwmpdv03c18am09xafysw33d6777xh8dmk"; libraryHaskellDepends = [ aeson attoparsec base bytestring case-insensitive http-client http-client-tls http-types text time tls @@ -137022,13 +137909,15 @@ self: { }) {}; "ngx-export" = callPackage - ({ mkDerivation, async, base, bytestring, template-haskell, unix }: + ({ mkDerivation, async, base, binary, bytestring, template-haskell + , unix + }: mkDerivation { pname = "ngx-export"; - version = "0.3.2.1"; - sha256 = "0rmvws1k58iqlcb0h0089l4niki1v90hr15mifjj2jbzrmlas26n"; + version = "0.5.0.1"; + sha256 = "0j3wxzf8p5ck3dxfb6bmv3g8xpknsdalgjgp39i47g4qf27prqgx"; libraryHaskellDepends = [ - async base bytestring template-haskell unix + async base binary bytestring template-haskell unix ]; homepage = "http://github.com/lyokha/nginx-haskell-module"; description = "Helper module for Nginx haskell module"; @@ -137432,6 +138321,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "noether" = callPackage + ({ mkDerivation, array, async, base, bytestring, containers + , criterion, deepseq, ghc-prim, hashable, hedgehog, mtl, mtl-compat + , pretty-show, safe, stm, text, transformers, vector + }: + mkDerivation { + pname = "noether"; + version = "0.0.1"; + sha256 = "1dc05qkbakw4gkqh3yh76lxdk0ab1k8milwjwgkibp4bs61f8rc8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array async base bytestring containers deepseq ghc-prim hashable + mtl mtl-compat pretty-show safe stm text transformers vector + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base hedgehog ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/mrkgnao/noether#readme"; + description = "Math in Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "nofib-analyse" = callPackage ({ mkDerivation, array, base, containers, regex-compat }: mkDerivation { @@ -138426,8 +139338,8 @@ self: { }: mkDerivation { pname = "numhask-range"; - version = "0.0.2"; - sha256 = "0ackcr1brczhnn66700i1dc3bj506vp79r4dzr7i40dyi19mk9fw"; + version = "0.0.3"; + sha256 = "0na22wnyhs30h2h6nfkpgfzxpbcan597l1gg9mayi3g41148cxvj"; libraryHaskellDepends = [ base containers foldl formatting lens linear numhask protolude QuickCheck @@ -138437,7 +139349,7 @@ self: { tasty-hspec tasty-hunit tasty-quickcheck tasty-smallcheck ]; homepage = "https://github.com/tonyday567/numhask-range"; - description = "see readme.md"; + description = "Numbers that are range representations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -138913,15 +139825,15 @@ self: { hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; - "octane_0_19_0" = callPackage + "octane_0_20_0" = callPackage ({ mkDerivation, aeson, base, bimap, binary, bytestring, containers , data-default-class, file-embed, http-client, http-client-tls , overloaded-records, rattletrap, text }: mkDerivation { pname = "octane"; - version = "0.19.0"; - sha256 = "1qdz8y7jacj6yq61icdyqw2fr741nwq1p9yyns6shbv6c9z9zy51"; + version = "0.20.0"; + sha256 = "1lgvx8nkfjh7x7hnpn689499gcx3hwq13s4kh4j74q1xfhmawwyv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139252,23 +140164,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ombra" = callPackage - ({ mkDerivation, base, Boolean, gl, hashable, hashtables - , transformers, unordered-containers, vector-space - }: - mkDerivation { - pname = "ombra"; - version = "0.3.1.0"; - sha256 = "0nzi7pb3m0sp4s0w5k06285xx85fpgfnc464xb431ac7ppinwq1q"; - libraryHaskellDepends = [ - base Boolean gl hashable hashtables transformers - unordered-containers vector-space - ]; - homepage = "https://github.com/ziocroc/Ombra"; - description = "Render engine"; - license = stdenv.lib.licenses.bsd3; - }) {}; - "omega" = callPackage ({ mkDerivation, array, base, containers, directory, filepath , pretty, time @@ -139405,25 +140300,6 @@ self: { }) {}; "one-liner" = callPackage - ({ mkDerivation, base, bifunctors, contravariant, ghc-prim, HUnit - , profunctors, tagged, transformers - }: - mkDerivation { - pname = "one-liner"; - version = "0.9"; - sha256 = "1ds95j4wz8m3lpsrfc2n8r8qz35s3slyvg9yhj4czsxdslc9ywq6"; - libraryHaskellDepends = [ - base bifunctors contravariant ghc-prim profunctors tagged - transformers - ]; - testHaskellDepends = [ base contravariant HUnit ]; - homepage = "https://github.com/sjoerdvisscher/one-liner"; - description = "Constraint-based generics"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "one-liner_0_9_1" = callPackage ({ mkDerivation, base, bifunctors, contravariant, ghc-prim, HUnit , profunctors, tagged, transformers }: @@ -139499,6 +140375,18 @@ self: { license = "GPL"; }) {}; + "onpartitions" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "onpartitions"; + version = "0.1.0.0"; + sha256 = "0iy4hpibiz6v93kz8jv5phb96sh6ygcdakf9vqss5d5622s5pgf1"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/paolino/onpartitions"; + description = "partition lenses"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "onu-course" = callPackage ({ mkDerivation, base, smallcheck }: mkDerivation { @@ -139784,8 +140672,10 @@ self: { }: mkDerivation { pname = "opencv"; - version = "0.0.0.0"; - sha256 = "1y2mjb6a6iym6h6m7c214lwrmcjhm9snsqgf1jrbq27fr346mrkb"; + version = "0.0.1.1"; + sha256 = "095vljv7y7am7dfn7hp9rncfcbcmmqvgzwgw6iwrp6s3z0qv10jn"; + revision = "1"; + editedCabalFile = "1gql71xhyd3ns0a7cigjgdpar7x0b0bwr9kvi17gfs91ggiw7684"; configureFlags = [ "--with-gcc=${stdenv.cc}/bin/c++" "--with-ld=${stdenv.cc}/bin/c++" ]; @@ -139817,8 +140707,10 @@ self: { }: mkDerivation { pname = "opencv-extra"; - version = "0.0.0.0"; - sha256 = "18r1y9ppw5i324fyfcbc3wm40gg16816javaxmsny5jc0vbl56gq"; + version = "0.1.0.0"; + sha256 = "1ah6jipanqag0vk4fjd35rr5xi479w2iym0ix6wd9g9zswb89k8j"; + revision = "1"; + editedCabalFile = "0pqkh3lqmgspg6h38jff8g4w7s28k4l6r17d7xkrfrghhaxl47mp"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bindings-DSL bytestring containers inline-c inline-c-cpp @@ -139878,6 +140770,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "openexr-write" = callPackage + ({ mkDerivation, base, binary, bytestring, data-binary-ieee754 + , deepseq, directory, hspec, split, vector, vector-split, zlib + }: + mkDerivation { + pname = "openexr-write"; + version = "0.1.0.1"; + sha256 = "0f45jgj08fmrj30f167xldapm5lqma4yy95y9mjx6appb7cg5qvd"; + libraryHaskellDepends = [ + base binary bytestring data-binary-ieee754 deepseq split vector + vector-split zlib + ]; + testHaskellDepends = [ base bytestring directory hspec vector ]; + homepage = "https://github.com/pavolzetor/openexr-write#readme"; + description = "Library for writing images in OpenEXR HDR file format"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "openflow" = callPackage ({ mkDerivation, aeson, base, bimap, binary, bytestring, containers , deepseq-generics, hashable, network @@ -140784,17 +141694,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "optparse-generic_1_2_1" = callPackage - ({ mkDerivation, base, bytestring, optparse-applicative, semigroups - , system-filepath, text, time, transformers, void + "optparse-generic_1_2_2" = callPackage + ({ mkDerivation, base, bytestring, Only, optparse-applicative + , semigroups, system-filepath, text, time, transformers, void }: mkDerivation { pname = "optparse-generic"; - version = "1.2.1"; - sha256 = "1dk945dp98mwk1v4y0cky3z0ngmd29nbg6fbaaxnigcrgpbvkjml"; + version = "1.2.2"; + sha256 = "110jil2n945x30d8wgdrgs7di310z9hdnzhw5c1zq2jfh3b54ygz"; libraryHaskellDepends = [ - base bytestring optparse-applicative semigroups system-filepath - text time transformers void + base bytestring Only optparse-applicative semigroups + system-filepath text time transformers void ]; description = "Auto-generate a command-line parser for your datatype"; license = stdenv.lib.licenses.bsd3; @@ -141342,8 +142252,8 @@ self: { }: mkDerivation { pname = "overload"; - version = "0.1.0.3"; - sha256 = "1mx49xzhqsmlb9njplxy9rs19mpahxbcskisp0ds1ihiyf51qzfm"; + version = "0.1.0.4"; + sha256 = "16sry2c4wrly3y3k47gry53klxf4kvbym6fybb8f7z9hqffx18a9"; libraryHaskellDepends = [ base simple-effects template-haskell th-expand-syns ]; @@ -143635,28 +144545,6 @@ self: { }) {}; "patat" = callPackage - ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base - , bytestring, containers, directory, filepath, mtl - , optparse-applicative, pandoc, skylighting, terminal-size, text - , time, unordered-containers, yaml - }: - mkDerivation { - pname = "patat"; - version = "0.5.2.0"; - sha256 = "1rpl61n8i0x01fbhr9k8ac8hw3azjrik4vxlwrx7i9n3ncdga7q5"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson ansi-terminal ansi-wl-pprint base bytestring containers - directory filepath mtl optparse-applicative pandoc skylighting - terminal-size text time unordered-containers yaml - ]; - homepage = "http://github.com/jaspervdj/patat"; - description = "Terminal-based presentations using Pandoc"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "patat_0_5_2_2" = callPackage ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base , bytestring, containers, directory, filepath, mtl, network , network-uri, optparse-applicative, pandoc, skylighting @@ -143677,7 +144565,6 @@ self: { homepage = "http://github.com/jaspervdj/patat"; description = "Terminal-based presentations using Pandoc"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "patch-combinators" = callPackage @@ -143756,15 +144643,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "path_0_6_0" = callPackage + "path_0_6_1" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions , filepath, genvalidity, genvalidity-property, hashable, hspec, mtl , QuickCheck, template-haskell, validity }: mkDerivation { pname = "path"; - version = "0.6.0"; - sha256 = "107jkd0wz40njxbdmgvc51q6bjqz71wl0bi0sprjhvgm2bn64x2x"; + version = "0.6.1"; + sha256 = "0nayla4k1gb821k8y5b9miflv1bi8f0czf9rqr044nrr2dddi2sb"; libraryHaskellDepends = [ aeson base deepseq exceptions filepath hashable template-haskell ]; @@ -143808,14 +144695,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "path-io_1_3_1" = callPackage + "path-io_1_3_2" = callPackage ({ mkDerivation, base, containers, directory, dlist, exceptions , filepath, hspec, path, temporary, time, transformers, unix-compat }: mkDerivation { pname = "path-io"; - version = "1.3.1"; - sha256 = "166wxidsfyyv609bjfrn204k7lia02hgb4kmmbfv716dplywsb0q"; + version = "1.3.2"; + sha256 = "031y6dypf6wnwx7fnjyvn2sb5y1lxfibx0jnwc19h93harm3lfyp"; libraryHaskellDepends = [ base containers directory dlist exceptions filepath path temporary time transformers unix-compat @@ -144220,8 +145107,8 @@ self: { }: mkDerivation { pname = "pcgen"; - version = "1.0.0"; - sha256 = "1nh05bf7xd0l9jrjzvvmng64q5wc6j7iz856g8z3d20mcv2q1lza"; + version = "2.0.1"; + sha256 = "15116krysjvp3if7rdqcfjgqappfybjzwmgrkd5v5x8w62izhnla"; libraryHaskellDepends = [ base random ]; testHaskellDepends = [ base hspec QuickCheck random ]; benchmarkHaskellDepends = [ base criterion deepseq random ]; @@ -144310,8 +145197,8 @@ self: { }: mkDerivation { pname = "pdf-slave"; - version = "1.3.1.0"; - sha256 = "0285cjf3qgy5kkpssa5g4pb73bxjkqdksh47cdgrgvhzypxfq5q4"; + version = "1.3.2.0"; + sha256 = "1l7an71cnsgq7j6yfdvjqp1lj44f4kwb52c555ciccd6mz6f7866"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144329,14 +145216,49 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pdf-slave-server" = callPackage + ({ mkDerivation, acid-state, aeson, aeson-injector, base + , base16-bytestring, bytestring, containers, cryptonite, hashable + , http-client, http-client-tls, immortal, lens, memory + , monad-control, monad-logger, mtl, optparse-applicative, pdf-slave + , pdf-slave-server-api, safecopy, scientific, servant + , servant-auth-token, servant-auth-token-acid + , servant-auth-token-api, servant-server, shelly, stm, text, time + , transformers-base, unbounded-delays, unordered-containers, uuid + , wai-extra, warp, wreq, yaml + }: + mkDerivation { + pname = "pdf-slave-server"; + version = "0.1.2.0"; + sha256 = "16s1wgbvs7j8fbw82wwz8qxgyvvvcqjb54q2sb5qwjmlijw0rdwn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + acid-state aeson aeson-injector base base16-bytestring bytestring + containers cryptonite hashable http-client http-client-tls immortal + lens memory monad-control monad-logger mtl pdf-slave + pdf-slave-server-api safecopy scientific servant servant-auth-token + servant-auth-token-acid servant-auth-token-api servant-server + shelly stm text time transformers-base unbounded-delays + unordered-containers uuid wreq yaml + ]; + executableHaskellDepends = [ + base lens optparse-applicative text wai-extra warp + ]; + homepage = "https://github.com/NCrashed/pdf-slave-server#readme"; + description = "Web service for pdf-slave tool"; + license = stdenv.lib.licenses.bsd3; + broken = true; + }) {pdf-slave-server-api = null;}; + "pdf-slave-template" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , containers, text }: mkDerivation { pname = "pdf-slave-template"; - version = "1.2.0.0"; - sha256 = "0c95p48pla8fsm2qq326rn1z98pkz3ycyh4g8bc9ixlinfgbxb33"; + version = "1.2.1.0"; + sha256 = "17sl4dcisvzjbxa0b6qbi934nl7f5rqm840l66axw2bz43aq1m1f"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring containers text ]; @@ -144453,6 +145375,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pdfname" = callPackage + ({ mkDerivation, base, directory, filepath, optparse-applicative + , pdfinfo, text + }: + mkDerivation { + pname = "pdfname"; + version = "0.1.3"; + sha256 = "0zrjz46fkrad76bwvylwv2ai9ygvrvh0mcdla26ax31w80wx5hk8"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory filepath optparse-applicative pdfinfo text + ]; + homepage = "https://github.com/asr/pdfname#readme"; + description = "Name a PDF file using information from the pdfinfo command"; + license = stdenv.lib.licenses.mit; + }) {}; + "pdfsplit" = callPackage ({ mkDerivation, base, directory, pdfinfo, process, temporary }: mkDerivation { @@ -144723,6 +145663,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "penrose" = callPackage + ({ mkDerivation, ad, aeson, base, containers, gloss, megaparsec + , old-time, random, text, websockets + }: + mkDerivation { + pname = "penrose"; + version = "0.1.0.2"; + sha256 = "0yva42b0av532a99kl0ldcfi229vs2m09w445r981i30xlilg5is"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ad aeson base containers gloss megaparsec old-time random text + websockets + ]; + homepage = "http://penrose.ink"; + description = "A system that automatically visualize mathematics"; + license = stdenv.lib.licenses.mit; + }) {}; + "peparser" = callPackage ({ mkDerivation, base, binary, bytestring, haskell98 }: mkDerivation { @@ -144934,14 +145893,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "persistable-record_0_5_0_1" = callPackage + "persistable-record_0_5_0_2" = callPackage ({ mkDerivation, array, base, containers, dlist, names-th , quickcheck-simple, template-haskell, th-data-compat, transformers }: mkDerivation { pname = "persistable-record"; - version = "0.5.0.1"; - sha256 = "0r0b23ixshsqqlqpg9jik5kkbdn5cxsr05bcmjwf3wcyrbl5c3g3"; + version = "0.5.0.2"; + sha256 = "125zx0c1jccbb62azx5z36gr27fa8rxr5ydnq5w1wyqi0w4kxg02"; libraryHaskellDepends = [ array base containers dlist names-th template-haskell th-data-compat transformers @@ -144970,6 +145929,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "persistable-types-HDBC-pg_0_0_1_5" = callPackage + ({ mkDerivation, base, bytestring, convertible, HDBC + , persistable-record, relational-query-HDBC, text-postgresql + }: + mkDerivation { + pname = "persistable-types-HDBC-pg"; + version = "0.0.1.5"; + sha256 = "0kdrqn6j7vsq748j9j22g3wqxik9pfy3s3dgk4gd5bqnp4gv7949"; + libraryHaskellDepends = [ + base bytestring convertible HDBC persistable-record + relational-query-HDBC text-postgresql + ]; + homepage = "http://khibino.github.io/haskell-relational-record/"; + description = "HDBC and Relational-Record instances of PostgreSQL extended types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistent" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, blaze-markup, bytestring, conduit, containers @@ -145199,26 +146176,6 @@ self: { }) {}; "persistent-mysql" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit - , containers, monad-control, monad-logger, mysql, mysql-simple - , persistent, resource-pool, resourcet, text, transformers - }: - mkDerivation { - pname = "persistent-mysql"; - version = "2.6.0.2"; - sha256 = "0i6m70fh0qs05xgm7c6wpsb815xn370jn29s352zg994rhlkmv0i"; - libraryHaskellDepends = [ - aeson base blaze-builder bytestring conduit containers - monad-control monad-logger mysql mysql-simple persistent - resource-pool resourcet text transformers - ]; - homepage = "http://www.yesodweb.com/book/persistent"; - description = "Backend for the persistent library using MySQL database server"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "persistent-mysql_2_6_1" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit , containers, monad-control, monad-logger, mysql, mysql-simple , persistent, resource-pool, resourcet, text, transformers @@ -145686,16 +146643,22 @@ self: { "pg-store" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring - , haskell-src-meta, mtl, postgresql-libpq, scientific - , template-haskell, text, time + , hashable, haskell-src-meta, mtl, postgresql-libpq, QuickCheck + , scientific, tagged, template-haskell, test-framework + , test-framework-quickcheck2, text, time }: mkDerivation { pname = "pg-store"; - version = "0.2"; - sha256 = "1dl33jspcs2lv30h9ji58iydf5l7mhzirjmg8j4wwkgb87zzn928"; + version = "0.4.3"; + sha256 = "1qqy79yqhwjw094p8i4qanmjwlvym7lndnqiw10mgp0xn63rznid"; libraryHaskellDepends = [ - aeson attoparsec base blaze-builder bytestring haskell-src-meta mtl - postgresql-libpq scientific template-haskell text time + aeson attoparsec base blaze-builder bytestring hashable + haskell-src-meta mtl postgresql-libpq scientific tagged + template-haskell text time + ]; + testHaskellDepends = [ + base bytestring mtl postgresql-libpq QuickCheck scientific + test-framework test-framework-quickcheck2 text ]; homepage = "https://github.com/vapourismo/pg-store"; description = "Simple storage interface to PostgreSQL"; @@ -145723,6 +146686,7 @@ self: { homepage = "https://github.com/jfischoff/pg-transact#readme"; description = "Another postgresql-simple transaction monad"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pgdl" = callPackage @@ -145734,8 +146698,8 @@ self: { }: mkDerivation { pname = "pgdl"; - version = "10.8"; - sha256 = "127xgzx1j2d4flqykgb6vp57zjmyc6jkx8l2jak4df68wpcy1gwq"; + version = "10.9"; + sha256 = "0hwky1331bv1zbjq9nbfnvx8gkbfhs5sjawxjccz9l484xsrbb5z"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -145857,8 +146821,8 @@ self: { ({ mkDerivation, base, bytestring, containers, text }: mkDerivation { pname = "phaser"; - version = "1.0.0.0"; - sha256 = "06m7a61fs6kmd4pgfj1zp7ijzprkdaximynzjv9wm9ynz3fplkzs"; + version = "1.0.0.1"; + sha256 = "1ig3hcalfg2qxb092krii6zv95kvq0kng4acvq7l3wz03x66wj29"; libraryHaskellDepends = [ base bytestring containers text ]; homepage = "https://github.com/quickdudley/phaser"; description = "Incremental multiple pass parser library"; @@ -146301,16 +147265,16 @@ self: { }) {}; "pid1" = callPackage - ({ mkDerivation, base, process, unix }: + ({ mkDerivation, base, directory, process, unix }: mkDerivation { pname = "pid1"; - version = "0.1.0.1"; - sha256 = "1j25fgp44ww1iy2ybj3jy7frlf30ypvmnrwpm38qlm96ak46sfqn"; + version = "0.1.2.0"; + sha256 = "0xkz4vdh8cblpl8k2xmqs8vwv2c0vpxdbikcf2dnmzbg9fdvz5wy"; revision = "1"; - editedCabalFile = "0ii76hs4yg72w8pyynb7fbs80fw4knkfsv1gxqkagnm10hf3y8gk"; + editedCabalFile = "11yg5pjci1d6p5ml0ic4vqn70vjx8vvhqs20rahgfqhh8palkyw9"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base process unix ]; + libraryHaskellDepends = [ base directory process unix ]; executableHaskellDepends = [ base ]; homepage = "https://github.com/fpco/pid1#readme"; description = "Do signal handling and orphan reaping for Unix PID1 init processes"; @@ -146614,35 +147578,20 @@ self: { "pipes-bytestring" = callPackage ({ mkDerivation, base, bytestring, pipes, pipes-group, pipes-parse - , transformers + , stringsearch, transformers }: mkDerivation { pname = "pipes-bytestring"; - version = "2.1.4"; - sha256 = "1svd8ssdqf8lp083g3lray823854i178hhn4ys3qhlxa53g74gvc"; + version = "2.1.6"; + sha256 = "061wcb48mdq694zhwb5xh423ss6f7cccxahc05cifrzkh033gp5i"; libraryHaskellDepends = [ - base bytestring pipes pipes-group pipes-parse transformers + base bytestring pipes pipes-group pipes-parse stringsearch + transformers ]; description = "ByteString support for pipes"; license = stdenv.lib.licenses.bsd3; }) {}; - "pipes-bytestring_2_1_5" = callPackage - ({ mkDerivation, base, bytestring, pipes, pipes-group, pipes-parse - , transformers - }: - mkDerivation { - pname = "pipes-bytestring"; - version = "2.1.5"; - sha256 = "10snjd1abl954gbcl2vxn5vsj830k4sb1jxs8z3h372has13ls9c"; - libraryHaskellDepends = [ - base bytestring pipes pipes-group pipes-parse transformers - ]; - description = "ByteString support for pipes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "pipes-bzip" = callPackage ({ mkDerivation, base, bindings-DSL, bytestring, bzip2, bzlib , data-default, directory, hspec, MonadRandom, mtl, pipes @@ -146683,6 +147632,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pipes-cacophony_0_5_0" = callPackage + ({ mkDerivation, base, bytestring, cacophony, hlint, pipes }: + mkDerivation { + pname = "pipes-cacophony"; + version = "0.5.0"; + sha256 = "1p6vb1abyzifczn537iabd87g2x7mnhvr4sx1j6ay51zvvn5vh20"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring cacophony pipes ]; + testHaskellDepends = [ base hlint ]; + homepage = "https://github.com/centromere/pipes-cacophony#readme"; + description = "Pipes for Noise-secured network connections"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pipes-category" = callPackage ({ mkDerivation, base, hspec, lens, mtl, pipes, pipes-extras , transformers @@ -148004,6 +148969,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "plot-light" = callPackage + ({ mkDerivation, attoparsec, attoparsec-time, base, blaze-svg + , colour, hspec, palette, QuickCheck, scientific, text, time + }: + mkDerivation { + pname = "plot-light"; + version = "0.2.1"; + sha256 = "1zpmmwqvpf6xba6pc7b884glwg3f23hc64srjshmaaa4dv3fjf21"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-svg colour palette scientific text time + ]; + executableHaskellDepends = [ + attoparsec attoparsec-time base blaze-svg colour scientific text + time + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://github.com/ocramz/plot-light"; + description = "A lightweight plotting library, exporting to SVG"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "plotfont" = callPackage ({ mkDerivation, base, containers, tasty, tasty-hunit }: mkDerivation { @@ -148033,6 +149021,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ploton" = callPackage + ({ mkDerivation, base, hspec, optparse-applicative, process }: + mkDerivation { + pname = "ploton"; + version = "0.3.0.0"; + sha256 = "1c045pc42bangg2rlclc91ad78ynjbc5lccmc33hjswcxynv6lj2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base optparse-applicative process ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/ishiy1993/ploton#readme"; + description = "A useful cli tool to draw figures"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "plots" = callPackage ({ mkDerivation, adjunctions, base, base-orphans, colour , containers, data-default, diagrams-core, diagrams-lib, directory @@ -148759,6 +149763,8 @@ self: { pname = "polyvariadic"; version = "0.3.0.0"; sha256 = "13q6sq56gkn6gfjl9mblhjkkfk5bgi86l1x2x9yirfjms4x8445z"; + revision = "1"; + editedCabalFile = "0xnj571ccbpwnra5nzlvsj9qfj79aiq2cphwl8454jpl17cjnir2"; libraryHaskellDepends = [ base containers ]; homepage = "https://github.com/fgaz/polyvariadic"; description = "Creation and application of polyvariadic functions"; @@ -149499,6 +150505,7 @@ self: { homepage = "https://github.com/cocreature/postgresql-named#readme"; description = "Generic deserialization of PostgreSQL rows based on column names"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postgresql-orm" = callPackage @@ -149566,8 +150573,8 @@ self: { }: mkDerivation { pname = "postgresql-schema"; - version = "0.1.10"; - sha256 = "0yp239akswajxp9l3d2sdgkba9iycri2zvb5r6pdjzvaj44pwc19"; + version = "0.1.11"; + sha256 = "1xhaqxc389dghf77hlz6zy6pa6phxv8by42lzs91ymjhvwhnb7bl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -149704,6 +150711,7 @@ self: { homepage = "https://github.com/jfischoff/postgresql-queue#readme"; description = "A PostgreSQL backed queue"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postgresql-simple-sop" = callPackage @@ -149745,6 +150753,8 @@ self: { pname = "postgresql-simple-url"; version = "0.2.0.0"; sha256 = "0k7anqkw9gn5mm3y93pzp8rqzlg1526pxikcllxcciyhgpz5mn7p"; + revision = "1"; + editedCabalFile = "1z9qk3kplc5y93h3xbb9gialhdmnblwrmf2943wkj70qg975hajb"; libraryHaskellDepends = [ base network-uri postgresql-simple split ]; @@ -149935,8 +150945,8 @@ self: { }: mkDerivation { pname = "postmark"; - version = "0.1.1"; - sha256 = "1jh1byixnc8mh3g4xb1w0nx9ghh5dchhqf1nxji869kbim2lqgaw"; + version = "0.2.0"; + sha256 = "14p4zff7phmavw4q0ygyd0b3sllgyn28q994zbgwmpvk9l1a6d80"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -150023,6 +151033,8 @@ self: { pname = "potrace-diagrams"; version = "0.1.0.0"; sha256 = "0ys70a5k384czz0c6bpyy0cqrk35wa1yg6ph19smhm3ag9d8161v"; + revision = "1"; + editedCabalFile = "1iwsxi5zkqqjf9wr460bqjpghcvjhpgqgk27a11ji6bpdf6gnhga"; libraryHaskellDepends = [ base diagrams-lib JuicyPixels potrace ]; homepage = "http://projects.haskell.org/diagrams/"; description = "Potrace bindings for the diagrams library"; @@ -150258,8 +151270,8 @@ self: { }: mkDerivation { pname = "preamble"; - version = "0.0.37"; - sha256 = "1qli01x2cbh8sfr4fxbyiq88n28cdmmziaz5qaqa3ii3wm1ajjaf"; + version = "0.0.47"; + sha256 = "1qjlw42xyynbwp72s2xx9kavvbqj13y603fpwf27hvab2ypyyg8w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -150948,10 +151960,8 @@ self: { }: mkDerivation { pname = "prettyprinter-ansi-terminal"; - version = "1.0.1"; - sha256 = "03vdnkvrwmny0y8p7bkw43l8x6a3b39nw20ii87pys4jr7aadd7c"; - revision = "1"; - editedCabalFile = "1yc598kz1p4w0whhl7h7b62fx4lcsyph908anscq299w89xp40lh"; + version = "1.1"; + sha256 = "0z2vi26qhrw5z36yy449x5yynv3wyx1c02z4m2lf7la7r9jwwfbj"; libraryHaskellDepends = [ ansi-terminal base prettyprinter text ]; testHaskellDepends = [ base doctest ]; homepage = "http://github.com/quchen/prettyprinter"; @@ -150979,15 +151989,13 @@ self: { }: mkDerivation { pname = "prettyprinter-compat-ansi-wl-pprint"; - version = "1"; - sha256 = "1w84df99n1fwzwyflfjh6bsbrv03yzdsq8b42ziqcb3m1mq5hf1v"; - revision = "2"; - editedCabalFile = "1bcj2y4b4pj028lllljpj52m622h6rv0qngfyq2xc8jzn7pls5ca"; + version = "1.0.1"; + sha256 = "0gzpjddnxl4z8pvb0lyal13jbr94dk900k8g4qwcq9fs26vnnb81"; libraryHaskellDepends = [ base prettyprinter prettyprinter-ansi-terminal text ]; homepage = "http://github.com/quchen/prettyprinter"; - description = "Prettyprinter compatibility module for previous users of the ansi-wl-pprint package"; + description = "Drop-in compatibility package to migrate from »ansi-wl-pprint« to »prettyprinter«"; license = stdenv.lib.licenses.bsd2; }) {}; @@ -151014,14 +152022,15 @@ self: { libraryHaskellDepends = [ base prettyprinter vty ]; description = "prettyprinter backend for vty"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prim-array" = callPackage ({ mkDerivation, base, ghc-prim, primitive }: mkDerivation { pname = "prim-array"; - version = "0.1"; - sha256 = "0k4askk73r6pm160lqgrdz787qacd7sv7j04awdwrxbr0mwqn5gk"; + version = "0.2"; + sha256 = "0h9n1v3xqvxf8pmycmj5qd4gw8zcxgy4l1fjxff9sfzhpsnvcmp9"; libraryHaskellDepends = [ base ghc-prim primitive ]; homepage = "https://github.com/andrewthad/prim-array#readme"; description = "Primitive byte array with type variable"; @@ -151295,8 +152304,8 @@ self: { }: mkDerivation { pname = "privileged-concurrency"; - version = "0.6"; - sha256 = "0ns24fvxjdjlhqb0f9fh73r6q8al9ixi197nc30g5b2b7csnixv7"; + version = "0.6.1"; + sha256 = "0dky434kdnb84a4wxlx3jcg1f7c7g4xh0llfiqv48wpk7lwkaic2"; libraryHaskellDepends = [ base contravariant lifted-base monad-control stm transformers-base ]; @@ -151426,24 +152435,6 @@ self: { }) {}; "process-extras" = callPackage - ({ mkDerivation, base, bytestring, data-default, deepseq - , generic-deriving, HUnit, ListLike, mtl, process, text - }: - mkDerivation { - pname = "process-extras"; - version = "0.7.1"; - sha256 = "03ykpjk2li6392vwqi1vi4pwvqbzyady98xbhq7vjq2rh8l64pyj"; - libraryHaskellDepends = [ - base bytestring data-default deepseq generic-deriving ListLike mtl - process text - ]; - testHaskellDepends = [ base HUnit ]; - homepage = "https://github.com/seereason/process-extras"; - description = "Process extras"; - license = stdenv.lib.licenses.mit; - }) {}; - - "process-extras_0_7_2" = callPackage ({ mkDerivation, base, bytestring, data-default, deepseq , generic-deriving, HUnit, ListLike, mtl, process, text }: @@ -151459,7 +152450,6 @@ self: { homepage = "https://github.com/seereason/process-extras"; description = "Process extras"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "process-iterio" = callPackage @@ -151932,6 +152922,74 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) proj;}; + "project-m36" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary + , bytestring, Cabal, cassava, conduit, containers, criterion + , cryptohash-sha256, data-interval, deepseq, deepseq-generics + , directory, distributed-process, distributed-process-async + , distributed-process-client-server, distributed-process-extras + , either, extended-reals, filepath, ghc, ghc-boot, ghc-paths, Glob + , gnuplot, hashable, hashable-time, haskeline, http-api-data, HUnit + , list-t, megaparsec, monad-parallel, MonadRandom, mtl, network + , network-transport, network-transport-tcp, old-locale + , optparse-applicative, parallel, path-pieces, random + , random-shuffle, resourcet, semigroups, stm, stm-containers + , template-haskell, temporary, text, time, transformers, unix + , unordered-containers, uuid, uuid-aeson, vector + , vector-binary-instances, websockets + }: + mkDerivation { + pname = "project-m36"; + version = "0.1"; + sha256 = "0g816q602vjkk0ix8wxwlc0w7fx9xaid9qiib9811y7ad4v9zkih"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring binary bytestring cassava + conduit containers cryptohash-sha256 data-interval deepseq + deepseq-generics directory distributed-process + distributed-process-async distributed-process-client-server + distributed-process-extras either extended-reals filepath ghc + ghc-boot ghc-paths Glob gnuplot hashable hashable-time haskeline + http-api-data list-t monad-parallel MonadRandom mtl + network-transport network-transport-tcp old-locale + optparse-applicative parallel path-pieces random-shuffle resourcet + stm stm-containers temporary text time transformers unix + unordered-containers uuid vector vector-binary-instances + ]; + executableHaskellDepends = [ + aeson attoparsec base base64-bytestring binary bytestring Cabal + cassava conduit containers data-interval deepseq deepseq-generics + directory either filepath ghc ghc-paths gnuplot hashable + hashable-time haskeline http-api-data HUnit list-t megaparsec + MonadRandom mtl network-transport-tcp optparse-applicative parallel + path-pieces random semigroups stm stm-containers template-haskell + temporary text time transformers unordered-containers uuid + uuid-aeson vector vector-binary-instances websockets + ]; + testHaskellDepends = [ + aeson attoparsec base base64-bytestring binary bytestring Cabal + cassava conduit containers data-interval deepseq deepseq-generics + directory either filepath gnuplot hashable hashable-time haskeline + http-api-data HUnit list-t megaparsec MonadRandom mtl network + network-transport network-transport-tcp optparse-applicative + parallel path-pieces random semigroups stm stm-containers + template-haskell temporary text time transformers + unordered-containers uuid uuid-aeson vector vector-binary-instances + websockets + ]; + benchmarkHaskellDepends = [ + attoparsec base base64-bytestring binary bytestring Cabal cassava + containers criterion data-interval deepseq deepseq-generics + directory filepath gnuplot hashable hashable-time haskeline HUnit + megaparsec mtl parallel stm stm-containers temporary text time + unordered-containers uuid vector vector-binary-instances + ]; + homepage = "https://github.com/agentm/project-m36"; + description = "Relational Algebra Engine"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "project-template" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, conduit , conduit-extra, containers, directory, filepath, hspec, mtl @@ -152094,6 +153152,32 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "prometheus-client_0_2_0" = callPackage + ({ mkDerivation, atomic-primops, base, bytestring, clock + , containers, criterion, doctest, hspec, mtl, QuickCheck, random + , random-shuffle, stm, transformers, utf8-string + }: + mkDerivation { + pname = "prometheus-client"; + version = "0.2.0"; + sha256 = "15iqacx6gygd5xp17i1c7sd0mvndqfxqvjjs17hndxiqjgxvlr1z"; + libraryHaskellDepends = [ + atomic-primops base bytestring clock containers mtl stm + transformers utf8-string + ]; + testHaskellDepends = [ + atomic-primops base bytestring clock containers doctest hspec mtl + QuickCheck random-shuffle stm transformers utf8-string + ]; + benchmarkHaskellDepends = [ + base bytestring criterion random utf8-string + ]; + homepage = "https://github.com/fimad/prometheus-haskell"; + description = "Haskell client library for http://prometheus.io."; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "prometheus-metrics-ghc" = callPackage ({ mkDerivation, base, doctest, prometheus-client, utf8-string }: mkDerivation { @@ -152107,6 +153191,20 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "prometheus-metrics-ghc_0_2_0" = callPackage + ({ mkDerivation, base, doctest, prometheus-client, utf8-string }: + mkDerivation { + pname = "prometheus-metrics-ghc"; + version = "0.2.0"; + sha256 = "0j3lk2khnqbf9l3lri4n7fn0riinwakp911l05h2qywjcj0v5vm0"; + libraryHaskellDepends = [ base prometheus-client utf8-string ]; + testHaskellDepends = [ base doctest prometheus-client ]; + homepage = "https://github.com/fimad/prometheus-haskell"; + description = "Metrics exposing GHC runtime information for use with prometheus-client"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "promise" = callPackage ({ mkDerivation, async, base }: mkDerivation { @@ -152172,8 +153270,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "4.0.6"; - sha256 = "0w8n7l4ws3awccqf6g12bk09l10s4scmdvr5vkxhhpm5cmawd0fq"; + version = "4.4.0"; + sha256 = "1rh8k1g8wpp898qh3g2k19v7qd95lv7l8vnb52dns350pgyswssx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -152310,8 +153408,8 @@ self: { }: mkDerivation { pname = "proto-lens-arbitrary"; - version = "0.1.0.2"; - sha256 = "0pqscamjyfkga8fixv1wnyygx2c1vcqa855gi526dvjp7rljj5pz"; + version = "0.1.0.3"; + sha256 = "029liw55v5k9f5bsfpsadd85sgrriwvrhfk242d2wfp3fypafd39"; libraryHaskellDepends = [ base bytestring containers lens-family proto-lens QuickCheck text ]; @@ -152362,21 +153460,6 @@ self: { }) {}; "proto-lens-optparse" = callPackage - ({ mkDerivation, base, optparse-applicative, proto-lens, text }: - mkDerivation { - pname = "proto-lens-optparse"; - version = "0.1.0.2"; - sha256 = "1mi4q21i7zzlk6bs8p6ir07bfw2n1kavamxb90v90vdjy42bdbyn"; - libraryHaskellDepends = [ - base optparse-applicative proto-lens text - ]; - homepage = "https://github.com/google/proto-lens"; - description = "Adapting proto-lens to optparse-applicative ReadMs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "proto-lens-optparse_0_1_0_3" = callPackage ({ mkDerivation, base, optparse-applicative, proto-lens, text }: mkDerivation { pname = "proto-lens-optparse"; @@ -152402,6 +153485,7 @@ self: { homepage = "https://github.com/google/proto-lens"; description = "Basic protocol buffer message types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "proto-lens-protoc" = callPackage @@ -152509,8 +153593,8 @@ self: { }: mkDerivation { pname = "protocol-buffers"; - version = "2.4.0"; - sha256 = "0sgybwg7js8dmzibr6cxn0p1n0m8kc9a3xqdbz7l8d4ili4q4khw"; + version = "2.4.2"; + sha256 = "13z1sh8z5b3nlscqnzw137k3979d4war3yzhxclljqq2z88rm1bv"; libraryHaskellDepends = [ array base binary bytestring containers directory filepath mtl parsec syb utf8-string @@ -152524,8 +153608,8 @@ self: { ({ mkDerivation, base, bytestring, containers, protocol-buffers }: mkDerivation { pname = "protocol-buffers-descriptor"; - version = "2.4.0"; - sha256 = "1x1xnb3ldgic9y6hskr4h7xdd4lxql2r5fcmsw366b0w631vr57q"; + version = "2.4.2"; + sha256 = "0r7n1pnkabzksik9zrqif490g135hcjgvc40zm5c0b3dpq64r4lb"; libraryHaskellDepends = [ base bytestring containers protocol-buffers ]; @@ -152805,8 +153889,8 @@ self: { }: mkDerivation { pname = "psqueues"; - version = "0.2.2.3"; - sha256 = "1dd6xv1wjxj1xinx155b14hijw8fafrg4096srzdzj7xyqq7qxbd"; + version = "0.2.3.0"; + sha256 = "19s36xkbpa8466y56bgcmrqxz7aq1fysliyvw79k2a76bpg9bv95"; libraryHaskellDepends = [ base deepseq ghc-prim hashable ]; testHaskellDepends = [ array base deepseq ghc-prim hashable HUnit QuickCheck tagged @@ -153326,8 +154410,8 @@ self: { }: mkDerivation { pname = "purescript"; - version = "0.11.5"; - sha256 = "1yqfgmxb8210dzffg4img8f2nzfvys3g583j2948lj03y9q170y1"; + version = "0.11.6"; + sha256 = "0cl4lyx9b1fk4sf94nj6zjj1n5s7wr56ygrxyi0ac7fbav8r42w0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -154022,8 +155106,8 @@ self: { }: mkDerivation { pname = "qm-interpolated-string"; - version = "0.1.0.0"; - sha256 = "1ycys6ak809vyjgzjp2ra1ndnsficzdjs7kq7xaks0k50sscf7dd"; + version = "0.1.1.0"; + sha256 = "1fidkdn4smbv4ybc881168401gfq2l19qfb7w0bvki93jqqajhs1"; libraryHaskellDepends = [ base bytestring haskell-src-meta template-haskell text ]; @@ -154256,6 +155340,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "quantification" = callPackage + ({ mkDerivation, aeson, base, hashable, path-pieces, text }: + mkDerivation { + pname = "quantification"; + version = "0.1.1"; + sha256 = "092qnimc99x1n1g0mfpgsr85fbyd33isjsd9cc8rgb1n44ryj14m"; + libraryHaskellDepends = [ aeson base hashable path-pieces text ]; + homepage = "https://github.com/andrewthad/quantification#readme"; + description = "Data types and typeclasses to deal with universally and existentially quantified types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "quantities" = callPackage ({ mkDerivation, base, containers, doctest, Glob, hlint, hspec, mtl , parsec, process, regex-compat @@ -154733,8 +155829,8 @@ self: { ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "quickcheck-simple"; - version = "0.1.0.1"; - sha256 = "166mavvz2rsi0clxhv9vkqdiyiird0xj8mdlfbav664qn5mn2yx5"; + version = "0.1.0.2"; + sha256 = "0p1ky7sj42crn9sas9d2cs5cwz03wsk20p55x2wgmlj5rmpr5mla"; libraryHaskellDepends = [ base QuickCheck ]; description = "Test properties and default-mains for QuickCheck"; license = stdenv.lib.licenses.bsd3; @@ -154746,8 +155842,8 @@ self: { }: mkDerivation { pname = "quickcheck-special"; - version = "0.1.0.4"; - sha256 = "1dv7pan8sdq8dfc17scyskr5f96857il85n6nh9alnjrnqj3lgws"; + version = "0.1.0.5"; + sha256 = "189gadjm06zm3jilr5dcqbmfgq8d6j91nsvnzwwp9kdn3j9m711p"; libraryHaskellDepends = [ base bytestring ieee754 QuickCheck scientific text ]; @@ -154758,18 +155854,18 @@ self: { }) {}; "quickcheck-state-machine" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, constraints, containers - , hspec, mtl, parallel-io, QuickCheck, random, singletons, stm + ({ mkDerivation, ansi-wl-pprint, base, containers, mtl, parallel-io + , QuickCheck, random, stm }: mkDerivation { pname = "quickcheck-state-machine"; - version = "0.0.0"; - sha256 = "0022zqwncc263dcvcck06faqxqyqq2vj57zbnqk63hjpikghkk9d"; + version = "0.1.0"; + sha256 = "1jczx6c1s5ir7r7r90kf5fhac4sydayr4lm6zsvjs4ykqnnparh6"; libraryHaskellDepends = [ - ansi-wl-pprint base constraints containers mtl parallel-io - QuickCheck random singletons stm + ansi-wl-pprint base containers mtl parallel-io QuickCheck random + stm ]; - testHaskellDepends = [ base hspec mtl QuickCheck random ]; + testHaskellDepends = [ base ]; homepage = "https://github.com/advancedtelematic/quickcheck-state-machine#readme"; description = "Test monadic programs using state machine based models"; license = stdenv.lib.licenses.bsd3; @@ -155974,6 +157070,8 @@ self: { pname = "range-set-list"; version = "0.1.2.0"; sha256 = "0rxb5dq228xypnilqvjyn97knlzfc7fl771w4qgziwfw8zs9qx1v"; + revision = "1"; + editedCabalFile = "061xbyarcjr4bcb08a5xyzqiyvagn9729p6hk5kzayzlkscx16j2"; libraryHaskellDepends = [ base containers deepseq hashable semigroups ]; @@ -156070,6 +157168,7 @@ self: { homepage = "https://github.com/blamario/grampa/tree/master/rank2classes"; description = "a mirror image of some standard type classes, with methods of rank 2 types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rapid" = callPackage @@ -156465,15 +157564,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "rattletrap_2_2_4" = callPackage + "rattletrap_2_5_0" = callPackage ({ mkDerivation, aeson, aeson-casing, base, bimap, binary , binary-bits, bytestring, containers, data-binary-ieee754 , filepath, hspec, template-haskell, temporary, text, vector }: mkDerivation { pname = "rattletrap"; - version = "2.2.4"; - sha256 = "19x353fks41555k7zax7i9h68hy8q420x071srn0q4bmsbzcpz1i"; + version = "2.5.0"; + sha256 = "14ksxmwy53xpa9k5swz8254x3kgswkb91r7fnkx85pph5x09qwxd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -157670,15 +158769,13 @@ self: { }: mkDerivation { pname = "recursion-schemes"; - version = "5.0.1"; - sha256 = "00zz8gxf3ha1zq6m2hzcia35cry5wgvs29h60s2jvp3yzmr7radp"; - revision = "1"; - editedCabalFile = "0f5fhr93jgnm1jhl6kd3fbxxmkyfa6h7asgwk5klliy0m2j3y51n"; + version = "5.0.2"; + sha256 = "1lmayskniljw3lxk64apvshn9h90gwfpflgxilfivsqhrjxnaj9s"; libraryHaskellDepends = [ base base-orphans bifunctors comonad free semigroups template-haskell transformers transformers-compat ]; - testHaskellDepends = [ base HUnit ]; + testHaskellDepends = [ base HUnit template-haskell transformers ]; homepage = "http://github.com/ekmett/recursion-schemes/"; description = "Generalized bananas, lenses and barbed wire"; license = stdenv.lib.licenses.bsd3; @@ -158563,6 +159660,8 @@ self: { pname = "regex-applicative-text"; version = "0.1.0.1"; sha256 = "1ng2qhk4mvpzl8fx91ig7ldv09v9aqdsvn6yl9yjapc6h0ghb4xh"; + revision = "1"; + editedCabalFile = "1w8aqqq6j1lhwpi2d0qj9h32cia3nr9l43a0mspqawb1nsmpjyic"; libraryHaskellDepends = [ base regex-applicative text ]; homepage = "https://github.com/phadej/regex-applicative-text#readme"; description = "regex-applicative on text"; @@ -159455,7 +160554,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "relational-query_0_9_1_0" = callPackage + "relational-query_0_9_2_1" = callPackage ({ mkDerivation, array, base, bytestring, containers, dlist , names-th, persistable-record, quickcheck-simple, sql-words , template-haskell, text, th-reify-compat, time, time-locale-compat @@ -159463,8 +160562,8 @@ self: { }: mkDerivation { pname = "relational-query"; - version = "0.9.1.0"; - sha256 = "1nv2kl2nzp3xawyhiwlh35a2z1x1hwa5fcqha78d2hnk2rd8036c"; + version = "0.9.2.1"; + sha256 = "0sdmvbzfxbs7hk71zdn8bhbzdcw10h9apm5gn47cmiqkyiv5si5k"; libraryHaskellDepends = [ array base bytestring containers dlist names-th persistable-record sql-words template-haskell text th-reify-compat time @@ -159499,7 +160598,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "relational-query-HDBC_0_6_2_0" = callPackage + "relational-query-HDBC_0_6_2_1" = callPackage ({ mkDerivation, base, containers, convertible, dlist, HDBC , HDBC-session, names-th, persistable-record, relational-query , relational-schemas, template-haskell, th-data-compat @@ -159507,8 +160606,8 @@ self: { }: mkDerivation { pname = "relational-query-HDBC"; - version = "0.6.2.0"; - sha256 = "0w9qk25idc9cbis27948jw9hcyib63q4byp8dd8xrqcx4jir5xr3"; + version = "0.6.2.1"; + sha256 = "1slx0zh9487q77spajwibnxpc5xwcdqg6i98gzxfd1k3jfh2ylw2"; libraryHaskellDepends = [ base containers convertible dlist HDBC HDBC-session names-th persistable-record relational-query relational-schemas @@ -159596,14 +160695,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "relational-schemas_0_1_3_3" = callPackage + "relational-schemas_0_1_4_0" = callPackage ({ mkDerivation, base, bytestring, containers, relational-query , template-haskell, time }: mkDerivation { pname = "relational-schemas"; - version = "0.1.3.3"; - sha256 = "1hqbx82cz4a2kmirlxild4n2rxw1xhj840ibyhzs5ppl325ibbrs"; + version = "0.1.4.0"; + sha256 = "1z0v175gx6yxmfjl55dyhsmpmyvrgwzynjy9yhi348kvij7iyivq"; libraryHaskellDepends = [ base bytestring containers relational-query template-haskell time ]; @@ -159943,6 +161042,8 @@ self: { pname = "repa"; version = "3.4.1.2"; sha256 = "0myw05dicby7dhkmjvv9wphfnnx2jj3dxaa50357n76zysxhpy2p"; + revision = "1"; + editedCabalFile = "0pagab03fw7xp1vvgrc87g6g6zdr60plqhjjxk3fwwm1gs0jj61k"; libraryHaskellDepends = [ base bytestring ghc-prim QuickCheck template-haskell vector ]; @@ -160458,6 +161559,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "req_0_3_0" = callPackage + ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder + , bytestring, case-insensitive, connection, data-default-class + , hspec, hspec-core, http-api-data, http-client, http-client-tls + , http-types, mtl, QuickCheck, retry, text, time, transformers + , unordered-containers + }: + mkDerivation { + pname = "req"; + version = "0.3.0"; + sha256 = "1wmj2grzkdwhi2cksp4xzxlrb99y9wysjxzvbbfy75dz2pkkwz3m"; + libraryHaskellDepends = [ + aeson authenticate-oauth base blaze-builder bytestring + case-insensitive connection data-default-class http-api-data + http-client http-client-tls http-types mtl retry text time + transformers + ]; + testHaskellDepends = [ + aeson base blaze-builder bytestring case-insensitive + data-default-class hspec hspec-core http-client http-types mtl + QuickCheck retry text time unordered-containers + ]; + homepage = "https://github.com/mrkkrp/req"; + description = "Easy-to-use, type-safe, expandable, high-level HTTP library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "req-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec , http-client, req, resourcet, temporary, transformers, weigh @@ -160484,6 +161613,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "req-conduit_0_2_0" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec + , http-client, req, resourcet, temporary, transformers, weigh + }: + mkDerivation { + pname = "req-conduit"; + version = "0.2.0"; + sha256 = "0yf5lmmf3fv4lfxyrk0kpzk8p0pzhfany05d7ny8l11mr99grpwg"; + libraryHaskellDepends = [ + base bytestring conduit http-client req resourcet transformers + ]; + testHaskellDepends = [ + base bytestring conduit conduit-extra hspec req resourcet temporary + transformers + ]; + benchmarkHaskellDepends = [ + base bytestring conduit conduit-extra req resourcet temporary weigh + ]; + homepage = "https://github.com/mrkkrp/req-conduit"; + description = "Conduit helpers for the req HTTP client library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "reqcatcher" = callPackage ({ mkDerivation, base, http-client, http-types, HUnit, lens , network, tasty, tasty-hunit, text, wai, warp, wreq @@ -161493,6 +162646,7 @@ self: { homepage = "https://github.com/iconnect/ridley#README"; description = "Quick metrics to grow your app strong"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ridley-extras" = callPackage @@ -161511,6 +162665,7 @@ self: { homepage = "https://github.com/iconnect/ridley/ridley-extras#readme"; description = "Handy metrics that don't belong to ridley"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "riemann" = callPackage @@ -162420,6 +163575,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rot13_0_2_0_1" = callPackage + ({ mkDerivation, base, bytestring, hspec, QuickCheck, text }: + mkDerivation { + pname = "rot13"; + version = "0.2.0.1"; + sha256 = "1p6lrjgigzbjigsyfsmx3kxrzm1aws3i708yl4xyh73arhcd89p0"; + libraryHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ base bytestring hspec QuickCheck text ]; + homepage = "https://github.com/kvanberendonck/codec-rot13"; + description = "Fast ROT13 cipher for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rotating-log" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, old-locale , time, time-locale-compat @@ -162835,8 +164004,8 @@ self: { }: mkDerivation { pname = "rtcm"; - version = "0.1.11"; - sha256 = "0nngz9b2w2ppssg4361jf445grff4x1k7p2ark2c8bbg4afayn6h"; + version = "0.1.12"; + sha256 = "1pscz3a7n8a3337zh4xh44gf00hd86d4dnh059sj60gx6dac7zxh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -163268,19 +164437,6 @@ self: { }) {}; "safe" = callPackage - ({ mkDerivation, base, deepseq, QuickCheck }: - mkDerivation { - pname = "safe"; - version = "0.3.14"; - sha256 = "13y8zlvifwwr5ybizqw0d1lzr763fnzlqsm8m5a1whpn933hqn6v"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base deepseq QuickCheck ]; - homepage = "https://github.com/ndmitchell/safe#readme"; - description = "Library of safe (exception free) functions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "safe_0_3_15" = callPackage ({ mkDerivation, base, deepseq, QuickCheck }: mkDerivation { pname = "safe"; @@ -163291,7 +164447,6 @@ self: { homepage = "https://github.com/ndmitchell/safe#readme"; description = "Library of safe (exception free) functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "safe-access" = callPackage @@ -163313,10 +164468,8 @@ self: { }: mkDerivation { pname = "safe-exceptions"; - version = "0.1.5.0"; - sha256 = "068srl44q66iv939fhk3mxalmxdn7348f6xh46pwg5mjj4vfrvvh"; - revision = "1"; - editedCabalFile = "0m0m2bj8xmiqj1qxkl00p0fndn6aw54a4yf2kx2qhijgzc4f1hwl"; + version = "0.1.6.0"; + sha256 = "074dy2f9fbhnh59clpz8c1ljplm1wwqjj7r3i4nv0rcl0khprm3i"; libraryHaskellDepends = [ base deepseq exceptions transformers ]; testHaskellDepends = [ base hspec void ]; homepage = "https://github.com/fpco/safe-exceptions#readme"; @@ -163332,8 +164485,8 @@ self: { pname = "safe-exceptions-checked"; version = "0.1.0"; sha256 = "0gyaq2pf87dqn0l6n3mi0qamf99y3zj5xxh513c0iqwdh8mma1yq"; - revision = "1"; - editedCabalFile = "1nnnljp0l70zafgfl09kskf965p993plmk52pv2wqhjj94xdnwzb"; + revision = "2"; + editedCabalFile = "18fwk5yr8zm4y215vbsl149jkn9pxyv3m8mgq3979pvs1c4kqivz"; libraryHaskellDepends = [ base deepseq safe-exceptions transformers ]; @@ -163508,6 +164661,23 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "safecopy-migrate" = callPackage + ({ mkDerivation, base, base-prelude, cereal, containers, extra + , haskell-src-meta, microlens, safecopy, template-haskell, uniplate + }: + mkDerivation { + pname = "safecopy-migrate"; + version = "0.1.0.0"; + sha256 = "1bs41w8zkgsidns68xv4finsnwici6wrfc6xiy9vk0la96i4wcv5"; + libraryHaskellDepends = [ + base base-prelude cereal containers extra haskell-src-meta + microlens safecopy template-haskell uniplate + ]; + homepage = "http://github.com/aelve/safecopy-migrate"; + description = "Making SafeCopy migrations easier"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "safecopy-store" = callPackage ({ mkDerivation, array, base, bytestring, containers, lens , lens-action, old-time, QuickCheck, quickcheck-instances, store @@ -164209,15 +165379,15 @@ self: { "sbp" = callPackage ({ mkDerivation, aeson, array, base, base64-bytestring , basic-prelude, binary, binary-conduit, bytestring, conduit - , conduit-combinators, conduit-extra, criterion - , data-binary-ieee754, lens, monad-loops, QuickCheck, resourcet - , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text - , unordered-containers, yaml + , conduit-combinators, conduit-extra, data-binary-ieee754, lens + , monad-loops, QuickCheck, resourcet, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, text, unordered-containers + , yaml }: mkDerivation { pname = "sbp"; - version = "2.2.3"; - sha256 = "1hqq3qz6xbbc2di85larf3ixj2gxsn6vhcxdhzxfn72lxdr9xgir"; + version = "2.2.8"; + sha256 = "1rldqn584zmlxa42fqqnr2idw82rmma9cfad7jl5ih5mb3hyii5g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -164233,10 +165403,6 @@ self: { aeson base base64-bytestring basic-prelude bytestring QuickCheck tasty tasty-hunit tasty-quickcheck ]; - benchmarkHaskellDepends = [ - aeson base base64-bytestring basic-prelude binary bytestring - criterion - ]; homepage = "https://github.com/swift-nav/libsbp"; description = "SwiftNav's SBP Library"; license = stdenv.lib.licenses.lgpl3; @@ -164856,16 +166022,16 @@ self: { "scientific" = callPackage ({ mkDerivation, base, binary, bytestring, containers, criterion , deepseq, ghc-prim, hashable, integer-gmp, integer-logarithms - , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit - , tasty-quickcheck, tasty-smallcheck, text, vector + , primitive, QuickCheck, smallcheck, tasty, tasty-ant-xml + , tasty-hunit, tasty-quickcheck, tasty-smallcheck, text }: mkDerivation { pname = "scientific"; - version = "0.3.4.15"; - sha256 = "1gsmpn3563k90nrai0jdjfvkxjjaxs7bxxsfbdpmw4xvbp2lmp9n"; + version = "0.3.5.1"; + sha256 = "19hvcqrrm375inqmci516xk32vir7dgw7ini8ij5rkdnrf1fd9jv"; libraryHaskellDepends = [ base binary bytestring containers deepseq ghc-prim hashable - integer-gmp integer-logarithms text vector + integer-gmp integer-logarithms primitive text ]; testHaskellDepends = [ base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml @@ -166499,17 +167665,17 @@ self: { "sensu-run" = callPackage ({ mkDerivation, aeson, base, bytestring, filepath, http-client , http-types, lens, network, optparse-applicative, process - , temporary, text, time, vector, wreq + , temporary, text, time, unix, vector, wreq }: mkDerivation { pname = "sensu-run"; - version = "0.1.1.3"; - sha256 = "1zhhnddp81p42z243i10kma5jic283gqlg190lfifsg8kdg3yms1"; + version = "0.2.0"; + sha256 = "066pi6smcvffs7gsl1l45r2dshkw570p6h4s4nwsp5skf6k3568r"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson base bytestring filepath http-client http-types lens network - optparse-applicative process temporary text time vector wreq + optparse-applicative process temporary text time unix vector wreq ]; homepage = "https://github.com/maoe/sensu-run#readme"; description = "A tool to send command execution results to Sensu"; @@ -167006,6 +168172,8 @@ self: { pname = "servant"; version = "0.11"; sha256 = "00vbhijdxb00n8ha068zdwvqlfqv1iradkkdchzzvnhg2jpzgcy5"; + revision = "1"; + editedCabalFile = "1az9id2dl7psc8lknf7y9cvzkivcjzw7g27yyp40flb6bfvmaqp3"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec base base-compat bytestring case-insensitive @@ -167030,10 +168198,8 @@ self: { }: mkDerivation { pname = "servant-JuicyPixels"; - version = "0.3.0.2"; - sha256 = "1g9y1fqyd7v1cmwjid5i83qji2a4c514hmpz7ypz6zvd4ppj5v9l"; - revision = "1"; - editedCabalFile = "1sj4qyaf75nf1mciddga30b8ddrwv94184cz751n9abxidl18r49"; + version = "0.3.0.3"; + sha256 = "0kb53kla03clkv0686awjm6nc57r5yw0zmfs02036iplq6cc1yb0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167140,7 +168306,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-auth-cookie_0_5_0_4" = callPackage + "servant-auth-cookie_0_5_0_5" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring , cereal, cookie, criterion, cryptonite, data-default, deepseq , exceptions, hspec, http-api-data, http-types, memory, mtl @@ -167149,8 +168315,8 @@ self: { }: mkDerivation { pname = "servant-auth-cookie"; - version = "0.5.0.4"; - sha256 = "0h9m9mzq2b5k5l3zp42cs45k5wi42bqvsp3lp2p1z1fb9as4cw2v"; + version = "0.5.0.5"; + sha256 = "1ml7f452ikfwzymvajrs0fmlww7pbq5prphsv65r12n4pzx9ynva"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167295,8 +168461,8 @@ self: { }: mkDerivation { pname = "servant-auth-token"; - version = "0.4.7.0"; - sha256 = "0237kjsvgi6wfn8qisbf93w3irp73i00728zd4v1z3s5a435kgff"; + version = "0.4.7.1"; + sha256 = "0mswxxq2b6n1f3laz15y87nxnsw5l1bmpl9kfdif4spd286wgaa8"; libraryHaskellDepends = [ aeson-injector base bytestring containers mtl pwstore-fast servant-auth-token-api servant-server text time transformers uuid @@ -167316,8 +168482,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-acid"; - version = "0.4.1.0"; - sha256 = "0m1kpjyl9s6xxmmg6sxq2ipg2ylw0ccvwbqzjg0lx26h9h44wzai"; + version = "0.4.1.1"; + sha256 = "01y3dis2v984a7g4hfl28ygac6jp6dcr5kzp8b45c4lywsi6pd7a"; libraryHaskellDepends = [ acid-state aeson-injector base bytestring containers ghc-prim monad-control mtl safe safecopy servant-auth-token @@ -167336,8 +168502,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-api"; - version = "0.4.2.1"; - sha256 = "06sn1k17acznmldknlqhfdvlb7cs7wiihsjcfk5xs9wzc6ssrvqf"; + version = "0.4.2.2"; + sha256 = "0dnaqhri1hg1c3gmlpnpyk21q4cq9j513fnd3g1m9k7mkc6h6bgv"; libraryHaskellDepends = [ aeson aeson-injector base lens raw-strings-qq servant servant-docs servant-swagger swagger2 text @@ -167357,8 +168523,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-leveldb"; - version = "0.4.2.0"; - sha256 = "09pnqdm6n3l5nivcrlczjp4sax0l1cg3l42hxwkw0s0prwvq1vi8"; + version = "0.4.2.1"; + sha256 = "0i7h05jsc0r644prgifbvj7xrjpr7qsmwhqcc93p33f1wznn9h5n"; libraryHaskellDepends = [ aeson-injector base bytestring concurrent-extra containers exceptions lens leveldb-haskell monad-control mtl resourcet safe @@ -167380,8 +168546,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-persistent"; - version = "0.5.1.0"; - sha256 = "0kvhk4wd8qdiaqjgs3k8s8jlxhph9jddpgq8caf7yldw6wz2kqi2"; + version = "0.5.1.1"; + sha256 = "09np7cilm1ij7ra06zyx7wqcm8ynras0q6fsfkkklpr5w632ifh1"; libraryHaskellDepends = [ aeson-injector base bytestring containers monad-control mtl persistent persistent-template servant-auth-token @@ -167403,8 +168569,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-rocksdb"; - version = "0.4.2.0"; - sha256 = "0268i74lf0ib7kc6nc8nqyfdn761vkdgjl1xyjcz8c8vlg0624vb"; + version = "0.4.2.1"; + sha256 = "0zl5xr12pnz99798pz1rn6q2msir57df97h6xayj3167zmmdv2fy"; libraryHaskellDepends = [ aeson-injector base bytestring concurrent-extra containers exceptions lens monad-control mtl resourcet rocksdb safe @@ -167531,6 +168697,8 @@ self: { pname = "servant-client"; version = "0.11"; sha256 = "1yiar76gf1zg8jaymz0xq751xs51fp0ryra4x4hwg71s32l2nvga"; + revision = "1"; + editedCabalFile = "0ymiqsn6451znpn524w1wn129plnqbplbvwxwjpp1drz3ab6xk6b"; libraryHaskellDepends = [ aeson attoparsec base base-compat base64-bytestring bytestring exceptions generics-sop http-api-data http-client http-client-tls @@ -167786,6 +168954,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-generic" = callPackage + ({ mkDerivation, base, servant, servant-server, text, warp }: + mkDerivation { + pname = "servant-generic"; + version = "0.1.0.0"; + sha256 = "03gh879j9qdm666lvl2j2xiqyrgclfg2k4f1l4lslby5y81r4lv6"; + libraryHaskellDepends = [ base servant servant-server ]; + testHaskellDepends = [ base servant servant-server text warp ]; + description = "Specify Servant APIs with records"; + license = stdenv.lib.licenses.mit; + }) {}; + "servant-github" = callPackage ({ mkDerivation, aeson, base, hspec, http-api-data, http-client , http-link-header, QuickCheck, servant, servant-client, text @@ -168350,6 +169530,8 @@ self: { pname = "servant-server"; version = "0.11"; sha256 = "1c821ia2741v7nxbv651hcj21dmcqnqf4ix198is5b63sj4ff3ib"; + revision = "1"; + editedCabalFile = "04s8kzc1jzarxg68nqgdckv0ajw846a1byqjksgzlqlmfqm0l32l"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -168492,7 +169674,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "servant-subscriber_0_6_0_0" = callPackage + "servant-subscriber_0_6_0_1" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, blaze-builder , bytestring, case-insensitive, containers, directory, filepath , http-types, lens, lifted-base, monad-control, monad-logger @@ -168502,10 +169684,8 @@ self: { }: mkDerivation { pname = "servant-subscriber"; - version = "0.6.0.0"; - sha256 = "0pa0zwb8qqs6y2fcs8acwljym9jmha273gb2v5nyhhfyimdl8x8q"; - revision = "1"; - editedCabalFile = "16r1ry5zd67mj5f2mi2sv9ls3vvc6y78ryijp8fcw1rif7mynf7h"; + version = "0.6.0.1"; + sha256 = "0fbqmh0lzcb0ixw09ldjddz21xcfy7knfwhh3hfzlgy08xmqb89x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -168547,7 +169727,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-swagger_1_1_3" = callPackage + "servant-swagger_1_1_3_1" = callPackage ({ mkDerivation, aeson, aeson-qq, base, bytestring, Cabal , cabal-doctest, directory, doctest, filepath, hspec, http-media , insert-ordered-containers, lens, QuickCheck, servant, swagger2 @@ -168555,8 +169735,8 @@ self: { }: mkDerivation { pname = "servant-swagger"; - version = "1.1.3"; - sha256 = "0hf3psdcbnj0mj73zdfhv0l4p432hxzj1i9m66al3kd3k7rz79pk"; + version = "1.1.3.1"; + sha256 = "0n5vvrxg1lllkm385g0jd2j5bsr21bcibwn5szdpn6r5yh2mvn78"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson base bytestring hspec http-media insert-ordered-containers @@ -168583,6 +169763,8 @@ self: { pname = "servant-swagger-ui"; version = "0.2.3.2.2.8"; sha256 = "0daqlhwy48098wp2hjsnam7d29fj6zqxmdckqfc8z0xfs07ppbg8"; + revision = "1"; + editedCabalFile = "0n2c7sn7ly5wwlvns1nfzig3a6hxs1qn6jih3amnp116avvjkk1k"; libraryHaskellDepends = [ base blaze-markup bytestring directory file-embed filepath http-media servant servant-blaze servant-server servant-swagger @@ -168606,8 +169788,8 @@ self: { pname = "servant-yaml"; version = "0.1.0.0"; sha256 = "011jxvr2i65bf0kmdn0sxkqgfz628a0sfhzphr1rqsmh8sqdj5y9"; - revision = "15"; - editedCabalFile = "0wbgbp0la0a8jg0g4xkx6cq47zgg5wpqhp1jkhbfr81x9xjmn3hk"; + revision = "16"; + editedCabalFile = "1szf52wk171jzm1vrs6lby7b7wijmfid3ar6wb960v9kq7g9k3iy"; libraryHaskellDepends = [ base bytestring http-media servant yaml ]; @@ -168654,6 +169836,7 @@ self: { homepage = "https://github.com/martyall/servant-zeppelin#readme"; description = "Client library for servant-zeppelin combinators"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-zeppelin-server" = callPackage @@ -168678,6 +169861,7 @@ self: { homepage = "https://github.com/martyall/servant-zeppelin#readme"; description = "Server library for servant-zeppelin combinators"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-zeppelin-swagger" = callPackage @@ -168700,6 +169884,7 @@ self: { homepage = "https://github.com/martyall/servant-zeppelin#readme"; description = "Swagger instances for servant-zeppelin combinators"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "server-generic" = callPackage @@ -168890,16 +170075,18 @@ self: { }) {}; "serviette" = callPackage - ({ mkDerivation, aeson, base, bytestring, generic-deriving, text }: + ({ mkDerivation, aeson, base, bytestring, generic-deriving, text + , text-show + }: mkDerivation { pname = "serviette"; - version = "0.1.0.4"; - sha256 = "1i5k12y547z3l2hb4h1zafvv9sbfh5x60hajjw78dnk2p4v1gzl4"; + version = "0.1.0.6"; + sha256 = "00bh2c73g11bglw5z96g9d1bqkcd783byd3jrf5amgay28xk2l5d"; libraryHaskellDepends = [ - aeson base bytestring generic-deriving text + aeson base bytestring generic-deriving text text-show ]; homepage = "https://github.com/v0d1ch/serviette#readme"; - description = "JSON to raw Sql string"; + description = "JSON to Sql"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -169080,18 +170267,6 @@ self: { }) {}; "setlocale" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "setlocale"; - version = "1.0.0.4"; - sha256 = "1sd73zgpijr9xjdj5p562cmlcxmx5iff5k8xh9b6rpcgrgnnlf9j"; - libraryHaskellDepends = [ base ]; - homepage = "https://bitbucket.org/IchUndNichtDu/haskell-setlocale"; - description = "Haskell bindings to setlocale"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "setlocale_1_0_0_5" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "setlocale"; @@ -169101,7 +170276,6 @@ self: { homepage = "https://bitbucket.org/IchUndNichtDu/haskell-setlocale"; description = "Haskell bindings to setlocale"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "setoid" = callPackage @@ -169690,8 +170864,8 @@ self: { ({ mkDerivation, base, basic-prelude, directory, shake }: mkDerivation { pname = "shakers"; - version = "0.0.18"; - sha256 = "1kl7sx4lf5pg6kdpvqfid0lx6l6fsxm1x9z4ccmlk7bq2x8djdgv"; + version = "0.0.27"; + sha256 = "0mlh6vzq7gdpyxm05y36fwjx0vjhbkk23qn2ajvc28l6d6d3p5ym"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base basic-prelude directory shake ]; @@ -170242,18 +171416,18 @@ self: { }: mkDerivation { pname = "shikensu"; - version = "0.3.3"; - sha256 = "15a2favvch2ph3sh0y1915vzqisl3bhkpnqp1kfmlyzpdw75h8yn"; + version = "0.3.7"; + sha256 = "1gi1l8rs093s2jxyqwpg7yjbyjc9km87hdxai2j832viwrd828b5"; libraryHaskellDepends = [ aeson base bytestring directory filepath flow Glob text unordered-containers ]; testHaskellDepends = [ - aeson base bytestring directory filepath flow tasty tasty-hunit - text unordered-containers + aeson base bytestring directory filepath flow Glob tasty + tasty-hunit text unordered-containers ]; - homepage = "https://github.com/icidasset/shikensu#README"; - description = "A small toolset for building static websites"; + homepage = "https://github.com/icidasset/shikensu#readme"; + description = "Run a sequence of functions on in-memory representations of files"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -170264,10 +171438,8 @@ self: { }: mkDerivation { pname = "shine"; - version = "0.1.0.0"; - sha256 = "1839whd680f1jm0789i6aqlkfbs8af6szzpfyhxzbxhdqjrz63mj"; - revision = "1"; - editedCabalFile = "06hzxlhb2ijhiq3vw74pbanjzfid0mk2j1cxvaz8w61yg2sq01b5"; + version = "0.2.0.2"; + sha256 = "0r0rl65rkcdg8c8lzli87nfad8bk4xypiqvb2qs68fhhzwx1zfg2"; libraryHaskellDepends = [ base ghcjs-dom ghcjs-prim keycode mtl time transformers ]; @@ -170284,8 +171456,8 @@ self: { pname = "shine-varying"; version = "0.1.0.0"; sha256 = "13mnzf8i9y7ifn73mvsrzv0dh01vc20cymqli29j384z1491sc40"; - revision = "1"; - editedCabalFile = "133i3r6kv109vq5hn1y6yq06p79hkfk4cd7qgb6caidgn422cm7v"; + revision = "3"; + editedCabalFile = "1icg7mcfw6zrdf884kh2g0ss2lki0zf0b3r0yqzmz4h2cwvxl910"; libraryHaskellDepends = [ base ghcjs-dom keycode shine varying ]; testHaskellDepends = [ base ghcjs-dom keycode shine varying ]; homepage = "https://github.com/fgaz/shine-varying"; @@ -170582,6 +171754,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "si-clock" = callPackage + ({ mkDerivation, base, bytestring, hsI2C, time, transformers }: + mkDerivation { + pname = "si-clock"; + version = "0.1.1"; + sha256 = "1wcw3ws1125lpazar5934v93y76shdl279ll02z8911d3hcx0vh5"; + libraryHaskellDepends = [ + base bytestring hsI2C time transformers + ]; + description = "An interface to the Silicon Labs Si5351 clock chip"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "sibe" = callPackage ({ mkDerivation, base, Chart, Chart-cairo, containers , data-default-class, deepseq, directory, hmatrix, JuicyPixels @@ -170986,8 +172171,8 @@ self: { }: mkDerivation { pname = "simple-effects"; - version = "0.8.0.2"; - sha256 = "04iszcd5sjr9qaq7604v8fdhlbljzkga468s9h6fv7q9mdy77sjw"; + version = "0.9.0.1"; + sha256 = "1n5jr909g410zfy0vk4pvl5phy981hhxsx61hcm6p99f0vdybcwx"; libraryHaskellDepends = [ array base exceptions list-t monad-control MonadRandom mtl text transformers transformers-base @@ -171179,6 +172364,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "simple-logging" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, exceptions + , filepath, hscolour, iso8601-time, lens, mtl, simple-effects + , string-conv, text, time, uuid, vector + }: + mkDerivation { + pname = "simple-logging"; + version = "0.2.0.2"; + sha256 = "1a917vvwnzmv9jqrrmk6knv8wfrxwkbal6gxp24a2xkiqcjpgbjw"; + libraryHaskellDepends = [ + aeson base bytestring directory exceptions filepath hscolour + iso8601-time lens mtl simple-effects string-conv text time uuid + vector + ]; + testHaskellDepends = [ + aeson base bytestring exceptions hscolour iso8601-time lens mtl + simple-effects string-conv text time vector + ]; + homepage = "https://gitlab.com/haskell-hr/logging"; + description = "Logging effect to plug into the simple-effects framework"; + license = stdenv.lib.licenses.mit; + }) {}; + "simple-money" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -171843,6 +173051,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "singnal" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "singnal"; + version = "0.1.1.0"; + sha256 = "16f0grf63wgkaab64mmqhxwwk50pzzy354i3v23lzw7s5x0bk8sj"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/zaoqi/Signal.hs"; + description = "Singnal"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "sink" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -172244,7 +173464,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "skylighting_0_3_3" = callPackage + "skylighting_0_3_3_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, blaze-html , bytestring, case-insensitive, containers, criterion, Diff , directory, filepath, HUnit, hxt, mtl, pretty-show, random @@ -172253,8 +173473,8 @@ self: { }: mkDerivation { pname = "skylighting"; - version = "0.3.3"; - sha256 = "15zclx8as9ck209acsy8bdy4di8m5iw4qzgiavn5xla2adw431h9"; + version = "0.3.3.1"; + sha256 = "0msx7hwnfcqmq0rkn27lr3y6iybghfnm9p5bybzkmqfhlh8gkqgk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -172491,8 +173711,8 @@ self: { }: mkDerivation { pname = "sloane"; - version = "5.0.0"; - sha256 = "0v97lc5pvkx8q0ll1zkmc5n79p03nja9pn0bmdk5s0z6k2zl1p8d"; + version = "5.0.1"; + sha256 = "14ffww6vfyv32nr1i17x8c8nc3y583yhza2dy6g6cfphcjw0zwf2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -172824,8 +174044,8 @@ self: { ({ mkDerivation, base, hspec, megaparsec, QuickCheck, text }: mkDerivation { pname = "smiles"; - version = "0.1.0.1"; - sha256 = "1bmnzwb8i6l8frfwzac1lv6r2iwipd84pwchnl9pam6w7gj0ncck"; + version = "0.1.1.0"; + sha256 = "054s7c6xbakbv0kc64iyv1gsqnddgv8kc07hplk8ksbzg8q5x8jz"; libraryHaskellDepends = [ base megaparsec text ]; testHaskellDepends = [ base hspec megaparsec QuickCheck text ]; homepage = "https://github.com/zmactep/smiles#readme"; @@ -173112,12 +174332,12 @@ self: { }: mkDerivation { pname = "snap-accept"; - version = "0.2.0"; - sha256 = "0a698lq1djgz3k84q6yh2jq4gzj48kzmvwzwk5rqdz1v5whssraf"; + version = "0.2.1"; + sha256 = "0847vq58nkhhr9msiy27cg9app6fzsswzy1dp1iylxygc9wbws6q"; libraryHaskellDepends = [ base bytestring case-insensitive http-media snap-core ]; - homepage = "http://github.com/zimothy/snap-accept"; + homepage = "https://github.com/zmthy/snap-accept"; description = "Accept header branching for the Snap web framework"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -174972,8 +176192,8 @@ self: { }: mkDerivation { pname = "solr"; - version = "0.4.2"; - sha256 = "07y7k4ilhmwy7h288djmsm9rmm2sb9zmwf7cy8fv4h0yk25wwzia"; + version = "0.4.3"; + sha256 = "00hq4gykcimwxa9zy3bmr4k4pxm13ryvfyq95yh4q28gy41wglk0"; libraryHaskellDepends = [ attoparsec-data base base-prelude bytestring bytestring-tree-builder case-insensitive contravariant http-client @@ -175584,21 +176804,6 @@ self: { }) {}; "spdx" = callPackage - ({ mkDerivation, base, tasty, tasty-quickcheck, transformers }: - mkDerivation { - pname = "spdx"; - version = "0.2.1.0"; - sha256 = "1wl0r4q6li6srvcbp4h1bk4k164vd7z8fcy12ixms7r0iq4xdw57"; - revision = "1"; - editedCabalFile = "0qffjk0iz3fnd4099n9bqzakpma6ffw6znk99x67j3i8qdmk1fmd"; - libraryHaskellDepends = [ base transformers ]; - testHaskellDepends = [ base tasty tasty-quickcheck ]; - homepage = "https://github.com/phadej/spdx"; - description = "SPDX license expression language"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "spdx_0_2_2_0" = callPackage ({ mkDerivation, base, tasty, tasty-quickcheck, transformers }: mkDerivation { pname = "spdx"; @@ -175609,7 +176814,6 @@ self: { homepage = "https://github.com/phadej/spdx"; description = "SPDX license expression language"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "spe" = callPackage @@ -176084,6 +177288,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "splitmix" = callPackage + ({ mkDerivation, base, base-compat, bytestring, containers + , criterion, random, tf-random, time + }: + mkDerivation { + pname = "splitmix"; + version = "0"; + sha256 = "0qa86iflw1v8vqci8krj4kdvp648hnl8wx3wyhnd1c95jrla0fpi"; + libraryHaskellDepends = [ base random time ]; + testHaskellDepends = [ + base base-compat bytestring random tf-random + ]; + benchmarkHaskellDepends = [ + base containers criterion random tf-random + ]; + description = "Fast Splittable PRNG"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "splitter" = callPackage ({ mkDerivation, base, directory, filepath, parsec, range }: mkDerivation { @@ -176187,8 +177410,8 @@ self: { }: mkDerivation { pname = "spreadsheet"; - version = "0.1.3.4"; - sha256 = "1hj90bad6b1iiycwlpghxwmwxc1h14702pw4qpxvcp2n9sn2cjky"; + version = "0.1.3.5"; + sha256 = "1h5a2ifr10ihaqvl819d0g3vnn2wzp27wqlfbk21v8wv07wrwckk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -176474,6 +177697,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sql-words_0_1_5_1" = callPackage + ({ mkDerivation, base, QuickCheck, quickcheck-simple }: + mkDerivation { + pname = "sql-words"; + version = "0.1.5.1"; + sha256 = "0nr4ld96s3n48ydd15jsxb823kk2682wkjd2h7vqc306891qwwzd"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base QuickCheck quickcheck-simple ]; + homepage = "http://khibino.github.io/haskell-relational-record/"; + description = "SQL keywords data constructors into OverloadedString"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sqlcipher" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, filepath , hspec, openssl, pretty, temporary, time, utf8-string @@ -176514,16 +177751,16 @@ self: { "sqlite-simple" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder - , blaze-textual, bytestring, containers, direct-sqlite, HUnit, text - , time, transformers + , blaze-textual, bytestring, containers, direct-sqlite, HUnit, Only + , text, time, transformers }: mkDerivation { pname = "sqlite-simple"; - version = "0.4.13.0"; - sha256 = "1s7rf4bip9ki6l3581x7h7ndlj5j369yvxfakfshrj5rcz329car"; + version = "0.4.14.0"; + sha256 = "0zx4fdv6larfyj6m1d4livb5cqdx10yi06yd6px2n0wnxcmvdyj9"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-textual bytestring containers - direct-sqlite text time transformers + direct-sqlite Only text time transformers ]; testHaskellDepends = [ base base16-bytestring bytestring direct-sqlite HUnit text time @@ -177078,6 +178315,30 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "stack-bump" = callPackage + ({ mkDerivation, ansi-terminal, async, base, bytestring, filepath + , Glob, hspec, lens, lens-aeson, optparse-applicative, process + , QuickCheck, strict, text, yaml + }: + mkDerivation { + pname = "stack-bump"; + version = "0.7.1.0"; + sha256 = "1la7v19zly3rnq0rwzv2h6hj9ibx0c0gdgvj4cc1pi893fyggkgz"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-terminal async base bytestring filepath Glob lens lens-aeson + optparse-applicative process strict text yaml + ]; + testHaskellDepends = [ + ansi-terminal async base bytestring filepath Glob hspec lens + lens-aeson optparse-applicative process QuickCheck strict text yaml + ]; + homepage = "https://github.com/yamadapc/stack-bump"; + description = "Dead simple version bumping for hpack packages"; + license = stdenv.lib.licenses.mit; + }) {}; + "stack-hpc-coveralls" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , directory, docopt, filepath, hlint, hpc, hspec, hspec-contrib @@ -177184,6 +178445,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "stack2nix" = callPackage + ({ mkDerivation, async, base, bytestring, Cabal, containers + , data-fix, directory, filepath, Glob, hnix, monad-parallel + , optparse-applicative, process, SafeSemaphore, temporary, text + , yaml + }: + mkDerivation { + pname = "stack2nix"; + version = "0.1.3.0"; + sha256 = "13czryr73cw6brxp8jhszwdmvd0ck4h8g3f32yi1agn3l67nnqpy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring Cabal containers data-fix directory filepath + Glob hnix monad-parallel process SafeSemaphore temporary text yaml + ]; + executableHaskellDepends = [ base Cabal optparse-applicative ]; + description = "Convert stack.yaml files into Nix build instructions."; + license = stdenv.lib.licenses.mit; + }) {}; + "stackage" = callPackage ({ mkDerivation, base, stackage-build-plan, stackage-cabal , stackage-cli, stackage-install, stackage-sandbox, stackage-setup @@ -177374,8 +178656,8 @@ self: { }: mkDerivation { pname = "stackage-query"; - version = "0.1.0"; - sha256 = "0q9v8p53xfv96rhq1a3yz9f1nblp6zhx2bfbvkkl98jq50yh501j"; + version = "0.1.1"; + sha256 = "0prwl42pn3k4yy2439bjsq2m5429xybxwivx1x5ws4k4chvl81fp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -178951,8 +180233,8 @@ self: { }: mkDerivation { pname = "stratosphere"; - version = "0.4.2"; - sha256 = "0rks6ick1fb1sk5mk90bmn0d63kybvkw5wribri351sfyjppm51p"; + version = "0.4.4"; + sha256 = "1gaxlxy1mcdlc6q7va8l6qry52svd2cangdlpvgj32ag95vvpdpc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -179204,6 +180486,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "streaming-cassava" = callPackage + ({ mkDerivation, base, bytestring, cassava, hspec, mtl, QuickCheck + , quickcheck-instances, streaming, streaming-bytestring, text + , transformers, vector + }: + mkDerivation { + pname = "streaming-cassava"; + version = "0.1.0.0"; + sha256 = "17swzhq069rr041l33bwa5ybx1j6w9lvh3l3xs40m842njli2bac"; + libraryHaskellDepends = [ + base bytestring cassava mtl streaming streaming-bytestring + transformers + ]; + testHaskellDepends = [ + base hspec mtl QuickCheck quickcheck-instances streaming text + vector + ]; + description = "Cassava support for the streaming ecosystem"; + license = stdenv.lib.licenses.mit; + }) {}; + "streaming-commons" = callPackage ({ mkDerivation, array, async, base, blaze-builder, bytestring , criterion, deepseq, directory, hspec, network, process @@ -179255,6 +180558,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "streaming-concurrency" = callPackage + ({ mkDerivation, base, exceptions, hspec, lifted-async + , monad-control, QuickCheck, quickcheck-instances, stm, streaming + , streaming-with, transformers-base + }: + mkDerivation { + pname = "streaming-concurrency"; + version = "0.3.0.1"; + sha256 = "040x4g1q520s6a1kxi4j730r6vr7n539wg92mdcvg9bswa620yqj"; + libraryHaskellDepends = [ + base exceptions lifted-async monad-control stm streaming + streaming-with transformers-base + ]; + testHaskellDepends = [ + base hspec QuickCheck quickcheck-instances streaming + ]; + description = "Concurrency support for the streaming ecosystem"; + license = stdenv.lib.licenses.mit; + }) {}; + "streaming-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, hspec, streaming , streaming-bytestring, transformers @@ -179386,6 +180709,21 @@ self: { maintainers = with stdenv.lib.maintainers; [ jb55 ]; }) {}; + "streaming-with" = callPackage + ({ mkDerivation, base, exceptions, managed, streaming-bytestring + , temporary, transformers + }: + mkDerivation { + pname = "streaming-with"; + version = "0.2.0.0"; + sha256 = "02cdjmq7dxqfpqs73v7c63iwavbwb56fdd3pk4qs91vm6d0lfbrp"; + libraryHaskellDepends = [ + base exceptions managed streaming-bytestring temporary transformers + ]; + description = "with/bracket-style idioms for use with streaming"; + license = stdenv.lib.licenses.mit; + }) {}; + "streamproc" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -180869,6 +182207,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "superrecord" = callPackage + ({ mkDerivation, aeson, base, bookkeeper, constraints, criterion + , deepseq, ghc-prim, hspec, labels, mtl, text + }: + mkDerivation { + pname = "superrecord"; + version = "0.3.0.0"; + sha256 = "1yya0lx3lqhr7pj3p72zi8xgjrqlrsrs9b6ilrskzkh0gjqcfjw5"; + libraryHaskellDepends = [ + aeson base constraints deepseq ghc-prim mtl text + ]; + testHaskellDepends = [ aeson base hspec ]; + benchmarkHaskellDepends = [ + aeson base bookkeeper criterion deepseq labels + ]; + homepage = "https://github.com/agrafix/superrecord#readme"; + description = "Supercharged anonymous records"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "supervisor" = callPackage ({ mkDerivation, base, containers, exceptions, monadloc, mtl }: mkDerivation { @@ -181080,18 +182438,17 @@ self: { "swagger2" = callPackage ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring - , containers, doctest, generics-sop, Glob, hashable, hspec - , http-media, HUnit, insert-ordered-containers, lens, mtl, network - , QuickCheck, scientific, template-haskell, text, time - , transformers, transformers-compat, unordered-containers - , uuid-types, vector + , Cabal, cabal-doctest, containers, doctest, generics-sop, Glob + , hashable, hspec, http-media, HUnit, insert-ordered-containers + , lens, mtl, network, QuickCheck, scientific, template-haskell + , text, time, transformers, transformers-compat + , unordered-containers, uuid-types, vector }: mkDerivation { pname = "swagger2"; - version = "2.1.4"; - sha256 = "0i3zchbshk8h0b6yip4p9lyz6abb4akv5n6lr3qsndz5pbxfibc5"; - revision = "1"; - editedCabalFile = "1sfabkac6a37frrzcmz6w0whszz39xpc3g0r8v2ihv0irswvfp2n"; + version = "2.1.4.1"; + sha256 = "0b4c9m6yvhj2z7krf7r3a4xmbnyiifhcc4ahl5xfkb2wh6g6nfi3"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson base base-compat bytestring containers generics-sop hashable http-media insert-ordered-containers lens mtl network scientific @@ -181313,6 +182670,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "syfco" = callPackage + ({ mkDerivation, array, base, containers, convertible, directory + , mtl, parsec, transformers + }: + mkDerivation { + pname = "syfco"; + version = "1.1.0.0"; + sha256 = "076094ygbcwriqjmajs0xyr7zqf86b5nikfm9k0ax7hla75x9b5m"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base containers convertible directory mtl parsec transformers + ]; + executableHaskellDepends = [ + array base containers convertible directory mtl parsec transformers + ]; + homepage = "https://github.com/reactive-systems/syfco"; + description = "Synthesis Format Conversion Tool / Library"; + license = stdenv.lib.licenses.mit; + }) {}; + "sylvia" = callPackage ({ mkDerivation, base, cairo, comonad-transformers, data-default , data-lens, data-lens-template, gtk, optparse-applicative, parsec @@ -181367,6 +182745,70 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "symantic" = callPackage + ({ mkDerivation, base, containers, mono-traversable + , symantic-document, symantic-grammar, text, transformers + }: + mkDerivation { + pname = "symantic"; + version = "6.3.0.20170703"; + sha256 = "14r9jdn7pgcajdjgzgxkcn2p394wljlhfsmy6ajp9i18crhinj9y"; + libraryHaskellDepends = [ + base containers mono-traversable symantic-document symantic-grammar + text transformers + ]; + description = "Library for Typed Tagless-Final Higher-Order Composable DSL"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "symantic-document" = callPackage + ({ mkDerivation, ansi-terminal, base, text }: + mkDerivation { + pname = "symantic-document"; + version = "0.0.0.20170623"; + sha256 = "0va9q2lp6vp81sm0vfm10s7ybp34i89bk6p2ry2f0fcr0lhb09i0"; + libraryHaskellDepends = [ ansi-terminal base text ]; + description = "Document symantics"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "symantic-grammar" = callPackage + ({ mkDerivation, base, megaparsec, tasty, tasty-hunit, text + , transformers + }: + mkDerivation { + pname = "symantic-grammar"; + version = "0.1.0.20170703"; + sha256 = "09anbgpkh3l8mgzz0nwl65054az0026wl65vi7qmy79ncl2823yd"; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ + base megaparsec tasty tasty-hunit text transformers + ]; + description = "Library for symantic grammars"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "symantic-lib" = callPackage + ({ mkDerivation, base, containers, ghc-prim, megaparsec + , monad-classes, mono-traversable, symantic, symantic-grammar + , tasty, tasty-hunit, text, transformers + }: + mkDerivation { + pname = "symantic-lib"; + version = "0.0.2.20170703"; + sha256 = "0ar1ikm42a0apy222y6ii7mjd7fr7n2kpyycyhfznc902jknxk2w"; + libraryHaskellDepends = [ + base containers ghc-prim monad-classes mono-traversable symantic + symantic-grammar text transformers + ]; + testHaskellDepends = [ + base containers megaparsec monad-classes mono-traversable symantic + symantic-grammar tasty tasty-hunit text transformers + ]; + description = "Symantics for common types"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "symbol" = callPackage ({ mkDerivation, base, containers, deepseq }: mkDerivation { @@ -182114,6 +183556,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "system-linux-proc" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers + , directory, errors, hedgehog, text + }: + mkDerivation { + pname = "system-linux-proc"; + version = "0.1.0.3"; + sha256 = "0gljgsbyzya0grh0m13sld6v2cj7g9j5jcgh6yxff2mmqfcf3z7p"; + libraryHaskellDepends = [ + attoparsec base bytestring containers directory errors text + ]; + testHaskellDepends = [ base hedgehog ]; + homepage = "https://github.com/erikd/system-linux-proc"; + description = "A library for accessing the /proc filesystem in Linux"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "system-locale" = callPackage ({ mkDerivation, attoparsec, base, hspec, process, text, time }: mkDerivation { @@ -183413,13 +184872,13 @@ self: { }: mkDerivation { pname = "tasty"; - version = "0.11.2.1"; - sha256 = "1fg2bk9x6jhksxcm4761ynmxgsx9clzg8xdykgzj1azjmk4dymk9"; + version = "0.11.2.2"; + sha256 = "006gnkr0s6id193j06g7zs1mdzdckbgc5vwclbk535xhrgr2gzk8"; libraryHaskellDepends = [ ansi-terminal async base clock containers deepseq mtl optparse-applicative regex-tdfa stm tagged unbounded-delays ]; - homepage = "http://documentup.com/feuerbach/tasty"; + homepage = "https://github.com/feuerbach/tasty"; description = "Modern and extensible testing framework"; license = stdenv.lib.licenses.mit; }) {}; @@ -183652,10 +185111,8 @@ self: { }: mkDerivation { pname = "tasty-hspec"; - version = "1.1.3.1"; - sha256 = "0i2lv0m8va2kirddgng5laaq9q78y56jg9li93iq8b9062smiila"; - revision = "2"; - editedCabalFile = "0d8cwpkqayf7qgg4xvs8aj4wxk3qkilmjfy74s3jkxyrxsg22d73"; + version = "1.1.3.2"; + sha256 = "0n4pn89jz9i8d7mxsdp6ynwkg5gjyaipdy261parx64m3nxi4vcv"; libraryHaskellDepends = [ base hspec hspec-core QuickCheck random tagged tasty tasty-quickcheck tasty-smallcheck @@ -183842,14 +185299,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tasty-quickcheck_0_9" = callPackage + "tasty-quickcheck_0_9_1" = callPackage ({ mkDerivation, base, pcre-light, QuickCheck, random, tagged , tasty, tasty-hunit }: mkDerivation { pname = "tasty-quickcheck"; - version = "0.9"; - sha256 = "00h7vvmadiq07bzd9dpi8maw1apshz66si9vkkqzxmgvnv9src33"; + version = "0.9.1"; + sha256 = "03db6aknm5rdl14mn98lxhb38357ywvs7agygyz1hbc5iv7rggxa"; libraryHaskellDepends = [ base QuickCheck random tagged tasty ]; testHaskellDepends = [ base pcre-light tasty tasty-hunit ]; homepage = "http://documentup.com/feuerbach/tasty"; @@ -184283,16 +185740,16 @@ self: { }) {}; "teardown" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, criterion, doctest, Glob - , protolude, QuickCheck, tasty, tasty-hspec, tasty-hunit + ({ mkDerivation, ansi-wl-pprint, base, criterion, deepseq, doctest + , Glob, protolude, QuickCheck, tasty, tasty-hspec, tasty-hunit , tasty-rerun, tasty-smallcheck, text, time }: mkDerivation { pname = "teardown"; - version = "0.1.0.0"; - sha256 = "0sg113khwlb56x0rgb47lm0hf0cfsr9wc31w98nav9zcw5gndm33"; + version = "0.1.0.1"; + sha256 = "0jxhr73dq4gvbzrwhbqsrwg1v8qa2mj1nfygb44kj60diwa4cwj2"; libraryHaskellDepends = [ - ansi-wl-pprint base protolude text time + ansi-wl-pprint base deepseq protolude text time ]; testHaskellDepends = [ base doctest Glob protolude QuickCheck tasty tasty-hspec @@ -184425,6 +185882,7 @@ self: { homepage = "https://github.com/andrewthad/teleshell#readme"; description = "Telnet client and other things"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tellbot" = callPackage @@ -184733,22 +186191,6 @@ self: { }) {}; "temporary" = callPackage - ({ mkDerivation, base, directory, exceptions, filepath - , transformers, unix - }: - mkDerivation { - pname = "temporary"; - version = "1.2.0.4"; - sha256 = "0qk741yqnpd69sksgks2vb7zi50rglp9m498lzw4sh268a017rsi"; - libraryHaskellDepends = [ - base directory exceptions filepath transformers unix - ]; - homepage = "http://www.github.com/feuerbach/temporary"; - description = "Portable temporary file and directory support for Windows and Unix, based on code from Cabal"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "temporary_1_2_1" = callPackage ({ mkDerivation, base, base-compat, directory, exceptions, filepath , tasty, tasty-hunit, transformers, unix }: @@ -184765,7 +186207,6 @@ self: { homepage = "https://github.com/feuerbach/temporary"; description = "Portable temporary file and directory support"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "temporary-rc" = callPackage @@ -185386,8 +186827,8 @@ self: { }: mkDerivation { pname = "test-framework-sandbox"; - version = "0.1.0"; - sha256 = "0bfj0l189dh52dipdnxcqllk2h6g4dwcwcw5pll2my3n7r78pn7v"; + version = "0.1.1"; + sha256 = "0q84ijm712zn1l20hih53j4axmhzaib1gxn11w0h7pnhybc04klx"; libraryHaskellDepends = [ ansi-terminal base lifted-base mtl temporary test-framework test-sandbox transformers @@ -185519,8 +186960,8 @@ self: { }: mkDerivation { pname = "test-sandbox"; - version = "0.1.6"; - sha256 = "08j8xa28fwmgh07ixml53w95jfrgmv5p4lb8wjv48x5pphz5x3dn"; + version = "0.1.7"; + sha256 = "0myrz0zs1i1360cb9dzffybakglm96kb9zjk6m8rdkdwklm94a8c"; libraryHaskellDepends = [ base bytestring cereal containers data-default directory filepath lifted-base monad-control monad-loops mtl network process random @@ -185647,17 +187088,21 @@ self: { }) {}; "testbench" = callPackage - ({ mkDerivation, base, boxes, criterion, deepseq, HUnit, statistics - , transformers + ({ mkDerivation, base, bytestring, cassava, criterion, deepseq + , dlist, HUnit, optparse-applicative, process, resourcet + , statistics, streaming, streaming-bytestring, streaming-cassava + , temporary, transformers, weigh }: mkDerivation { pname = "testbench"; - version = "0.1.0.0"; - sha256 = "10rydywa6d6adfzckafhiwwh1r84pzh60icrmv9h66kfzw328nb6"; + version = "0.2.1.0"; + sha256 = "0pka1vmzh4x0pzwlrxzzsjaxjd7py43m5ph3barwfrbjkqbyjzj6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base boxes criterion deepseq HUnit statistics transformers + base bytestring cassava criterion deepseq dlist HUnit + optparse-applicative process resourcet statistics streaming + streaming-bytestring streaming-cassava temporary transformers weigh ]; description = "Create tests and benchmarks together"; license = stdenv.lib.licenses.mit; @@ -185793,8 +187238,8 @@ self: { }: mkDerivation { pname = "texmath"; - version = "0.9.4"; - sha256 = "1591d0z2f8anql4sxh3566gyfmfyvvf83sg21ss9yrq8jw35srns"; + version = "0.9.4.1"; + sha256 = "014xka6vz8qc043icrhf5m47g8jwlr608qzymrikjh4nr2r048ih"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -185892,13 +187337,16 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "text-all_0_4_0_0" = callPackage - ({ mkDerivation, base, text, text-format }: + "text-all_0_4_1_1" = callPackage + ({ mkDerivation, base, bytestring, text, text-format, utf8-string + }: mkDerivation { pname = "text-all"; - version = "0.4.0.0"; - sha256 = "0imy2q8dg1w3j0w8s0cc80fmjin99x2y7p41hdfwmaj5j1d5k6jb"; - libraryHaskellDepends = [ base text text-format ]; + version = "0.4.1.1"; + sha256 = "195f1l4s6vfg4dhpmkfsd178rldknw0gdkl1qpbn3kzhba044y7w"; + libraryHaskellDepends = [ + base bytestring text text-format utf8-string + ]; homepage = "http://github.com/aelve/text-all"; description = "Everything Data.Text related in one package"; license = stdenv.lib.licenses.bsd3; @@ -186333,6 +187781,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "text-postgresql_0_0_2_3" = callPackage + ({ mkDerivation, base, dlist, QuickCheck, quickcheck-simple + , transformers, transformers-compat + }: + mkDerivation { + pname = "text-postgresql"; + version = "0.0.2.3"; + sha256 = "0dp4f213d9rslgiqpmpk9dzl6yb9njmiym7s1fn3ms9aadipag72"; + libraryHaskellDepends = [ + base dlist transformers transformers-compat + ]; + testHaskellDepends = [ base QuickCheck quickcheck-simple ]; + homepage = "http://khibino.github.io/haskell-relational-record/"; + description = "Parser and Printer of PostgreSQL extended types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-printer" = callPackage ({ mkDerivation, base, bytestring, pretty, QuickCheck, semigroups , test-framework, test-framework-quickcheck2, text, text-latin1 @@ -186449,6 +187915,7 @@ self: { ]; description = "Memory-efficient representation of Unicode text strings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-show" = callPackage @@ -186905,8 +188372,8 @@ self: { ({ mkDerivation, base, containers, ghc-prim, template-haskell }: mkDerivation { pname = "th-abstraction"; - version = "0.2.2.0"; - sha256 = "00xnyknp1xgbr6rqbmdbpvxrnd3pw1wax46vv03g8bbjm0m4d7kd"; + version = "0.2.3.0"; + sha256 = "00yy303rrnx26z9aam33j8m1v0dq5wxk71901fbl50jm9mdg4jwm"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; @@ -186991,8 +188458,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "th-data-compat"; - version = "0.0.2.2"; - sha256 = "0f6fcazfjb5iravmflx1s023hp2swzzkwk296l4jv64xjpxqvdd1"; + version = "0.0.2.4"; + sha256 = "0zs36p32khrvdi5m6zhf93jyrcv184bhyxp49w8cj0fms51w2vcs"; libraryHaskellDepends = [ base template-haskell ]; description = "Compatibility for data definition template of TH"; license = stdenv.lib.licenses.bsd3; @@ -187238,8 +188705,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "th-reify-compat"; - version = "0.0.1.1"; - sha256 = "04y539y3ajm92rxnc149qrvw02bk0m8sac1swn0q6763wahsa73j"; + version = "0.0.1.2"; + sha256 = "102w8zxsgdk1p7478p0sdhapai3paid3wyar2cpia649a17jlhwc"; libraryHaskellDepends = [ base template-haskell ]; homepage = "http://github.com/khibino/haskell-th-reify-compat/"; description = "Compatibility for the result type of TH reify"; @@ -187247,23 +188714,6 @@ self: { }) {}; "th-reify-many" = callPackage - ({ mkDerivation, base, containers, mtl, safe, template-haskell - , th-expand-syns - }: - mkDerivation { - pname = "th-reify-many"; - version = "0.1.6"; - sha256 = "1b76zjxkj0v0n8zj9l0nwav2irm0c43rx6qjihfw8klmmxvx59df"; - libraryHaskellDepends = [ - base containers mtl safe template-haskell th-expand-syns - ]; - testHaskellDepends = [ base template-haskell ]; - homepage = "http://github.com/mgsloan/th-reify-many"; - description = "Recurseively reify template haskell datatype info"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "th-reify-many_0_1_7" = callPackage ({ mkDerivation, base, containers, mtl, safe, template-haskell , th-expand-syns }: @@ -187278,7 +188728,6 @@ self: { homepage = "http://github.com/mgsloan/th-reify-many"; description = "Recurseively reify template haskell datatype info"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-sccs" = callPackage @@ -187613,6 +189062,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "thread-local-storage_0_1_2" = callPackage + ({ mkDerivation, atomic-primops, base, containers, criterion }: + mkDerivation { + pname = "thread-local-storage"; + version = "0.1.2"; + sha256 = "0nfl0i9g0d2z199a824ja6vb2h9nqswizv0hn266j0mpid1p3hl5"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ atomic-primops base ]; + benchmarkHaskellDepends = [ atomic-primops base criterion ]; + homepage = "https://github.com/rrnewton/thread-local-storage"; + description = "Several options for thread-local-storage (TLS) in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "threadPool" = callPackage ({ mkDerivation, base, process }: mkDerivation { @@ -187708,8 +189172,8 @@ self: { }: mkDerivation { pname = "threadscope"; - version = "0.2.7"; - sha256 = "1dpxgzm29p07iy17hkfzki4c9ckhwx4acvjhlwxmpmaj2a1m6mnc"; + version = "0.2.8"; + sha256 = "067jwdh0xbv02mh9narwnw36wvz0d1v5wwhysmzbfc263l0iazn2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -187739,17 +189203,18 @@ self: { }) {}; "threepenny-editors" = callPackage - ({ mkDerivation, base, data-default, generics-sop, profunctors - , threepenny-gui + ({ mkDerivation, base, casing, containers, data-default + , generics-sop, profunctors, threepenny-gui }: mkDerivation { pname = "threepenny-editors"; - version = "0.2.0.11"; - sha256 = "0wq8s88l3pdl2n00gfyzg99dg2fd7d7gcq7pssxhg3z4rv72fdif"; + version = "0.3.0"; + sha256 = "090nhbb4yzjjmbbh1n48mi5i2kkky7s4kjwvmvbgf1694yjbb5ss"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base data-default generics-sop profunctors threepenny-gui + base casing containers data-default generics-sop profunctors + threepenny-gui ]; homepage = "https://github.com/pepeiborra/threepenny-editors"; description = "Composable algebraic editors"; @@ -187929,19 +189394,17 @@ self: { }) {}; "throwable-exceptions" = callPackage - ({ mkDerivation, base, either, safe-exceptions, tasty - , tasty-discover, tasty-hunit, template-haskell, text + ({ mkDerivation, base, doctest, either, safe-exceptions, silently + , tasty, tasty-discover, tasty-hunit, template-haskell, text }: mkDerivation { pname = "throwable-exceptions"; - version = "0.1.0.5"; - sha256 = "1f4aaj37j0wni1qgshf1n72kid74wz4gj6dydzzasrxq4ls51cvn"; - isLibrary = true; - isExecutable = true; + version = "0.1.0.8"; + sha256 = "0d8dxrd922rxnn417yn2ij71v6vb9c5i37qvcmdixfh773p9sm8r"; libraryHaskellDepends = [ base safe-exceptions template-haskell ]; - executableHaskellDepends = [ base safe-exceptions ]; testHaskellDepends = [ - base either safe-exceptions tasty tasty-discover tasty-hunit text + base doctest either safe-exceptions silently tasty tasty-discover + tasty-hunit text ]; homepage = "https://github.com/aiya000/hs-throwable-exceptions#README.md"; description = "throwable-exceptions gives the easy way to throw exceptions"; @@ -188508,6 +189971,8 @@ self: { pname = "time-parsers"; version = "0.1.2.0"; sha256 = "091wpcqj1kjvyjgj1y1invn0g5lhdxc92az2bcbwbrpq2c7x8l2f"; + revision = "1"; + editedCabalFile = "1fvk31ab241v4ib7lg718q6qwrc3w7axq9kinccbdnn7b7d259gj"; libraryHaskellDepends = [ base parsers template-haskell time ]; testHaskellDepends = [ attoparsec base bifunctors parsec parsers tasty tasty-hunit @@ -189296,12 +190761,12 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "titlecase_1" = callPackage + "titlecase_1_0_1" = callPackage ({ mkDerivation, base, tasty, tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "titlecase"; - version = "1"; - sha256 = "1q7pll71rqgmzm90949i6fskfjysfdqhqvby0mh38ykm88bxm80w"; + version = "1.0.1"; + sha256 = "1k29br4ck9hpjq0w8md7i5kbh47svx74i2abv6ql2awxa0liqwz7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -189406,10 +190871,8 @@ self: { }: mkDerivation { pname = "tls"; - version = "1.3.10"; - sha256 = "0w81bv1khibp36mnqb2685y01s3v1032l3qf1y6wx9fx807ps1cz"; - revision = "2"; - editedCabalFile = "17734zs69kph9pv8zpk4fm58gfhzcwjwqlk71sqib5r2zi0lby9h"; + version = "1.3.11"; + sha256 = "00r7zfkdzy7hi6nhzkirp8jjims4kikgjcm3z4a82kw78awqw01z"; libraryHaskellDepends = [ asn1-encoding asn1-types async base bytestring cereal cryptonite data-default-class memory mtl network transformers x509 x509-store @@ -189469,6 +190932,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tls-session-manager" = callPackage + ({ mkDerivation, auto-update, base, clock, psqueues, time, tls }: + mkDerivation { + pname = "tls-session-manager"; + version = "0.0.0.0"; + sha256 = "04bci0pcky2sc3d0nb5nc2hg03k0gg04iy5rhcr7698ig02x8wvn"; + libraryHaskellDepends = [ + auto-update base clock psqueues time tls + ]; + description = "In-memory TLS session manager"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tmapchan" = callPackage ({ mkDerivation, base, containers, hashable, stm , unordered-containers @@ -189512,8 +190988,8 @@ self: { }: mkDerivation { pname = "tmp-postgres"; - version = "0.1.0.6"; - sha256 = "0h3rhli1vm0rq2943fz1z4l26s6nzrx5sccwdx6wc998wbgbdq15"; + version = "0.1.0.7"; + sha256 = "0cx0b0743fv2p651sf6s95aqhpq8rk20mxdk06dw8v8bgdyvncq2"; libraryHaskellDepends = [ base directory network process temporary unix ]; @@ -189524,6 +191000,7 @@ self: { homepage = "https://github.com/jfischoff/tmp-postgres#readme"; description = "Start and stop a temporary postgres for testing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tmpl" = callPackage @@ -189885,6 +191362,7 @@ self: { homepage = "http://github.com/tittoassini/top"; description = "Top (typed oriented protocol) API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "topkata" = callPackage @@ -190451,6 +191929,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "transformers-bifunctors" = callPackage + ({ mkDerivation, base, mmorph, transformers }: + mkDerivation { + pname = "transformers-bifunctors"; + version = "0.1"; + sha256 = "01s8516m9cybx5gqxk8g00fnkbwpfi5vrm1pgi62pxk1cgbx699w"; + libraryHaskellDepends = [ base mmorph transformers ]; + homepage = "https://github.com/jystic/transformers-bifunctors"; + description = "Bifunctors over monad transformers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "transformers-compat" = callPackage ({ mkDerivation, base, ghc-prim, transformers }: mkDerivation { @@ -190780,6 +192270,7 @@ self: { ]; description = "Type safe http requests"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "trasa-reflex" = callPackage @@ -190894,6 +192385,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "travis-pogodi" = callPackage + ({ mkDerivation, base, optparse-applicative, process }: + mkDerivation { + pname = "travis-pogodi"; + version = "0.1.0"; + sha256 = "1m75rlbzy0lm3nhp14kms3v1l9bykdva3ivgw4n8rqy5i48ismi0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base optparse-applicative process ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/4e6/travis-pogodi#readme"; + description = "A better travis_wait"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "trawl" = callPackage ({ mkDerivation, base, Cabal, directory, filepath, MissingH , optparse-applicative, process, split @@ -191829,29 +193335,6 @@ self: { }) {}; "turtle" = callPackage - ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock - , criterion, directory, doctest, foldl, hostname, managed - , optional-args, optparse-applicative, process, semigroups, stm - , system-fileio, system-filepath, temporary, text, time - , transformers, unix, unix-compat - }: - mkDerivation { - pname = "turtle"; - version = "1.3.5"; - sha256 = "0ry3d42s3g3hbdg8gjdlcadd0cfmf4harb30w4l2r6p94vj25453"; - libraryHaskellDepends = [ - ansi-wl-pprint async base bytestring clock directory foldl hostname - managed optional-args optparse-applicative process semigroups stm - system-fileio system-filepath temporary text time transformers unix - unix-compat - ]; - testHaskellDepends = [ base doctest system-filepath temporary ]; - benchmarkHaskellDepends = [ base criterion text ]; - description = "Shell programming, Haskell-style"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "turtle_1_3_6" = callPackage ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock , criterion, directory, doctest, foldl, hostname, managed , optional-args, optparse-applicative, process, semigroups, stm @@ -191872,7 +193355,6 @@ self: { benchmarkHaskellDepends = [ base criterion text ]; description = "Shell programming, Haskell-style"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "turtle-options" = callPackage @@ -191945,23 +193427,28 @@ self: { "tweet-hs" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base , bytestring, composition, containers, criterion, data-default - , directory, extra, hspec, http-client, http-client-tls, http-types - , lens, optparse-applicative, split, text + , directory, extra, hspec, hspec-megaparsec, htoml, http-client + , http-client-tls, http-types, lens, megaparsec + , optparse-applicative, QuickCheck, split, text + , unordered-containers }: mkDerivation { pname = "tweet-hs"; - version = "0.6.0.0"; - sha256 = "1myvwhyzw4a9xdrp16ibzgafdv84kwyvn0pqcsnq8kf3lnic60n3"; + version = "1.0.0.1"; + sha256 = "0z1gi0mlxkchzq6644m5ya3qjz2jzi5rziak5jyz8b8ssvspw3nv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-wl-pprint authenticate-oauth base bytestring composition - containers data-default directory extra http-client http-client-tls - http-types lens optparse-applicative split text + containers data-default directory extra htoml http-client + http-client-tls http-types lens megaparsec optparse-applicative + split text unordered-containers ]; executableHaskellDepends = [ base ]; - testHaskellDepends = [ base bytestring hspec ]; - benchmarkHaskellDepends = [ base bytestring criterion ]; + testHaskellDepends = [ + base bytestring hspec hspec-megaparsec megaparsec QuickCheck + ]; + benchmarkHaskellDepends = [ base bytestring criterion megaparsec ]; homepage = "https://github.com/vmchale/command-line-tweeter#readme"; description = "Command-line tool for twitter"; license = stdenv.lib.licenses.bsd3; @@ -192210,10 +193697,8 @@ self: { }: mkDerivation { pname = "twilio"; - version = "0.1.3.1"; - sha256 = "0vsb0fli01fy1qbvqvmm12sl70nxz0gk7rsmghhyqwv01nmakfwk"; - revision = "1"; - editedCabalFile = "10dgcxjhmz7fn5fcgs28niyfpjq0vfs8fcpipq0ijcxwk6z78h3c"; + version = "0.1.3.2"; + sha256 = "1vbb846cdav6csm2y9asrdzvmh9s3pf4apyharrr1hwd2xz3jcga"; libraryHaskellDepends = [ aeson base bifunctors bytestring containers errors exceptions free http-client http-client-tls http-types mtl network-uri old-locale @@ -193146,6 +194631,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "typed-duration" = callPackage + ({ mkDerivation, base, lifted-base, monad-control + , transformers-base + }: + mkDerivation { + pname = "typed-duration"; + version = "0.1.1.0"; + sha256 = "14na0mczkppzdixkr75z7vkp2rk7r1lsiysvgb6j29scj5a9l6x4"; + libraryHaskellDepends = [ + base lifted-base monad-control transformers-base + ]; + homepage = "https://github.com/osa1/typed-duration#readme"; + description = "Thread delay and timeout functions with typed arguments"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "typed-process" = callPackage ({ mkDerivation, async, base, base64-bytestring, bytestring , conduit, conduit-extra, exceptions, hspec, http-conduit, process @@ -193461,17 +194962,18 @@ self: { "tyro" = callPackage ({ mkDerivation, aeson, base, bytestring, HUnit, protolude , reflection, singletons, test-framework, test-framework-hunit - , text + , text, vector }: mkDerivation { pname = "tyro"; - version = "0.2.0.0"; - sha256 = "116hay13pqngpxbqbxz60mzhz2ccgkiqgaz7frfqyc4mwqm80xnh"; + version = "0.3.0.0"; + sha256 = "0gx50kx5pvh8fi88wjh1hvmawnj1k1jl7z78h9q9spvg0l7nz4q5"; libraryHaskellDepends = [ - aeson base bytestring protolude reflection singletons text + aeson base bytestring protolude reflection singletons text vector ]; testHaskellDepends = [ - aeson base HUnit protolude test-framework test-framework-hunit text + aeson base bytestring HUnit protolude reflection singletons + test-framework test-framework-hunit text vector ]; homepage = "https://github.com/rlupton20/tyro#readme"; description = "Type derived JSON parsing using Aeson"; @@ -193573,8 +195075,8 @@ self: { }: mkDerivation { pname = "ua-parser"; - version = "0.7.3"; - sha256 = "043srsyff22vfhs2nwqmzp6w7vlqqlg3sl7acnbl4vical0k7cmx"; + version = "0.7.4"; + sha256 = "1maph5na307ih1qx2ziww3mhc9c0a5rxqj2jfc4w404hisby947i"; libraryHaskellDepends = [ aeson base bytestring data-default file-embed pcre-light text yaml ]; @@ -194059,12 +195561,13 @@ self: { }) {}; "unboxed-ref" = callPackage - ({ mkDerivation, base, ghc-prim, primitive }: + ({ mkDerivation, async, base, ghc-prim, HUnit, primitive }: mkDerivation { pname = "unboxed-ref"; - version = "0.3.0.0"; - sha256 = "0zzw9myflayv0lzlfj11abgfxjb5yvyp3jw8xwbal92bzvd569gl"; + version = "0.4.0.0"; + sha256 = "0gvpp35mzx6ydwhwqdv319pl4yw7g4pyayciry83lnh3a3asisv4"; libraryHaskellDepends = [ base ghc-prim primitive ]; + testHaskellDepends = [ async base HUnit ]; homepage = "https://github.com/winterland1989/unboxed-ref"; description = "Fast unboxed references for ST and IO monad"; license = stdenv.lib.licenses.bsd3; @@ -194127,8 +195630,8 @@ self: { }: mkDerivation { pname = "unfoldable"; - version = "0.9.3"; - sha256 = "0bf5qf6w6blwxbyz5cd8662hd6xv0s0wa8zcrx6s696f2qvjr10f"; + version = "0.9.4"; + sha256 = "0qqjr060d79g5lnsdzx9ff6ava78441h8wvkn38hs7y3rvzw9vzd"; libraryHaskellDepends = [ base containers ghc-prim one-liner QuickCheck random transformers ]; @@ -194392,15 +195895,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "unicode-transforms_0_3_0" = callPackage + "unicode-transforms_0_3_1" = callPackage ({ mkDerivation, base, bitarray, bytestring, criterion, deepseq , filepath, getopt-generics, optparse-applicative, path, path-io , QuickCheck, split, text }: mkDerivation { pname = "unicode-transforms"; - version = "0.3.0"; - sha256 = "0iajm8shb0p6kgcly8n8hzww3f993wdyz4546dl8yn8rinnmxhid"; + version = "0.3.1"; + sha256 = "03n9s1pqgq9gl3q6xydwjlsvwq4al6khwd8lr137941263zxx0di"; libraryHaskellDepends = [ base bitarray bytestring text ]; testHaskellDepends = [ base deepseq getopt-generics QuickCheck split text @@ -194928,8 +196431,8 @@ self: { }: mkDerivation { pname = "universum"; - version = "0.4.3"; - sha256 = "17rrikfid54z8h95qns5q7bdxadnnggv1pl2d9ilz9pz9hi7a9g6"; + version = "0.5"; + sha256 = "0i444yzxn4g8khjj8m2n4507qwvdvsypsb4qkylkz23214c6qax4"; libraryHaskellDepends = [ base bytestring containers deepseq exceptions ghc-prim hashable microlens microlens-mtl mtl safe stm text text-format transformers @@ -195124,6 +196627,35 @@ self: { license = "GPL"; }) {}; + "unliftio" = callPackage + ({ mkDerivation, async, base, deepseq, directory, filepath + , monad-logger, resourcet, transformers, unix, unliftio-core + }: + mkDerivation { + pname = "unliftio"; + version = "0.1.0.0"; + sha256 = "053swazav18rrmlwskrgnw99wn7j7wznaadjmsf8nmzk13qzn18i"; + libraryHaskellDepends = [ + async base deepseq directory filepath monad-logger resourcet + transformers unix unliftio-core + ]; + homepage = "https://github.com/fpco/monad-unlift/tree/master/unliftio#readme"; + description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; + license = stdenv.lib.licenses.mit; + }) {}; + + "unliftio-core" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "unliftio-core"; + version = "0.1.0.0"; + sha256 = "0wxv6s91wpfv2f5x17lwm04fvghcfnmzqw7p65117pr1r6yz5fcj"; + libraryHaskellDepends = [ base transformers ]; + homepage = "https://github.com/fpco/monad-unlift/tree/master/unliftio-core#readme"; + description = "The MonadUnliftIO typeclass for unlifting monads to IO"; + license = stdenv.lib.licenses.mit; + }) {}; + "unlit" = callPackage ({ mkDerivation, base, directory, text }: mkDerivation { @@ -195154,6 +196686,19 @@ self: { license = "GPL"; }) {}; + "unmed2" = callPackage + ({ mkDerivation, base, storable-endian, utility-ht }: + mkDerivation { + pname = "unmed2"; + version = "0.0"; + sha256 = "1pmp720nhs8blwpjjfhn123miyb31nzn0s3af3ifxrr6s4rapsdg"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base storable-endian utility-ht ]; + description = "Extract useful information from Amiga MED files"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "unordered-containers" = callPackage ({ mkDerivation, base, bytestring, ChasingBottoms, containers , criterion, deepseq, deepseq-generics, hashable, hashmap, HUnit @@ -195850,6 +197395,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "urn-random" = callPackage + ({ mkDerivation, base, deepseq, haskell-src-meta, integer-gmp + , MonadRandom, QuickCheck, template-haskell, transformers + }: + mkDerivation { + pname = "urn-random"; + version = "0.1.0.0"; + sha256 = "1zpx56gy8dnmnkkqqhzqxiw2yqkan6h2gfm9lq4218978801jdl4"; + libraryHaskellDepends = [ + base deepseq haskell-src-meta integer-gmp MonadRandom QuickCheck + template-haskell transformers + ]; + homepage = "https://github.com/antalsz/urn-random"; + description = "A package for updatable discrete distributions"; + license = stdenv.lib.licenses.mit; + }) {}; + "urxml" = callPackage ({ mkDerivation, base, filepath, mtl, optparse-applicative, parsec , process, syb @@ -195875,8 +197437,8 @@ self: { }: mkDerivation { pname = "usb"; - version = "1.3.0.4"; - sha256 = "1izxrjwxs9h4gs9kaiw696p4r10wq6n5mijn80ab6bn716zkhwdf"; + version = "1.3.0.5"; + sha256 = "0r3v6w0nqcwz2vcaz0pdkfb8fs4ry2nlg9pfy77avv7mjwlvp7r1"; libraryHaskellDepends = [ base bindings-libusb bytestring containers ghc-prim text vector ]; @@ -197470,19 +199032,6 @@ self: { }) {}; "vector-fftw" = callPackage - ({ mkDerivation, base, fftw, primitive, storable-complex, vector }: - mkDerivation { - pname = "vector-fftw"; - version = "0.1.3.7"; - sha256 = "0xl1gymdl20j4n4z7rn9ngm4yfzkc2q75af5ls15rd5zsqk1ihp3"; - libraryHaskellDepends = [ base primitive storable-complex vector ]; - librarySystemDepends = [ fftw ]; - homepage = "http://hackage.haskell.org/package/vector-fftw"; - description = "A binding to the fftw library for one-dimensional vectors"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) fftw;}; - - "vector-fftw_0_1_3_8" = callPackage ({ mkDerivation, base, fftw, primitive, storable-complex, vector }: mkDerivation { pname = "vector-fftw"; @@ -197493,7 +199042,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 @@ -197557,12 +199105,15 @@ self: { }) {}; "vector-mmap" = callPackage - ({ mkDerivation, base, mmap, primitive, vector }: + ({ mkDerivation, base, mmap, primitive, QuickCheck, temporary + , vector + }: mkDerivation { pname = "vector-mmap"; - version = "0.0.2"; - sha256 = "03hczjc7j1hxnny912cblxdwn908gwm012w03zgj2v9avldp0gmr"; + version = "0.0.3"; + sha256 = "12l6ka6vgl5g193sycn3k6gr2q3k64jaq196p825vawh46qdsfg5"; libraryHaskellDepends = [ base mmap primitive vector ]; + testHaskellDepends = [ base QuickCheck temporary vector ]; homepage = "http://github.com/pumpkin/vector-mmap"; description = "Memory map immutable and mutable vectors"; license = stdenv.lib.licenses.bsd3; @@ -197956,14 +199507,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "viewprof_0_0_0_3" = callPackage + "viewprof_0_0_0_5" = callPackage ({ mkDerivation, base, brick, containers, ghc-prof, lens , scientific, text, vector, vector-algorithms, vty }: mkDerivation { pname = "viewprof"; - version = "0.0.0.3"; - sha256 = "13rb9cgi65vcc6y6rj79li1rywzb711ayl1dwsm97b7nqz4007rk"; + version = "0.0.0.5"; + sha256 = "1i1rrr920dappcvj7gjs60bjcrznb4ny4aslvxxidv93lz9kv617"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -198941,8 +200492,8 @@ self: { }: mkDerivation { pname = "wai-extra"; - version = "3.0.19.1"; - sha256 = "1xm744dmdajmvswr9wgzpkhb9jil2mkz4vzi96sqp1px692cmrzp"; + version = "3.0.20.0"; + sha256 = "0w8r0azjhl132sa8wzqjd8vs359h8dc7l6afr3g5wbw1kr9clqxd"; libraryHaskellDepends = [ aeson ansi-terminal base base64-bytestring blaze-builder bytestring case-insensitive containers cookie data-default-class deepseq @@ -199252,8 +200803,8 @@ self: { }: mkDerivation { pname = "wai-middleware-auth"; - version = "0.1.2.0"; - sha256 = "04lkj70lirgz8aj8zis23rd5an0xk0kskl94hvmm84jmq34s92cb"; + version = "0.1.2.1"; + sha256 = "0x3x3vc2l7glvfv6xcmqq0bw4mm8w2l577zx6qhx4399b03j56a1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -200388,8 +201939,8 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.2.12"; - sha256 = "04d7hfh52j0j241jn5yffng6iyf2hrfimn82pdrq0hz94giffg73"; + version = "3.2.13"; + sha256 = "0964l8xcbdqnrz0mnk0b732n66i7q8grwzzax96mqbh15ps5nfcj"; libraryHaskellDepends = [ array async auto-update base blaze-builder bytestring bytestring-builder case-insensitive containers ghc-prim hashable @@ -200455,15 +202006,15 @@ self: { "warp-tls" = callPackage ({ mkDerivation, base, bytestring, cryptonite, data-default-class - , network, streaming-commons, tls, wai, warp + , network, streaming-commons, tls, tls-session-manager, wai, warp }: mkDerivation { pname = "warp-tls"; - version = "3.2.3"; - sha256 = "14m2bzk5ivz9gdpxlcj6qnh46f2lycm1ybdjnfkj2876zrqwii7m"; + version = "3.2.4"; + sha256 = "05vfjlgi574nnydfmfpyp3q6mf389iyj9mv94djnm8d1izasml85"; libraryHaskellDepends = [ base bytestring cryptonite data-default-class network - streaming-commons tls wai warp + streaming-commons tls tls-session-manager wai warp ]; homepage = "http://github.com/yesodweb/wai"; description = "HTTP over TLS support for Warp via the TLS package"; @@ -200876,8 +202427,10 @@ self: { }: mkDerivation { pname = "web-routes"; - version = "0.27.11"; - sha256 = "1n4cvqbbnjhliy9080fff7nfn9x073vnp8vj7mh0ja4ii96lsqj5"; + version = "0.27.12"; + sha256 = "0c0wqr3f79gx26pfknvv4zka8g8fkfxw5fqb0qpq8zv0mv5rflba"; + revision = "1"; + editedCabalFile = "1pdp6x3q5423m99n24nhwlqmi0xyz0dhz02v2m8n4nkbg33lrv1q"; libraryHaskellDepends = [ base blaze-builder bytestring exceptions ghc-prim http-types mtl parsec split text utf8-string @@ -201372,7 +202925,7 @@ self: { "webkitgtk3" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, glib , gtk2hs-buildtools, gtk3, mtl, pango, text, transformers - , webkitgtk24x + , webkitgtk24x-gtk3 }: mkDerivation { pname = "webkitgtk3"; @@ -201382,26 +202935,27 @@ self: { libraryHaskellDepends = [ base bytestring cairo glib gtk3 mtl pango text transformers ]; - libraryPkgconfigDepends = [ webkitgtk24x ]; + libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ]; homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Webkit library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) webkitgtk24x;}; + }) {inherit (pkgs) webkitgtk24x-gtk3;}; "webkitgtk3-javascriptcore" = callPackage - ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk24x }: + ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk24x-gtk3 + }: mkDerivation { pname = "webkitgtk3-javascriptcore"; version = "0.14.2.1"; sha256 = "0kcjrka0c9ifq3zfhmkv05wy3xb7v0cyznfxldp2gjcn1haq084j"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base ]; - libraryPkgconfigDepends = [ webkitgtk24x ]; + libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ]; description = "JavaScriptCore FFI from webkitgtk"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) webkitgtk24x;}; + }) {inherit (pkgs) webkitgtk24x-gtk3;}; "webpage" = callPackage ({ mkDerivation, base, blaze-html, data-default, lucid, text }: @@ -202573,19 +204127,19 @@ self: { "wolf" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-swf, base, bytestring , conduit, directory, exceptions, filemanip, filepath, http-types - , lifted-async, lifted-base, monad-control, optparse-generic - , preamble, process, resourcet, shakers, time, uuid, yaml + , lifted-async, lifted-base, optparse-generic, preamble, process + , shakers, time, uuid, yaml }: mkDerivation { pname = "wolf"; - version = "0.3.18"; - sha256 = "08wpjp1m6szx2sp4g7h03ks7r2ryadzz3a3apchd2vymhlb1qaxb"; + version = "0.3.23"; + sha256 = "0vj6195qqgx1ypv4h6jha3ayi73gcqxwwvcd7km12j4al68x6nvv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson amazonka amazonka-swf base bytestring conduit directory exceptions filemanip filepath http-types lifted-async lifted-base - monad-control preamble process resourcet time uuid yaml + preamble process time uuid yaml ]; executableHaskellDepends = [ base optparse-generic shakers ]; homepage = "https://github.com/swift-nav/wolf"; @@ -202634,6 +204188,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "word-wrap" = callPackage + ({ mkDerivation, base, hspec, text }: + mkDerivation { + pname = "word-wrap"; + version = "0.1"; + sha256 = "1znkvh6nzx64v5kbfvr06r85idazxjx9qsbqgidrr5vnz0wccj76"; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/jtdaugherty/word-wrap/"; + description = "A library for word-wrapping"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "word24" = callPackage ({ mkDerivation, base, criterion, deepseq, QuickCheck , test-framework, test-framework-quickcheck2 @@ -202673,8 +204240,8 @@ self: { }: mkDerivation { pname = "wordchoice"; - version = "0.1.0.5"; - sha256 = "0841dzjxnj9hm2lm31sa7xabaywdpnjjksy1c7b4idirdpmz9rhd"; + version = "0.1.1.0"; + sha256 = "1san5jgb2nc0shjk38jxgnqdj0mq248gqsn9zc1ldhai1qqy490h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -203195,6 +204762,8 @@ self: { pname = "writer-cps-morph"; version = "0.1.0.2"; sha256 = "1n6m7wpxvvnxgkjz8qfiqz9jn2d83qb9wj4gmp476fg8vjvhf7g9"; + revision = "1"; + editedCabalFile = "0dqpbpaidwa7ahk0n7pv397mv7ncr26p3vcrjh1xzl6vk26bdah5"; libraryHaskellDepends = [ base mmorph writer-cps-transformers ]; homepage = "https://github.com/louispan/writer-cps-morph#readme"; description = "MFunctor instance for CPS style WriterT and RWST"; @@ -204529,28 +206098,6 @@ self: { }) {}; "xml-conduit-parse" = callPackage - ({ mkDerivation, base, conduit, conduit-parse, containers - , data-default, exceptions, hlint, parsers, resourcet, tasty - , tasty-hunit, text, xml-conduit, xml-types - }: - mkDerivation { - pname = "xml-conduit-parse"; - version = "0.3.1.0"; - sha256 = "1mbjqmp9bib6m49y3lrfpspc05ihjddj10lqz30nq89ys36sma32"; - libraryHaskellDepends = [ - base conduit conduit-parse containers exceptions parsers text - xml-conduit xml-types - ]; - testHaskellDepends = [ - base conduit conduit-parse data-default hlint parsers resourcet - tasty tasty-hunit - ]; - homepage = "https://github.com/k0ral/xml-conduit-parse"; - description = "Streaming XML parser based on conduits"; - license = "unknown"; - }) {}; - - "xml-conduit-parse_0_3_1_1" = callPackage ({ mkDerivation, base, conduit, conduit-parse, containers , data-default, exceptions, hlint, parsers, resourcet, tasty , tasty-hunit, text, xml-conduit, xml-types @@ -204570,7 +206117,6 @@ self: { homepage = "https://github.com/k0ral/xml-conduit-parse"; description = "Streaming XML parser based on conduits"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xml-conduit-writer" = callPackage @@ -205338,23 +206884,23 @@ self: { }) {}; "xmonad-extras" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, hint - , libmpd, mtl, network, old-locale, old-time, parsec, process - , random, regex-posix, split, unix, X11, xmonad, xmonad-contrib + ({ mkDerivation, alsa-mixer, base, bytestring, containers + , directory, hint, libmpd, mtl, network, old-locale, old-time + , process, random, regex-posix, unix, X11, xmonad, xmonad-contrib }: mkDerivation { pname = "xmonad-extras"; - version = "0.12.1"; - sha256 = "14g8i3rvfiqp6mq1xhw8f9q0svcfz5nhlsgbz20zlk1az7673z55"; + version = "0.13.0"; + sha256 = "11clsfa5i174i6bfp6mdy06w11jyx2sydrbbczf2s9kg92ysbnqb"; configureFlags = [ "-f-with_hlist" "-fwith_parsec" "-fwith_split" ]; libraryHaskellDepends = [ - base bytestring containers directory hint libmpd mtl network - old-locale old-time parsec process random regex-posix split unix - X11 xmonad xmonad-contrib + alsa-mixer base bytestring containers directory hint libmpd mtl + network old-locale old-time process random regex-posix unix X11 + xmonad xmonad-contrib ]; - homepage = "http://projects.haskell.org/xmonad-extras"; + homepage = "https://github.com/xmonad/xmonad-extras"; description = "Third party extensions for xmonad with wacky dependencies"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -205750,8 +207296,8 @@ self: { ({ mkDerivation, base, word8 }: mkDerivation { pname = "yabi"; - version = "0.1.1.0"; - sha256 = "05avn1m1mmgvzx9vkjy0fyyy38vmz39km0b190lz7lhy9qrwa2bb"; + version = "0.2.0.0"; + sha256 = "1iihmhq87z5k9wzv8j8ydyy100m0401yqm576z27fk01i1a6fq3x"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base word8 ]; @@ -205919,8 +207465,8 @@ self: { }: mkDerivation { pname = "yaml"; - version = "0.8.23"; - sha256 = "0p0ya8vgydsjc9nvc92kncz7239lixjh1rdw3gprnqs2h8a3f428"; + version = "0.8.23.3"; + sha256 = "0hvmxl8krh8m3804d1nrvgmbirvw11a8iy80ciq4rg0csmz5r1fc"; configureFlags = [ "-fsystem-libyaml" ]; isLibrary = true; isExecutable = true; @@ -205941,38 +207487,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) libyaml;}; - "yaml_0_8_23_1" = callPackage - ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat - , bytestring, conduit, containers, directory, filepath, hspec - , HUnit, libyaml, mockery, resourcet, scientific, semigroups - , template-haskell, temporary, text, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "yaml"; - version = "0.8.23.1"; - sha256 = "0sv01yzi08mr2r7wkjcrsl5pf02zzv3y2n7amznv0pdj82sw16sa"; - configureFlags = [ "-fsystem-libyaml" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring conduit containers directory - filepath resourcet scientific semigroups template-haskell text - transformers unordered-containers vector - ]; - libraryPkgconfigDepends = [ libyaml ]; - executableHaskellDepends = [ aeson base bytestring ]; - testHaskellDepends = [ - aeson aeson-qq base base-compat bytestring conduit directory hspec - HUnit mockery resourcet temporary text transformers - unordered-containers vector - ]; - homepage = "http://github.com/snoyberg/yaml/"; - description = "Support for parsing and rendering YAML documents"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) libyaml;}; - "yaml-combinators" = callPackage ({ mkDerivation, aeson, base, bytestring, doctest, generics-sop , scientific, tasty, tasty-hunit, text, transformers @@ -206518,6 +208032,8 @@ self: { pname = "yesod-angular-ui"; version = "0.1.1.0"; sha256 = "08rr8w4bibjjchgfp1j9gywldr8v10vg8ddmkxj6dx5b6w2kvm8k"; + revision = "1"; + editedCabalFile = "1nak49v5ggsmpgawa8q8li88vf1nw6kn0f9fii7d6xbnfxpx6w6x"; libraryHaskellDepends = [ base blaze-html containers directory hjsmin mtl resourcet shakespeare template-haskell text transformers yesod yesod-core @@ -207374,6 +208890,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-form-bootstrap4" = callPackage + ({ mkDerivation, base, classy-prelude-yesod, yesod-form }: + mkDerivation { + pname = "yesod-form-bootstrap4"; + version = "0.1.0.0"; + sha256 = "0n8pqa94v3ffx0225zv9mqlknwcwicdwrc0l3vj7iw4dggn1qy81"; + libraryHaskellDepends = [ base classy-prelude-yesod yesod-form ]; + homepage = "https://github.com/ncaq/yesod-form-bootstrap4.git#readme"; + description = "renderBootstrap4"; + license = stdenv.lib.licenses.mit; + }) {}; + "yesod-form-json" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, text , unordered-containers, yesod-core, yesod-form @@ -207396,8 +208924,8 @@ self: { }: mkDerivation { pname = "yesod-form-richtext"; - version = "0.1.0.0"; - sha256 = "1l8idjn0ib0y6gjsgzkvnznm69mhy49cb9ppw99w3ajndp8zw15l"; + version = "0.1.0.1"; + sha256 = "0bmngw13lgacni8xn5jwpnf77qf0nmg3cqhb0mshp7cccky7cg7y"; libraryHaskellDepends = [ base blaze-builder blaze-html shakespeare text xss-sanitize yesod-core yesod-form @@ -208198,8 +209726,8 @@ self: { }: mkDerivation { pname = "yesod-test"; - version = "1.5.6"; - sha256 = "1zb3zm6id0nnsbpic8643b1p0x6yx1in8x1c7n36wbp9crinr0h3"; + version = "1.5.7"; + sha256 = "04q1hp09wbr4y77v0296c9z9hp5rgaz5pvahw6p1hk3vfypjlss2"; libraryHaskellDepends = [ attoparsec base blaze-builder blaze-html blaze-markup bytestring case-insensitive containers cookie hspec-core html-conduit @@ -208458,18 +209986,19 @@ self: { "yi-core" = callPackage ({ mkDerivation, array, attoparsec, base, binary, bytestring - , containers, data-default, directory, dlist, dynamic-state, dyre - , exceptions, filepath, hashable, Hclip, ListLike - , microlens-platform, mtl, old-locale, oo-prototypes, parsec - , pointedlist, process, process-extras, safe, semigroups, split - , tasty, tasty-hunit, tasty-quickcheck, text, text-icu, time - , transformers-base, unix, unix-compat, unordered-containers - , word-trie, xdg-basedir, yi-language, yi-rope + , containers, criterion, data-default, deepseq, directory, dlist + , dynamic-state, dyre, exceptions, filepath, hashable, Hclip + , ListLike, microlens-platform, mtl, old-locale, oo-prototypes + , parsec, pointedlist, process, process-extras, quickcheck-text + , safe, semigroups, split, tasty, tasty-hunit, tasty-quickcheck + , text, text-icu, time, transformers-base, unix, unix-compat + , unordered-containers, word-trie, xdg-basedir, yi-language + , yi-rope }: mkDerivation { pname = "yi-core"; - version = "0.13.5"; - sha256 = "0ac8drczsiigic6q086dqz7qx0jf3zqhpkvz7ld81ybw1gs4jjxq"; + version = "0.13.7"; + sha256 = "0i2n8jx15fic32kakppj9lz935dcm0090b736f8w711x6aib6nmg"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-default directory dlist dynamic-state dyre exceptions filepath hashable @@ -208482,10 +210011,19 @@ self: { array attoparsec base binary bytestring containers data-default directory dlist dynamic-state dyre exceptions filepath hashable Hclip ListLike microlens-platform mtl old-locale oo-prototypes - parsec pointedlist process process-extras safe semigroups split - tasty tasty-hunit tasty-quickcheck text text-icu time - transformers-base unix unix-compat unordered-containers word-trie - xdg-basedir yi-language yi-rope + parsec pointedlist process process-extras quickcheck-text safe + semigroups split tasty tasty-hunit tasty-quickcheck text text-icu + time transformers-base unix unix-compat unordered-containers + word-trie xdg-basedir yi-language yi-rope + ]; + benchmarkHaskellDepends = [ + array attoparsec base binary bytestring containers criterion + data-default deepseq directory dlist dynamic-state dyre exceptions + filepath hashable Hclip ListLike microlens-platform mtl old-locale + oo-prototypes parsec pointedlist process process-extras safe + semigroups split text text-icu time transformers-base unix + unix-compat unordered-containers word-trie xdg-basedir yi-language + yi-rope ]; homepage = "https://github.com/yi-editor/yi#readme"; description = "Yi editor core library"; @@ -208551,6 +210089,7 @@ self: { homepage = "https://github.com/yi-editor/yi#readme"; description = "Dynamic configuration support for Yi"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-emacs-colours" = callPackage @@ -208587,15 +210126,15 @@ self: { "yi-frontend-vty" = callPackage ({ mkDerivation, base, containers, data-default, dlist , microlens-platform, pointedlist, stm, text, vty, yi-core - , yi-language + , yi-language, yi-rope }: mkDerivation { pname = "yi-frontend-vty"; - version = "0.13.5"; - sha256 = "1crpl6810xiz4mk4yj56w9anxs7yz09m12gmi859vjp0sbglrrsv"; + version = "0.13.7"; + sha256 = "0sgk9cx6q7mxjc1w7396mrrlds0gbilky2w04j4cj7c57nq42n93"; libraryHaskellDepends = [ base containers data-default dlist microlens-platform pointedlist - stm text vty yi-core yi-language + stm text vty yi-core yi-language yi-rope ]; homepage = "https://github.com/yi-editor/yi#readme"; description = "Vty frontend for Yi editor"; @@ -208628,8 +210167,8 @@ self: { }: mkDerivation { pname = "yi-fuzzy-open"; - version = "0.13.5"; - sha256 = "0bcyxlq66mmcdwn44knpkrzfki201jkcyiadnqy1bfwq8p8ky757"; + version = "0.13.7"; + sha256 = "0gqab3cdl2mrdp7wymhn6gy63mnd438m6ax6wis22kq1xpc5hdqd"; libraryHaskellDepends = [ base binary containers data-default directory filepath mtl text transformers-base vector yi-core yi-language yi-rope @@ -208676,8 +210215,8 @@ self: { }: mkDerivation { pname = "yi-ireader"; - version = "0.13.5"; - sha256 = "0j3v7ph93qlf40q5abcv2396hjnz4l5a81yd292sm1w3jp5pbzhg"; + version = "0.13.7"; + sha256 = "1f4nj22nkk33s3w8gwa38cab50232laifkc4kd89ybaj4w9yawfj"; libraryHaskellDepends = [ base binary bytestring containers data-default microlens-platform text yi-core yi-language yi-rope @@ -208711,8 +210250,8 @@ self: { }: mkDerivation { pname = "yi-keymap-cua"; - version = "0.13.5"; - sha256 = "1iap9lgzj2gg3yqrpli4alhklsppfnlczrjqddidc8vy174017nl"; + version = "0.13.7"; + sha256 = "0fm2kgafmzbn8fvksl0mx0c5r0aqvdmnh6pnp5ql5xr73k4n4pmf"; libraryHaskellDepends = [ base microlens-platform text yi-core yi-keymap-emacs yi-rope ]; @@ -208746,8 +210285,8 @@ self: { }: mkDerivation { pname = "yi-keymap-emacs"; - version = "0.13.5"; - sha256 = "05h4xgg7w1m0hiimrx9xrhjc53h0vdhgsaal7g0sb0bgrilx06c0"; + version = "0.13.7"; + sha256 = "1whxh7jznfq27ps9wnqaarhc8dcmfx19i01m0h6pbh7zmlyl2ddn"; libraryHaskellDepends = [ base containers filepath Hclip microlens-platform mtl oo-prototypes semigroups text transformers-base yi-core yi-language yi-misc-modes @@ -208788,8 +210327,8 @@ self: { }: mkDerivation { pname = "yi-keymap-vim"; - version = "0.13.5"; - sha256 = "01s9qx2yd297gda53j7f9kv39lxy09qj4kk8ms21ajjzj7q4hyn3"; + version = "0.13.7"; + sha256 = "0d91lpcrsbwwacqycmkdmxkwnx7rn116cj76ddb7wrnikaj6vv1j"; libraryHaskellDepends = [ attoparsec base binary containers data-default directory filepath Hclip microlens-platform mtl oo-prototypes pointedlist safe @@ -208846,8 +210385,8 @@ self: { }: mkDerivation { pname = "yi-language"; - version = "0.13.5"; - sha256 = "1zgw4amvmm0qhid8mcdakb4q8vlasnk5vqy9hsx9v0nc6w6c36fm"; + version = "0.13.7"; + sha256 = "1cfa44fv2kvsk695ny9rvi3ih55d3gzak5873zmb35bdc64v2k66"; libraryHaskellDepends = [ array base binary containers data-default hashable microlens-platform oo-prototypes pointedlist regex-base regex-tdfa @@ -208901,8 +210440,8 @@ self: { }: mkDerivation { pname = "yi-misc-modes"; - version = "0.13.5"; - sha256 = "1a91p4yrs38ra93szds00rm5w5lgbm672lhs65c7vwqk300w52aq"; + version = "0.13.7"; + sha256 = "0gyy7rg0wgblsilx83hrdb0fgc54skhljxw2csq41qdb5z756nqg"; libraryHaskellDepends = [ array base binary data-default filepath microlens-platform semigroups text yi-core yi-language yi-rope @@ -208943,8 +210482,8 @@ self: { }: mkDerivation { pname = "yi-mode-haskell"; - version = "0.13.5"; - sha256 = "16bg0kr21zdwcbclmyl4b7y3g0nza21vmn804c3r2lz4d95v68s3"; + version = "0.13.7"; + sha256 = "00p9hmvdd3llm0xnm0xrz8n9a74jh8lmazsm9ng4c3l0a5f3kxqq"; libraryHaskellDepends = [ array base binary data-default microlens-platform text yi-core yi-language yi-rope @@ -208988,8 +210527,8 @@ self: { }: mkDerivation { pname = "yi-mode-javascript"; - version = "0.13.5"; - sha256 = "071qhr626zkpc1472jvk54mc9nmcqw3hnyp1nqmy2v5h7yqb4v8m"; + version = "0.13.7"; + sha256 = "0fifk329g66r2k5a0j4jw8lcwlxc9v4r66sggrizgcqmcfxj895a"; libraryHaskellDepends = [ array base binary data-default dlist filepath microlens-platform mtl text yi-core yi-language yi-rope @@ -209055,21 +210594,44 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "yi-rope_0_9" = callPackage + ({ mkDerivation, base, binary, bytestring, charsetdetect-ae + , criterion, data-default, deepseq, fingertree, hspec, QuickCheck + , quickcheck-instances, text, text-icu + }: + mkDerivation { + pname = "yi-rope"; + version = "0.9"; + sha256 = "0j9g96dgjy30zzygbrimcq6g6dz978xgk53j12kdn710ilklkhs6"; + libraryHaskellDepends = [ + base binary bytestring charsetdetect-ae data-default deepseq + fingertree text text-icu + ]; + testHaskellDepends = [ + base hspec QuickCheck quickcheck-instances text + ]; + benchmarkHaskellDepends = [ base criterion deepseq text ]; + description = "A rope data structure used by Yi"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-snippet" = callPackage - ({ mkDerivation, base, binary, containers, data-default, free, lens - , mtl, tasty-hunit, tasty-th, text, vector, yi-core, yi-rope + ({ mkDerivation, base, binary, containers, data-default, free + , microlens-platform, mtl, tasty-hunit, tasty-th, text, vector + , yi-core, yi-rope }: mkDerivation { pname = "yi-snippet"; - version = "0.13.5"; - sha256 = "04xblqv2sglwzgplfcn737v7gk0w6zfyf2l72c01jv0sq247rdpk"; + version = "0.13.7"; + sha256 = "18h67vc2fb35jfmz4zq3sc7av5nrl5cqa8q5vhdywhhhp6bsvi00"; libraryHaskellDepends = [ - base binary containers data-default free lens mtl text vector - yi-core yi-rope + base binary containers data-default free microlens-platform mtl + text vector yi-core yi-rope ]; testHaskellDepends = [ - base binary containers data-default free lens mtl tasty-hunit - tasty-th text vector yi-core yi-rope + base binary containers data-default free microlens-platform mtl + tasty-hunit tasty-th text vector yi-core yi-rope ]; homepage = "https://github.com/yi-editor/yi#readme"; description = "Snippet support for yi"; @@ -209722,6 +211284,7 @@ self: { homepage = "https://github.com/itkovian/zeromq4-conduit#readme"; description = "Conduit wrapper around zeromq4-haskell"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zeromq4-haskell" = callPackage @@ -209731,8 +211294,8 @@ self: { }: mkDerivation { pname = "zeromq4-haskell"; - version = "0.6.5"; - sha256 = "1hp7k5kzj6fbv0jkvcgxx6pg0nd200dsa4ynwd658s92i37vd6bf"; + version = "0.6.7"; + sha256 = "1kjgmy8pbq9b00s8ak469afwgvhvnyyk7430x20amw01jcjbicll"; libraryHaskellDepends = [ async base bytestring containers exceptions monad-control semigroups transformers transformers-base @@ -209746,29 +211309,6 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) zeromq;}; - "zeromq4-haskell_0_6_6" = callPackage - ({ mkDerivation, async, base, bytestring, containers, exceptions - , monad-control, QuickCheck, semigroups, tasty, tasty-hunit - , tasty-quickcheck, transformers, transformers-base, zeromq - }: - mkDerivation { - pname = "zeromq4-haskell"; - version = "0.6.6"; - sha256 = "1pblwyn2lly3px9843g4a2wpkqhnffd53kam1b9kx31zpplfhbx8"; - libraryHaskellDepends = [ - async base bytestring containers exceptions monad-control - semigroups transformers transformers-base - ]; - libraryPkgconfigDepends = [ zeromq ]; - testHaskellDepends = [ - async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck - ]; - homepage = "https://gitlab.com/twittner/zeromq-haskell/"; - description = "Bindings to ZeroMQ 4.x"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) zeromq;}; - "zeroth" = callPackage ({ mkDerivation, base, Cabal, derive, directory, filepath , haskell-src-exts, hskeleton, monoid-record, process, syb @@ -209984,31 +211524,6 @@ self: { }) {}; "zip-archive" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , digest, directory, filepath, HUnit, mtl, old-time, pretty - , process, temporary, text, time, unix, zip, zlib - }: - mkDerivation { - pname = "zip-archive"; - version = "0.3.1"; - sha256 = "0ywy6isvyizs5d27lh108y6k4qnwmbcdmvzsrm3r45bwcj1nii5f"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base binary bytestring containers digest directory filepath - mtl old-time pretty text time unix zlib - ]; - testHaskellDepends = [ - base bytestring directory HUnit old-time process temporary time - unix - ]; - testToolDepends = [ zip ]; - homepage = "http://github.com/jgm/zip-archive"; - description = "Library for creating and modifying zip archives"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) zip;}; - - "zip-archive_0_3_1_1" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , digest, directory, filepath, HUnit, mtl, old-time, pretty , process, temporary, text, time, unix, zip, zlib @@ -210031,7 +211546,6 @@ self: { homepage = "http://github.com/jgm/zip-archive"; description = "Library for creating and modifying zip archives"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) zip;}; "zip-conduit" = callPackage diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index cc161e3ca2d..6ed8d0864ca 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -130,7 +130,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // { in generateExprs name src {}) overrides; # : { root : Path - # , source-overrides : Defaulted (Either Path VersionNumber + # , source-overrides : Defaulted (Either Path VersionNumber) # , overrides : Defaulted (HaskellPackageOverrideSet) # } -> NixShellAwareDerivation # Given a path to a haskell package directory whose cabal file is diff --git a/pkgs/development/interpreters/elixir/1.3.nix b/pkgs/development/interpreters/elixir/1.3.nix new file mode 100644 index 00000000000..43d48e2cf7c --- /dev/null +++ b/pkgs/development/interpreters/elixir/1.3.nix @@ -0,0 +1,7 @@ +{ mkDerivation }: + +mkDerivation rec { + version = "1.3.4"; + sha256 = "01qqv1ghvfadcwcr5p88w8j217cgaf094pmpqllij3l0q1yg104l"; + minimumOTPVersion = "18"; +} diff --git a/pkgs/development/interpreters/elixir/1.4.nix b/pkgs/development/interpreters/elixir/1.4.nix new file mode 100644 index 00000000000..9ddd9062acd --- /dev/null +++ b/pkgs/development/interpreters/elixir/1.4.nix @@ -0,0 +1,7 @@ +{ mkDerivation }: + +mkDerivation rec { + version = "1.4.5"; + sha256 = "18ivcxmh5bak13k3rjy7jjzin57rgb2nffhwnqb2wl7bpi8mrarw"; + minimumOTPVersion = "18"; +} diff --git a/pkgs/development/interpreters/elixir/1.5.nix b/pkgs/development/interpreters/elixir/1.5.nix new file mode 100644 index 00000000000..0c3c0304a9b --- /dev/null +++ b/pkgs/development/interpreters/elixir/1.5.nix @@ -0,0 +1,7 @@ +{ mkDerivation }: + +mkDerivation rec { + version = "1.5.0-rc.2"; + sha256 = "0wfxsfz1qbb6iapg8j1qskva6j4mccxqvv79xbz08fzzb6n1wvxa"; + minimumOTPVersion = "18"; +} diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix deleted file mode 100644 index 0e77b2af252..00000000000 --- a/pkgs/development/interpreters/elixir/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ stdenv, fetchFromGitHub, erlang, rebar, makeWrapper, coreutils, curl, bash, - debugInfo ? false }: - -stdenv.mkDerivation rec { - name = "elixir-${version}"; - version = "1.4.4"; - - src = fetchFromGitHub { - owner = "elixir-lang"; - repo = "elixir"; - rev = "v${version}"; - sha256 = "0m51cirkv1dahw4z2jlmz58cwmpy0dya88myx4wykq0v5bh1xbq8"; - }; - - buildInputs = [ erlang rebar makeWrapper ]; - - # Elixir expects that UTF-8 locale to be set (see https://github.com/elixir-lang/elixir/issues/3548). - # In other cases there is warnings during compilation. - LANG = "en_US.UTF-8"; - LC_TYPE = "en_US.UTF-8"; - - setupHook = ./setup-hook.sh; - - inherit debugInfo; - - buildFlags = if debugInfo - then "ERL_COMPILER_OPTIONS=debug_info" - else ""; - - preBuild = '' - # The build process uses ./rebar. Link it to the nixpkgs rebar - rm -v rebar - ln -s ${rebar}/bin/rebar rebar - - substituteInPlace Makefile \ - --replace "/usr/local" $out - ''; - - postFixup = '' - # Elixir binaries are shell scripts which run erl. Add some stuff - # to PATH so the scripts can run without problems. - - for f in $out/bin/*; do - b=$(basename $f) - if [ $b == "mix" ]; then continue; fi - wrapProgram $f \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ erlang coreutils curl bash ]}" \ - --set CURL_CA_BUNDLE /etc/ssl/certs/ca-certificates.crt - done - - substituteInPlace $out/bin/mix \ - --replace "/usr/bin/env elixir" "${coreutils}/bin/env elixir" - ''; - - meta = with stdenv.lib; { - homepage = "http://elixir-lang.org/"; - description = "A functional, meta-programming aware language built on top of the Erlang VM"; - - longDescription = '' - Elixir is a functional, meta-programming aware language built on - top of the Erlang VM. It is a dynamic language with flexible - syntax and macro support that leverages Erlang's abilities to - build concurrent, distributed and fault-tolerant applications - with hot code upgrades. - ''; - - license = licenses.epl10; - platforms = platforms.unix; - maintainers = with maintainers; [ the-kenny havvy couchemar ]; - }; -} diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix new file mode 100644 index 00000000000..ff63406aea3 --- /dev/null +++ b/pkgs/development/interpreters/elixir/generic-builder.nix @@ -0,0 +1,77 @@ +{ pkgs, stdenv, fetchFromGitHub, erlang, rebar, makeWrapper, + coreutils, curl, bash, debugInfo ? false }: + +{ baseName ? "elixir" +, version +, minimumOTPVersion +, sha256 ? null +, rev ? "v${version}" +, src ? fetchFromGitHub { inherit rev sha256; owner = "elixir-lang"; repo = "elixir"; } +}: + +let + inherit (stdenv.lib) getVersion versionAtLeast; + +in + assert versionAtLeast (getVersion erlang) minimumOTPVersion; + + stdenv.mkDerivation ({ + name = "${baseName}-${version}"; + + inherit src version; + + buildInputs = [ erlang rebar makeWrapper ]; + + LANG = "en_US.UTF-8"; + LC_TYPE = "en_US.UTF-8"; + + setupHook = ./setup-hook.sh; + + inherit debugInfo; + + buildFlags = if debugInfo + then "ERL_COMPILER_OPTIONS=debug_info" + else ""; + + preBuild = '' + # The build process uses ./rebar. Link it to the nixpkgs rebar + rm -v rebar + ln -s ${rebar}/bin/rebar rebar + + substituteInPlace Makefile \ + --replace "/usr/local" $out + ''; + + postFixup = '' + # Elixir binaries are shell scripts which run erl. Add some stuff + # to PATH so the scripts can run without problems. + + for f in $out/bin/*; do + b=$(basename $f) + if [ "$b" = mix ]; then continue; fi + wrapProgram $f \ + --prefix PATH ":" "${stdenv.lib.makeBinPath [ erlang coreutils curl bash ]}" \ + --set CURL_CA_BUNDLE /etc/ssl/certs/ca-certificates.crt + done + + substituteInPlace $out/bin/mix \ + --replace "/usr/bin/env elixir" "${coreutils}/bin/env elixir" + ''; + + meta = with stdenv.lib; { + homepage = "http://elixir-lang.org/"; + description = "A functional, meta-programming aware language built on top of the Erlang VM"; + + longDescription = '' + Elixir is a functional, meta-programming aware language built on + top of the Erlang VM. It is a dynamic language with flexible + syntax and macro support that leverages Erlang's abilities to + build concurrent, distributed and fault-tolerant applications + with hot code upgrades. + ''; + + license = licenses.epl10; + platforms = platforms.unix; + maintainers = with maintainers; [ the-kenny havvy couchemar ankhers ]; + }; + }) diff --git a/pkgs/development/interpreters/erlang/R20.nix b/pkgs/development/interpreters/erlang/R20.nix new file mode 100644 index 00000000000..8866d9848e7 --- /dev/null +++ b/pkgs/development/interpreters/erlang/R20.nix @@ -0,0 +1,10 @@ +{ mkDerivation, fetchurl }: + +mkDerivation rec { + version = "20.0"; + sha256 = "12dbay254ivnakwknjn5h55wndb0a0wqx55p156h8hwjhykj2kn0"; + + prePatch = '' + substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10' + ''; +} diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix index 04f31dda26a..5746300fca0 100644 --- a/pkgs/development/interpreters/guile/2.0.nix +++ b/pkgs/development/interpreters/guile/2.0.nix @@ -1,5 +1,7 @@ { fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring -, libffi, gawk, makeWrapper, fetchpatch, coverageAnalysis ? null, gnu ? null }: +, libffi, gawk, makeWrapper, fetchpatch, coverageAnalysis ? null, gnu ? null +, hostPlatform +}: # Do either a coverage analysis build or a standard build. (if coverageAnalysis != null @@ -84,7 +86,7 @@ setupHook = ./setup-hook-2.0.sh; crossAttrs.preConfigure = - stdenv.lib.optionalString (stdenv.cross.config == "i586-pc-gnu") + stdenv.lib.optionalString (hostPlatform.isHurd) # On GNU, libgc depends on libpthread, but the cross linker doesn't # know where to find libpthread, which leads to erroneous test failures # in `configure', where `-pthread' and `-lpthread' aren't explicitly diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 769c1951a3c..fe9f94beed1 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -1,5 +1,7 @@ { fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring -, libffi, gawk, makeWrapper, fetchpatch, coverageAnalysis ? null, gnu ? null }: +, libffi, gawk, makeWrapper, fetchpatch, coverageAnalysis ? null, gnu ? null +, hostPlatform +}: # Do either a coverage analysis build or a standard build. (if coverageAnalysis != null @@ -80,7 +82,7 @@ setupHook = ./setup-hook-2.2.sh; crossAttrs.preConfigure = - stdenv.lib.optionalString (stdenv.cross.config == "i586-pc-gnu") + stdenv.lib.optionalString (hostPlatform.isHurd) # On GNU, libgc depends on libpthread, but the cross linker doesn't # know where to find libpthread, which leads to erroneous test failures # in `configure', where `-pthread' and `-lpthread' aren't explicitly diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index e17dd363873..0ea1bf19231 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -1,13 +1,16 @@ -{ stdenv, fetchurl, makeWrapper, jre }: +{ stdenv, callPackage, fetchurl, makeWrapper, jre }: -stdenv.mkDerivation rec { +let +# The version number here is whatever is reported by the RUBY_VERSION string +rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" ""; +jruby = stdenv.mkDerivation rec { name = "jruby-${version}"; - version = "9.0.5.0"; + version = "9.1.12.0"; src = fetchurl { url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz"; - sha256 = "1wysymqzc7591743f2ycgwpm232y6i050izn72lck44nhnyr5wwy"; + sha256 = "15x5w4awy8h6xfkbj0p4xnb68xzfrss1rf2prk0kzk5kyjakrcnx"; }; buildInputs = [ makeWrapper ]; @@ -18,16 +21,42 @@ stdenv.mkDerivation rec { rm $out/bin/*.{bat,dll,exe,sh} mv $out/COPYING $out/LICENSE* $out/docs - for i in $out/bin/*; do + for i in $out/bin/jruby{,.bash}; do wrapProgram $i \ --set JAVA_HOME ${jre} done + + ln -s $out/bin/jruby $out/bin/ruby + + # Bundler tries to create this directory + mkdir -pv $out/${passthru.gemPath} + mkdir -p $out/nix-support + cat > $out/nix-support/setup-hook < alsaSupport || pulseaudioSupport; +assert hostPlatform.isLinux -> alsaSupport || pulseaudioSupport; let inherit (stdenv.lib) optional optionals; @@ -37,7 +38,7 @@ stdenv.mkDerivation rec { optional stdenv.isDarwin Cocoa; buildInputs = let - notMingw = !(stdenv ? cross) || stdenv.cross.libc != "msvcrt"; + notMingw = !hostPlatform.isMinGW; in optional notMingw audiofile ++ optionals stdenv.isDarwin [ OpenGL CoreAudio CoreServices AudioUnit Kernel ]; @@ -52,9 +53,8 @@ stdenv.mkDerivation rec { "--enable-rpath" "--disable-pulseaudio-shared" "--disable-osmesa-shared" - ] ++ optionals (stdenv ? cross) ([ - "--without-x" - ] ++ optional alsaSupport "--with-alsa-prefix=${alsaLib.out}/lib"); + ] ++ optional (!x11Support) "--without-x" + ++ optional (alsaSupport && hostPlatform != buildPlatform) "--with-alsa-prefix=${alsaLib.out}/lib"; patches = [ # Fix window resizing issues, e.g. for xmonad diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix index 9bc714c5538..42988e334b0 100644 --- a/pkgs/development/libraries/ace/default.nix +++ b/pkgs/development/libraries/ace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ace-${version}"; - version = "6.4.2"; + version = "6.4.3"; src = fetchurl { url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2"; - sha256 = "0dscvlgxy0fwma63azjkdbc85mh8k751ik67s88w6w75j0psld73"; + sha256 = "07dvpi3abmjvg7m0aak4x82aj8cvw5zl2cqj525wd3fl6y0pn3mq"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index 1829b3306eb..3251693f574 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -13,11 +13,11 @@ assert ldapSupport -> openldap != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "apr-util-1.5.4"; + name = "apr-util-1.6.0"; src = fetchurl { url = "mirror://apache/apr/${name}.tar.bz2"; - sha256 = "0bn81pfscy9yjvbmyx442svf43s6dhrdfcsnkpxz43fai5qk5kx6"; + sha256 = "0k6a90d67xl36brz69s7adgkswjmw7isnjblm1naqmjblwzwjx44"; }; patches = optional stdenv.isFreeBSD ./include-static-dependencies.patch; diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index 329cd77ad26..9abf48289ae 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "apr-1.5.2"; + name = "apr-1.6.2"; src = fetchurl { url = "mirror://apache/apr/${name}.tar.bz2"; - sha256 = "0ypn51xblix5ys9xy7da3ngdydip0qqh9rdq8nz54w9aq8lys0vx"; + sha256 = "1gffipa87pflvgvw01dbkvgh75p8n2sr56m1pcl01avv6zm9q409"; }; patches = stdenv.lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ]; diff --git a/pkgs/development/libraries/asio/default.nix b/pkgs/development/libraries/asio/default.nix index 76ef5ff1d98..dae8657388f 100644 --- a/pkgs/development/libraries/asio/default.nix +++ b/pkgs/development/libraries/asio/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, boost, openssl}: stdenv.mkDerivation rec { - name = "asio-1.10.6"; + name = "asio-1.10.8"; src = fetchurl { url = "mirror://sourceforge/asio/${name}.tar.bz2"; - sha256 = "0phr6zq8z78dwhhzs3h27q32mcv1ffg2gyq880rw3xmilx01rmz0"; + sha256 = "0jgdl4fxw0hwy768rl3lhdc0czz7ak7czf3dg10j21pdpfpfvpi6"; }; propagatedBuildInputs = [ boost ]; diff --git a/pkgs/development/libraries/aspell/aspell-with-dicts.nix b/pkgs/development/libraries/aspell/aspell-with-dicts.nix new file mode 100644 index 00000000000..eb96070f4fd --- /dev/null +++ b/pkgs/development/libraries/aspell/aspell-with-dicts.nix @@ -0,0 +1,35 @@ +# Create a derivation that contains aspell and selected dictionaries. +# Composition is done using `pkgs.buildEnv`. + +{ aspell +, aspellDicts +, makeWrapper +, symlinkJoin +, runCommand +}: + +f: + +let + # Dictionaries we want + dicts = f aspellDicts; + + # A tree containing the dictionaries + dictEnv = symlinkJoin { + name = "aspell-dicts"; + paths = dicts; + }; + +in runCommand "aspell-env" { + buildInputs = [ makeWrapper ]; +} '' + # Construct wrappers in /bin + mkdir -p $out/bin + pushd "${aspell}/bin" + for prg in *; do + if [ -f "$prg" ]; then + makeWrapper "${aspell}/bin/$prg" "$out/bin/$prg" --set ASPELL_CONF "data-dir ${dictEnv}/lib/aspell" + fi + done + popd +'' diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 974989dc24b..9f97b18b4d7 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -26,6 +26,7 @@ in stdenv.mkDerivation rec { # FIXME: might be nice to put different APIs in different outputs # (e.g. libaws-cpp-sdk-s3.so in output "s3"). outputs = [ "out" "dev" ]; + separateDebugInfo = stdenv.isLinux; buildInputs = [ cmake curl ]; diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index 96e41790aac..e4311c0a5e9 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchurl, pkgconfig, libatomic_ops, enableLargeConfig ? false }: +{ lib, stdenv, fetchurl, pkgconfig, libatomic_ops, enableLargeConfig ? false +, buildPlatform, hostPlatform +}: stdenv.mkDerivation rec { name = "boehm-gc-7.6.0"; @@ -12,6 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; outputs = [ "out" "dev" "doc" ]; + separateDebugInfo = stdenv.isLinux; configureFlags = [ "--enable-cplusplus" ] @@ -20,7 +23,7 @@ stdenv.mkDerivation rec { doCheck = true; # Don't run the native `strip' when cross-compiling. - dontStrip = stdenv ? cross; + dontStrip = hostPlatform != buildPlatform; postInstall = '' diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 174e9fe4776..9a6c5d7b413 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, libiconv +, buildPlatform, hostPlatform , toolset ? if stdenv.cc.isClang then "clang" else null , enableRelease ? true , enableDebug ? false , enableSingleThreaded ? false , enableMultiThreaded ? true -, enableShared ? !(stdenv.cross.libc or null == "msvcrt") # problems for now +, enableShared ? !(hostPlatform.libc == "msvcrt") # problems for now , enableStatic ? !enableShared , enablePIC ? false , enableExceptions ? false @@ -76,11 +77,11 @@ let "--user-config=user-config.jam" "toolset=gcc-cross" "--without-python" - ] ++ optionals (stdenv.cross.libc == "msvcrt") [ + ] ++ optionals (hostPlatform.libc == "msvcrt") [ "target-os=windows" "threadapi=win32" "binary-format=pe" - "address-model=${if hasPrefix "x86_64-" stdenv.cross.config then "64" else "32"}" + "address-model=${toString hostPlatform.parsed.cpu.bits}" "architecture=x86" ]; crossB2Args = concatStringsSep " " (genericB2Flags ++ crossB2Flags); @@ -110,8 +111,8 @@ let find include \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \ -exec sed '1i#line 1 "{}"' -i '{}' \; ) - '' + optionalString (stdenv.cross.libc or null == "msvcrt") '' - ${stdenv.cross.config}-ranlib "$out/lib/"*.a + '' + optionalString (hostPlatform.libc == "msvcrt") '' + ${stdenv.cc.prefix}ranlib "$out/lib/"*.a ''; in @@ -147,13 +148,13 @@ stdenv.mkDerivation { enableParallelBuilding = true; buildInputs = [ expat zlib bzip2 libiconv ] - ++ stdenv.lib.optionals (! stdenv ? cross) [ python icu ] + ++ stdenv.lib.optionals (hostPlatform == buildPlatform) [ python icu ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; configureScript = "./bootstrap.sh"; configureFlags = commonConfigureFlags ++ [ "--with-python=${python.interpreter}" ] - ++ optional (! stdenv ? cross) "--with-icu=${icu.dev}" + ++ optional (hostPlatform == buildPlatform) "--with-icu=${icu.dev}" ++ optional (toolset != null) "--with-toolset=${toolset}"; buildPhase = builder nativeB2Args; @@ -177,7 +178,7 @@ stdenv.mkDerivation { buildPhase = builder crossB2Args; installPhase = installer crossB2Args; postFixup = fixup; - } // optionalAttrs (stdenv.cross.libc == "msvcrt") { + } // optionalAttrs (hostPlatform.libc == "msvcrt") { patches = fetchurl { url = "https://svn.boost.org/trac/boost/raw-attachment/ticket/7262/" + "boost-mingw.patch"; diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix index 66ed90a90b3..1c55aa7f834 100644 --- a/pkgs/development/libraries/catch/default.nix +++ b/pkgs/development/libraries/catch/default.nix @@ -1,15 +1,14 @@ -{ stdenv, cmake, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "catch-${version}"; - version = "1.9.5"; + version = "1.9.6"; src = fetchFromGitHub { owner = "philsquared"; repo = "Catch"; rev = "v${version}"; - sha256 = "1in4f6w1pja8m1hvyiwx7s7gxnj6nlj1fgxw9blldffh09ikgpm2"; + sha256 = "0nqnyw6haa2771748ycag4hhjb8ni32cv4f7w3h0pji212542xan"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 07f323699b1..3d6d1c22605 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, kerberos, db, gettext, pam, fixDarwinDylibNames, autoreconfHook }: +{ lib, stdenv, fetchurl, openssl, openldap, kerberos, db, gettext, pam, fixDarwinDylibNames, autoreconfHook, enableLdap ? false }: with stdenv.lib; stdenv.mkDerivation rec { @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl db gettext kerberos ] + ++ lib.optional enableLdap openldap ++ lib.optional stdenv.isFreeBSD autoreconfHook ++ lib.optional stdenv.isLinux pam ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; @@ -29,12 +30,11 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-openssl=${openssl.dev}" - ]; + ] ++ lib.optional enableLdap "--with-ldap=${openldap.dev}"; # Set this variable at build-time to make sure $out can be evaluated. preConfigure = '' configureFlagsArray=( --with-plugindir=$out/lib/sasl2 - --with-configdir=$out/lib/sasl2 --with-saslauthd=/run/saslauthd --enable-login ) diff --git a/pkgs/development/libraries/db/db-6.2.nix b/pkgs/development/libraries/db/db-6.2.nix new file mode 100644 index 00000000000..f897e3744af --- /dev/null +++ b/pkgs/development/libraries/db/db-6.2.nix @@ -0,0 +1,8 @@ +{ stdenv, fetchurl, ... } @ args: + +import ./generic.nix (args // rec { + version = "6.2.23"; + sha256 = "1isxx4jfmnh913jzhp8hhfngbk6dsg46f4kjpvvc56maj64jqqa7"; + license = stdenv.lib.licenses.agpl3; + extraPatches = [ ./clang-6.0.patch ]; +}) diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index a11be14df10..a1a07b43197 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch, zlib, expat, gettext }: stdenv.mkDerivation rec { - name = "exiv2-0.25"; + name = "exiv2-0.26"; src = fetchurl { - url = "http://www.exiv2.org/${name}.tar.gz"; - sha256 = "197g6vgcpyf9p2cwn5p5hb1r714xsk1v4p96f5pv1z8mi9vzq2y8"; + url = "http://www.exiv2.org/builds/${name}-trunk.tar.gz"; + sha256 = "1yza317qxd8yshvqnay164imm0ks7cvij8y8j86p1gqi1153qpn7"; }; postPatch = "patchShebangs ./src/svn_version.sh"; diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index 3cbfc4c568d..205faa845fe 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "expat-2.2.1"; + name = "expat-2.2.2"; src = fetchurl { url = "mirror://sourceforge/expat/${name}.tar.bz2"; - sha256 = "11c8jy1wvllvlk7xdc5cm8hdhg0hvs8j0aqy6s702an8wkdcls0q"; + sha256 = "0ik0r39ala9c6hj4kxrk933klgwkzlkbrfhvhaykx8l1rwgr2xj3"; }; outputs = [ "out" "dev" ]; # TODO: fix referrers diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index d5b2632a371..6246026e9ea 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, pkgconfig, perl, texinfo, yasm +, hostPlatform /* * Licensing options (yes some are listed twice, filters and such are not listed) */ @@ -428,30 +429,13 @@ stdenv.mkDerivation rec { /* Cross-compilation is untested, consider this an outline, more work needs to be done to portions of the build to get it to work correctly */ - crossAttrs = let - os = '' - if [ "${stdenv.cross.config}" = "*cygwin*" ] ; then - # Probably should look for mingw too - echo "cygwin" - elif [ "${stdenv.cross.config}" = "*darwin*" ] ; then - echo "darwin" - elif [ "${stdenv.cross.config}" = "*freebsd*" ] ; then - echo "freebsd" - elif [ "${stdenv.cross.config}" = "*linux*" ] ; then - echo "linux" - elif [ "${stdenv.cross.config}" = "*netbsd*" ] ; then - echo "netbsd" - elif [ "${stdenv.cross.config}" = "*openbsd*" ] ; then - echo "openbsd" - fi - ''; - in { - dontSetConfigureCross = true; + crossAttrs = { + configurePlatforms = []; configureFlags = configureFlags ++ [ - "--cross-prefix=${stdenv.cross.config}-" + "--cross-prefix=${stdenv.cc.prefix}" "--enable-cross-compile" - "--target_os=${os}" - "--arch=${stdenv.cross.arch}" + "--target_os=${hostPlatform.parsed.kernel.name}" + "--arch=${hostPlatform.arch}" ]; }; diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 57ac086368f..a34b378552a 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -2,6 +2,7 @@ , alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg , libtheora, libva, libvorbis, libvpx, lzma, libpulseaudio, soxr , x264, x265, xvidcore, zlib, libopus +, hostPlatform , openglSupport ? false, mesa ? null # Build options , runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime @@ -169,30 +170,13 @@ stdenv.mkDerivation rec { /* Cross-compilation is untested, consider this an outline, more work needs to be done to portions of the build to get it to work correctly */ - crossAttrs = let - os = '' - if [ "${stdenv.cross.config}" = "*cygwin*" ] ; then - # Probably should look for mingw too - echo "cygwin" - elif [ "${stdenv.cross.config}" = "*darwin*" ] ; then - echo "darwin" - elif [ "${stdenv.cross.config}" = "*freebsd*" ] ; then - echo "freebsd" - elif [ "${stdenv.cross.config}" = "*linux*" ] ; then - echo "linux" - elif [ "${stdenv.cross.config}" = "*netbsd*" ] ; then - echo "netbsd" - elif [ "${stdenv.cross.config}" = "*openbsd*" ] ; then - echo "openbsd" - fi - ''; - in { - dontSetConfigureCross = true; + crossAttrs = { + configurePlatforms = []; configureFlags = configureFlags ++ [ - "--cross-prefix=${stdenv.cross.config}-" + "--cross-prefix=${stdenv.cc.prefix}" "--enable-cross-compile" - "--target_os=${os}" - "--arch=${stdenv.cross.arch}" + "--target_os=${hostPlatform.parsed.kernel}" + "--arch=${hostPlatform.arch}" ]; }; diff --git a/pkgs/development/libraries/fontconfig/2.10.nix b/pkgs/development/libraries/fontconfig/2.10.nix index 302992fc8c8..7eaba8f75ec 100644 --- a/pkgs/development/libraries/fontconfig/2.10.nix +++ b/pkgs/development/libraries/fontconfig/2.10.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, freetype, expat }: +{ stdenv, fetchurl, pkgconfig, freetype, expat +, hostPlatform +}: stdenv.mkDerivation rec { name = "fontconfig-2.10.2"; @@ -21,7 +23,7 @@ stdenv.mkDerivation rec { ]; # We should find a better way to access the arch reliably. - crossArch = stdenv.cross.arch or null; + crossArch = hostPlatform.arch or null; preConfigure = '' if test -n "$crossConfig"; then diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 14983b744df..f176aa0878c 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -1,5 +1,7 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, freetype, expat, libxslt, dejavu_fonts -, substituteAll }: +{ stdenv, substituteAll, fetchurl, fetchpatch +, pkgconfig, freetype, expat, libxslt, dejavu_fonts +, hostPlatform +}: /** Font configuration scheme - ./config-compat.patch makes fontconfig try the following root configs, in order: @@ -53,7 +55,7 @@ stdenv.mkDerivation rec { ]; # We should find a better way to access the arch reliably. - crossArch = stdenv.cross.arch or null; + crossArch = hostPlatform.arch or null; preConfigure = '' if test -n "$crossConfig"; then diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 9b2c6fe11e1..8f16f85cabf 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -1,12 +1,12 @@ -{ - stdenv, lib, fetchurl, copyPathsToStore, - pkgconfig, which, - zlib, bzip2, libpng, gnumake, glib, +{ stdenv, lib, fetchurl, copyPathsToStore +, hostPlatform +, pkgconfig, which +, zlib, bzip2, libpng, gnumake, glib - # FreeType supports LCD filtering (colloquially referred to as sub-pixel rendering). +, # FreeType supports LCD filtering (colloquially referred to as sub-pixel rendering). # LCD filtering is also known as ClearType and covered by several Microsoft patents. # This option allows it to be disabled. See http://www.freetype.org/patents.html. - useEncumberedCode ? true, + useEncumberedCode ? true }: let @@ -67,7 +67,7 @@ in stdenv.mkDerivation { postInstall = glib.flattenInclude; - crossAttrs = stdenv.lib.optionalAttrs (stdenv.cross.libc or null != "msvcrt") { + crossAttrs = stdenv.lib.optionalAttrs (hostPlatform.libc or null != "msvcrt") { # Somehow it calls the unwrapped gcc, "i686-pc-linux-gnu-gcc", instead # of gcc. I think it's due to the unwrapped gcc being in the PATH. I don't # know why it's on the PATH. diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 7e296fb9d06..07f370b4210 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib , postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl -, libpng, sqlite, libspatialite, poppler +, libpng, sqlite, libspatialite, poppler, hdf4 , libiconv , netcdfSupport ? true, netcdf, hdf5 , curl }: @@ -17,15 +17,20 @@ composableDerivation.composableDerivation {} (fixed: rec { }; buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite - libspatialite poppler ] + libspatialite poppler hdf4 ] ++ (with pythonPackages; [ python numpy wrapPython ]) ++ stdenv.lib.optional stdenv.isDarwin libiconv ++ stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ]; hardeningDisable = [ "format" ]; - # Unset CC and CXX as they confuse libtool. - preConfigure = "unset CC CXX"; + # - Unset CC and CXX as they confuse libtool. + # - teach gdal that libdf is the legacy name for libhdf + preConfigure = '' + unset CC CXX + substituteInPlace configure \ + --replace "-lmfhdf -ldf" "-lmfhdf -lhdf" + ''; configureFlags = [ "--with-jpeg=${libjpeg.dev}" @@ -41,6 +46,7 @@ composableDerivation.composableDerivation {} (fixed: rec { "--with-python" # optional "--with-static-proj4=${proj}" # optional "--with-geos=${geos}/bin/geos-config"# optional + "--with-hdf4=${hdf4.dev}" # optional (if netcdfSupport then "--with-netcdf=${netcdf}" else "") ]; diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix index de77b4c99b8..86d9bd64988 100644 --- a/pkgs/development/libraries/gdbm/default.nix +++ b/pkgs/development/libraries/gdbm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, lib, buildPlatform, fetchurl }: stdenv.mkDerivation rec { name = "gdbm-1.13"; @@ -10,9 +10,22 @@ stdenv.mkDerivation rec { doCheck = true; + # Linking static stubs on cygwin requires correct ordering. + # Consider upstreaming this. + + # Disable dbmfetch03.at test because it depends on unlink() + # failing on a link in a chmod -w directory, which cygwin + # apparently allows. + postPatch = lib.optionalString buildPlatform.isCygwin '' + substituteInPlace tests/Makefile.in --replace \ + '_LDADD = ../src/libgdbm.la ../compat/libgdbm_compat.la' \ + '_LDADD = ../compat/libgdbm_compat.la ../src/libgdbm.la' + substituteInPlace tests/testsuite.at --replace \ + 'm4_include([dbmfetch03.at])' "" + ''; configureFlags = [ "--enable-libgdbm-compat" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "GNU dbm key/value database library"; longDescription = diff --git a/pkgs/development/libraries/getdata/default.nix b/pkgs/development/libraries/getdata/default.nix index 5dbf22df552..22e7d216e6c 100644 --- a/pkgs/development/libraries/getdata/default.nix +++ b/pkgs/development/libraries/getdata/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, libtool }: stdenv.mkDerivation rec { name = "getdata-${version}"; - version = "0.9.4"; + version = "0.10.0"; src = fetchurl { url = "mirror://sourceforge/getdata/${name}.tar.xz"; - sha256 = "0kikla8sxv6f1rlh77m86dajcsa7b1029zb8iigrmksic27mj9ja"; + sha256 = "18xbb32vygav9x6yz0gdklif4chjskmkgp06rwnjdf9myhia0iym"; }; + buildInputs = [ libtool ]; + meta = with stdenv.lib; { description = "Reference implementation of the Dirfile Standards"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 7d555ba4d06..d7058884104 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, libiconv, xz }: +{ stdenv, lib, hostPlatform, fetchurl, libiconv, xz }: stdenv.mkDerivation rec { name = "gettext-${version}"; @@ -18,15 +18,6 @@ stdenv.mkDerivation rec { LDFLAGS = if stdenv.isSunOS then "-lm -lmd -lmp -luutil -lnvpair -lnsl -lidmap -lavl -lsec" else ""; configureFlags = [ "--disable-csharp" "--with-xz" ] - ++ lib.optionals stdenv.isCygwin [ - "--disable-java" - "--disable-native-java" - # Share the cache among the various `configure' runs. - "--config-cache" - "--with-included-gettext" - "--with-included-glib" - "--with-included-libcroco" - ] # avoid retaining reference to CF during stdenv bootstrap ++ lib.optionals stdenv.isDarwin [ "gt_cv_func_CFPreferencesCopyAppValue=no" @@ -38,6 +29,9 @@ stdenv.mkDerivation rec { substituteInPlace gettext-tools/projects/KDE/trigger --replace "/bin/pwd" pwd substituteInPlace gettext-tools/projects/GNOME/trigger --replace "/bin/pwd" pwd substituteInPlace gettext-tools/src/project-id --replace "/bin/pwd" pwd + '' + lib.optionalString hostPlatform.isCygwin '' + sed -i -e "s/\(cldr_plurals_LDADD = \)/\\1..\/gnulib-lib\/libxml_rpl.la /" gettext-tools/src/Makefile.in + sed -i -e "s/\(libgettextsrc_la_LDFLAGS = \)/\\1..\/gnulib-lib\/libxml_rpl.la /" gettext-tools/src/Makefile.in ''; # On cross building, gettext supposes that the wchar.h from libc @@ -49,11 +43,9 @@ stdenv.mkDerivation rec { echo gl_cv_func_wcwidth_works=yes > cachefile configureFlags="$configureFlags --cache-file=`pwd`/cachefile" fi - '' + lib.optionalString stdenv.isCygwin '' - sed -i -e "s/\(am_libgettextlib_la_OBJECTS = \)error.lo/\\1/" gettext-tools/gnulib-lib/Makefile.in ''; - nativeBuildInputs = [ xz xz.bin ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv; # HACK, see #10874 (and 14664) + nativeBuildInputs = [ xz xz.bin ] ++ stdenv.lib.optional (!stdenv.isLinux && !hostPlatform.isCygwin) libiconv; # HACK, see #10874 (and 14664) enableParallelBuilding = true; @@ -89,14 +81,3 @@ stdenv.mkDerivation rec { // stdenv.lib.optionalAttrs stdenv.isDarwin { makeFlags = "CFLAGS=-D_FORTIFY_SOURCE=0"; } - -// stdenv.lib.optionalAttrs stdenv.isCygwin { - patchPhase = - # Make sure `error.c' gets compiled and is part of `libgettextlib.la'. - # This fixes: - # gettext-0.18.1.1/gettext-tools/src/msgcmp.c:371: undefined reference to `_error_message_count' - '' - sed -i gettext-tools/gnulib-lib/Makefile.in \ - -e 's/am_libgettextlib_la_OBJECTS =/am_libgettextlib_la_OBJECTS = error.lo/g' - ''; -} diff --git a/pkgs/development/libraries/glew/1.10.nix b/pkgs/development/libraries/glew/1.10.nix index 9d5ded5be15..159bf47e130 100644 --- a/pkgs/development/libraries/glew/1.10.nix +++ b/pkgs/development/libraries/glew/1.10.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, mesa_glu, x11, libXmu, libXi -, AGL ? null }: +, buildPlatform, hostPlatform +, AGL ? null +}: with stdenv.lib; @@ -17,7 +19,7 @@ stdenv.mkDerivation rec { patchPhase = '' sed -i 's|lib64|lib|' config/Makefile.linux - ${optionalString (stdenv ? cross) '' + ${optionalString (hostPlatform != buildPlatform) '' sed -i -e 's/\(INSTALL.*\)-s/\1/' Makefile ''} ''; @@ -36,13 +38,9 @@ stdenv.mkDerivation rec { cp -r README.txt LICENSE.txt doc $out/share/doc/glew ''; - crossAttrs.makeFlags = [ - "CC=${stdenv.cross.config}-gcc" - "LD=${stdenv.cross.config}-gcc" - "AR=${stdenv.cross.config}-ar" - "STRIP=" - ] ++ optional (stdenv.cross.libc == "msvcrt") "SYSTEM=mingw" - ++ optional (stdenv.cross.libc == "libSystem") "SYSTEM=darwin"; + makeFlags = [ + "SYSTEM=${if hostPlatform.isMinGW then "mingw" else hostPlatform.parsed.kernel.name}" + ]; meta = with stdenv.lib; { description = "An OpenGL extension loading library for C(++)"; diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 02c87cf709a..814e4496b77 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, mesa_glu, xlibsWrapper, libXmu, libXi }: +{ stdenv, fetchurl, mesa_glu, xlibsWrapper, libXmu, libXi +, buildPlatform, hostPlatform +}: with stdenv.lib; @@ -17,7 +19,7 @@ stdenv.mkDerivation rec { patchPhase = '' sed -i 's|lib64|lib|' config/Makefile.linux - ${optionalString (stdenv ? cross) '' + ${optionalString (hostPlatform != buildPlatform) '' sed -i -e 's/\(INSTALL.*\)-s/\1/' Makefile ''} ''; @@ -37,13 +39,9 @@ stdenv.mkDerivation rec { rm $out/lib/*.a ''; - crossAttrs.makeFlags = [ - "CC=${stdenv.cross.config}-gcc" - "LD=${stdenv.cross.config}-gcc" - "AR=${stdenv.cross.config}-ar" - "STRIP=" - ] ++ optional (stdenv.cross.libc == "msvcrt") "SYSTEM=mingw" - ++ optional (stdenv.cross.libc == "libSystem") "SYSTEM=darwin"; + makeFlags = [ + "SYSTEM=${if hostPlatform.isMinGW then "mingw" else hostPlatform.parsed.kernel.name}" + ]; meta = with stdenv.lib; { description = "An OpenGL extension loading library for C(++)"; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 96175d04a4e..84c04468277 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, perl, python +{ stdenv, hostPlatform, fetchurl, pkgconfig, gettext, perl, python , libiconv, libintlOrEmpty, zlib, libffi, pcre, libelf # use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib) , utillinuxMinimal ? null @@ -9,7 +9,7 @@ with stdenv.lib; -assert stdenv.isFreeBSD || stdenv.isDarwin || stdenv.cc.isGNU; +assert stdenv.isFreeBSD || stdenv.isDarwin || stdenv.cc.isGNU || hostPlatform.isCygwin; assert stdenv.isLinux -> utillinuxMinimal != null; # TODO: diff --git a/pkgs/development/libraries/glibc/CVE-2017-1000366-rtld-LD_AUDIT.patch b/pkgs/development/libraries/glibc/CVE-2017-1000366-rtld-LD_AUDIT.patch new file mode 100644 index 00000000000..68e2798181f --- /dev/null +++ b/pkgs/development/libraries/glibc/CVE-2017-1000366-rtld-LD_AUDIT.patch @@ -0,0 +1,209 @@ +From ba67ba3275d47e0080f0e5f09d9f5102c000c97e Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: +References: +From: Florian Weimer +Date: Sun, 28 May 2017 20:44:52 +0200 +Subject: [PATCH 3/3] rtld: Reject overly long LD_AUDIT path elements +To: libc-alpha@sourceware.org + +Also only process the last LD_AUDIT entry. +--- + elf/rtld.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------- + 1 file changed, 95 insertions(+), 15 deletions(-) + +diff --git a/elf/rtld.c b/elf/rtld.c +index 30f0cae..89d8573 100644 +--- a/elf/rtld.c ++++ b/elf/rtld.c +@@ -116,13 +116,95 @@ dso_name_valid_for_suid (const char *p) + return *p != '\0'; + } + +-/* List of auditing DSOs. */ ++/* LD_AUDIT variable contents. Must be processed before the ++ audit_list below. */ ++const char *audit_list_string; ++ ++/* Cyclic list of auditing DSOs. audit_list->next is the first ++ element. */ + static struct audit_list + { + const char *name; + struct audit_list *next; + } *audit_list; + ++/* Iterator for audit_list_string followed by audit_list. */ ++struct audit_list_iter ++{ ++ /* Tail of audit_list_string still needing processing, or NULL. */ ++ const char *audit_list_tail; ++ ++ /* The list element returned in the previous iteration. NULL before ++ the first element. */ ++ struct audit_list *previous; ++ ++ /* Scratch buffer for returning a name which is part of ++ audit_list_string. */ ++#ifdef PATH_MAX ++ char fname[PATH_MAX]; ++#else ++ char fname[4096]; ++#endif ++}; ++ ++/* Initialize an audit list iterator. */ ++static void ++audit_list_iter_init (struct audit_list_iter *iter) ++{ ++ iter->audit_list_tail = audit_list_string; ++ iter->previous = NULL; ++} ++ ++/* Iterate through both audit_list_string and audit_list. */ ++static const char * ++audit_list_iter_next (struct audit_list_iter *iter) ++{ ++ if (iter->audit_list_tail != NULL) ++ { ++ /* First iterate over audit_list_string. */ ++ while (*iter->audit_list_tail != '\0') ++ { ++ /* Split audit list at colon. */ ++ size_t len = strcspn (iter->audit_list_tail, ":"); ++ if (len > 0 && len < sizeof(iter->fname)) ++ { ++ memcpy (iter->fname, iter->audit_list_tail, len); ++ iter->fname[len] = '\0'; ++ } ++ else ++ /* Do not return this name to the caller. */ ++ iter->fname[0] = '\0'; ++ ++ /* Skip over the substring and the following delimiter. */ ++ iter->audit_list_tail += len; ++ if (*iter->audit_list_tail == ':') ++ ++iter->audit_list_tail; ++ ++ /* If the name is valid, return it. */ ++ if (dso_name_valid_for_suid (iter->fname)) ++ return iter->fname; ++ /* Otherwise, wrap around and try the next name. */ ++ } ++ /* Fall through to the procesing of audit_list. */ ++ } ++ ++ if (iter->previous == NULL) ++ { ++ if (audit_list == NULL) ++ /* No pre-parsed audit list. */ ++ return NULL; ++ /* Start of audit list. The first list element is at ++ audit_list->next (cyclic list). */ ++ iter->previous = audit_list->next; ++ return iter->previous->name; ++ } ++ if (iter->previous == audit_list) ++ /* Cyclic list wrap-around. */ ++ return NULL; ++ iter->previous = iter->previous->next; ++ return iter->previous->name; ++} ++ + #ifndef HAVE_INLINED_SYSCALLS + /* Set nonzero during loading and initialization of executable and + libraries, cleared before the executable's entry point runs. This +@@ -1290,11 +1368,13 @@ of this helper program; chances are you did not intend to run this program.\n\ + GL(dl_rtld_map).l_tls_modid = _dl_next_tls_modid (); + + /* If we have auditing DSOs to load, do it now. */ +- if (__glibc_unlikely (audit_list != NULL)) ++ bool need_security_init = true; ++ if (__glibc_unlikely (audit_list != NULL) ++ || __glibc_unlikely (audit_list_string != NULL)) + { +- /* Iterate over all entries in the list. The order is important. */ + struct audit_ifaces *last_audit = NULL; +- struct audit_list *al = audit_list->next; ++ struct audit_list_iter al_iter; ++ audit_list_iter_init (&al_iter); + + /* Since we start using the auditing DSOs right away we need to + initialize the data structures now. */ +@@ -1305,9 +1385,14 @@ of this helper program; chances are you did not intend to run this program.\n\ + use different values (especially the pointer guard) and will + fail later on. */ + security_init (); ++ need_security_init = false; + +- do ++ while (true) + { ++ const char *name = audit_list_iter_next (&al_iter); ++ if (name == NULL) ++ break; ++ + int tls_idx = GL(dl_tls_max_dtv_idx); + + /* Now it is time to determine the layout of the static TLS +@@ -1316,7 +1401,7 @@ of this helper program; chances are you did not intend to run this program.\n\ + no DF_STATIC_TLS bit is set. The reason is that we know + glibc will use the static model. */ + struct dlmopen_args dlmargs; +- dlmargs.fname = al->name; ++ dlmargs.fname = name; + dlmargs.map = NULL; + + const char *objname; +@@ -1329,7 +1414,7 @@ of this helper program; chances are you did not intend to run this program.\n\ + not_loaded: + _dl_error_printf ("\ + ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", +- al->name, err_str); ++ name, err_str); + if (malloced) + free ((char *) err_str); + } +@@ -1433,10 +1518,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", + goto not_loaded; + } + } +- +- al = al->next; + } +- while (al != audit_list->next); + + /* If we have any auditing modules, announce that we already + have two objects loaded. */ +@@ -1700,7 +1782,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", + if (tcbp == NULL) + tcbp = init_tls (); + +- if (__glibc_likely (audit_list == NULL)) ++ if (__glibc_likely (need_security_init)) + /* Initialize security features. But only if we have not done it + earlier. */ + security_init (); +@@ -2331,9 +2413,7 @@ process_dl_audit (char *str) + char *p; + + while ((p = (strsep) (&str, ":")) != NULL) +- if (p[0] != '\0' +- && (__builtin_expect (! __libc_enable_secure, 1) +- || strchr (p, '/') == NULL)) ++ if (dso_name_valid_for_suid (p)) + { + /* This is using the local malloc, not the system malloc. The + memory can never be freed. */ +@@ -2397,7 +2477,7 @@ process_envvars (enum mode *modep) + break; + } + if (memcmp (envline, "AUDIT", 5) == 0) +- process_dl_audit (&envline[6]); ++ audit_list_string = &envline[6]; + break; + + case 7: +-- +2.9.4 + diff --git a/pkgs/development/libraries/glibc/CVE-2017-1000366-rtld-LD_LIBRARY_PATH.patch b/pkgs/development/libraries/glibc/CVE-2017-1000366-rtld-LD_LIBRARY_PATH.patch new file mode 100644 index 00000000000..88b1925fa12 --- /dev/null +++ b/pkgs/development/libraries/glibc/CVE-2017-1000366-rtld-LD_LIBRARY_PATH.patch @@ -0,0 +1,33 @@ +From 4d009d39ac9ede0369e268554a181b428f177a80 Mon Sep 17 00:00:00 2001 +Message-Id: <4d009d39ac9ede0369e268554a181b428f177a80.1495998948.git.fweimer@redhat.com> +In-Reply-To: +References: +From: Florian Weimer +Date: Sun, 28 May 2017 20:37:40 +0200 +Subject: [PATCH 1/3] rtld: Completely ignore LD_LIBRARY_PATH for AT_SECURE=1 + programs +To: libc-alpha@sourceware.org + +LD_LIBRARY_PATH can only be used to reorder system search paths, which +is not useful functionality. +--- + elf/rtld.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/elf/rtld.c b/elf/rtld.c +index 319ef06..824b6cf 100644 +--- a/elf/rtld.c ++++ b/elf/rtld.c +@@ -2419,7 +2419,8 @@ process_envvars (enum mode *modep) + + case 12: + /* The library search path. */ +- if (memcmp (envline, "LIBRARY_PATH", 12) == 0) ++ if (!__libc_enable_secure ++ && memcmp (envline, "LIBRARY_PATH", 12) == 0) + { + library_path = &envline[13]; + break; +-- +2.9.4 + diff --git a/pkgs/development/libraries/glibc/CVE-2017-1000366-rtld-LD_PRELOAD.patch b/pkgs/development/libraries/glibc/CVE-2017-1000366-rtld-LD_PRELOAD.patch new file mode 100644 index 00000000000..76be2a3308f --- /dev/null +++ b/pkgs/development/libraries/glibc/CVE-2017-1000366-rtld-LD_PRELOAD.patch @@ -0,0 +1,115 @@ +From 65ff0b7a085b85271ec8fde99f542281b495e3bc Mon Sep 17 00:00:00 2001 +Message-Id: <65ff0b7a085b85271ec8fde99f542281b495e3bc.1495998948.git.fweimer@redhat.com> +In-Reply-To: +References: +From: Florian Weimer +Date: Sun, 28 May 2017 20:57:40 +0200 +Subject: [PATCH 2/3] rtld: Reject overly long LD_PRELOAD path elements +To: libc-alpha@sourceware.org + +--- + elf/rtld.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++--------------- + 1 file changed, 53 insertions(+), 16 deletions(-) + +diff --git a/elf/rtld.c b/elf/rtld.c +index 824b6cf..30f0cae 100644 +--- a/elf/rtld.c ++++ b/elf/rtld.c +@@ -99,6 +99,22 @@ uintptr_t __pointer_chk_guard_local + strong_alias (__pointer_chk_guard_local, __pointer_chk_guard) + #endif + ++/* Check that AT_SECURE=0, or that the passed name does not contain ++ directories and is not overly long. Reject empty names ++ unconditionally. */ ++static bool ++dso_name_valid_for_suid (const char *p) ++{ ++ if (__glibc_unlikely (__libc_enable_secure)) ++ { ++ /* Ignore pathnames with directories for AT_SECURE=1 ++ programs, and also skip overlong names. */ ++ size_t len = strlen (p); ++ if (len >= NAME_MAX || memchr (p, '/', len) != NULL) ++ return false; ++ } ++ return *p != '\0'; ++} + + /* List of auditing DSOs. */ + static struct audit_list +@@ -716,6 +732,46 @@ static const char *preloadlist attribute_relro; + /* Nonzero if information about versions has to be printed. */ + static int version_info attribute_relro; + ++/* The LD_PRELOAD environment variable gives list of libraries ++ separated by white space or colons that are loaded before the ++ executable's dependencies and prepended to the global scope list. ++ (If the binary is running setuid all elements containing a '/' are ++ ignored since it is insecure.) Return the number of preloads ++ performed. */ ++unsigned int ++handle_ld_preload (const char *preloadlist, struct link_map *main_map) ++{ ++ unsigned int npreloads = 0; ++ const char *p = preloadlist; ++#ifdef PATH_MAX ++ char fname[PATH_MAX]; ++#else ++ char fname[4096]; ++#endif ++ ++ while (*p != '\0') ++ { ++ /* Split preload list at space/colon. */ ++ size_t len = strcspn (p, " :"); ++ if (len > 0 && len < sizeof(fname)) ++ { ++ memcpy (fname, p, len); ++ fname[len] = '\0'; ++ } ++ else ++ fname[0] = '\0'; ++ ++ /* Skip over the substring and the following delimiter. */ ++ p += len; ++ if (*p == ' ' || *p == ':') ++ ++p; ++ ++ if (dso_name_valid_for_suid (fname)) ++ npreloads += do_preload (fname, main_map, "LD_PRELOAD"); ++ } ++ return npreloads; ++} ++ + static void + dl_main (const ElfW(Phdr) *phdr, + ElfW(Word) phnum, +@@ -1462,23 +1514,8 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", + + if (__glibc_unlikely (preloadlist != NULL)) + { +- /* The LD_PRELOAD environment variable gives list of libraries +- separated by white space or colons that are loaded before the +- executable's dependencies and prepended to the global scope +- list. If the binary is running setuid all elements +- containing a '/' are ignored since it is insecure. */ +- char *list = strdupa (preloadlist); +- char *p; +- + HP_TIMING_NOW (start); +- +- /* Prevent optimizing strsep. Speed is not important here. */ +- while ((p = (strsep) (&list, " :")) != NULL) +- if (p[0] != '\0' +- && (__builtin_expect (! __libc_enable_secure, 1) +- || strchr (p, '/') == NULL)) +- npreloads += do_preload (p, main_map, "LD_PRELOAD"); +- ++ npreloads += handle_ld_preload (preloadlist, main_map); + HP_TIMING_NOW (stop); + HP_TIMING_DIFF (diff, start, stop); + HP_TIMING_ACCUM_NT (load_time, diff); +-- +2.9.4 + diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index db80a8be299..1b53acf12b1 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -59,8 +59,17 @@ stdenv.mkDerivation ({ "/bin:/usr/bin", which is inappropriate on NixOS machines. This patch extends the search path by "/run/current-system/sw/bin". */ ./fix_path_attribute_in_getconf.patch + + /* Stack Clash */ + ./CVE-2017-1000366-rtld-LD_LIBRARY_PATH.patch + ./CVE-2017-1000366-rtld-LD_PRELOAD.patch + ./CVE-2017-1000366-rtld-LD_AUDIT.patch ] - ++ lib.optional stdenv.isi686 ./fix-i686-memchr.patch; + ++ lib.optionals stdenv.isi686 [ + ./fix-i686-memchr.patch + ./i686-fix-vectorized-strcspn.patch + ] + ++ lib.optional stdenv.isx86_64 ./fix-x64-abi.patch; postPatch = # Needed for glibc to build with the gnumake 3.82 diff --git a/pkgs/development/libraries/glibc/fix-x64-abi.patch b/pkgs/development/libraries/glibc/fix-x64-abi.patch new file mode 100644 index 00000000000..1d60dcd7988 --- /dev/null +++ b/pkgs/development/libraries/glibc/fix-x64-abi.patch @@ -0,0 +1,35 @@ +From 3288c6da64add3b4561b8c10fff522027caea01c Mon Sep 17 00:00:00 2001 +From: Nicholas Miell +Date: Sat, 17 Jun 2017 18:21:07 -0700 +Subject: [PATCH] Align the stack on entry to __tls_get_addr() + +Old versions of gcc (4 & 5) didn't align the stack according to the +AMD64 psABI when calling __tls_get_addr(). Apparently new versions of +gcc (7) got much more aggressive about vectorizing and generating MOVAPS +instructions, which means old binaries built with the buggy versions of +gcc are much more likely to crash when using versions of glibc built +using gcc 7. + +For example, a large number of Linux games built using the Unity game +engine and available for purchase on Steam. +--- + elf/dl-tls.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/elf/dl-tls.c b/elf/dl-tls.c +index 5aba33b3fa..3f3cb917de 100644 +--- a/elf/dl-tls.c ++++ b/elf/dl-tls.c +@@ -827,6 +827,10 @@ rtld_hidden_proto (__tls_get_addr) + rtld_hidden_def (__tls_get_addr) + #endif + ++#ifdef __x86_64__ ++/* Old versions of gcc didn't align the stack. */ ++__attribute__((force_align_arg_pointer)) ++#endif + /* The generic dynamic and local dynamic model cannot be used in + statically linked applications. */ + void * +-- +2.13.0 diff --git a/pkgs/development/libraries/glibc/i686-fix-vectorized-strcspn.patch b/pkgs/development/libraries/glibc/i686-fix-vectorized-strcspn.patch new file mode 100644 index 00000000000..ba4ec7c60cb --- /dev/null +++ b/pkgs/development/libraries/glibc/i686-fix-vectorized-strcspn.patch @@ -0,0 +1,42 @@ +From adc7e06fb412a2a1ee52f8cb788caf436335b9f3 Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Wed, 14 Jun 2017 08:11:22 +0200 +Subject: [PATCH] i686: Add missing IS_IN (libc) guards to vectorized strcspn + +Since commit d957c4d3fa48d685ff2726c605c988127ef99395 (i386: Compile +rtld-*.os with -mno-sse -mno-mmx -mfpmath=387), vector intrinsics can +no longer be used in ld.so, even if the compiled code never makes it +into the final ld.so link. This commit adds the missing IS_IN (libc) +guard to the SSE 4.2 strcspn implementation, so that it can be used from +ld.so in the future. + +(cherry picked from commit 69052a3a95da37169a08f9e59b2cc1808312753c) +--- + ChangeLog | 5 +++++ + sysdeps/i386/i686/multiarch/strcspn-c.c | 6 ++++-- + sysdeps/i386/i686/multiarch/varshift.c | 4 +++- + 3 files changed, 12 insertions(+), 3 deletions(-) + +diff --git a/sysdeps/i386/i686/multiarch/strcspn-c.c b/sysdeps/i386/i686/multiarch/strcspn-c.c +index 6d61e19..ec230fb 100644 +--- a/sysdeps/i386/i686/multiarch/strcspn-c.c ++++ b/sysdeps/i386/i686/multiarch/strcspn-c.c +@@ -1,2 +1,4 @@ +-#define __strcspn_sse2 __strcspn_ia32 +-#include ++#if IS_IN (libc) ++# define __strcspn_sse2 __strcspn_ia32 ++# include ++#endif +diff --git a/sysdeps/i386/i686/multiarch/varshift.c b/sysdeps/i386/i686/multiarch/varshift.c +index 7760b96..6742a35 100644 +--- a/sysdeps/i386/i686/multiarch/varshift.c ++++ b/sysdeps/i386/i686/multiarch/varshift.c +@@ -1 +1,3 @@ +-#include ++#if IS_IN (libc) ++# include ++#endif +-- +2.9.3 + diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix index 03f8ff3bc76..a4b0090296f 100644 --- a/pkgs/development/libraries/glpk/default.nix +++ b/pkgs/development/libraries/glpk/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "glpk-4.61"; + name = "glpk-4.62"; src = fetchurl { url = "mirror://gnu/glpk/${name}.tar.gz"; - sha256 = "1adbvwiaqrv9pql9ry3lhn2vfsxnff2vh4fs477d90kpfx0xwrlq"; + sha256 = "0w7s3869ybwyq9a4490dikpib1qp3jnn5nqz1vvwqy1qz3ilnvh9"; }; doCheck = true; diff --git a/pkgs/development/libraries/gnutls/3.5.nix b/pkgs/development/libraries/gnutls/3.5.nix index e47537c64a9..62ff2547569 100644 --- a/pkgs/development/libraries/gnutls/3.5.nix +++ b/pkgs/development/libraries/gnutls/3.5.nix @@ -1,11 +1,11 @@ { callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { - version = "3.5.13"; + version = "3.5.14"; src = fetchurl { url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz"; - sha256 = "15ihq6p0hnnhs8cnjrkj40dmlcaa1jjg8xg0g2ydbnlqs454ixbr"; + sha256 = "1nhv0mf3apz65ljh335l8xds7wpn08ywljkrvws08apljbn2v8aa"; }; # Skip two tests introduced in 3.5.11. Probable reasons of failure: diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix index 8b4103dec7f..7971448133e 100644 --- a/pkgs/development/libraries/goffice/default.nix +++ b/pkgs/development/libraries/goffice/default.nix @@ -2,11 +2,11 @@ , libgsf, libxml2, libxslt, cairo, pango, librsvg, libspectre }: stdenv.mkDerivation rec { - name = "goffice-0.10.34"; + name = "goffice-0.10.35"; src = fetchurl { url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz"; - sha256 = "554a75a22b5863b3b17595148bee6462122f2dbf031dfa78b61e941e3c2dd603"; + sha256 = "c19001afca09dc5446e06605a113d81a57124018a09c5889aeebba16cf1d5738"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index d130a328dba..afd6391d719 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -1,11 +1,11 @@ { fetchurl, fetchpatch, stdenv }: stdenv.mkDerivation rec { - name = "gsl-2.3"; + name = "gsl-2.4"; src = fetchurl { url = "mirror://gnu/gsl/${name}.tar.gz"; - sha256 = "1yxdzqjwmi2aid650fa9zyr8llw069x7lm489wx9nnfdi6vh09an"; + sha256 = "16yfs5n444s03np1naj6yp1fsysd42kdscxzkg0k2yvfjixx0ijd"; }; patches = [ diff --git a/pkgs/development/libraries/gsoap/default.nix b/pkgs/development/libraries/gsoap/default.nix index 89abd93180d..07efe42b99d 100644 --- a/pkgs/development/libraries/gsoap/default.nix +++ b/pkgs/development/libraries/gsoap/default.nix @@ -1,15 +1,28 @@ -{ stdenv, fetchurl, unzip, m4, bison, flex, openssl, zlib }: +{ stdenv, fetchurl, autoreconfHook, unzip, m4, bison, flex, openssl, zlib }: -stdenv.mkDerivation rec { +let + majorVersion = "2.8"; + +in stdenv.mkDerivation rec { name = "gsoap-${version}"; - version = "2.8.42"; + version = "${majorVersion}.49"; src = fetchurl { - url = "mirror://sourceforge/project/gsoap2/gsoap-2.8/gsoap_${version}.zip"; - sha256 = "0fav4lhdibwggkf495pggmqna632jxkh6q2mi32b9hsn883pg5m7"; + url = "mirror://sourceforge/project/gsoap2/gsoap-${majorVersion}/gsoap_${version}.zip"; + sha256 = "0414q7zabkq3iiccl2yql3vbihbr7ach9d517b37zv3mp7nhj2aj"; }; - buildInputs = [ unzip m4 bison flex openssl zlib ]; + buildInputs = [ openssl zlib ]; + nativeBuildInputs = [ autoreconfHook bison flex m4 unzip ]; + # Parallel building doesn't work as of 2.8.49 + enableParallelBuilding = false; + + # Future versions of automake require subdir-objects if the source is structured this way + # As of 2.8.49 (maybe earlier) this is needed to silence warnings + prePatch = '' + substituteInPlace configure.ac \ + --replace 'AM_INIT_AUTOMAKE([foreign])' 'AM_INIT_AUTOMAKE([foreign subdir-objects])' + ''; meta = with stdenv.lib; { description = "C/C++ toolkit for SOAP web services and XML-based applications"; @@ -27,6 +40,6 @@ stdenv.mkDerivation rec { # restrictions) license = licenses.gpl2; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 4efef258211..69378d95a30 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig, python, gst-plugins-base, orc , faacSupport ? false, faac ? null +, gtkSupport ? false, gtk3 ? null , faad2, libass, libkate, libmms , libmodplug, mpeg2dec, mpg123 , openjpeg, libopus, librsvg @@ -10,6 +11,7 @@ }: assert faacSupport -> faac != null; +assert gtkSupport -> gtk3 != null; let inherit (stdenv.lib) optional optionalString; @@ -41,7 +43,7 @@ stdenv.mkDerivation rec { buildInputs = [ gst-plugins-base orc - faad2 libass libkate libmms + faad2 gtk3 libass libkate libmms libmodplug mpeg2dec mpg123 openjpeg libopus librsvg fluidsynth libvdpau @@ -50,6 +52,8 @@ stdenv.mkDerivation rec { ] ++ libintlOrEmpty ++ optional faacSupport faac + # for gtksink + ++ optional gtkSupport gtk3 ++ optional stdenv.isLinux wayland # wildmidi requires apple's OpenAL # TODO: package apple's OpenAL, fix wildmidi, include on Darwin diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index c28cfca31c5..c18d8332b0c 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -4,6 +4,7 @@ , libvpx, speex, flac, taglib, libshout , cairo, gdk_pixbuf, aalib, libcaca , libsoup, libpulseaudio, libintlOrEmpty +, darwin }: let @@ -40,6 +41,7 @@ stdenv.mkDerivation rec { libsoup libshout ] ++ libintlOrEmpty + ++ optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ] ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 ]; preFixup = '' diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index 0d21649a9b1..120b4176c19 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -1,30 +1,13 @@ /* hunspell dictionaries */ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchurl, fetchFromGitHub, unzip, coreutils, bash, which, zip }: -with stdenv.lib; let - mkDict = - { name, src, meta, readmeFile, dictFileName, ... }: - let - isFrench = hasSuffix "fr_" dictFileName; - isItaly = hasSuffix "it_" dictFileName; - isSpanish = hasSuffix "es_" dictFileName; - isEnglish = hasSuffix "en_" dictFileName; - in - stdenv.mkDerivation rec { - inherit name src meta; - buildInputs = [ unzip ]; - sourceRoot = "."; - phases = "unpackPhase installPhase" + (if isItaly then "patchPhase" else ""); - unpackCmd = "unzip $src ${readmeFile} ${dictFileName}.dic ${dictFileName}.aff"; - prePatch = if isItaly then '' - # Fix dic file empty lines (FS#22275) - sed '/^\/$/d' -i it_IT.dic - '' else ""; - + { name, readmeFile, dictFileName, ... }@args: + stdenv.mkDerivation (rec { + inherit name; installPhase = '' # hunspell dicts install -dm755 "$out/share/hunspell" @@ -38,7 +21,45 @@ let install -dm755 "$out/share/doc" install -m644 ${readmeFile} $out/share/doc/${name}.txt ''; - }; + } // args); + + mkDictFromRla = + { shortName, shortDescription, dictFileName }: + mkDict rec { + inherit dictFileName; + version = "2.2"; + name = "hunspell-dict-${shortName}-rla-${version}"; + readmeFile = "README.txt"; + src = fetchFromGitHub { + owner = "sbosio"; + repo = "rla-es"; + rev = "v${version}"; + sha256 = "0n9ms092k7vg7xpd3ksadxydbrizkb7js7dfxr08nbnnb9fgy0i8"; + }; + meta = with stdenv.lib; { + description = "Hunspell dictionary for ${shortDescription} from rla"; + homepage = https://github.com/sbosio/rla-es; + license = with licenses; [ gpl3 lgpl3 mpl11 ]; + maintainers = with maintainers; [ renzo ]; + platforms = platforms.all; + }; + phases = "unpackPhase patchPhase buildPhase installPhase"; + buildInputs = [ bash coreutils unzip which zip ]; + patchPhase = '' + substituteInPlace ortograf/herramientas/make_dict.sh \ + --replace /bin/bash bash \ + --replace /dev/stderr stderr.log + + substituteInPlace ortograf/herramientas/remover_comentarios.sh \ + --replace /bin/bash bash \ + ''; + buildPhase = '' + cd ortograf/herramientas + bash -x ./make_dict.sh -l ${dictFileName} -2 + unzip ${dictFileName}.zip \ + ${dictFileName}.dic ${dictFileName}.aff ${readmeFile} + ''; + }; mkDictFromDicollecte = { shortName, shortDescription, longDescription, dictFileName }: @@ -59,6 +80,12 @@ let maintainers = with maintainers; [ renzo ]; platforms = platforms.all; }; + buildInputs = [ unzip ]; + phases = "unpackPhase installPhase"; + sourceRoot = "."; + unpackCmd = '' + unzip $src ${dictFileName}.dic ${dictFileName}.aff ${readmeFile} + ''; }; mkDictFromWordlist = @@ -75,9 +102,15 @@ let maintainers = with maintainers; [ renzo ]; platforms = platforms.all; }; + buildInputs = [ unzip ]; + phases = "unpackPhase installPhase"; + sourceRoot = "."; + unpackCmd = '' + unzip $src ${dictFileName}.dic ${dictFileName}.aff ${readmeFile} + ''; }; - mkLinguistico = + mkDictFromLinguistico = { shortName, shortDescription, dictFileName, src }: mkDict rec { inherit src dictFileName; @@ -90,6 +123,16 @@ let maintainers = with maintainers; [ renzo ]; platforms = platforms.all; }; + buildInputs = [ unzip ]; + phases = "unpackPhase patchPhase installPhase"; + sourceRoot = "."; + prePatch = '' + # Fix dic file empty lines (FS#22275) + sed '/^\/$/d' -i ${dictFileName}.dic + ''; + unpackCmd = '' + unzip $src ${dictFileName}.dic ${dictFileName}.aff ${readmeFile} + ''; }; mkDictFromXuxen = @@ -169,6 +212,134 @@ in { }; }; + /* SPANISH */ + + es-any = mkDictFromRla { + shortName = "es-any"; + shortDescription = "Spanish (any variant)"; + dictFileName = "es_ANY"; + }; + + es-ar = mkDictFromRla { + shortName = "es-ar"; + shortDescription = "Spanish (Argentina)"; + dictFileName = "es_AR"; + }; + + es-bo = mkDictFromRla { + shortName = "es-bo"; + shortDescription = "Spanish (Bolivia)"; + dictFileName = "es_BO"; + }; + + es-cl = mkDictFromRla { + shortName = "es-cl"; + shortDescription = "Spanish (Chile)"; + dictFileName = "es_CL"; + }; + + es-co = mkDictFromRla { + shortName = "es-co"; + shortDescription = "Spanish (Colombia)"; + dictFileName = "es_CO"; + }; + + es-cr = mkDictFromRla { + shortName = "es-cr"; + shortDescription = "Spanish (Costra Rica)"; + dictFileName = "es_CR"; + }; + + es-cu = mkDictFromRla { + shortName = "es-cu"; + shortDescription = "Spanish (Cuba)"; + dictFileName = "es_CU"; + }; + + es-do = mkDictFromRla { + shortName = "es-do"; + shortDescription = "Spanish (Dominican Republic)"; + dictFileName = "es_DO"; + }; + + es-ec = mkDictFromRla { + shortName = "es-ec"; + shortDescription = "Spanish (Ecuador)"; + dictFileName = "es_EC"; + }; + + es-es = mkDictFromRla { + shortName = "es-es"; + shortDescription = "Spanish (Spain)"; + dictFileName = "es_ES"; + }; + + es-gt = mkDictFromRla { + shortName = "es-gt"; + shortDescription = "Spanish (Guatemala)"; + dictFileName = "es_GT"; + }; + + es-hn = mkDictFromRla { + shortName = "es-hn"; + shortDescription = "Spanish (Honduras)"; + dictFileName = "es_HN"; + }; + + es-mx = mkDictFromRla { + shortName = "es-mx"; + shortDescription = "Spanish (Mexico)"; + dictFileName = "es_MX"; + }; + + es-ni = mkDictFromRla { + shortName = "es-ni"; + shortDescription = "Spanish (Nicaragua)"; + dictFileName = "es_NI"; + }; + + es-pa = mkDictFromRla { + shortName = "es-pa"; + shortDescription = "Spanish (Panama)"; + dictFileName = "es_PA"; + }; + + es-pe = mkDictFromRla { + shortName = "es-pe"; + shortDescription = "Spanish (Peru)"; + dictFileName = "es_PE"; + }; + + es-pr = mkDictFromRla { + shortName = "es-pr"; + shortDescription = "Spanish (Puerto Rico)"; + dictFileName = "es_PR"; + }; + + es-py = mkDictFromRla { + shortName = "es-py"; + shortDescription = "Spanish (Paraguay)"; + dictFileName = "es_PY"; + }; + + es-sv = mkDictFromRla { + shortName = "es-sv"; + shortDescription = "Spanish (El Salvador)"; + dictFileName = "es_SV"; + }; + + es-uy = mkDictFromRla { + shortName = "es-uy"; + shortDescription = "Spanish (Uruguay)"; + dictFileName = "es_UY"; + }; + + es-ve = mkDictFromRla { + shortName = "es-ve"; + shortDescription = "Spanish (Venezuela)"; + dictFileName = "es_VE"; + }; + /* FRENCH */ fr-any = mkDictFromDicollecte { @@ -215,7 +386,7 @@ in { /* ITALIAN */ - it-it = mkLinguistico rec { + it-it = mkDictFromLinguistico rec { shortName = "it-it"; dictFileName = "it_IT"; shortDescription = "Hunspell dictionary for 'Italian (Italy)' from Linguistico"; diff --git a/pkgs/development/libraries/kde-frameworks/breeze-icons.nix b/pkgs/development/libraries/kde-frameworks/breeze-icons.nix index 9e4a40b22ab..c8382ed3408 100644 --- a/pkgs/development/libraries/kde-frameworks/breeze-icons.nix +++ b/pkgs/development/libraries/kde-frameworks/breeze-icons.nix @@ -1,9 +1,13 @@ -{ mkDerivation, lib, extra-cmake-modules, qtsvg }: +{ mkDerivation, lib, extra-cmake-modules, gtk3, qtsvg }: mkDerivation { name = "breeze-icons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ extra-cmake-modules gtk3 ]; buildInputs = [ qtsvg ]; outputs = [ "out" ]; # only runtime outputs + postInstall = '' + gtk-update-icon-cache "''${out:?}/share/icons/breeze" + gtk-update-icon-cache "''${out:?}/share/icons/breeze-dark" + ''; } diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 8ab1d1b99b6..d92e7d19c65 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -41,17 +41,26 @@ let propagate = out: let setupHook = { writeScript }: - writeScript "setup-hook.sh" '' - # Propagate $${out} output - propagatedUserEnvPkgs+=" @${out}@" + writeScript "setup-hook" '' + if [ "$hookName" != postHook ]; then + postHooks+=("source @dev@/nix-support/setup-hook") + else + # Propagate $${out} output + propagatedUserEnvPkgs="$propagatedUserEnvPkgs @${out}@" - # Propagate $dev so that this setup hook is propagated - # But only if there is a separate $dev output - if [ "$outputDev" != out ]; then - if [ -n "$crossConfig" ]; then - propagatedBuildInputs+=" @dev@" - else - propagatedNativeBuildInputs+=" @dev@" + if [ -z "$outputDev" ]; then + echo "error: \$outputDev is unset!" >&2 + exit 1 + fi + + # Propagate $dev so that this setup hook is propagated + # But only if there is a separate $dev output + if [ "$outputDev" != out ]; then + if [ -n "$crossConfig" ]; then + propagatedBuildInputs="$propagatedBuildInputs @dev@" + else + propagatedNativeBuildInputs="$propagatedNativeBuildInputs @dev@" + fi fi fi ''; diff --git a/pkgs/development/libraries/kde-frameworks/kjs.nix b/pkgs/development/libraries/kde-frameworks/kjs.nix index 62bcc0065b3..311f07241d6 100644 --- a/pkgs/development/libraries/kde-frameworks/kjs.nix +++ b/pkgs/development/libraries/kde-frameworks/kjs.nix @@ -1,12 +1,12 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, - qtbase, + pcre, qtbase, }: mkDerivation { name = "kjs"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ qtbase ]; + buildInputs = [ pcre qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kwallet-dbus.patch b/pkgs/development/libraries/kde-frameworks/kwallet-dbus.patch new file mode 100644 index 00000000000..00f3d8baedf --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/kwallet-dbus.patch @@ -0,0 +1,9 @@ +diff --git a/src/runtime/kwalletd/org.kde.kwalletd5.service.in b/src/runtime/kwalletd/org.kde.kwalletd5.service.in +index 76eb90e..7a78e83 100644 +--- a/src/runtime/kwalletd/org.kde.kwalletd5.service.in ++++ b/src/runtime/kwalletd/org.kde.kwalletd5.service.in +@@ -1,3 +1,3 @@ + [D-BUS Service] + Name=org.kde.kwalletd5 +-Exec=@CMAKE_INSTALL_PREFIX@/bin/kwalletd5 ++Exec=@CMAKE_INSTALL_BINDIR@/kwalletd5 diff --git a/pkgs/development/libraries/kde-frameworks/kwallet.nix b/pkgs/development/libraries/kde-frameworks/kwallet.nix index fca0dedd083..ece915071ad 100644 --- a/pkgs/development/libraries/kde-frameworks/kwallet.nix +++ b/pkgs/development/libraries/kde-frameworks/kwallet.nix @@ -15,4 +15,5 @@ mkDerivation { knotifications kservice kwidgetsaddons kwindowsystem libgcrypt qgpgme ]; propagatedBuildInputs = [ qtbase ]; + patches = [ ./kwallet-dbus.patch ]; } diff --git a/pkgs/development/libraries/kirigami/default.nix b/pkgs/development/libraries/kirigami/default.nix index e24ad8196ee..1127f3e197d 100644 --- a/pkgs/development/libraries/kirigami/default.nix +++ b/pkgs/development/libraries/kirigami/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, extra-cmake-modules, pkgconfig -, plasma-framework, qtbase +, plasma-framework, qtbase, qttranslations , qtquickcontrols ? null , qtquickcontrols2 ? null }: @@ -15,7 +15,7 @@ let inherit sha256; }; - buildInputs = [ plasma-framework qtbase qtqc ]; + buildInputs = [ plasma-framework qtbase qtqc qttranslations ]; nativeBuildInputs = [ cmake pkgconfig extra-cmake-modules ]; diff --git a/pkgs/development/libraries/libargon2/default.nix b/pkgs/development/libraries/libargon2/default.nix new file mode 100644 index 00000000000..79cbf09317c --- /dev/null +++ b/pkgs/development/libraries/libargon2/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "libargon2-${version}"; + version = "20161029"; + + src = fetchFromGitHub { + owner = "P-H-C"; + repo = "phc-winner-argon2"; + rev = "${version}"; + sha256 = "021g8wi4g67ywm8zf3yncqwrmfz7ypgm1ih9wcmnxip5n75rymh5"; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/lib/pkgconfig + substitute libargon2.pc $out/lib/pkgconfig/libargon2.pc \ + --replace @UPSTREAM_VER@ "${version}" \ + --replace @HOST_MULTIARCH@ "" \ + --replace 'prefix=/usr' "prefix=$out" + + make install PREFIX=$out + ln -s $out/lib/libargon2.so $out/lib/libargon2.so.0 + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "A key derivation function that was selected as the winner of the Password Hashing Competition in July 2015"; + longDescription = '' + A password-hashing function created by by Alex Biryukov, Daniel Dinu, and + Dmitry Khovratovich. Argon2 was declared the winner of the Password + Hashing Competition (PHC). There were 24 submissions and 9 finalists. + Catena, Lyra2, Makwa and yescrypt were given special recognition. The PHC + recommends using Argon2 rather than legacy algorithms. + ''; + homepage = https://www.argon2.com/; + license = with licenses; [ asl20 cc0 ]; + maintainers = with maintainers; [ taeer olynch ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix index 33209f2fd44..eedc0993d73 100644 --- a/pkgs/development/libraries/libatomic_ops/default.nix +++ b/pkgs/development/libraries/libatomic_ops/default.nix @@ -5,7 +5,10 @@ stdenv.mkDerivation rec { version = "7.6.0"; src = fetchurl { - url = "http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-${version}.tar.gz"; + urls = [ + "http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-${version}.tar.gz" + "https://github.com/ivmai/libatomic_ops/releases/download/v${version}/libatomic_ops-${version}.tar.gz" + ]; sha256 ="03ylfr29g9zc0r6b6axz3i68alj5qmxgzknxwam3jlx0sz8hcb4f"; }; diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 6aa88a524c0..28d435fbb9c 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -13,6 +13,7 @@ , SDL # only for avplay in $bin, adds nontrivial closure to it , enableGPL ? true # ToDo: some additional default stuff may need GPL , enableUnfree ? faacSupport +, hostPlatform }: assert faacSupport -> enableUnfree; @@ -27,7 +28,7 @@ let inherit (stdenv.lib) optional optionals hasPrefix; in let result = { libav_0_8 = libavFun "0.8.20" "0c7a2417c3a01eb74072691bb93ce802ae1be08f"; - libav_11 = libavFun "11.9" "36ed1329099676ff3c970576e03c6a21f2da2e15"; + libav_11 = libavFun "11.10" "38db6721ca8423682e4d614c170eccc33ba32e00"; libav_12 = libavFun "12" "4ecde7274621c82a6882b7614d907b28de25cc4e"; }; @@ -105,12 +106,12 @@ let installCheckTarget = "check"; # tests need to be run *after* installation crossAttrs = { - dontSetConfigureCross = true; + configurePlatforms = []; configureFlags = configureFlags ++ [ - "--cross-prefix=${stdenv.cross.config}-" + "--cross-prefix=${stdenv.cc.prefix}" "--enable-cross-compile" "--target_os=linux" - "--arch=${stdenv.cross.arch}" + "--arch=${hostPlatform.arch}" ]; }; diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index a1a61e33668..792a29eb1fb 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libbsd-${version}"; - version = "0.8.4"; + version = "0.8.5"; src = fetchurl { url = "http://libbsd.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "1cya8bv976ijv5yy1ix3pzbnmp9k2qqpgw3dx98k2w0m55jg2yi1"; + sha256 = "0a2vq0xdhs3yyj91b0612f19fakg7a9xlqy2f993128kyhjd0ivn"; }; # darwin changes configure.ac which means we need to regenerate diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix index 5027afa397a..5cf74164f0f 100644 --- a/pkgs/development/libraries/libelf/default.nix +++ b/pkgs/development/libraries/libelf/default.nix @@ -1,4 +1,7 @@ -{ fetchurl, stdenv, gettext, glibc }: +{ stdenv, fetchurl +, gettext, glibc +, buildPlatform, hostPlatform +}: stdenv.mkDerivation rec { name = "libelf-0.8.13"; @@ -8,20 +11,19 @@ stdenv.mkDerivation rec { sha256 = "0vf7s9dwk2xkmhb79aigqm0x0yfbw1j0b9ksm51207qwr179n6jr"; }; + patches = [ + ./dont-hardcode-ar.patch + ]; + doCheck = true; # FIXME needs gcc 4.9 in bootstrap tools hardeningDisable = [ "stackprotector" ]; - # For cross-compiling, native glibc is needed for the "gencat" program. - crossAttrs = { - nativeBuildInputs = [ gettext glibc ]; - }; - # Libelf's custom NLS macros fail to determine the catalog file extension on # Darwin, so disable NLS for now. # FIXME: Eventually make Gettext a build input on all platforms. - configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-nls"; + configureFlags = stdenv.lib.optional hostPlatform.isDarwin "--disable-nls"; nativeBuildInputs = [ gettext ]; diff --git a/pkgs/development/libraries/libelf/dont-hardcode-ar.patch b/pkgs/development/libraries/libelf/dont-hardcode-ar.patch new file mode 100644 index 00000000000..e282d9005db --- /dev/null +++ b/pkgs/development/libraries/libelf/dont-hardcode-ar.patch @@ -0,0 +1,11 @@ +--- a/lib/Makefile.in ++++ b/lib/Makefile.in +@@ -27,7 +27,7 @@ installdirs = $(libdir) $(includedir) $(includedir)/libelf + + CC = @CC@ + LD = @LD@ +-AR = ar ++AR ?= ar + MV = mv -f + RM = rm -f + LN_S = @LN_S@ diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix index 37e0c9b3431..d77337c912b 100644 --- a/pkgs/development/libraries/libev/default.nix +++ b/pkgs/development/libraries/libev/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libev-${version}"; - version="4.22"; + version="4.24"; src = fetchurl { url = "http://dist.schmorp.de/libev/Attic/${name}.tar.gz"; - sha256 = "1mhvy38g9947bbr0n0hzc34zwfvvfd99qgzpkbap8g2lmkl7jq3k"; + sha256 = "08gqsza1czx0nf62nkk183jb0946yzjsymaacxbzdgcs8z9r6dcp"; }; meta = { diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index b203f634647..ca149bd3db3 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -1,4 +1,6 @@ -{ fetchurl, stdenv, dejagnu, doCheck ? false }: +{ fetchurl, stdenv, dejagnu, doCheck ? false +, buildPlatform, hostPlatform +}: stdenv.mkDerivation rec { name = "libffi-3.2.1"; @@ -21,7 +23,7 @@ stdenv.mkDerivation rec { inherit doCheck; - dontStrip = stdenv ? cross; # Don't run the native `strip' when cross-compiling. + dontStrip = hostPlatform != buildPlatform; # Don't run the native `strip' when cross-compiling. # Install headers and libs in the right places. postFixup = '' diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 1903787149c..ac54858b1de 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -4,11 +4,11 @@ assert enableCapabilities -> stdenv.isLinux; stdenv.mkDerivation rec { name = "libgcrypt-${version}"; - version = "1.7.7"; + version = "1.7.8"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${name}.tar.bz2"; - sha256 = "16ndaj93asw122mwjz172x2ilpm03w1yp5mqcrp3xslk0yx5xf5r"; + sha256 = "16f1rsv4y4w2pk1il2jbcqggsb6mrlfva5vayd205fp68zm7d0ll"; }; outputs = [ "out" "dev" "info" ]; diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 4c634de9246..89946512410 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -1,6 +1,8 @@ -{ fetchurl, stdenv, lib }: +{ fetchurl, stdenv, lib +, buildPlatform, hostPlatform +}: -assert !stdenv.isLinux || stdenv ? cross; # TODO: improve on cross +assert !stdenv.isLinux || hostPlatform != buildPlatform; # TODO: improve on cross stdenv.mkDerivation rec { name = "libiconv-${version}"; @@ -11,24 +13,14 @@ stdenv.mkDerivation rec { sha256 = "0y1ij745r4p48mxq84rax40p10ln7fc7m243p8k8sia519i3dxfc"; }; - patches = lib.optionals stdenv.isCygwin [ - ./libiconv-1.14-reloc.patch - ./libiconv-1.14-wchar.patch - ]; - postPatch = - lib.optionalString ((stdenv ? cross && stdenv.cross.libc == "msvcrt") || stdenv.cc.nativeLibc) + lib.optionalString ((hostPlatform != buildPlatform && hostPlatform.libc == "msvcrt") || stdenv.cc.nativeLibc) '' sed '/^_GL_WARN_ON_USE (gets/d' -i srclib/stdio.in.h ''; configureFlags = - # On Cygwin, Libtool produces a `.dll.a', which is not a "real" DLL - # (Windows' linker would need to be used somehow to produce an actual - # DLL.) Thus, build the static library too, and this is what Gettext - # will actually use. - lib.optional stdenv.isCygwin "--enable-static" - ++ lib.optional stdenv.isFreeBSD "--with-pic"; + lib.optional stdenv.isFreeBSD "--with-pic"; crossAttrs = { # Disable stripping to avoid "libiconv.a: Archive has no index" (MinGW). diff --git a/pkgs/development/libraries/libiconv/libiconv-1.14-reloc.patch b/pkgs/development/libraries/libiconv/libiconv-1.14-reloc.patch deleted file mode 100644 index 005e3379d16..00000000000 --- a/pkgs/development/libraries/libiconv/libiconv-1.14-reloc.patch +++ /dev/null @@ -1,269 +0,0 @@ ---- libiconv-1.14/lib/relocatable.c 2011-08-07 13:48:03.000000000 -0400 -+++ libiconv-1.14/lib/relocatable.c 2011-10-15 03:14:13.195133600 -0400 -@@ -2,20 +2,18 @@ - Copyright (C) 2003-2006, 2008-2011 Free Software Foundation, Inc. - Written by Bruno Haible , 2003. - -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This program is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as published by -+ the Free Software Foundation; either version 2.1 of the License, or -+ (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - - /* Tell glibc's to provide a prototype for getline(). -@@ -87,6 +85,19 @@ - # define FILE_SYSTEM_PREFIX_LEN(P) 0 - #endif - -+/* Whether to enable the more costly support for relocatable libraries. -+ It allows libraries to be have been installed with a different original -+ prefix than the program. But it is quite costly, especially on Cygwin -+ platforms, see below. Therefore we enable it by default only on native -+ Win32 platforms. */ -+#ifndef ENABLE_COSTLY_RELOCATABLE -+# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ -+# define ENABLE_COSTLY_RELOCATABLE 1 -+# else -+# define ENABLE_COSTLY_RELOCATABLE 0 -+# endif -+#endif -+ - /* Original installation prefix. */ - static char *orig_prefix; - static size_t orig_prefix_len; -@@ -156,7 +167,7 @@ - #endif - } - --#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR) -+#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE) - - /* Convenience function: - Computes the current installation prefix, based on the original -@@ -286,7 +297,7 @@ - - #endif /* !IN_LIBRARY || PIC */ - --#if defined PIC && defined INSTALLDIR -+#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE - - /* Full pathname of shared library, or NULL. */ - static char *shared_library_fullname; -@@ -332,7 +343,9 @@ - #if (defined __linux__ && (__GLIBC__ >= 2 || defined __UCLIBC__)) || defined __CYGWIN__ - /* Linux has /proc/self/maps. glibc 2 and uClibc have the getline() - function. -- Cygwin >= 1.5 has /proc/self/maps and the getline() function too. */ -+ Cygwin >= 1.5 has /proc/self/maps and the getline() function too. -+ But it is costly: ca. 0.3 ms on Linux, 3 ms on Cygwin 1.5, and 5 ms on -+ Cygwin 1.7. */ - FILE *fp; - - /* Open the current process' maps file. It describes one VMA per line. */ -@@ -405,7 +418,7 @@ - const char * - relocate (const char *pathname) - { --#if defined PIC && defined INSTALLDIR -+#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE - static int initialized; - - /* Initialization code for a shared library. */ ---- libiconv-1.14/libcharset/lib/relocatable.c 2011-08-07 13:48:03.000000000 -0400 -+++ libiconv-1.14/libcharset/lib/relocatable.c 2011-10-15 03:14:27.878133600 -0400 -@@ -2,20 +2,18 @@ - Copyright (C) 2003-2006, 2008-2011 Free Software Foundation, Inc. - Written by Bruno Haible , 2003. - -- This program is free software; you can redistribute it and/or modify it -- under the terms of the GNU Library General Public License as published -- by the Free Software Foundation; either version 2, or (at your option) -- any later version. -+ This program is free software: you can redistribute it and/or modify -+ it under the terms of the GNU Lesser General Public License as published by -+ the Free Software Foundation; either version 2.1 of the License, or -+ (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Library General Public License for more details. -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU Library General Public -- License along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -- USA. */ -+ You should have received a copy of the GNU Lesser General Public License -+ along with this program. If not, see . */ - - - /* Tell glibc's to provide a prototype for getline(). -@@ -87,6 +85,19 @@ - # define FILE_SYSTEM_PREFIX_LEN(P) 0 - #endif - -+/* Whether to enable the more costly support for relocatable libraries. -+ It allows libraries to be have been installed with a different original -+ prefix than the program. But it is quite costly, especially on Cygwin -+ platforms, see below. Therefore we enable it by default only on native -+ Win32 platforms. */ -+#ifndef ENABLE_COSTLY_RELOCATABLE -+# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ -+# define ENABLE_COSTLY_RELOCATABLE 1 -+# else -+# define ENABLE_COSTLY_RELOCATABLE 0 -+# endif -+#endif -+ - /* Original installation prefix. */ - static char *orig_prefix; - static size_t orig_prefix_len; -@@ -156,7 +167,7 @@ - #endif - } - --#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR) -+#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE) - - /* Convenience function: - Computes the current installation prefix, based on the original -@@ -286,7 +297,7 @@ - - #endif /* !IN_LIBRARY || PIC */ - --#if defined PIC && defined INSTALLDIR -+#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE - - /* Full pathname of shared library, or NULL. */ - static char *shared_library_fullname; -@@ -332,7 +343,9 @@ - #if (defined __linux__ && (__GLIBC__ >= 2 || defined __UCLIBC__)) || defined __CYGWIN__ - /* Linux has /proc/self/maps. glibc 2 and uClibc have the getline() - function. -- Cygwin >= 1.5 has /proc/self/maps and the getline() function too. */ -+ Cygwin >= 1.5 has /proc/self/maps and the getline() function too. -+ But it is costly: ca. 0.3 ms on Linux, 3 ms on Cygwin 1.5, and 5 ms on -+ Cygwin 1.7. */ - FILE *fp; - - /* Open the current process' maps file. It describes one VMA per line. */ -@@ -405,7 +418,7 @@ - const char * - relocate (const char *pathname) - { --#if defined PIC && defined INSTALLDIR -+#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE - static int initialized; - - /* Initialization code for a shared library. */ ---- libiconv-1.14/srclib/relocatable.c 2011-08-07 09:42:06.000000000 -0400 -+++ libiconv-1.14/srclib/relocatable.c 2011-10-15 03:14:37.739133600 -0400 -@@ -3,16 +3,16 @@ - Written by Bruno Haible , 2003. - - This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 3 of the License, or -+ it under the terms of the GNU Lesser General Public License as published by -+ the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU General Public License for more details. -+ GNU Lesser General Public License for more details. - -- You should have received a copy of the GNU General Public License -+ You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ - - -@@ -85,6 +85,19 @@ - # define FILE_SYSTEM_PREFIX_LEN(P) 0 - #endif - -+/* Whether to enable the more costly support for relocatable libraries. -+ It allows libraries to be have been installed with a different original -+ prefix than the program. But it is quite costly, especially on Cygwin -+ platforms, see below. Therefore we enable it by default only on native -+ Win32 platforms. */ -+#ifndef ENABLE_COSTLY_RELOCATABLE -+# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ -+# define ENABLE_COSTLY_RELOCATABLE 1 -+# else -+# define ENABLE_COSTLY_RELOCATABLE 0 -+# endif -+#endif -+ - /* Original installation prefix. */ - static char *orig_prefix; - static size_t orig_prefix_len; -@@ -154,7 +167,7 @@ - #endif - } - --#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR) -+#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE) - - /* Convenience function: - Computes the current installation prefix, based on the original -@@ -284,7 +297,7 @@ - - #endif /* !IN_LIBRARY || PIC */ - --#if defined PIC && defined INSTALLDIR -+#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE - - /* Full pathname of shared library, or NULL. */ - static char *shared_library_fullname; -@@ -330,7 +343,9 @@ - #if (defined __linux__ && (__GLIBC__ >= 2 || defined __UCLIBC__)) || defined __CYGWIN__ - /* Linux has /proc/self/maps. glibc 2 and uClibc have the getline() - function. -- Cygwin >= 1.5 has /proc/self/maps and the getline() function too. */ -+ Cygwin >= 1.5 has /proc/self/maps and the getline() function too. -+ But it is costly: ca. 0.3 ms on Linux, 3 ms on Cygwin 1.5, and 5 ms on -+ Cygwin 1.7. */ - FILE *fp; - - /* Open the current process' maps file. It describes one VMA per line. */ -@@ -403,7 +418,7 @@ - const char * - relocate (const char *pathname) - { --#if defined PIC && defined INSTALLDIR -+#if defined PIC && defined INSTALLDIR && ENABLE_COSTLY_RELOCATABLE - static int initialized; - - /* Initialization code for a shared library. */ ---- libiconv-1.14/srcm4/gnulib-comp.m4 2011-08-07 09:42:12.000000000 -0400 -+++ libiconv-1.14/srcm4/gnulib-comp.m4 2011-08-30 02:40:45.597317000 -0400 -@@ -164,6 +164,7 @@ gl_UNISTD_MODULE_INDICATOR([readlink]) - gl_RELOCATABLE([$gl_source_base]) - if test $RELOCATABLE = yes; then - AC_LIBOBJ([progreloc]) -+ AC_LIBOBJ([relocatable]) - fi - gl_FUNC_READLINK_SEPARATE - gl_CANONICALIZE_LGPL_SEPARATE diff --git a/pkgs/development/libraries/libiconv/libiconv-1.14-wchar.patch b/pkgs/development/libraries/libiconv/libiconv-1.14-wchar.patch deleted file mode 100644 index 0e4ddd931bb..00000000000 --- a/pkgs/development/libraries/libiconv/libiconv-1.14-wchar.patch +++ /dev/null @@ -1,102 +0,0 @@ ---- libiconv-1.14/libcharset/lib/localcharset.c 2011-02-28 17:43:35.000000000 -0500 -+++ libiconv-1.14/libcharset/lib/localcharset.c 2011-08-28 00:16:57.238000000 -0400 -@@ -54,10 +54,6 @@ - # include - # endif - # endif --# ifdef __CYGWIN__ --# define WIN32_LEAN_AND_MEAN --# include --# endif - #elif defined WIN32_NATIVE - # define WIN32_LEAN_AND_MEAN - # include -@@ -124,7 +120,7 @@ - cp = charset_aliases; - if (cp == NULL) - { --#if !(defined DARWIN7 || defined VMS || defined WIN32_NATIVE || defined __CYGWIN__) -+#if !(defined DARWIN7 || defined VMS || defined WIN32_NATIVE) - const char *dir; - const char *base = "charset.alias"; - char *file_name; -@@ -309,7 +305,7 @@ - "DECKOREAN" "\0" "EUC-KR" "\0"; - # endif - --# if defined WIN32_NATIVE || defined __CYGWIN__ -+# if defined WIN32_NATIVE - /* To avoid the troubles of installing a separate file in the same - directory as the DLL and of retrieving the DLL's directory at - runtime, simply inline the aliases here. */ -@@ -365,64 +361,12 @@ - - # if HAVE_LANGINFO_CODESET - -- /* Most systems support nl_langinfo (CODESET) nowadays. */ -- codeset = nl_langinfo (CODESET); -- --# ifdef __CYGWIN__ -- /* Cygwin < 1.7 does not have locales. nl_langinfo (CODESET) always -- returns "US-ASCII". Return the suffix of the locale name from the -- environment variables (if present) or the codepage as a number. */ -- if (codeset != NULL && strcmp (codeset, "US-ASCII") == 0) -- { -- const char *locale; -- static char buf[2 + 10 + 1]; -- -- locale = getenv ("LC_ALL"); -- if (locale == NULL || locale[0] == '\0') -- { -- locale = getenv ("LC_CTYPE"); -- if (locale == NULL || locale[0] == '\0') -- locale = getenv ("LANG"); -- } -- if (locale != NULL && locale[0] != '\0') -- { -- /* If the locale name contains an encoding after the dot, return -- it. */ -- const char *dot = strchr (locale, '.'); -- -- if (dot != NULL) -- { -- const char *modifier; -- -- dot++; -- /* Look for the possible @... trailer and remove it, if any. */ -- modifier = strchr (dot, '@'); -- if (modifier == NULL) -- return dot; -- if (modifier - dot < sizeof (buf)) -- { -- memcpy (buf, dot, modifier - dot); -- buf [modifier - dot] = '\0'; -- return buf; -- } -- } -- } -- -- /* Woe32 has a function returning the locale's codepage as a number: -- GetACP(). This encoding is used by Cygwin, unless the user has set -- the environment variable CYGWIN=codepage:oem (which very few people -- do). -- Output directed to console windows needs to be converted (to -- GetOEMCP() if the console is using a raster font, or to -- GetConsoleOutputCP() if it is using a TrueType font). Cygwin does -- this conversion transparently (see winsup/cygwin/fhandler_console.cc), -- converting to GetConsoleOutputCP(). This leads to correct results, -- except when SetConsoleOutputCP has been called and a raster font is -- in use. */ -- sprintf (buf, "CP%u", GetACP ()); -- codeset = buf; -- } --# endif -+ /* Most systems support nl_langinfo (CODESET) nowadays. -+ POSIX allows that the returned pointer may point to a static area that -+ may be overwritten by subsequent calls to setlocale or nl_langinfo. */ -+ static char codeset_buf[64]; -+ codeset_buf[0] = '\0'; -+ codeset = strncat (codeset_buf, nl_langinfo (CODESET), sizeof (codeset_buf)); - - # else - diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index a59a1702e17..cd8484170bd 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, nasm }: +{ stdenv, fetchurl, nasm +, hostPlatform +}: stdenv.mkDerivation rec { name = "libjpeg-turbo-${version}"; @@ -10,7 +12,7 @@ stdenv.mkDerivation rec { }; # github releases still need autotools, surprisingly patches = - stdenv.lib.optional (stdenv.cross.libc or null == "msvcrt") + stdenv.lib.optional (hostPlatform.libc or null == "msvcrt") ./mingw-boolean.patch; outputs = [ "bin" "dev" "out" "doc" ]; diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index 0a1fe70bd1d..23e6a37f918 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libgcrypt, curl, gnutls, pkgconfig }: stdenv.mkDerivation rec { - name = "libmicrohttpd-0.9.53"; + name = "libmicrohttpd-0.9.55"; src = fetchurl { url = "mirror://gnu/libmicrohttpd/${name}.tar.gz"; - sha256 = "1i1c7hwjmc4n31cgmfycgi8xsnm3kyc4zzdd4dir6i0z70nyq5cv"; + sha256 = "1y6h1slav5l6k8zyb01dpw65dscdgxxgfa3a0z9qnn7jr66sn70c"; }; outputs = [ "out" "dev" "devdoc" "info" ]; diff --git a/pkgs/development/libraries/libmpc/default.nix b/pkgs/development/libraries/libmpc/default.nix index 0d3c9c0997c..1bad236e044 100644 --- a/pkgs/development/libraries/libmpc/default.nix +++ b/pkgs/development/libraries/libmpc/default.nix @@ -1,4 +1,8 @@ -{ fetchurl, stdenv, gmp, mpfr }: +{ stdenv, fetchurl +, gmp, mpfr +, buildPlatform, hostPlatform +}: + let version = "1.0.3"; in @@ -14,7 +18,7 @@ stdenv.mkDerivation rec { CFLAGS = "-I${gmp.dev}/include"; - doCheck = true; + doCheck = hostPlatform == buildPlatform; # FIXME needs gcc 4.9 in bootstrap tools hardeningDisable = [ "stackprotector" ]; diff --git a/pkgs/development/libraries/libmsgpack/generic.nix b/pkgs/development/libraries/libmsgpack/generic.nix index 2da703da4cf..c6870f77f1f 100644 --- a/pkgs/development/libraries/libmsgpack/generic.nix +++ b/pkgs/development/libraries/libmsgpack/generic.nix @@ -1,5 +1,6 @@ { stdenv, cmake , version, src, patches ? [ ] +, hostPlatform , ... }: @@ -11,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; crossAttrs = { - } // stdenv.lib.optionalAttrs (stdenv.cross.libc == "msvcrt") { + } // stdenv.lib.optionalAttrs (hostPlatform.libc == "msvcrt") { cmakeFlags = "-DMSGPACK_BUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=Windows"; }; diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 328c5db0b65..66c7e7e882e 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -2,14 +2,14 @@ , fixedPoint ? false, withCustomModes ? true }: let - version = "1.1.5"; + version = "1.2.1"; in stdenv.mkDerivation rec { name = "libopus-${version}"; src = fetchurl { - url = "http://downloads.xiph.org/releases/opus/opus-${version}.tar.gz"; - sha256 = "1r33nm7b052dw7gsc99809df1zmj5icfiljqbrfkw2pll0f9i17b"; + url = "https://archive.mozilla.org/pub/opus/opus-${version}.tar.gz"; + sha256 = "0ch7yzgg4bn1g36bpjsfrgs4n19c84d7wpdida6yzifrrhwx7byg"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix index b3f7f96e936..457f99ef13b 100644 --- a/pkgs/development/libraries/libpng/12.nix +++ b/pkgs/development/libraries/libpng/12.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchurl, zlib }: +{ stdenv, fetchurl, zlib +, buildPlatform, hostPlatform +}: -assert !(stdenv ? cross) -> zlib != null; +assert hostPlatform == buildPlatform -> zlib != null; stdenv.mkDerivation rec { name = "libpng-1.2.57"; @@ -16,7 +18,7 @@ stdenv.mkDerivation rec { passthru = { inherit zlib; }; - crossAttrs = stdenv.lib.optionalAttrs (stdenv.cross.libc == "libSystem") { + crossAttrs = stdenv.lib.optionalAttrs (hostPlatform.libc == "libSystem") { propagatedBuildInputs = []; passthru = {}; }; diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 92e0fa339b2..c2f50af84ca 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, zlib, apngSupport ? true }: +{ stdenv, fetchurl, zlib, apngSupport ? true +, buildPlatform, hostPlatform +}: assert zlib != null; @@ -29,7 +31,7 @@ in stdenv.mkDerivation rec { # it's hard to cross-run tests and some check programs didn't compile anyway makeFlags = stdenv.lib.optional (!doCheck) "check_PROGRAMS="; - doCheck = ! stdenv ? cross; + doCheck = hostPlatform == buildPlatform; passthru = { inherit zlib; }; diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index 10979abdeab..0047f30aad2 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -28,7 +28,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.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libressl/2.4.nix b/pkgs/development/libraries/libressl/2.4.nix deleted file mode 100644 index c5642635b0f..00000000000 --- a/pkgs/development/libraries/libressl/2.4.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - name = "libressl-${version}"; - version = "2.4.5"; - - src = fetchurl { - url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; - sha256 = "0is3zqjcxxncycq44m3if6s5hiq31kpq85pxdnpm3sdfb3iw806k"; - }; - - enableParallelBuilding = true; - - outputs = [ "bin" "dev" "out" "man" ]; - - meta = with stdenv.lib; { - description = "Free TLS/SSL implementation"; - homepage = "http://www.libressl.org"; - platforms = platforms.all; - maintainers = with maintainers; [ thoughtpolice wkennington fpletz globin ]; - }; -} diff --git a/pkgs/development/libraries/libressl/2.5.nix b/pkgs/development/libraries/libressl/2.5.nix deleted file mode 100644 index 6ab07248655..00000000000 --- a/pkgs/development/libraries/libressl/2.5.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - name = "libressl-${version}"; - version = "2.5.4"; - - src = fetchurl { - url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; - sha256 = "1ykf6dqlbafafhbdfmcj19pjj1z6wmsq0rmyqga1i0xv5x95nyhh"; - }; - - enableParallelBuilding = true; - - outputs = [ "bin" "dev" "out" "man" ]; - - dontGzipMan = if stdenv.isDarwin then true else null; # not sure what's wrong - - meta = with stdenv.lib; { - description = "Free TLS/SSL implementation"; - homepage = "http://www.libressl.org"; - platforms = platforms.all; - maintainers = with maintainers; [ thoughtpolice wkennington fpletz globin ]; - }; -} diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix new file mode 100644 index 00000000000..4ce1b664725 --- /dev/null +++ b/pkgs/development/libraries/libressl/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl }: + +let + + generic = { version, sha256 }: stdenv.mkDerivation rec { + name = "libressl-${version}"; + inherit version; + + src = fetchurl { + url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; + inherit sha256; + }; + + enableParallelBuilding = true; + + outputs = [ "bin" "dev" "out" "man" ]; + + dontGzipMan = if stdenv.isDarwin then true else null; # not sure what's wrong + + meta = with stdenv.lib; { + description = "Free TLS/SSL implementation"; + homepage = "http://www.libressl.org"; + platforms = platforms.all; + maintainers = with maintainers; [ thoughtpolice wkennington fpletz globin ]; + }; + }; + +in { + + libressl_2_5 = generic { + version = "2.5.5"; + sha256 = "1i77viqy1afvbr392npk9v54k9zhr9zq2vhv6pliza22b0ymwzz5"; + }; + + libressl_2_6 = generic { + version = "2.6.0"; + sha256 = "0lwapvfda4zj4r0kxn9ys43l5wyfgpljmhq0j1lr45spfis5b3g4"; + }; +} diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix index 2e3df7cf9e0..3409948f59e 100644 --- a/pkgs/development/libraries/librsync/default.nix +++ b/pkgs/development/libraries/librsync/default.nix @@ -1,21 +1,18 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, perl, zlib, bzip2, popt }: +{ stdenv, fetchFromGitHub, cmake, perl, zlib, bzip2, popt }: stdenv.mkDerivation rec { name = "librsync-${version}"; - version = "1.0.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "librsync"; repo = "librsync"; rev = "v${version}"; - sha256 = "0rc2pksdd0mhdvk8y1yix71rf19wdx1lb2ryrkhi7vcy240rvgvc"; + sha256 = "0yad7nkw6d8j824qkxrj008ak2wq6yw5p894sbhr35yc1wr5mki6"; }; - buildInputs = [ autoreconfHook perl zlib bzip2 popt ]; - - configureFlags = if stdenv.isCygwin then "--enable-static" else "--enable-shared"; - - CFLAGS = "-std=gnu89"; + nativeBuildInputs = [ cmake ]; + buildInputs = [ perl zlib bzip2 popt ]; crossAttrs = { dontStrip = true; diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix index 0e644686af0..961b3b2d883 100644 --- a/pkgs/development/libraries/libsigsegv/default.nix +++ b/pkgs/development/libraries/libsigsegv/default.nix @@ -1,4 +1,6 @@ -{ fetchurl, stdenv }: +{ stdenv, fetchurl +, buildPlatform, hostPlatform +}: stdenv.mkDerivation rec { name = "libsigsegv-2.11"; @@ -8,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "063swdvq7mbmc1clv0rnh20grwln1zfc2qnm0sa1hivcxyr2wz6x"; }; - doCheck = true; + doCheck = hostPlatform == buildPlatform; meta = { homepage = http://www.gnu.org/software/libsigsegv/; diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index bfe224d28cd..b508b2fea0e 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -9,6 +9,7 @@ stdenv.mkDerivation rec { }; outputs = [ "out" "dev" ]; + separateDebugInfo = stdenv.isLinux; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libspectre/default.nix b/pkgs/development/libraries/libspectre/default.nix index a04c5631ecb..647e6f16fdf 100644 --- a/pkgs/development/libraries/libspectre/default.nix +++ b/pkgs/development/libraries/libspectre/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { ''; license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index 4320cacc590..4d754dc8086 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -1,4 +1,6 @@ -{stdenv, fetchurlBoot, openssl, zlib, windows}: +{ stdenv, fetchurlBoot, openssl, zlib, windows +, hostPlatform +}: stdenv.mkDerivation rec { name = "libssh2-1.8.0"; @@ -20,7 +22,7 @@ stdenv.mkDerivation rec { "--with-libz" "--with-libz-prefix=${zlib.crossDrv}" ]; - } // stdenv.lib.optionalAttrs (stdenv.cross.libc == "msvcrt") { + } // stdenv.lib.optionalAttrs (hostPlatform.libc == "msvcrt") { # mingw needs import library of ws2_32 to build the shared library preConfigure = '' export LDFLAGS="-L${windows.mingw_w64}/lib $LDFLAGS" diff --git a/pkgs/development/libraries/libunwind/cve-2015-3239.patch b/pkgs/development/libraries/libunwind/cve-2015-3239.patch deleted file mode 100644 index 247b2dab44f..00000000000 --- a/pkgs/development/libraries/libunwind/cve-2015-3239.patch +++ /dev/null @@ -1,15 +0,0 @@ -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 419a14551ba..8565bc75ff9 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -1,39 +1,24 @@ { stdenv, fetchurl, fetchpatch, autoreconfHook, xz }: stdenv.mkDerivation rec { - name = "libunwind-1.1"; + name = "libunwind-${version}"; + version = "1.2.1"; src = fetchurl { url = "mirror://savannah/libunwind/${name}.tar.gz"; - sha256 = "16nhx2pahh9d62mvszc88q226q5lwjankij276fxwrm8wb50zzlx"; + sha256 = "1jsslwkilwrsj959dc8b479qildawz67r8m4lzxm7glcwa8cngiz"; }; - buildInputs = stdenv.lib.optional stdenv.isAarch64 autoreconfHook; + patches = [ + ./version-1.2.1.patch + ]; - patches = [ ./libunwind-1.1-lzma.patch ./cve-2015-3239.patch - # https://lists.nongnu.org/archive/html/libunwind-devel/2014-04/msg00000.html - (fetchpatch { - url = "https://raw.githubusercontent.com/dropbox/pyston/1b2e676417b0f5f17526ece0ed840aa88c744145/libunwind_patches/0001-Change-the-RBP-validation-heuristic-to-allow-size-0-.patch"; - sha256 = "1a0fsgfxmgd218nscswx7pgyb7rcn2gh6566252xhfvzhgn5i4ha"; - }) - ] ++ stdenv.lib.optional stdenv.isAarch64 (fetchpatch { - url = "https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/77709d1c6d5c39e23c1535b1bd584be1455f2551/extra/libunwind/libunwind-aarch64.patch"; - sha256 = "1mpjs8izq9wxiaf5rl4gzaxrkz0s51f9qz5qc5dj72pr84mw50w8"; - }); - - postPatch = '' - sed -i -e '/LIBLZMA/s:-lzma:-llzma:' configure - ''; + nativeBuildInputs = [ autoreconfHook ]; outputs = [ "out" "dev" ]; propagatedBuildInputs = [ xz ]; - preInstall = '' - mkdir -p "$out/lib" - touch "$out/lib/libunwind-generic.so" - ''; - postInstall = '' find $out -name \*.la | while read file; do sed -i 's,-llzma,${xz.out}/lib/liblzma.la,' $file @@ -43,7 +28,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.nongnu.org/libunwind; description = "A portable and efficient API to determine the call-chain of a program"; + maintainers = with maintainers; [ orivej ]; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.mit; }; } diff --git a/pkgs/development/libraries/libunwind/libunwind-1.1-lzma.patch b/pkgs/development/libraries/libunwind/libunwind-1.1-lzma.patch deleted file mode 100644 index 09cefa02853..00000000000 --- a/pkgs/development/libraries/libunwind/libunwind-1.1-lzma.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 38c349bb000b427c376e756e3ecdb764a2b4d297 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Sat, 15 Feb 2014 21:00:59 -0500 -Subject: [PATCH] link sublibs against liblzma as needed - -The coredump/elf32/elf64/elfxx libs use lzma funcs but don't link against -it. This produces sub-shared libs that don't link against lzma and can -make the linker angry due to underlinking like so: - -libtool: link: x86_64-pc-linux-gnu-gcc -O2 -march=amdfam10 -pipe -g \ - -frecord-gcc-switches -Wimplicit-function-declaration -fexceptions \ - -Wall -Wsign-compare -Wl,-O1 -Wl,--hash-style=gnu \ - -o .libs/test-coredump-unwind test-coredump-unwind.o \ - ../src/.libs/libunwind-coredump.so ../src/.libs/libunwind-x86_64.so -../src/.libs/libunwind-coredump.so: error: undefined reference to 'lzma_stream_footer_decode' -../src/.libs/libunwind-coredump.so: error: undefined reference to 'lzma_index_buffer_decode' -../src/.libs/libunwind-coredump.so: error: undefined reference to 'lzma_index_size' -../src/.libs/libunwind-coredump.so: error: undefined reference to 'lzma_index_end' -../src/.libs/libunwind-coredump.so: error: undefined reference to 'lzma_index_uncompressed_size' -../src/.libs/libunwind-coredump.so: error: undefined reference to 'lzma_stream_buffer_decode' -collect2: error: ld returned 1 exit status - -So add LIBLZMA to the right LIBADD for each of these libraries. - -URL: https://bugs.gentoo.org/444050 -Signed-off-by: Mike Frysinger ---- - src/Makefile.am | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -169,7 +169,7 @@ libunwind_arm_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libunwind_arm_la_LDFLAGS) $(LDFLAGS) -o $@ - @ARCH_ARM_TRUE@am_libunwind_arm_la_rpath = -rpath $(libdir) --libunwind_coredump_la_LIBADD = -+libunwind_coredump_la_LIBADD = $(LIBLZMA) - am__libunwind_coredump_la_SOURCES_DIST = coredump/_UCD_accessors.c \ - coredump/_UCD_create.c coredump/_UCD_destroy.c \ - coredump/_UCD_access_mem.c coredump/_UCD_elf_map_image.c \ -@@ -214,15 +214,15 @@ am_libunwind_dwarf_local_la_OBJECTS = dwarf/Lexpr.lo dwarf/Lfde.lo \ - libunwind_dwarf_local_la_OBJECTS = \ - $(am_libunwind_dwarf_local_la_OBJECTS) - @REMOTE_ONLY_FALSE@@USE_DWARF_TRUE@am_libunwind_dwarf_local_la_rpath = --libunwind_elf32_la_LIBADD = -+libunwind_elf32_la_LIBADD = $(LIBLZMA) - am_libunwind_elf32_la_OBJECTS = elf32.lo - libunwind_elf32_la_OBJECTS = $(am_libunwind_elf32_la_OBJECTS) - @USE_ELF32_TRUE@am_libunwind_elf32_la_rpath = --libunwind_elf64_la_LIBADD = -+libunwind_elf64_la_LIBADD = $(LIBLZMA) - am_libunwind_elf64_la_OBJECTS = elf64.lo - libunwind_elf64_la_OBJECTS = $(am_libunwind_elf64_la_OBJECTS) - @USE_ELF64_TRUE@am_libunwind_elf64_la_rpath = --libunwind_elfxx_la_LIBADD = -+libunwind_elfxx_la_LIBADD = $(LIBLZMA) - am_libunwind_elfxx_la_OBJECTS = elfxx.lo - libunwind_elfxx_la_OBJECTS = $(am_libunwind_elfxx_la_OBJECTS) - @USE_ELFXX_TRUE@am_libunwind_elfxx_la_rpath = --- -1.8.5.5 - diff --git a/pkgs/development/libraries/libunwind/version-1.2.1.patch b/pkgs/development/libraries/libunwind/version-1.2.1.patch new file mode 100644 index 00000000000..63202937084 --- /dev/null +++ b/pkgs/development/libraries/libunwind/version-1.2.1.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index a254bbe..fe0247b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,6 +1,6 @@ + define(pkg_major, 1) +-define(pkg_minor, 2.1) +-define(pkg_extra, ) ++define(pkg_minor, 2) ++define(pkg_extra, 1) + define(pkg_maintainer, libunwind-devel@nongnu.org) + define(mkvers, $1.$2$3) + dnl Process this file with autoconf to produce a configure script. diff --git a/pkgs/development/libraries/libutempter/default.nix b/pkgs/development/libraries/libutempter/default.nix index 8481f857b2c..d54c82ae7f2 100644 --- a/pkgs/development/libraries/libutempter/default.nix +++ b/pkgs/development/libraries/libutempter/default.nix @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { buildInputs = [ glib ]; + prePatch = '' + substituteInPlace Makefile --replace 2711 0711 + ''; + installFlags = [ "libdir=\${out}/lib" "libexecdir=\${out}/lib" diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 511f97eb3cd..805a4c0b63d 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -12,11 +12,11 @@ with stdenv.lib; # if you update, also bump pythonPackages.libvirt or it will break stdenv.mkDerivation rec { name = "libvirt-${version}"; - version = "3.1.0"; + version = "3.5.0"; src = fetchurl { url = "http://libvirt.org/sources/${name}.tar.xz"; - sha256 = "1a9j6yqfy7i5yv414wk6nv26a5bpfyyg0rpcps6ybi6a1yd04ybq"; + sha256 = "05mm4xdw6g960rwvc9189nhxpm1vrilnmpl4h4m1lha11pivlqr9"; }; patches = [ ./build-on-bsd.patch ]; @@ -59,6 +59,7 @@ stdenv.mkDerivation rec { "--with-virtualport" "--with-init-script=systemd+redhat" "--with-storage-disk" + ] ++ optionals (stdenv.isLinux && zfs != null) [ "--with-storage-zfs" ] ++ optionals stdenv.isDarwin [ "--with-init-script=none" @@ -74,6 +75,8 @@ stdenv.mkDerivation rec { substituteInPlace $out/libexec/libvirt-guests.sh \ --replace "$out/bin" "${gettext}/bin" \ --replace "lock/subsys" "lock" + sed -e "/gettext\.sh/a \\\n# Added in nixpkgs:\ngettext() { \"${gettext}/bin/gettext\" \"\$@\"; }" \ + -i "$out/libexec/libvirt-guests.sh" '' + optionalString stdenv.isLinux '' rm $out/lib/systemd/system/{virtlockd,virtlogd}.* wrapProgram $out/sbin/libvirtd \ diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 7efff3412a3..4b50fe090e3 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -1,4 +1,5 @@ -{stdenv, fetchFromGitHub, perl, yasm +{ stdenv, fetchFromGitHub, perl, yasm +, hostPlatform , vp8DecoderSupport ? true # VP8 decoder , vp8EncoderSupport ? true # VP8 encoder , vp9DecoderSupport ? true # VP9 decoder @@ -144,11 +145,8 @@ stdenv.mkDerivation rec { postInstall = ''moveToOutput bin "$bin" ''; - crossAttrs = let - isCygwin = stdenv.cross.libc == "msvcrt"; - isDarwin = stdenv.cross.libc == "libSystem"; - in { - dontSetConfigureCross = true; + crossAttrs = { + configurePlatforms = []; configureFlags = configureFlags ++ [ #"--extra-cflags=" #"--extra-cxxflags=" @@ -159,17 +157,17 @@ stdenv.mkDerivation rec { # libvpx darwin targets include darwin version (ie. ARCH-darwinXX-gcc, XX being the darwin version) # See all_platforms: https://github.com/webmproject/libvpx/blob/master/configure # Darwin versions: 10.4=8, 10.5=9, 10.6=10, 10.7=11, 10.8=12, 10.9=13, 10.10=14 - "--force-target=${stdenv.cross.config}${( - if isDarwin then ( - if stdenv.cross.osxMinVersion == "10.10" then "14" - else if stdenv.cross.osxMinVersion == "10.9" then "13" - else if stdenv.cross.osxMinVersion == "10.8" then "12" - else if stdenv.cross.osxMinVersion == "10.7" then "11" - else if stdenv.cross.osxMinVersion == "10.6" then "10" - else if stdenv.cross.osxMinVersion == "10.5" then "9" - else "8") - else "")}-gcc" - (if isCygwin then "--enable-static-msvcrt" else "") + "--force-target=${hostPlatform.config}${ + if hostPlatform.isDarwin then + if hostPlatform.osxMinVersion == "10.10" then "14" + else if hostPlatform.osxMinVersion == "10.9" then "13" + else if hostPlatform.osxMinVersion == "10.8" then "12" + else if hostPlatform.osxMinVersion == "10.7" then "11" + else if hostPlatform.osxMinVersion == "10.6" then "10" + else if hostPlatform.osxMinVersion == "10.5" then "9" + else "8" + else ""}-gcc" + (if hostPlatform.isCygwin then "--enable-static-msvcrt" else "") ]; }; diff --git a/pkgs/development/libraries/libvpx/git.nix b/pkgs/development/libraries/libvpx/git.nix index 1dafd4a124d..824449a347a 100644 --- a/pkgs/development/libraries/libvpx/git.nix +++ b/pkgs/development/libraries/libvpx/git.nix @@ -1,4 +1,5 @@ -{stdenv, fetchgit, perl, yasm +{ stdenv, fetchgit, perl, yasm +, hostPlatform , vp8DecoderSupport ? true # VP8 decoder , vp8EncoderSupport ? true # VP8 encoder , vp9DecoderSupport ? true # VP9 decoder @@ -152,11 +153,8 @@ stdenv.mkDerivation rec { postInstall = ''moveToOutput bin "$bin" ''; - crossAttrs = let - isCygwin = stdenv.cross.libc == "msvcrt"; - isDarwin = stdenv.cross.libc == "libSystem"; - in { - dontSetConfigureCross = true; + crossAttrs = { + configurePlatforms = []; configureFlags = configureFlags ++ [ #"--extra-cflags=" #"--prefix=" @@ -166,17 +164,17 @@ stdenv.mkDerivation rec { # libvpx darwin targets include darwin version (ie. ARCH-darwinXX-gcc, XX being the darwin version) # See all_platforms: https://github.com/webmproject/libvpx/blob/master/configure # Darwin versions: 10.4=8, 10.5=9, 10.6=10, 10.7=11, 10.8=12, 10.9=13, 10.10=14 - "--force-target=${stdenv.cross.config}${( - if isDarwin then ( - if stdenv.cross.osxMinVersion == "10.10" then "14" - else if stdenv.cross.osxMinVersion == "10.9" then "13" - else if stdenv.cross.osxMinVersion == "10.8" then "12" - else if stdenv.cross.osxMinVersion == "10.7" then "11" - else if stdenv.cross.osxMinVersion == "10.6" then "10" - else if stdenv.cross.osxMinVersion == "10.5" then "9" - else "8") - else "")}-gcc" - (if isCygwin then "--enable-static-msvcrt" else "") + "--force-target=${hostPlatform.config}${ + if hostPlatform.isDarwin then + if hostPlatform.osxMinVersion == "10.10" then "14" + else if hostPlatform.osxMinVersion == "10.9" then "13" + else if hostPlatform.osxMinVersion == "10.8" then "12" + else if hostPlatform.osxMinVersion == "10.7" then "11" + else if hostPlatform.osxMinVersion == "10.6" then "10" + else if hostPlatform.osxMinVersion == "10.5" then "9" + else "8" + else ""}-gcc" + (if hostPlatform.isCygwin then "--enable-static-msvcrt" else "") ]; }; diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix index 6da1b00ee81..673cd7abe7d 100644 --- a/pkgs/development/libraries/libwebp/default.nix +++ b/pkgs/development/libraries/libwebp/default.nix @@ -27,11 +27,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "libwebp-${version}"; - version = "0.4.3"; + version = "0.6.0"; src = fetchurl { url = "http://downloads.webmproject.org/releases/webp/${name}.tar.gz"; - sha256 = "1i4hfczjm3b1qj1g4cc9hgb69l47f3nkgf6hk7nz4dm9zmc0vgpg"; + sha256 = "0h1brwkyxc7lb8lc53aacdks5vc1y9hzngqi41gg7y6l56912a69"; }; configureFlags = [ diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index fb397ace794..10dd4ee5dbe 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -1,7 +1,9 @@ { stdenv, lib, fetchurl, fetchpatch , zlib, xz, python2, findXMLCatalogs, libiconv -, pythonSupport ? (! stdenv ? cross) -, icuSupport ? false, icu ? null }: +, buildPlatform, hostPlatform +, pythonSupport ? buildPlatform == hostPlatform +, icuSupport ? false, icu ? null +}: let python = python2; @@ -45,7 +47,7 @@ in stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; - crossAttrs = lib.optionalAttrs (stdenv.cross.libc == "msvcrt") { + crossAttrs = lib.optionalAttrs (hostPlatform.libc == "msvcrt") { # creating the DLL is broken ATM dontDisableStatic = true; configureFlags = configureFlags ++ [ "--disable-shared" ]; diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 4647eecf87d..118b8af5a6f 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs, python2 +, buildPlatform, hostPlatform , cryptoSupport ? false -, pythonSupport ? (! stdenv ? cross) +, pythonSupport ? buildPlatform == hostPlatform }: assert pythonSupport -> python2 != null; @@ -18,6 +19,12 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optional stdenv.isSunOS ./patch-ah.patch; + # fixes: can't build x86_64-unknown-cygwin shared library unless -no-undefined is specified + postPatch = optionalString hostPlatform.isCygwin '' + substituteInPlace tests/plugins/Makefile.in \ + --replace 'la_LDFLAGS =' 'la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS)' + ''; + outputs = [ "bin" "dev" "out" "doc" ] ++ stdenv.lib.optional pythonSupport "py"; buildInputs = [ libxml2.dev ] ++ stdenv.lib.optionals pythonSupport [ libxml2.py python2 ]; diff --git a/pkgs/development/libraries/lucene++/default.nix b/pkgs/development/libraries/lucene++/default.nix index 9f9b6aa4482..b4ec850b491 100644 --- a/pkgs/development/libraries/lucene++/default.nix +++ b/pkgs/development/libraries/lucene++/default.nix @@ -2,33 +2,18 @@ stdenv.mkDerivation rec { name = "lucene++-${version}"; - version = "3.0.6"; + version = "3.0.7"; src = fetchurl { url = "https://github.com/luceneplusplus/LucenePlusPlus/" + "archive/rel_${version}.tar.gz"; - sha256 = "068msvh05gsbfj1wwdqj698kxxfjdqy8zb6pqvail3ayjfj94w1y"; + sha256 = "032yb35b381ifm7wb8cy2m3yndklnxyi5cgprjh48jqy641z46bc"; }; - patches = let - baseurl = "https://github.com/luceneplusplus/LucenePlusPlus"; - in [ - (fetchpatch { - url = "${baseurl}/pull/62.diff"; - sha256 = "0v314877mjb0hljg4mcqi317m1p1v27rgsgf5wdr9swix43vmhgw"; - }) - (fetchpatch { - url = "${baseurl}/commit/994f03cf736229044a168835ae7387696041658f.diff"; - sha256 = "0fcm5b87nxw062wjd7b4qrfcwsyblmcw19s64004pklj9grk30zz"; - }) - ]; - postPatch = '' sed -i -e '/Subversion *REQUIRED/d' \ -e '/include.*CMakeExternal/d' \ CMakeLists.txt - # not using -f because we want it to fail for the next release - rm CMakeExternal.txt ''; cmakeFlags = [ "-DGTEST_INCLUDE_DIR=${gtest}/include" ]; diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix index b33950d35e0..83ddcbf52e1 100644 --- a/pkgs/development/libraries/matio/default.nix +++ b/pkgs/development/libraries/matio/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "matio-1.5.9"; + name = "matio-1.5.10"; src = fetchurl { url = "mirror://sourceforge/matio/${name}.tar.gz"; - sha256 = "0p60c3wdj4w7v7hzdc0iivciq4hwxzhhx0zq8gpv9i8yhdjzkdxy"; + sha256 = "00dmg2f5k2xgakp7l0lganz122b1agazw5d899xci35xrqc9j821"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index d606fcd1548..e1bd4255636 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -67,7 +67,7 @@ let in let - version = "17.1.2"; + version = "17.1.4"; branch = head (splitString "." version); driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32"; in @@ -82,7 +82,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz" ]; - sha256 = "0937804f43746339b1f9540d8f9c8b4a1bb3d3eec0e4020eac283b8799798239"; + sha256 = "06f3b0e6a28f0d20b7f3391cf67fe89ae98ecd0a686cd545da76557b6cec9cad"; }; prePatch = "patchShebangs ."; diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix index 8dbe150e2cb..4f9a9fb9bd0 100644 --- a/pkgs/development/libraries/mpfr/default.nix +++ b/pkgs/development/libraries/mpfr/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, gmp }: +{ stdenv, fetchurl, gmp +, buildPlatform, hostPlatform +}: stdenv.mkDerivation rec { name = "mpfr-3.1.3"; @@ -19,10 +21,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "stackprotector" ]; configureFlags = - stdenv.lib.optional stdenv.isSunOS "--disable-thread-safe" ++ - stdenv.lib.optional stdenv.is64bit "--with-pic"; + stdenv.lib.optional hostPlatform.isSunOS "--disable-thread-safe" ++ + stdenv.lib.optional hostPlatform.is64bit "--with-pic"; - doCheck = true; + doCheck = hostPlatform == buildPlatform; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 46283e371aa..827a556a468 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -61,8 +61,6 @@ stdenv.mkDerivation rec { -e '/CPPFLAGS="$CPPFLAGS/s/ -D_XOPEN_SOURCE_EXTENDED//' \ configure CFLAGS=-D_XOPEN_SOURCE_EXTENDED - '' + lib.optionalString stdenv.isCygwin '' - sed -i -e 's,LIB_SUFFIX="t,LIB_SUFFIX=",' configure ''; enableParallelBuilding = true; @@ -122,7 +120,7 @@ stdenv.mkDerivation rec { moveToOutput "bin/tset" "$out" ''; - preFixup = '' + preFixup = lib.optionalString (!hostPlatform.isCygwin) '' rm "$out"/lib/*.a ''; diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/development/libraries/newt/default.nix index 8a4b793cad7..9002d06693e 100644 --- a/pkgs/development/libraries/newt/default.nix +++ b/pkgs/development/libraries/newt/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lncurses"; crossAttrs = { - makeFlags = "CROSS_COMPILE=${stdenv.cross.config}-"; + makeFlags = "CROSS_COMPILE=${stdenv.cc.prefix}"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index a5a808c1f61..9fb614cd071 100644 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ b/pkgs/development/libraries/nlohmann_json/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ stdenv, fetchFromGitHub, cmake +, hostPlatform +}: stdenv.mkDerivation rec { name = "nlohmann_json-${version}"; @@ -21,7 +23,7 @@ stdenv.mkDerivation rec { crossAttrs = { cmakeFlags = "-DBuildTests=OFF"; doCheck = false; - } // stdenv.lib.optionalAttrs (stdenv.cross.libc == "msvcrt") { + } // stdenv.lib.optionalAttrs (hostPlatform.libc == "msvcrt") { cmakeFlags = "-DBuildTests=OFF -DCMAKE_SYSTEM_NAME=Windows"; }; diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index dc4a00e6dd9..85b4d562720 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -15,6 +15,7 @@ , enableFfmpeg ? false, ffmpeg , enableGStreamer ? false, gst_all_1 , enableEigen ? false, eigen +, enableOpenblas ? false, openblas , enableCuda ? false, cudatoolkit, gcc5 , AVFoundation, Cocoa, QTKit }: @@ -130,6 +131,7 @@ stdenv.mkDerivation rec { ++ lib.optional enableFfmpeg ffmpeg ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ]) ++ lib.optional enableEigen eigen + ++ lib.optional enableOpenblas openblas ++ lib.optionals enableCuda [ cudatoolkit gcc5 ] ++ lib.optional enableContrib protobuf3_1 ++ lib.optionals stdenv.isDarwin [ AVFoundation Cocoa QTKit ]; @@ -141,7 +143,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = lib.optional enableEXR "-I${ilmbase.dev}/include/OpenEXR"; cmakeFlags = [ - "-DWITH_IPP=${if enableIpp then "ON" else "OFF"}" + "-DWITH_IPP=${if enableIpp then "ON" else "OFF"} -DWITH_OPENMP=ON" (opencvFlag "TIFF" enableTIFF) (opencvFlag "JASPER" enableJPEG2K) (opencvFlag "WEBP" enableWebP) diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix new file mode 100644 index 00000000000..75d2b090e71 --- /dev/null +++ b/pkgs/development/libraries/opendht/default.nix @@ -0,0 +1,48 @@ +{ stdenv +, fetchFromGitHub +, autoconf +, automake +, libtool +, pkgconfig +, nettle +, gnutls +, libmsgpack +, readline +, libargon2 +}: + +stdenv.mkDerivation rec { + name = "opendht-${version}"; + version = "1.3.4"; + + src = fetchFromGitHub { + owner = "savoirfairelinux"; + repo = "opendht"; + rev = "${version}"; + sha256 = "0karj37f0zq39w0ip8ahrjr6lcrrn9jd6bpzylp1m92jzs8pfki8"; + }; + + buildInputs = [ + autoconf + automake + libtool + pkgconfig + nettle + gnutls + libmsgpack + readline + libargon2 + ]; + + preConfigure = '' + ./autogen.sh + ''; + + meta = with stdenv.lib; { + description = "A C++11 Kademlia distributed hash table implementation"; + homepage = https://github.com/savoirfairelinux/opendht; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ taeer olynch ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 05c03dcd842..7155d0f48a8 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, cyrus_sasl, db, groff, libtool }: stdenv.mkDerivation rec { - name = "openldap-2.4.44"; + name = "openldap-2.4.45"; src = fetchurl { url = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/${name}.tgz"; - sha256 = "0044p20hx07fwgw2mbwj1fkx04615hhs1qyx4mawj2bhqvrnppnp"; + sha256 = "091qvwk5dkcpp17ziabcnh3rg3m7qwzw2pihfcd1d5fdxgywzmnd"; }; # TODO: separate "out" and "bin" diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index c7ab69e5169..2d08f37c8c2 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -13,19 +13,13 @@ let majorVersion = "1.10"; in stdenv.mkDerivation rec { - name = "openmpi-${majorVersion}.1"; + name = "openmpi-${majorVersion}.7"; src = fetchurl { url = "http://www.open-mpi.org/software/ompi/v${majorVersion}/downloads/${name}.tar.bz2"; - sha256 = "14p4px9a3qzjc22lnl6braxrcrmd9rgmy7fh4qpanawn2pgfq6br"; + sha256 = "142s1vny9gllkq336yafxayjgcirj2jv0ddabj879jgya7hyr2d0"; }; - # Bug in openmpi implementation for zero sized messages - # Patch required to make mpi4py pass. Will NOT - # be required when openmpi >= 2.0.0 - # https://www.open-mpi.org/community/lists/users/2015/11/28030.php - patches = [ ./nbc_copy.patch ]; - buildInputs = [ gfortran ] ++ optional (stdenv.isLinux || stdenv.isFreeBSD) libibverbs; diff --git a/pkgs/development/libraries/openmpi/nbc_copy.patch b/pkgs/development/libraries/openmpi/nbc_copy.patch deleted file mode 100644 index d496c7cc2d7..00000000000 --- a/pkgs/development/libraries/openmpi/nbc_copy.patch +++ /dev/null @@ -1,30 +0,0 @@ -commit 4ee20ba31dd64b8f899447cdad78ec2379acfce7 -Author: Gilles Gouaillardet -Date: Tue Nov 10 08:59:03 2015 +0900 - - fix NBC_Copy for legitimate zero size messages - - (back ported from commit open-mpi/ompi@0bd765eddd33e3d4ac18ec644c60a5c160cb48dc) - (back ported from commit open-mpi/ompi@9a70765f27fdf17e70e1a115754fef7e5f16132a) - -diff --git a/ompi/mca/coll/libnbc/nbc_internal.h b/ompi/mca/coll/libnbc/nbc_internal.h -index bf2f1cb..81be8cc 100644 ---- a/ompi/mca/coll/libnbc/nbc_internal.h -+++ b/ompi/mca/coll/libnbc/nbc_internal.h -@@ -501,7 +501,14 @@ static inline int NBC_Copy(void *src, int srccount, MPI_Datatype srctype, void * - } else { - /* we have to pack and unpack */ - res = MPI_Pack_size(srccount, srctype, comm, &size); -- if (MPI_SUCCESS != res || 0 == size) { printf("MPI Error in MPI_Pack_size() (%i:%i)\n", res, size); return (MPI_SUCCESS == res) ? MPI_ERR_SIZE : res;} -+ if (MPI_SUCCESS != res) { -+ printf ("MPI Error in MPI_Pack_size() (%i:%i)", res, size); -+ return res; -+ } -+ -+ if (0 == size) { -+ return OMPI_SUCCESS; -+ } - packbuf = malloc(size); - if (NULL == packbuf) { printf("Error in malloc()\n"); return res; } - pos=0; - diff --git a/pkgs/development/libraries/openpa/default.nix b/pkgs/development/libraries/openpa/default.nix new file mode 100644 index 00000000000..fa147a9d9cc --- /dev/null +++ b/pkgs/development/libraries/openpa/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, file }: + +stdenv.mkDerivation rec { + pname = "openpa"; + version = "1.0.4"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://trac.mpich.org/projects/${pname}/raw-attachment/wiki/Downloads/${name}.tar.gz"; + sha256 = "0flyi596hm6fv7xyw2iykx3s65p748s62bf15624xcnwpfrh8ncy"; + }; + + prePatch = ''substituteInPlace configure --replace /usr/bin/file ${file}/bin/file''; + + doCheck = true; + + meta = { + description = "Atomic primitives for high performance, concurrent software"; + homepage = "https://trac.mpich.org/projects/openpa"; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ leenaars ]; + platforms = with stdenv.lib.platforms; linux; + longDescription = '' + OPA (or sometimes OpenPA or Open Portable Atomics) is an + open source library intended to provide a consistent C API for performing + atomic operations on a variety of platforms. The main goal of the project is to + enable the portable usage of atomic operations in concurrent software. + Developers of client software can worry about implementing and improving their + concurrent algorithms instead of fiddling with inline assembly syntax and + learning new assembly dialects in order improve or maintain application + portability. + ''; + }; +} diff --git a/pkgs/development/libraries/openslp/default.nix b/pkgs/development/libraries/openslp/default.nix index 80a77e72275..864e2dc7085 100644 --- a/pkgs/development/libraries/openslp/default.nix +++ b/pkgs/development/libraries/openslp/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation { patches = [ (fetchpatch { name = "openslp-2.0.0-null-pointer-deref.patch"; - url = "https://svnweb.mageia.org/packages/cauldron/openslp/current/SOURCES/openslp-2.0.0-null-pointer-deref.patch?revision=1019712&view=co"; + url = "https://src.fedoraproject.org/cgit/rpms/openslp.git/plain/openslp-2.0.0-null-pointer-deref.patch"; sha256 = "186f3rj3z2lf5h1lpbhqk0szj2a9far1p3mjqg6422f29yjfnz6a"; }) (fetchpatch { name = "openslp-2.0.0-CVE-2016-7567.patch"; - url = "https://svnweb.mageia.org/packages/cauldron/openslp/current/SOURCES/openslp-2.0.0-CVE-2016-7567.patch?revision=1057233&view=co"; - sha256 = "1zrgql91vjjl2v7brlibc8jqndnjz9fclqbdn0b6fklkpwznprny"; + url = "https://src.fedoraproject.org/cgit/rpms/openslp.git/plain/openslp-2.0.0-cve-2016-7567.patch"; + sha256 = "0zp61axx93b7nrbsyhn2x4dnw7n9y6g4rys21hyqxk4khrnc2yr9"; }) ]; diff --git a/pkgs/development/libraries/openssl/1.0.1-cygwin64.patch b/pkgs/development/libraries/openssl/1.0.1-cygwin64.patch deleted file mode 100644 index 63112abf3a3..00000000000 --- a/pkgs/development/libraries/openssl/1.0.1-cygwin64.patch +++ /dev/null @@ -1,136 +0,0 @@ ---- openssl-1.0.1e/config 2014-10-23 15:53:23.436600000 +0200 -+++ openssl-1.0.1e/config 2014-10-23 15:55:33.837000000 +0200 -@@ -832,6 +832,7 @@ - # these are all covered by the catchall below - # *-dgux) OUT="dgux" ;; - mips-sony-newsos4) OUT="newsos4-gcc" ;; -+ x86_64-*-cygwin) OUT="Cygwin-x86_64" ;; - *-*-cygwin_pre1.3) OUT="Cygwin-pre1.3" ;; - *-*-cygwin) OUT="Cygwin" ;; - t3e-cray-unicosmk) OUT="cray-t3e" ;; ---- openssl-1.0.1e/Configure 2013-02-17 17:06:18.682058900 -0600 -+++ openssl-1.0.1e/Configure 2013-02-17 16:38:08.000000000 -0600 -@@ -550,6 +550,7 @@ my %table=( - "Cygwin-pre1.3", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:win32", - "Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall:::CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:coff:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a", - "debug-Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror:::CYGWIN32:::${no_asm}:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a", -+"Cygwin-x86_64", "gcc:-DTERMIOS -DL_ENDIAN -O3 -Wall:::CYGWIN32::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:mingw64:dlfcn:cygwin-shared:-D_WINDLL:-shared:.dll.a", - - # NetWare from David Ward (dsward@novell.com) - # requires either MetroWerks NLM development tools, or gcc / nlmconv -@@ -1128,7 +1129,7 @@ foreach (sort @experimental) - - my $IsMK1MF=scalar grep /^$target$/,@MK1MF_Builds; - --$exe_ext=".exe" if ($target eq "Cygwin" || $target eq "DJGPP" || $target =~ /^mingw/); -+$exe_ext=".exe" if ($target =~ /^Cygwin/ || $target eq "DJGPP" || $target =~ /^mingw/); - $exe_ext=".nlm" if ($target =~ /netware/); - $exe_ext=".pm" if ($target =~ /vos/); - $openssldir="/usr/local/ssl" if ($openssldir eq "" and $prefix eq ""); ---- openssl-1.0.1e/Makefile.org 2013-02-11 09:26:04.000000000 -0600 -+++ openssl-1.0.1e/Makefile.org 2013-02-17 16:38:08.000000000 -0600 -@@ -326,9 +326,9 @@ clean-shared: - done; \ - fi; \ - ( set -x; rm -f lib$$i$(SHLIB_EXT) ); \ -- if [ "$(PLATFORM)" = "Cygwin" ]; then \ -+ case "$(PLATFORM)" in Cygwin*) \ - ( set -x; rm -f cyg$$i$(SHLIB_EXT) lib$$i$(SHLIB_EXT).a ); \ -- fi; \ -+ esac; \ - done - - link-shared: -@@ -571,11 +571,7 @@ install_sw: - do \ - if [ -f "$$i" -o -f "$$i.a" ]; then \ - ( echo installing $$i; \ -- if [ "$(PLATFORM)" != "Cygwin" ]; then \ -- cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ -- chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ -- mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \ -- else \ -+ case "$(PLATFORM)" in Cygwin*) \ - c=`echo $$i | sed 's/^lib\(.*\)\.dll\.a/cyg\1-$(SHLIB_VERSION_NUMBER).dll/'`; \ - cp $$c $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \ - chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \ -@@ -583,7 +579,12 @@ install_sw: - cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \ -- fi ); \ -+ ;; \ -+ *) \ -+ cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ -+ chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \ -+ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \ -+ esac ); \ - if expr $(PLATFORM) : 'mingw' > /dev/null; then \ - ( case $$i in \ - *crypto*) i=libeay32.dll;; \ -@@ -643,9 +644,9 @@ install_docs: - @pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \ - here="`pwd`"; \ - filecase=; \ -- if [ "$(PLATFORM)" = "DJGPP" -o "$(PLATFORM)" = "Cygwin" -o "$(PLATFORM)" = "mingw" ]; then \ -+ case "$(PLATFORM)" in DJGPP|Cygwin*|mingw*) \ - filecase=-i; \ -- fi; \ -+ esac; \ - set -e; for i in doc/apps/*.pod; do \ - fn=`basename $$i .pod`; \ - sec=`$(PERL) util/extract-section.pl 1 < $$i`; \ ---- openssl-1.0.1e/engines/ccgost/Makefile 2013-02-11 09:26:04.000000000 -0600 -+++ openssl-1.0.1e/engines/ccgost/Makefile 2013-02-17 17:05:47.759290200 -0600 -@@ -45,7 +45,11 @@ install: - set -e; \ - echo installing $(LIBNAME); \ - pfx=lib; \ -- if [ "$(PLATFORM)" != "Cygwin" ]; then \ -+ case "$(PLATFORM)" in Cygwin*) \ -+ sfx=".so"; \ -+ cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \ -+ ;; \ -+ *) \ - case "$(CFLAGS)" in \ - *DSO_BEOS*) sfx=".so";; \ - *DSO_DLFCN*) sfx=`expr "$(SHLIB_EXT)" : '.*\(\.[a-z][a-z]*\)' \| ".so"`;; \ -@@ -54,10 +58,7 @@ install: - *) sfx=".bad";; \ - esac; \ - cp $${pfx}$(LIBNAME)$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \ -- else \ -- sfx=".so"; \ -- cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \ -- fi; \ -+ esac; \ - chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \ - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx; \ - fi ---- openssl-1.0.1i/engines/Makefile 2014-10-23 16:08:19.360200000 +0200 -+++ openssl-1.0.1i/engines/Makefile 2014-10-23 16:10:54.205800000 +0200 -@@ -111,7 +111,11 @@ - for l in $(LIBNAMES); do \ - ( echo installing $$l; \ - pfx=lib; \ -- if [ "$(PLATFORM)" != "Cygwin" ]; then \ -+ case "$(PLATFORM)" in Cygwin*) \ -+ sfx=".so"; \ -+ cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ -+ ;; \ -+ *) \ - case "$(CFLAGS)" in \ - *DSO_BEOS*) sfx=".so";; \ - *DSO_DLFCN*) sfx=`expr "$(SHLIB_EXT)" : '.*\(\.[a-z][a-z]*\)' \| ".so"`;; \ -@@ -120,10 +124,7 @@ - *) sfx=".bad";; \ - esac; \ - cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ -- else \ -- sfx=".so"; \ -- cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ -- fi; \ -+ esac; \ - chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \ - done; \ diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 8582c0a1833..c0296f42406 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -1,12 +1,14 @@ { stdenv, fetchurl, buildPackages, perl +, hostPlatform , withCryptodev ? false, cryptodevHeaders -, enableSSL2 ? false }: +, enableSSL2 ? false +}: with stdenv.lib; let - opensslCrossSystem = stdenv.cross.openssl.system or + opensslCrossSystem = hostPlatform.openssl.system or (throw "openssl needs its platform name cross building"); common = args@{ version, sha256, patches ? [] }: stdenv.mkDerivation rec { @@ -22,13 +24,12 @@ let ++ [ ./nix-ssl-cert-file.patch ] ++ optional (versionOlder version "1.1.0") (if stdenv.isDarwin then ./use-etc-ssl-certs-darwin.patch else ./use-etc-ssl-certs.patch) - ++ optional stdenv.isCygwin ./1.0.1-cygwin64.patch - ++ optional - (versionOlder version "1.0.2" && (stdenv.isDarwin || (stdenv ? cross && stdenv.cross.libc == "libSystem"))) + ++ optional (versionOlder version "1.0.2" && hostPlatform.isDarwin) ./darwin-arch.patch; outputs = [ "bin" "dev" "out" "man" ]; setOutputFlags = false; + separateDebugInfo = stdenv.isLinux; nativeBuildInputs = [ perl ]; buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders; @@ -89,10 +90,6 @@ let preConfigure='' # It's configure does not like --build or --host export configureFlags="${concatStringsSep " " (configureFlags ++ [ opensslCrossSystem ])}" - # WINDRES and RANLIB need to be prefixed when cross compiling; - # the openssl configure script doesn't do that for us - export WINDRES=${stdenv.cross.config}-windres - export RANLIB=${stdenv.cross.config}-ranlib ''; configureScript = "./Configure"; }; diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 21de038f7d6..93e32529592 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl -, windows ? null, variant ? null, pcre +, pcre, windows ? null +, buildPlatform, hostPlatform +, variant ? null }: with stdenv.lib; @@ -31,7 +33,9 @@ in stdenv.mkDerivation rec { patches = [ ./CVE-2017-7186.patch ]; - doCheck = with stdenv; !(isCygwin || isFreeBSD); + buildInputs = optional (hostPlatform.libc == "msvcrt") windows.mingw_w64_pthreads; + + doCheck = !(with hostPlatform; isCygwin || isFreeBSD) && hostPlatform == buildPlatform; # XXX: test failure on Cygwin # we are running out of stack on both freeBSDs on Hydra @@ -42,10 +46,6 @@ in stdenv.mkDerivation rec { ln -sf -t "$out/lib/" '${pcre.out}'/lib/libpcre{,posix}.{so.*.*.*,*dylib} ''; - crossAttrs = optionalAttrs (stdenv.cross.libc == "msvcrt") { - buildInputs = [ windows.mingw_w64_pthreads.crossDrv ]; - }; - meta = { homepage = "http://www.pcre.org/"; description = "A library for Perl Compatible Regular Expressions"; diff --git a/pkgs/development/libraries/physics/fastnlo/default.nix b/pkgs/development/libraries/physics/fastnlo/default.nix index e07583fccb5..e568e159797 100644 --- a/pkgs/development/libraries/physics/fastnlo/default.nix +++ b/pkgs/development/libraries/physics/fastnlo/default.nix @@ -1,17 +1,21 @@ -{ stdenv, fetchurl, boost, lhapdf, root, yoda }: +{ stdenv, fetchurl, boost, fastjet, gfortran, lhapdf, python2, root, yoda, zlib }: stdenv.mkDerivation rec { name = "fastnlo_toolkit-${version}"; - version = "2.3.1pre-2212"; + version = "2.3.1pre-2402"; src = fetchurl { url = "http://fastnlo.hepforge.org/code/v23/${name}.tar.gz"; - sha256 = "0xgnnwc002awvz6dhn7792jc8kdff843yjgvwmgcs60yvcj6blgp"; + sha256 = "1h41xnqcz401x3zbs8i2dsb4xlhbv8i5ps0561p6y7gcyridgcbl"; }; - buildInputs = [ boost lhapdf root yoda ]; + buildInputs = [ boost fastjet gfortran gfortran.cc.lib lhapdf python2 root yoda ]; + propagatedBuildInputs = [ zlib ]; - CXXFLAGS="-std=c++11"; # for yoda + preConfigure = '' + substituteInPlace ./fastnlotoolkit/Makefile.in \ + --replace "-fext-numeric-literals" "" + ''; configureFlags = [ "--with-yoda=${yoda}" diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix index 737565d298e..407be5c5e4a 100644 --- a/pkgs/development/libraries/physics/herwig/default.nix +++ b/pkgs/development/libraries/physics/herwig/default.nix @@ -2,31 +2,21 @@ stdenv.mkDerivation rec { name = "herwig-${version}"; - version = "7.0.4"; + version = "7.1.1"; src = fetchurl { url = "http://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2"; - sha256 = "1vac5y5cyyn1z1ii1a6x1ysx2znxmfq9a51gxqib0i19mrn5y9p6"; + sha256 = "13xaykwr7x6mp2bi22wz6dyzx3dxhcv6aw9cg8p29bh9l890g63j"; }; - patches = [ - # Otherwise it causes an error - # lib/Herwig/HwMatchboxScales.so: undefined symbol: _Z8renScaleSt6vectorIN6ThePEG14Lorentz5VectorIdEESaIS2_EES4_S4_ - (fetchpatch { - url = "https://herwig.hepforge.org/hg/herwig/rev/fe543583fa02?style=raw"; - sha256 = "1y6a9q93wicw3c73xni74w5k25vidgcr60ffi2b2ymhb390jas83"; - }) - ]; - nativeBuildInputs = [ autoconf automake libtool ]; buildInputs = [ boost fastjet gfortran gsl thepeg zlib ] # There is a bug that requires for MMHT PDF's to be presend during the build ++ (with lhapdf.pdf_sets; [ MMHT2014lo68cl MMHT2014nlo68cl ]); - preConfigure = '' - # needed for the patch above - autoreconf -i + postPatch = '' + patchShebangs ./cat_with_cpplines ''; configureFlags = [ diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix index 90a6d17f09a..1a203172d2c 100644 --- a/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/pkgs/development/libraries/physics/lhapdf/default.nix @@ -1,19 +1,15 @@ -{ stdenv, fetchurl, boost, python2 }: +{ stdenv, fetchurl, python2 }: stdenv.mkDerivation rec { name = "lhapdf-${version}"; - version = "6.1.6"; + version = "6.2.0"; src = fetchurl { url = "http://www.hepforge.org/archive/lhapdf/LHAPDF-${version}.tar.gz"; - sha256 = "1sgbaxv8clcfy4d96fkwfyqcd4b29i0hwv32ry4vy69j5qiki0f2"; + sha256 = "0gfjps7v93n0rrdndkhp22d93y892bf76pnzdhqbish0cigkkxph"; }; - buildInputs = [ boost python2 ]; - - patches = [ ./distutils-c++.patch ]; - - configureFlags = "--with-boost=${boost.dev}"; + buildInputs = [ python2 ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/physics/lhapdf/distutils-c++.patch b/pkgs/development/libraries/physics/lhapdf/distutils-c++.patch deleted file mode 100644 index 822c3e38272..00000000000 --- a/pkgs/development/libraries/physics/lhapdf/distutils-c++.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/wrappers/python/Makefile.am -+++ b/wrappers/python/Makefile.am -@@ -25,7 +25,7 @@ fix-out-of-source: $(FIXSOURCES) - - if WITH_PYTHON - --PYEXT_ENV = CC=$(CC) CXX=$(CXX) -+PYEXT_ENV = CC=$(CXX) CXX=$(CXX) - - ## Always force setup.py, it's not good at guessing what needs to rebuild - all-local: fix-out-of-source -diff --git a/wrappers/python/Makefile.in b/wrappers/python/Makefile.in -index 925460c..fdc8888 100644 ---- a/wrappers/python/Makefile.in -+++ b/wrappers/python/Makefile.in -@@ -266,7 +266,7 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - EXTRA_DIST = lhapdf.cpp lhapdf.pyx clhapdf.pxd - FIXSOURCES = $(EXTRA_DIST) --@WITH_PYTHON_TRUE@PYEXT_ENV = CC=$(CC) CXX=$(CXX) -+@WITH_PYTHON_TRUE@PYEXT_ENV = CC=$(CXX) CXX=$(CXX) - all: all-am - - .SUFFIXES: diff --git a/pkgs/development/libraries/physics/lhapdf/maintainer.sh b/pkgs/development/libraries/physics/lhapdf/maintainer.sh index b0ced3b24e0..a8518d340b7 100755 --- a/pkgs/development/libraries/physics/lhapdf/maintainer.sh +++ b/pkgs/development/libraries/physics/lhapdf/maintainer.sh @@ -2,7 +2,7 @@ set -e -BASE_URL="https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/" +BASE_URL="https://www.hepforge.org/archive/lhapdf/pdfsets/6.2/" for pdf_set in `curl $BASE_URL 2>/dev/null | gsed -e "s/.* $out/libexec/qt.conf <app_libpaths.reset(app_libpaths); diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/libressl.patch b/pkgs/development/libraries/qt-5/5.9/qtbase/libressl.patch similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtbase/libressl.patch rename to pkgs/development/libraries/qt-5/5.9/qtbase/libressl.patch diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/qgtk-env.patch b/pkgs/development/libraries/qt-5/5.9/qtbase/qgtk-env.patch similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtbase/qgtk-env.patch rename to pkgs/development/libraries/qt-5/5.9/qtbase/qgtk-env.patch diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/qnativesocketengine-type-pun.patch b/pkgs/development/libraries/qt-5/5.9/qtbase/qnativesocketengine-type-pun.patch similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtbase/qnativesocketengine-type-pun.patch rename to pkgs/development/libraries/qt-5/5.9/qtbase/qnativesocketengine-type-pun.patch diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/series b/pkgs/development/libraries/qt-5/5.9/qtbase/series similarity index 88% rename from pkgs/development/libraries/qt-5/5.8/qtbase/series rename to pkgs/development/libraries/qt-5/5.9/qtbase/series index f3387694518..4f354e87c84 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtbase/series +++ b/pkgs/development/libraries/qt-5/5.9/qtbase/series @@ -1,7 +1,6 @@ dlopen-resolv.patch tzdir.patch dlopen-libXcursor.patch -xdg-config-dirs.patch library-paths.patch libressl.patch dlopen-gl.patch diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/tzdir.patch b/pkgs/development/libraries/qt-5/5.9/qtbase/tzdir.patch similarity index 88% rename from pkgs/development/libraries/qt-5/5.8/qtbase/tzdir.patch rename to pkgs/development/libraries/qt-5/5.9/qtbase/tzdir.patch index b8c05815a78..d57f24c3ed0 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtbase/tzdir.patch +++ b/pkgs/development/libraries/qt-5/5.9/qtbase/tzdir.patch @@ -1,7 +1,7 @@ -Index: qtbase-opensource-src-5.8.0/src/corelib/tools/qtimezoneprivate_tz.cpp +Index: qtbase-opensource-src-5.9.0/src/corelib/tools/qtimezoneprivate_tz.cpp =================================================================== ---- qtbase-opensource-src-5.8.0.orig/src/corelib/tools/qtimezoneprivate_tz.cpp -+++ qtbase-opensource-src-5.8.0/src/corelib/tools/qtimezoneprivate_tz.cpp +--- qtbase-opensource-src-5.9.0.orig/src/corelib/tools/qtimezoneprivate_tz.cpp ++++ qtbase-opensource-src-5.9.0/src/corelib/tools/qtimezoneprivate_tz.cpp @@ -70,7 +70,11 @@ typedef QHash Q // Parse zone.tab table, assume lists all installed zones, if not will need to read directories static QTzTimeZoneHash loadTzTimeZones() @@ -15,7 +15,7 @@ Index: qtbase-opensource-src-5.8.0/src/corelib/tools/qtimezoneprivate_tz.cpp if (!QFile::exists(path)) path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); -@@ -642,12 +646,16 @@ void QTzTimeZonePrivate::init(const QByt +@@ -643,12 +647,16 @@ void QTzTimeZonePrivate::init(const QByt if (!tzif.open(QIODevice::ReadOnly)) return; } else { diff --git a/pkgs/development/libraries/qt-5/5.8/qtconnectivity.nix b/pkgs/development/libraries/qt-5/5.9/qtconnectivity.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtconnectivity.nix rename to pkgs/development/libraries/qt-5/5.9/qtconnectivity.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.9/qtdeclarative/default.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix rename to pkgs/development/libraries/qt-5/5.9/qtdeclarative/default.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/import-paths.patch b/pkgs/development/libraries/qt-5/5.9/qtdeclarative/import-paths.patch similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtdeclarative/import-paths.patch rename to pkgs/development/libraries/qt-5/5.9/qtdeclarative/import-paths.patch diff --git a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/series b/pkgs/development/libraries/qt-5/5.9/qtdeclarative/series similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtdeclarative/series rename to pkgs/development/libraries/qt-5/5.9/qtdeclarative/series diff --git a/pkgs/development/libraries/qt-5/5.8/qtdoc.nix b/pkgs/development/libraries/qt-5/5.9/qtdoc.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtdoc.nix rename to pkgs/development/libraries/qt-5/5.9/qtdoc.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qtgraphicaleffects.nix b/pkgs/development/libraries/qt-5/5.9/qtgraphicaleffects.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtgraphicaleffects.nix rename to pkgs/development/libraries/qt-5/5.9/qtgraphicaleffects.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qtimageformats.nix b/pkgs/development/libraries/qt-5/5.9/qtimageformats.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtimageformats.nix rename to pkgs/development/libraries/qt-5/5.9/qtimageformats.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qtlocation.nix b/pkgs/development/libraries/qt-5/5.9/qtlocation.nix similarity index 73% rename from pkgs/development/libraries/qt-5/5.8/qtlocation.nix rename to pkgs/development/libraries/qt-5/5.9/qtlocation.nix index 0eabe04e478..6270bc577cf 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtlocation.nix +++ b/pkgs/development/libraries/qt-5/5.9/qtlocation.nix @@ -8,4 +8,6 @@ qtSubmodule { moveToOutput "$qtPluginPrefix" "$bin" moveToOutput "$qtQmlPrefix" "$bin" ''; + # Linking with -lclipper fails with parallel build enabled + enableParallelBuilding = false; } diff --git a/pkgs/development/libraries/qt-5/5.8/qtmacextras.nix b/pkgs/development/libraries/qt-5/5.9/qtmacextras.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtmacextras.nix rename to pkgs/development/libraries/qt-5/5.9/qtmacextras.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.9/qtmultimedia.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtmultimedia.nix rename to pkgs/development/libraries/qt-5/5.9/qtmultimedia.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qtquickcontrols.nix b/pkgs/development/libraries/qt-5/5.9/qtquickcontrols.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtquickcontrols.nix rename to pkgs/development/libraries/qt-5/5.9/qtquickcontrols.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qtquickcontrols2.nix b/pkgs/development/libraries/qt-5/5.9/qtquickcontrols2.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtquickcontrols2.nix rename to pkgs/development/libraries/qt-5/5.9/qtquickcontrols2.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qtscript/0001-glib-2.32.patch b/pkgs/development/libraries/qt-5/5.9/qtscript/0001-glib-2.32.patch similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtscript/0001-glib-2.32.patch rename to pkgs/development/libraries/qt-5/5.9/qtscript/0001-glib-2.32.patch diff --git a/pkgs/development/libraries/qt-5/5.8/qtscript/default.nix b/pkgs/development/libraries/qt-5/5.9/qtscript/default.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtscript/default.nix rename to pkgs/development/libraries/qt-5/5.9/qtscript/default.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qtsensors.nix b/pkgs/development/libraries/qt-5/5.9/qtsensors.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtsensors.nix rename to pkgs/development/libraries/qt-5/5.9/qtsensors.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qtserialport/default.nix b/pkgs/development/libraries/qt-5/5.9/qtserialport/default.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtserialport/default.nix rename to pkgs/development/libraries/qt-5/5.9/qtserialport/default.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qtserialport/qtserialport-dlopen-udev.patch b/pkgs/development/libraries/qt-5/5.9/qtserialport/qtserialport-dlopen-udev.patch similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtserialport/qtserialport-dlopen-udev.patch rename to pkgs/development/libraries/qt-5/5.9/qtserialport/qtserialport-dlopen-udev.patch diff --git a/pkgs/development/libraries/qt-5/5.8/qtserialport/series b/pkgs/development/libraries/qt-5/5.9/qtserialport/series similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtserialport/series rename to pkgs/development/libraries/qt-5/5.9/qtserialport/series diff --git a/pkgs/development/libraries/qt-5/5.8/qtsvg.nix b/pkgs/development/libraries/qt-5/5.9/qtsvg.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtsvg.nix rename to pkgs/development/libraries/qt-5/5.9/qtsvg.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qttools/cmake-paths.patch b/pkgs/development/libraries/qt-5/5.9/qttools/cmake-paths.patch similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qttools/cmake-paths.patch rename to pkgs/development/libraries/qt-5/5.9/qttools/cmake-paths.patch diff --git a/pkgs/development/libraries/qt-5/5.8/qttools/default.nix b/pkgs/development/libraries/qt-5/5.9/qttools/default.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qttools/default.nix rename to pkgs/development/libraries/qt-5/5.9/qttools/default.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qttools/series b/pkgs/development/libraries/qt-5/5.9/qttools/series similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qttools/series rename to pkgs/development/libraries/qt-5/5.9/qttools/series diff --git a/pkgs/development/libraries/qt-5/5.8/qttranslations.nix b/pkgs/development/libraries/qt-5/5.9/qttranslations.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qttranslations.nix rename to pkgs/development/libraries/qt-5/5.9/qttranslations.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qtwayland.nix b/pkgs/development/libraries/qt-5/5.9/qtwayland.nix similarity index 88% rename from pkgs/development/libraries/qt-5/5.8/qtwayland.nix rename to pkgs/development/libraries/qt-5/5.9/qtwayland.nix index 7b7bd2f6ebc..3e5deea7ec1 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtwayland.nix +++ b/pkgs/development/libraries/qt-5/5.9/qtwayland.nix @@ -8,6 +8,6 @@ qtSubmodule { outputs = [ "out" "dev" "bin" ]; postInstall = '' moveToOutput "$qtPluginPrefix" "$bin" - moveToOutput "$qtQmlPrefix "$bin" + moveToOutput "$qtQmlPrefix" "$bin" ''; } diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebchannel.nix b/pkgs/development/libraries/qt-5/5.9/qtwebchannel.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtwebchannel.nix rename to pkgs/development/libraries/qt-5/5.9/qtwebchannel.nix diff --git a/pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix new file mode 100644 index 00000000000..1684e6aac70 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix @@ -0,0 +1,113 @@ +{ qtSubmodule, qtquickcontrols, qtlocation, qtwebchannel + +, bison, coreutils, flex, git, gperf, ninja, pkgconfig, python2, which + +, xlibs, libXcursor, libXScrnSaver, libXrandr, libXtst +, fontconfig, freetype, harfbuzz, icu, dbus +, zlib, minizip, libjpeg, libpng, libtiff, libwebp, libopus +, jsoncpp, protobuf, libvpx, srtp, snappy, nss, libevent +, alsaLib +, libcap +, pciutils +, systemd + +, enableProprietaryCodecs ? true + +, lib, stdenv # lib.optional, needsPax +}: + +with stdenv.lib; + +qtSubmodule { + name = "qtwebengine"; + qtInputs = [ qtquickcontrols qtlocation qtwebchannel ]; + nativeBuildInputs = [ + bison coreutils flex git gperf ninja pkgconfig python2 which + ]; + doCheck = true; + outputs = [ "out" "dev" "bin" ]; + + enableParallelBuilding = true; + + postPatch = + # Patch Chromium build tools + '' + ( cd src/3rdparty/chromium; patchShebangs . ) + '' + # Patch Chromium build files + + '' + substituteInPlace ./src/3rdparty/chromium/build/common.gypi \ + --replace /bin/echo ${coreutils}/bin/echo + substituteInPlace ./src/3rdparty/chromium/v8/gypfiles/toolchain.gypi \ + --replace /bin/echo ${coreutils}/bin/echo + substituteInPlace ./src/3rdparty/chromium/v8/gypfiles/standalone.gypi \ + --replace /bin/echo ${coreutils}/bin/echo + '' + # Patch library paths in Qt sources + + '' + sed -i \ + -e "s,QLibraryInfo::location(QLibraryInfo::DataPath),QLatin1String(\"$out\"),g" \ + -e "s,QLibraryInfo::location(QLibraryInfo::TranslationsPath),QLatin1String(\"$out/translations\"),g" \ + -e "s,QLibraryInfo::location(QLibraryInfo::LibraryExecutablesPath),QLatin1String(\"$out/libexec\"),g" \ + src/core/web_engine_library_info.cpp + '' + # Patch library paths in Chromium sources + + optionalString (!stdenv.isDarwin) '' + sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \ + src/3rdparty/chromium/device/udev_linux/udev?_loader.cc + + sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ + src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc + ''; + + preConfigure = '' + export MAKEFLAGS=-j$NIX_BUILD_CORES + ''; + + qmakeFlags = + [ + # Use system Ninja because bootstrapping it is fragile + "WEBENGINE_CONFIG+=use_system_ninja" + ] ++ optional enableProprietaryCodecs "WEBENGINE_CONFIG+=use_proprietary_codecs"; + + propagatedBuildInputs = [ + # Image formats + libjpeg libpng libtiff libwebp + + # Video formats + srtp libvpx + + # Audio formats + libopus + + # Text rendering + harfbuzz icu + ] + ++ optionals (!stdenv.isDarwin) [ + dbus zlib minizip snappy nss protobuf jsoncpp libevent + + # Audio formats + alsaLib + + # Text rendering + fontconfig freetype + + libcap + pciutils + + # X11 libs + xlibs.xrandr libXScrnSaver libXcursor libXrandr xlibs.libpciaccess libXtst + xlibs.libXcomposite + ]; + patches = optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch; + postInstall = '' + cat > $out/libexec/qt.conf < readline != null && ncurses != null; stdenv.mkDerivation { - name = "sqlite-3.17.0"; + name = "sqlite-3.19.3"; src = fetchurl { - url = "http://sqlite.org/2017/sqlite-autoconf-3170000.tar.gz"; - sha256 = "0k472gq0p706jq4529p60znvw02hdf172qxgbdv59q0n7anqbr54"; + url = "http://sqlite.org/2017/sqlite-autoconf-3190300.tar.gz"; + sha256 = "00b3l2qglpl1inx21fckiwxnfq5xf6441flc79rqg7zdvh1rq4h6"; }; outputs = [ "bin" "dev" "out" ]; + separateDebugInfo = stdenv.isLinux; buildInputs = lib.optionals interactive [ readline ncurses ]; diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix index 6cef26d3aad..4a40806c4eb 100644 --- a/pkgs/development/libraries/utf8proc/default.nix +++ b/pkgs/development/libraries/utf8proc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "utf8proc-${version}"; - version = "2.0.2"; + version = "2.1.0"; src = fetchurl { url = "https://github.com/JuliaLang/utf8proc/archive/v${version}.tar.gz"; - sha256 = "140vib1m6n5kwzkw1n9fbsi5gl6xymbd7yndwqx1sj15aakak776"; + sha256 = "0q1jhdkk4f9b0zb8s2ql3sba3br5nvjsmbsaybmgj064k9hwbk15"; }; makeFlags = [ "prefix=$(out)" ]; diff --git a/pkgs/development/libraries/uthash/default.nix b/pkgs/development/libraries/uthash/default.nix index 511129de1e8..9c252004656 100644 --- a/pkgs/development/libraries/uthash/default.nix +++ b/pkgs/development/libraries/uthash/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, perl }: let - version = "1.9.9"; + version = "2.0.2"; in stdenv.mkDerivation rec { name = "uthash-${version}"; src = fetchurl { url = "https://github.com/troydhanson/uthash/archive/v${version}.tar.gz"; - sha256 = "035z3cs5ignywgh4wqxx358a2nhn3lj0x1ifij6vj0yyyhah3wgj"; + sha256 = "1la82gdlyl7m8ahdjirigwfh7zjgkc24cvydrqcri0vsvm8iv8rl"; }; dontBuild = false; diff --git a/pkgs/development/libraries/v8/3.16.14.nix b/pkgs/development/libraries/v8/3.16.14.nix index 91a8763d43f..73f5febb668 100644 --- a/pkgs/development/libraries/v8/3.16.14.nix +++ b/pkgs/development/libraries/v8/3.16.14.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, gyp, readline, python, which, icu, utillinux}: +{ stdenv, lib, fetchurl, gyp, readline, python, which, icu, utillinux, cctools }: assert readline != null; @@ -24,9 +24,7 @@ stdenv.mkDerivation rec { ''; configurePhase = stdenv.lib.optionalString stdenv.isDarwin '' - ln -s /usr/bin/xcodebuild $TMPDIR - ln -s /usr/bin/libtool $TMPDIR - export PATH=$TMPDIR:$PATH + export GYP_DEFINES="mac_deployment_target=$MACOSX_DEPLOYMENT_TARGET" '' + '' PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \ ${gyp}/bin/gyp \ @@ -41,12 +39,16 @@ stdenv.mkDerivation rec { ${lib.optionalString armHardFloat "-Dv8_use_arm_eabi_hardfloat=true"} \ --depth=. -Ibuild/standalone.gypi \ build/all.gyp + '' + stdenv.lib.optionalString stdenv.isDarwin '' + sed -i 's@/usr/bin/env python@${python}/bin/python@g' out/gyp-mac-tool ''; nativeBuildInputs = [ which ]; - buildInputs = [ readline python icu ] ++ lib.optional stdenv.isLinux utillinux; + buildInputs = [ readline python icu ] + ++ lib.optional stdenv.isLinux utillinux + ++ lib.optional stdenv.isDarwin cctools; - NIX_CFLAGS_COMPILE = "-Wno-error"; + NIX_CFLAGS_COMPILE = "-Wno-error -w"; buildFlags = [ "-C out" diff --git a/pkgs/development/libraries/wcslib/default.nix b/pkgs/development/libraries/wcslib/default.nix index 6bbc7705671..64c5293fac7 100644 --- a/pkgs/development/libraries/wcslib/default.nix +++ b/pkgs/development/libraries/wcslib/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { sha256 ="1s2nig327g4bimd9xshlk11ww09a7mrjmsbpdcd8smsmn2kl1glb"; }; + prePatch = '' + substituteInPlace GNUmakefile --replace 2775 0775 + substituteInPlace C/GNUmakefile --replace 2775 0775 + ''; + enableParallelBuilding = true; meta = { diff --git a/pkgs/development/libraries/webkitgtk/2.16.nix b/pkgs/development/libraries/webkitgtk/2.16.nix index 4431972b5dd..b50d94b90a5 100644 --- a/pkgs/development/libraries/webkitgtk/2.16.nix +++ b/pkgs/development/libraries/webkitgtk/2.16.nix @@ -12,7 +12,7 @@ assert enableGeoLocation -> geoclue2 != null; with stdenv.lib; stdenv.mkDerivation rec { name = "webkitgtk-${version}"; - version = "2.16.3"; + version = "2.16.4"; meta = { description = "Web content rendering engine, GTK+ port"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "04mmfxm8284zrlkrhkcn9gq1l4lpm1q6wwb5hyybj081v8qr2ki0"; + sha256 = "0a2ikwiw1wn8w11y9ci6nn6dq9w0iki48l9lhnbm7g8rhcrs9azr"; }; # see if we can clean this up.... diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix index cd13fa8dbb4..832600fed87 100644 --- a/pkgs/development/libraries/wlc/default.nix +++ b/pkgs/development/libraries/wlc/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { name = "wlc-${version}"; - version = "0.0.8"; + version = "0.0.9"; src = fetchgit { url = "https://github.com/Cloudef/wlc"; rev = "refs/tags/v${version}"; - sha256 = "1lkxbqnxfmbk9j9k8wq2fl5z0a9ihzalad3x1pp8w2riz41j3by6"; + sha256 = "1r6jf64gs7n9a8129wsc0mdwhcv44p8k87kg0714rhx3g2w22asg"; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index 1d19b441740..0f1f87b9bd6 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "wolfssl-${version}"; - version = "3.10.3"; + version = "3.11.0"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; - rev = "v${version}"; - sha256 = "05j3sg4vdzir89qy6y566wyfpqaz3mn53fiqg7ia4r7wjwhzbzrw"; + rev = "v${version}-stable"; + sha256 = "0s4s9adni2q1sgqpavbmxhkl8i98bmlw6gla6dnifgsm1dirv75w"; }; outputs = [ "out" "dev" "doc" "lib" ]; diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index 5b1e0fc067c..f7fcf8a2206 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -1,46 +1,51 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, gtk2, gtk3, libXinerama, libSM, libXxf86vm , xf86vidmodeproto , gstreamer, gst-plugins-base, GConf, setfile , withMesa ? true, mesa_glu ? null, mesa_noglu ? null , compat24 ? false, compat26 ? true, unicode ? true -, withWebKit ? false, webkitgtk2 ? null +, withGtk2 ? true +, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk216x ? null , AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null }: assert withMesa -> mesa_glu != null && mesa_noglu != null; -assert withWebKit -> webkitgtk2 != null; +assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk216x) != null; with stdenv.lib; let - version = "3.0.2"; + version = "3.0.3.1"; in stdenv.mkDerivation { name = "wxwidgets-${version}"; - src = fetchurl { - url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.bz2"; - sha256 = "0paq27brw4lv8kspxh9iklpa415mxi8zc117vbbbhfjgapf7js1l"; + src = fetchFromGitHub { + owner = "wxWidgets"; + repo = "wxWidgets"; + rev = "v${version}"; + sha256 = "1b90in65k1ij6kyk41knxs86i6hx5lkz30gpvzdvh0cbjagv5asq"; }; buildInputs = - [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer + [ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst-plugins-base GConf ] ++ optional withMesa mesa_glu - ++ optional withWebKit webkitgtk2 + ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk216x) ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = optional stdenv.isDarwin AGL; - patches = [ (fetchpatch { - url = "https://raw.githubusercontent.com/jessehager/MINGW-packages/af6ece963d8157dd3fbc710bcc190647c4924c63/mingw-w64-wxwidgets/wxWidgets-3.0.2-gcc6-abs.patch"; - sha256 = "0100pg0z7i6cjyysf2k3330pmqmdaxgc9hz6kxnfvc31dynjcq3h"; - }) ]; + patches = + # "Add support for WebKit2GTK+ in wxWebView". Will be in 3.0.4 + optional (!withGtk2) (fetchpatch { + url = "https://github.com/wxWidgets/wxWidgets/commit/ec6e54bc893fb7516731ca9c71e0d0bbc5ae9ff7.patch"; + sha256 = "0gxd83xajm7gdv9rdzyvqwa2p5nz29nr23i0zx2dgfpsvz2qjp3q"; + }); configureFlags = - [ "--enable-gtk2" "--disable-precomp-headers" "--enable-mediactrl" + [ "--disable-precomp-headers" "--enable-mediactrl" (if compat24 then "--enable-compat24" else "--disable-compat24") (if compat26 then "--enable-compat26" else "--disable-compat26") ] ++ optional unicode "--enable-unicode" @@ -72,7 +77,7 @@ stdenv.mkDerivation { passthru = { inherit compat24 compat26 unicode; - gtk = gtk2; + gtk = if withGtk2 then gtk2 else gtk3; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 5d96299380e..ef9f2569c45 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -1,9 +1,12 @@ -{ stdenv, fetchurl, static ? false }: - -let version = "1.2.11"; in +{ stdenv +, fetchurl +, buildPlatform, hostPlatform +, static ? false +}: stdenv.mkDerivation rec { name = "zlib-${version}"; + version = "1.2.11"; src = fetchurl { urls = @@ -13,7 +16,9 @@ stdenv.mkDerivation rec { sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1"; }; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + patches = stdenv.lib.optional hostPlatform.isCygwin ./disable-cygwin-widechar.patch; + + postPatch = stdenv.lib.optionalString hostPlatform.isDarwin '' substituteInPlace configure \ --replace '/usr/bin/libtool' 'ar' \ --replace 'AR="libtool"' 'AR="ar"' \ @@ -24,12 +29,6 @@ stdenv.mkDerivation rec { setOutputFlags = false; outputDoc = "dev"; # single tiny man3 page - preConfigure = '' - if test -n "$crossConfig"; then - export CC=$crossConfig-gcc - fi - ''; - # FIXME needs gcc 4.9 in bootstrap tools hardeningDisable = [ "stackprotector" ]; @@ -41,39 +40,42 @@ stdenv.mkDerivation rec { # jww (2015-01-06): Sometimes this library install as a .so, even on # Darwin; others time it installs as a .dylib. I haven't yet figured out # what causes this difference. - + stdenv.lib.optionalString stdenv.isDarwin '' + + stdenv.lib.optionalString hostPlatform.isDarwin '' for file in $out/lib/*.so* $out/lib/*.dylib* ; do install_name_tool -id "$file" $file done + '' + # Non-typical naming confuses libtool which then refuses to use zlib's DLL + # in some cases, e.g. when compiling libpng. + + stdenv.lib.optionalString (hostPlatform.libc == "msvcrt") '' + ln -s zlib1.dll $out/bin/libz.dll ''; # As zlib takes part in the stdenv building, we don't want references # to the bootstrap-tools libgcc (as uses to happen on arm/mips) - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.isDarwin) "-static-libgcc"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!hostPlatform.isDarwin) "-static-libgcc"; - crossAttrs = { - dontStrip = static; - dontSetConfigureCross = true; - } // stdenv.lib.optionalAttrs (stdenv.cross.libc == "msvcrt") { - installFlags = [ - "BINARY_PATH=$(out)/bin" - "INCLUDE_PATH=$(dev)/include" - "LIBRARY_PATH=$(out)/lib" - ]; - makeFlags = [ - "-f" "win32/Makefile.gcc" - "PREFIX=${stdenv.cross.config}-" - ] ++ stdenv.lib.optional (!static) "SHARED_MODE=1"; + dontStrip = hostPlatform != buildPlatform && static; + configurePlatforms = []; - # Non-typical naming confuses libtool which then refuses to use zlib's DLL - # in some cases, e.g. when compiling libpng. - postInstall = postInstall + "ln -s zlib1.dll $out/bin/libz.dll"; - } // stdenv.lib.optionalAttrs (stdenv.cross.libc == "libSystem") { - makeFlags = [ "RANLIB=${stdenv.cross.config}-ranlib" ]; + installFlags = stdenv.lib.optionals (hostPlatform.libc == "msvcrt") [ + "BINARY_PATH=$(out)/bin" + "INCLUDE_PATH=$(dev)/include" + "LIBRARY_PATH=$(out)/lib" + ]; + + makeFlags = [ + "PREFIX=${stdenv.cc.prefix}" + ] ++ stdenv.lib.optionals (hostPlatform.libc == "msvcrt") [ + "-f" "win32/Makefile.gcc" + ] ++ stdenv.lib.optionals (!static) [ + "SHARED_MODE=1" + ]; + + passthru = { + inherit version; }; - passthru.version = version; - meta = with stdenv.lib; { description = "Lossless data-compression library"; license = licenses.zlib; diff --git a/pkgs/development/libraries/zlib/disable-cygwin-widechar.patch b/pkgs/development/libraries/zlib/disable-cygwin-widechar.patch new file mode 100644 index 00000000000..3de4978c306 --- /dev/null +++ b/pkgs/development/libraries/zlib/disable-cygwin-widechar.patch @@ -0,0 +1,13 @@ +diff --git a/gzguts.h b/gzguts.h +index 990a4d2..6378d46 100644 +--- a/gzguts.h ++++ b/gzguts.h +@@ -39,7 +39,7 @@ + # include + #endif + +-#if defined(_WIN32) || defined(__CYGWIN__) ++#if defined(_WIN32) + # define WIDECHAR + #endif + diff --git a/pkgs/development/lisp-modules/README.txt b/pkgs/development/lisp-modules/README.txt new file mode 100644 index 00000000000..2a2fc9cb4f3 --- /dev/null +++ b/pkgs/development/lisp-modules/README.txt @@ -0,0 +1,16 @@ +Prerequisite: have Quicklisp installed somehow. + +Add to LD_LIBRARY_PATH all the things listed in quicklisp-to-nix-overrides.nix +for library propagatedBuildInputs (a lot of these are done via addNativeLibs). + +Current list is: +openssl fuse libuv mariadb libfixposix libev sqlite + +Add the needed system names to quicklisp-to-nix-systems.txt and load +quicklisp-to-nix/ql-to-nix.lisp and call +(ql-to-nix "/path/to/nixpkgs/pkgs/development/lisp-modules/") which is often +just (ql-to-nix ".") + +Add native libraries and whatever else is needed to overrides. + +The lispPackages set is supposed to be buildable in its entirety. diff --git a/pkgs/development/lisp-modules/define-package.nix b/pkgs/development/lisp-modules/define-package.nix index 1acedf4b704..83bbdf3b8f9 100644 --- a/pkgs/development/lisp-modules/define-package.nix +++ b/pkgs/development/lisp-modules/define-package.nix @@ -1,4 +1,5 @@ -args @ {stdenv, clwrapper, baseName, testSystems ? [baseName], version ? "latest" +args @ {stdenv, clwrapper, baseName, packageName ? baseName, testSystems ? [packageName] + , version ? "latest" , src, description, deps, buildInputs ? [], meta ? {}, overrides?(x: {}) , propagatedBuildInputs ? []}: let diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix similarity index 83% rename from pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd.nix rename to pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix index e04b3032091..4bc7545d966 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix @@ -1,6 +1,6 @@ args @ { fetchurl, ... }: rec { - baseName = ''3bmd''; + baseName = ''_3bmd''; version = ''20161204-git''; description = ''markdown processor in CL using esrap parser.''; @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/3bmd/2016-12-04/3bmd-20161204-git.tgz''; sha256 = ''158rymq6ra9ipmkqrqmgr4ay5m46cdxxha03622svllhyf7xzypx''; }; + + packageName = "3bmd"; overrides = x: { postInstall = '' @@ -29,6 +31,7 @@ rec { }; } /* (SYSTEM 3bmd DESCRIPTION markdown processor in CL using esrap parser. SHA256 158rymq6ra9ipmkqrqmgr4ay5m46cdxxha03622svllhyf7xzypx URL - http://beta.quicklisp.org/archive/3bmd/2016-12-04/3bmd-20161204-git.tgz MD5 b80864c74437e0cfb66663e9bbf08fed NAME 3bmd TESTNAME NIL FILENAME 3bmd DEPS - ((NAME split-sequence) (NAME esrap) (NAME alexandria)) DEPENDENCIES (split-sequence esrap alexandria) VERSION 20161204-git SIBLINGS + http://beta.quicklisp.org/archive/3bmd/2016-12-04/3bmd-20161204-git.tgz MD5 b80864c74437e0cfb66663e9bbf08fed NAME 3bmd TESTNAME NIL FILENAME _3bmd DEPS + ((NAME split-sequence FILENAME split-sequence) (NAME esrap FILENAME esrap) (NAME alexandria FILENAME alexandria)) DEPENDENCIES + (split-sequence esrap alexandria) VERSION 20161204-git SIBLINGS (3bmd-ext-code-blocks 3bmd-ext-definition-lists 3bmd-ext-tables 3bmd-ext-wiki-links 3bmd-youtube-tests 3bmd-youtube)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix new file mode 100644 index 00000000000..1f605fcc795 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''abnf''; + version = ''cl-20150608-git''; + + description = ''ABNF Parser Generator, per RFC2234''; + + deps = [ args."cl-ppcre" args."esrap" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-abnf/2015-06-08/cl-abnf-20150608-git.tgz''; + sha256 = ''00x95h7v5q7azvr9wrpcfcwsq3sdipjr1hgq9a9lbimp8gfbz687''; + }; + + packageName = "abnf"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/abnf[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM abnf DESCRIPTION ABNF Parser Generator, per RFC2234 SHA256 00x95h7v5q7azvr9wrpcfcwsq3sdipjr1hgq9a9lbimp8gfbz687 URL + http://beta.quicklisp.org/archive/cl-abnf/2015-06-08/cl-abnf-20150608-git.tgz MD5 311c2b17e49666dac1c2bb45256be708 NAME abnf TESTNAME NIL FILENAME abnf + DEPS ((NAME cl-ppcre FILENAME cl-ppcre) (NAME esrap FILENAME esrap)) DEPENDENCIES (cl-ppcre esrap) VERSION cl-20150608-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix index d72835e88c6..7f60d2dde20 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix @@ -1,16 +1,18 @@ args @ { fetchurl, ... }: rec { baseName = ''alexandria''; - version = ''20170227-git''; + version = ''20170516-git''; description = ''Alexandria is a collection of portable public domain utilities.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/alexandria/2017-02-27/alexandria-20170227-git.tgz''; - sha256 = ''0gnn4ysyvqf8wfi94kh6x23iwx3czaicam1lz9pnwsv40ws5fwwh''; + url = ''http://beta.quicklisp.org/archive/alexandria/2017-05-16/alexandria-20170516-git.tgz''; + sha256 = ''0yi2lxy9w7pmw4k7yzp82m6cpambclji7c7km3lx0hazv838rw82''; }; + + packageName = "alexandria"; overrides = x: { postInstall = '' @@ -28,6 +30,6 @@ rec { ''; }; } -/* (SYSTEM alexandria DESCRIPTION Alexandria is a collection of portable public domain utilities. SHA256 0gnn4ysyvqf8wfi94kh6x23iwx3czaicam1lz9pnwsv40ws5fwwh - URL http://beta.quicklisp.org/archive/alexandria/2017-02-27/alexandria-20170227-git.tgz MD5 b0cbf86723fa3a1fe5c544e8079a3be3 NAME alexandria TESTNAME NIL - FILENAME alexandria DEPS NIL DEPENDENCIES NIL VERSION 20170227-git SIBLINGS (alexandria-tests)) */ +/* (SYSTEM alexandria DESCRIPTION Alexandria is a collection of portable public domain utilities. SHA256 0yi2lxy9w7pmw4k7yzp82m6cpambclji7c7km3lx0hazv838rw82 + URL http://beta.quicklisp.org/archive/alexandria/2017-05-16/alexandria-20170516-git.tgz MD5 9234737872493dd82d2da9cadf6a1484 NAME alexandria TESTNAME NIL + FILENAME alexandria DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (alexandria-tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix index fde774a9b24..cc1eb196202 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/anaphora/2017-02-27/anaphora-20170227-git.tgz''; sha256 = ''1inv6bcly6r7yixj1pp0i4h0y7lxyv68mk9wsi5iwi9gx6000yd9''; }; + + packageName = "anaphora"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix index 0f51b69e200..80030739535 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix @@ -1,16 +1,18 @@ args @ { fetchurl, ... }: rec { baseName = ''array-utils''; - version = ''20160929-git''; + version = ''20170516-git''; description = ''A few utilities for working with arrays.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/array-utils/2016-09-29/array-utils-20160929-git.tgz''; - sha256 = ''1nlrf7b81qq7l85kkdh3fxcs6ngnvh5zk7mb5mwf8vjm5kpfbbcx''; + url = ''http://beta.quicklisp.org/archive/array-utils/2017-05-16/array-utils-20170516-git.tgz''; + sha256 = ''0mbzv2w0jkd175bl2flrkg1108f32hir5fl1n4x6cn8kc14af13q''; }; + + packageName = "array-utils"; overrides = x: { postInstall = '' @@ -28,6 +30,6 @@ rec { ''; }; } -/* (SYSTEM array-utils DESCRIPTION A few utilities for working with arrays. SHA256 1nlrf7b81qq7l85kkdh3fxcs6ngnvh5zk7mb5mwf8vjm5kpfbbcx URL - http://beta.quicklisp.org/archive/array-utils/2016-09-29/array-utils-20160929-git.tgz MD5 8b3880c7b73625cf8ed599d91a3836b4 NAME array-utils TESTNAME NIL - FILENAME array-utils DEPS NIL DEPENDENCIES NIL VERSION 20160929-git SIBLINGS (array-utils-test)) */ +/* (SYSTEM array-utils DESCRIPTION A few utilities for working with arrays. SHA256 0mbzv2w0jkd175bl2flrkg1108f32hir5fl1n4x6cn8kc14af13q URL + http://beta.quicklisp.org/archive/array-utils/2017-05-16/array-utils-20170516-git.tgz MD5 c6e4ccbee8f5d72fb86493b419cd0f59 NAME array-utils TESTNAME NIL + FILENAME array-utils DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (array-utils-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix new file mode 100644 index 00000000000..f694e4746ac --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''asdf-system-connections''; + version = ''20170124-git''; + + description = ''Allows for ASDF system to be connected so that auto-loading may occur.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/asdf-system-connections/2017-01-24/asdf-system-connections-20170124-git.tgz''; + sha256 = ''0h8237bq3niw6glcsps77n1ykcmc5bjkcrbjyxjgkmcb1c5kwwpq''; + }; + + packageName = "asdf-system-connections"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/asdf-system-connections[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM asdf-system-connections DESCRIPTION Allows for ASDF system to be connected so that auto-loading may occur. SHA256 + 0h8237bq3niw6glcsps77n1ykcmc5bjkcrbjyxjgkmcb1c5kwwpq URL + http://beta.quicklisp.org/archive/asdf-system-connections/2017-01-24/asdf-system-connections-20170124-git.tgz MD5 23bdbb69c433568e3e15ed705b803992 NAME + asdf-system-connections TESTNAME NIL FILENAME asdf-system-connections DEPS NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix index 4ad9f00b150..adc5571a337 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix @@ -1,16 +1,18 @@ args @ { fetchurl, ... }: rec { baseName = ''babel-streams''; - version = ''babel-20150608-git''; + version = ''babel-20170516-git''; description = ''Some useful streams based on Babel's encoding code''; - deps = [ args."trivial-gray-streams" args."alexandria" ]; + deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/babel/2015-06-08/babel-20150608-git.tgz''; - sha256 = ''0nv2w7k33rwc4dwi33ay2rkmvnj4vsz9ar27z8fiar34895vndk5''; + url = ''http://beta.quicklisp.org/archive/babel/2017-05-16/babel-20170516-git.tgz''; + sha256 = ''0igl7vgbbpil8ksfsmj1055m6jcpmvf149zmmzsxr9h608siy7fk''; }; + + packageName = "babel-streams"; overrides = x: { postInstall = '' @@ -28,7 +30,6 @@ rec { ''; }; } -/* (SYSTEM babel-streams DESCRIPTION Some useful streams based on Babel's encoding code SHA256 0nv2w7k33rwc4dwi33ay2rkmvnj4vsz9ar27z8fiar34895vndk5 URL - http://beta.quicklisp.org/archive/babel/2015-06-08/babel-20150608-git.tgz MD5 308e6c9132994cf09db7766569ee23fd NAME babel-streams TESTNAME NIL FILENAME - babel-streams DEPS ((NAME trivial-gray-streams) (NAME alexandria)) DEPENDENCIES (trivial-gray-streams alexandria) VERSION babel-20150608-git SIBLINGS - (babel-tests babel)) */ +/* (SYSTEM babel-streams DESCRIPTION Some useful streams based on Babel's encoding code SHA256 0igl7vgbbpil8ksfsmj1055m6jcpmvf149zmmzsxr9h608siy7fk URL + http://beta.quicklisp.org/archive/babel/2017-05-16/babel-20170516-git.tgz MD5 d2ab5a273a436375ba40a8ec7f38d0a9 NAME babel-streams TESTNAME NIL FILENAME + babel-streams DEPS NIL DEPENDENCIES NIL VERSION babel-20170516-git SIBLINGS (babel-tests babel)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix index a88e60824d1..c9b98838862 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix @@ -1,16 +1,18 @@ args @ { fetchurl, ... }: rec { baseName = ''babel''; - version = ''20150608-git''; + version = ''20170516-git''; description = ''Babel, a charset conversion library.''; - deps = [ args."trivial-features" args."alexandria" ]; + deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/babel/2015-06-08/babel-20150608-git.tgz''; - sha256 = ''0nv2w7k33rwc4dwi33ay2rkmvnj4vsz9ar27z8fiar34895vndk5''; + url = ''http://beta.quicklisp.org/archive/babel/2017-05-16/babel-20170516-git.tgz''; + sha256 = ''0igl7vgbbpil8ksfsmj1055m6jcpmvf149zmmzsxr9h608siy7fk''; }; + + packageName = "babel"; overrides = x: { postInstall = '' @@ -28,6 +30,6 @@ rec { ''; }; } -/* (SYSTEM babel DESCRIPTION Babel, a charset conversion library. SHA256 0nv2w7k33rwc4dwi33ay2rkmvnj4vsz9ar27z8fiar34895vndk5 URL - http://beta.quicklisp.org/archive/babel/2015-06-08/babel-20150608-git.tgz MD5 308e6c9132994cf09db7766569ee23fd NAME babel TESTNAME NIL FILENAME babel DEPS - ((NAME trivial-features) (NAME alexandria)) DEPENDENCIES (trivial-features alexandria) VERSION 20150608-git SIBLINGS (babel-streams babel-tests)) */ +/* (SYSTEM babel DESCRIPTION Babel, a charset conversion library. SHA256 0igl7vgbbpil8ksfsmj1055m6jcpmvf149zmmzsxr9h608siy7fk URL + http://beta.quicklisp.org/archive/babel/2017-05-16/babel-20170516-git.tgz MD5 d2ab5a273a436375ba40a8ec7f38d0a9 NAME babel TESTNAME NIL FILENAME babel DEPS + NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (babel-streams babel-tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix index 352538cd353..edeadade715 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/blackbird/2016-05-31/blackbird-20160531-git.tgz''; sha256 = ''0l053fb5fdz1q6dyfgys6nmbairc3aig4wjl5abpf8b1paf7gzq9''; }; + + packageName = "blackbird"; overrides = x: { postInstall = '' @@ -30,4 +32,4 @@ rec { } /* (SYSTEM blackbird DESCRIPTION A promise implementation for Common Lisp. SHA256 0l053fb5fdz1q6dyfgys6nmbairc3aig4wjl5abpf8b1paf7gzq9 URL http://beta.quicklisp.org/archive/blackbird/2016-05-31/blackbird-20160531-git.tgz MD5 5cb13dc06a0eae8dcba14714d2b5365d NAME blackbird TESTNAME NIL FILENAME - blackbird DEPS ((NAME vom)) DEPENDENCIES (vom) VERSION 20160531-git SIBLINGS (blackbird-test)) */ + blackbird DEPS ((NAME vom FILENAME vom)) DEPENDENCIES (vom) VERSION 20160531-git SIBLINGS (blackbird-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix index adcf9fa5a72..002b2ad0e37 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/bordeaux-threads/2016-03-18/bordeaux-threads-v0.8.5.tgz''; sha256 = ''09q1xd3fca6ln6mh45cx24xzkrcnvhgl5nn9g2jv0rwj1m2xvbpd''; }; + + packageName = "bordeaux-threads"; overrides = x: { postInstall = '' @@ -30,5 +32,5 @@ rec { } /* (SYSTEM bordeaux-threads DESCRIPTION Bordeaux Threads makes writing portable multi-threaded apps simple. SHA256 09q1xd3fca6ln6mh45cx24xzkrcnvhgl5nn9g2jv0rwj1m2xvbpd URL http://beta.quicklisp.org/archive/bordeaux-threads/2016-03-18/bordeaux-threads-v0.8.5.tgz MD5 - 67e363a363e164b6f61a047957b8554e NAME bordeaux-threads TESTNAME NIL FILENAME bordeaux-threads DEPS ((NAME alexandria)) DEPENDENCIES (alexandria) VERSION - v0.8.5 SIBLINGS NIL) */ + 67e363a363e164b6f61a047957b8554e NAME bordeaux-threads TESTNAME NIL FILENAME bordeaux-threads DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES + (alexandria) VERSION v0.8.5 SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix index e5d895adb63..5b5d13bcec1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/caveman/2016-10-31/caveman-20161031-git.tgz''; sha256 = ''111zxnlsn99sybmwgyxh0x29avq898nxssysvaf8v4mbb6fva2hi''; }; + + packageName = "caveman"; overrides = x: { postInstall = '' @@ -31,7 +33,8 @@ rec { /* (SYSTEM caveman DESCRIPTION Web Application Framework for Common Lisp SHA256 111zxnlsn99sybmwgyxh0x29avq898nxssysvaf8v4mbb6fva2hi URL http://beta.quicklisp.org/archive/caveman/2016-10-31/caveman-20161031-git.tgz MD5 a6700f14fd7c4bf8fdc573473ff5fab6 NAME caveman TESTNAME NIL FILENAME caveman DEPS - ((NAME myway) (NAME local-time) (NAME do-urlencode) (NAME clack-v1-compat) (NAME cl-syntax-annot) (NAME cl-syntax) (NAME cl-project) (NAME cl-ppcre) - (NAME cl-emb) (NAME anaphora)) + ((NAME myway FILENAME myway) (NAME local-time FILENAME local-time) (NAME do-urlencode FILENAME do-urlencode) + (NAME clack-v1-compat FILENAME clack-v1-compat) (NAME cl-syntax-annot FILENAME cl-syntax-annot) (NAME cl-syntax FILENAME cl-syntax) + (NAME cl-project FILENAME cl-project) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-emb FILENAME cl-emb) (NAME anaphora FILENAME anaphora)) DEPENDENCIES (myway local-time do-urlencode clack-v1-compat cl-syntax-annot cl-syntax cl-project cl-ppcre cl-emb anaphora) VERSION 20161031-git SIBLINGS (caveman-middleware-dbimanager caveman-test caveman2-db caveman2-test caveman2)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix index fdb2ab5b869..dba9bfcbc76 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz''; sha256 = ''0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz''; }; + + packageName = "cffi-grovel"; overrides = x: { postInstall = '' @@ -30,4 +32,5 @@ rec { } /* (SYSTEM cffi-grovel DESCRIPTION The CFFI Groveller SHA256 0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz URL http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz MD5 5be207fca26205c7550d7b6307871f4e NAME cffi-grovel TESTNAME NIL FILENAME cffi-grovel - DEPS ((NAME alexandria)) DEPENDENCIES (alexandria) VERSION cffi_0.18.0 SIBLINGS (cffi-examples cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat cffi)) */ + DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION cffi_0.18.0 SIBLINGS + (cffi-examples cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat cffi)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix index 81f3dfad8aa..9f92871b712 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz''; sha256 = ''0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz''; }; + + packageName = "cffi"; overrides = x: { postInstall = '' @@ -30,5 +32,6 @@ rec { } /* (SYSTEM cffi DESCRIPTION The Common Foreign Function Interface SHA256 0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz URL http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz MD5 5be207fca26205c7550d7b6307871f4e NAME cffi TESTNAME NIL FILENAME cffi DEPS - ((NAME uiop) (NAME trivial-features) (NAME babel) (NAME alexandria)) DEPENDENCIES (uiop trivial-features babel alexandria) VERSION cffi_0.18.0 SIBLINGS + ((NAME uiop FILENAME uiop) (NAME trivial-features FILENAME trivial-features) (NAME babel FILENAME babel) (NAME alexandria FILENAME alexandria)) + DEPENDENCIES (uiop trivial-features babel alexandria) VERSION cffi_0.18.0 SIBLINGS (cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix index 0a1d054b05e..e2a9da13b45 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/chipz/2016-03-18/chipz-20160318-git.tgz''; sha256 = ''1dpsg8kd43k075xihb0szcq1f7iq8ryg5r77x5wi6hy9jhpq8826''; }; + + packageName = "chipz"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix index 6f38719781e..d6361d4392d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/chunga/2014-12-17/chunga-1.1.6.tgz''; sha256 = ''1ivdfi9hjkzp2anhpjm58gzrjpn6mdsp35km115c1j1c4yhs9lzg''; }; + + packageName = "chunga"; overrides = x: { postInstall = '' @@ -30,4 +32,4 @@ rec { } /* (SYSTEM chunga DESCRIPTION NIL SHA256 1ivdfi9hjkzp2anhpjm58gzrjpn6mdsp35km115c1j1c4yhs9lzg URL http://beta.quicklisp.org/archive/chunga/2014-12-17/chunga-1.1.6.tgz MD5 75f5c4f9dec3a8a181ed5ef7e5d700b5 NAME chunga TESTNAME NIL FILENAME chunga DEPS - ((NAME trivial-gray-streams)) DEPENDENCIES (trivial-gray-streams) VERSION 1.1.6 SIBLINGS NIL) */ + ((NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES (trivial-gray-streams) VERSION 1.1.6 SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix index ff69c56e8a6..39cf82831a9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz''; sha256 = ''1i29b9sciqs5x59hlkdj2r4siyqgrwj5hb4lnc80jgfqvzbq4128''; }; + + packageName = "circular-streams"; overrides = x: { postInstall = '' @@ -30,5 +32,5 @@ rec { } /* (SYSTEM circular-streams DESCRIPTION Circularly readable streams for Common Lisp SHA256 1i29b9sciqs5x59hlkdj2r4siyqgrwj5hb4lnc80jgfqvzbq4128 URL http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz MD5 2383f3b82fa3335d9106e1354a678db8 NAME circular-streams - TESTNAME NIL FILENAME circular-streams DEPS ((NAME trivial-gray-streams) (NAME fast-io)) DEPENDENCIES (trivial-gray-streams fast-io) VERSION 20161204-git - SIBLINGS (circular-streams-test)) */ + TESTNAME NIL FILENAME circular-streams DEPS ((NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME fast-io FILENAME fast-io)) DEPENDENCIES + (trivial-gray-streams fast-io) VERSION 20161204-git SIBLINGS (circular-streams-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix index 9b19aa51678..bfe44d109d5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cl+ssl/2017-04-03/cl+ssl-20170403-git.tgz''; sha256 = ''1f1nr1wy6nk0l2n249djcvygl0379ch3x4ndc243jcahcp44x18s''; }; + + packageName = "cl+ssl"; overrides = x: { postInstall = '' @@ -30,5 +32,7 @@ rec { } /* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256 1f1nr1wy6nk0l2n249djcvygl0379ch3x4ndc243jcahcp44x18s URL http://beta.quicklisp.org/archive/cl+ssl/2017-04-03/cl+ssl-20170403-git.tgz MD5 e6d22f98947384d0e0bb2eb18230f72d NAME cl+ssl TESTNAME NIL FILENAME cl+ssl - DEPS ((NAME uiop) (NAME trivial-gray-streams) (NAME trivial-garbage) (NAME flexi-streams) (NAME cffi) (NAME bordeaux-threads)) DEPENDENCIES - (uiop trivial-gray-streams trivial-garbage flexi-streams cffi bordeaux-threads) VERSION cl+ssl-20170403-git SIBLINGS (cl+ssl.test)) */ + DEPS + ((NAME uiop FILENAME uiop) (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME trivial-garbage FILENAME trivial-garbage) + (NAME flexi-streams FILENAME flexi-streams) (NAME cffi FILENAME cffi) (NAME bordeaux-threads FILENAME bordeaux-threads)) + DEPENDENCIES (uiop trivial-gray-streams trivial-garbage flexi-streams cffi bordeaux-threads) VERSION cl+ssl-20170403-git SIBLINGS (cl+ssl.test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix index 2988906735a..5057ddbd9d1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix @@ -1,16 +1,18 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-aa''; - version = ''cl-vectors-20150407-git''; + version = ''cl-vectors-20170516-git''; description = ''cl-aa: polygon rasterizer''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-vectors/2015-04-07/cl-vectors-20150407-git.tgz''; - sha256 = ''1qd7ywc2ayiyd5nw7shnjgh0nc14h328h0cw921g5b2n8j6y959w''; + url = ''http://beta.quicklisp.org/archive/cl-vectors/2017-05-16/cl-vectors-20170516-git.tgz''; + sha256 = ''0j7cdg6akq5giv8rgbxdv8rwpzkv98r5bv78p5nnrixpprvjhvzx''; }; + + packageName = "cl-aa"; overrides = x: { postInstall = '' @@ -28,6 +30,6 @@ rec { ''; }; } -/* (SYSTEM cl-aa DESCRIPTION cl-aa: polygon rasterizer SHA256 1qd7ywc2ayiyd5nw7shnjgh0nc14h328h0cw921g5b2n8j6y959w URL - http://beta.quicklisp.org/archive/cl-vectors/2015-04-07/cl-vectors-20150407-git.tgz MD5 9e255503bf4559912ea1511c919c474a NAME cl-aa TESTNAME NIL FILENAME - cl-aa DEPS NIL DEPENDENCIES NIL VERSION cl-vectors-20150407-git SIBLINGS (cl-aa-misc cl-paths-ttf cl-paths cl-vectors)) */ +/* (SYSTEM cl-aa DESCRIPTION cl-aa: polygon rasterizer SHA256 0j7cdg6akq5giv8rgbxdv8rwpzkv98r5bv78p5nnrixpprvjhvzx URL + http://beta.quicklisp.org/archive/cl-vectors/2017-05-16/cl-vectors-20170516-git.tgz MD5 0258ae7face22f2035c1a85379ee0aae NAME cl-aa TESTNAME NIL FILENAME + cl-aa DEPS NIL DEPENDENCIES NIL VERSION cl-vectors-20170516-git SIBLINGS (cl-aa-misc cl-paths-ttf cl-paths cl-vectors)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix index bdf0dbdf48a..591df96c84e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cl-annot/2015-06-08/cl-annot-20150608-git.tgz''; sha256 = ''0ixsp20rk498phv3iivipn3qbw7a7x260x63hc6kpv2s746lpdg3''; }; + + packageName = "cl-annot"; overrides = x: { postInstall = '' @@ -30,4 +32,4 @@ rec { } /* (SYSTEM cl-annot DESCRIPTION Python-like Annotation Syntax for Common Lisp SHA256 0ixsp20rk498phv3iivipn3qbw7a7x260x63hc6kpv2s746lpdg3 URL http://beta.quicklisp.org/archive/cl-annot/2015-06-08/cl-annot-20150608-git.tgz MD5 35d8f79311bda4dd86002d11edcd0a21 NAME cl-annot TESTNAME NIL FILENAME - cl-annot DEPS ((NAME alexandria)) DEPENDENCIES (alexandria) VERSION 20150608-git SIBLINGS NIL) */ + cl-annot DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION 20150608-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix index dae0666a727..51b5b5cf543 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cl-anonfun/2011-12-03/cl-anonfun-20111203-git.tgz''; sha256 = ''16r3v3yba41smkqpz0qvzabkxashl39klfb6vxhzbly696x87p1m''; }; + + packageName = "cl-anonfun"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix index 2530203e3b7..0dce1f78944 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cl-ansi-text/2015-08-04/cl-ansi-text-20150804-git.tgz''; sha256 = ''112w7qg8yp28qyc2b5c7km457krr3xksxyps1icmgdpqf9ccpn2i''; }; + + packageName = "cl-ansi-text"; overrides = x: { postInstall = '' @@ -30,4 +32,5 @@ rec { } /* (SYSTEM cl-ansi-text DESCRIPTION ANSI control string characters, focused on color SHA256 112w7qg8yp28qyc2b5c7km457krr3xksxyps1icmgdpqf9ccpn2i URL http://beta.quicklisp.org/archive/cl-ansi-text/2015-08-04/cl-ansi-text-20150804-git.tgz MD5 70aa38b40377a5e89a7f22bb68b3f796 NAME cl-ansi-text TESTNAME NIL - FILENAME cl-ansi-text DEPS ((NAME cl-colors) (NAME alexandria)) DEPENDENCIES (cl-colors alexandria) VERSION 20150804-git SIBLINGS (cl-ansi-text-test)) */ + FILENAME cl-ansi-text DEPS ((NAME cl-colors FILENAME cl-colors) (NAME alexandria FILENAME alexandria)) DEPENDENCIES (cl-colors alexandria) VERSION + 20150804-git SIBLINGS (cl-ansi-text-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-base.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-base.nix index ea9c89dffb7..210e914aeee 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-base.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-base.nix @@ -13,6 +13,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz''; sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa''; }; + + packageName = "cl-async-base"; overrides = x: { postInstall = '' @@ -32,5 +34,5 @@ rec { } /* (SYSTEM cl-async-base DESCRIPTION Base system for cl-async. SHA256 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async-base TESTNAME cl-async - FILENAME cl-async-base DEPS ((NAME cl-libuv) (NAME cffi) (NAME bordeaux-threads)) DEPENDENCIES (cl-libuv cffi bordeaux-threads) VERSION - cl-async-20160825-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test cl-async)) */ + FILENAME cl-async-base DEPS ((NAME cl-libuv FILENAME cl-libuv) (NAME cffi FILENAME cffi) (NAME bordeaux-threads FILENAME bordeaux-threads)) DEPENDENCIES + (cl-libuv cffi bordeaux-threads) VERSION cl-async-20160825-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test cl-async)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix index ccc138a9b5e..21dd26e4a83 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz''; sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa''; }; + + packageName = "cl-async-repl"; overrides = x: { postInstall = '' @@ -30,5 +32,5 @@ rec { } /* (SYSTEM cl-async-repl DESCRIPTION REPL integration for CL-ASYNC. SHA256 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async-repl TESTNAME NIL - FILENAME cl-async-repl DEPS ((NAME bordeaux-threads)) DEPENDENCIES (bordeaux-threads) VERSION cl-async-20160825-git SIBLINGS + FILENAME cl-async-repl DEPS ((NAME bordeaux-threads FILENAME bordeaux-threads)) DEPENDENCIES (bordeaux-threads) VERSION cl-async-20160825-git SIBLINGS (cl-async-ssl cl-async-test cl-async)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix index dbd056059f7..438a85700e7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz''; sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa''; }; + + packageName = "cl-async-ssl"; overrides = x: { postInstall = '' @@ -30,4 +32,5 @@ rec { } /* (SYSTEM cl-async-ssl DESCRIPTION SSL Wrapper around cl-async socket implementation. SHA256 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async-ssl TESTNAME NIL - FILENAME cl-async-ssl DEPS ((NAME vom) (NAME cffi)) DEPENDENCIES (vom cffi) VERSION cl-async-20160825-git SIBLINGS (cl-async-repl cl-async-test cl-async)) */ + FILENAME cl-async-ssl DEPS ((NAME vom FILENAME vom) (NAME cffi FILENAME cffi)) DEPENDENCIES (vom cffi) VERSION cl-async-20160825-git SIBLINGS + (cl-async-repl cl-async-test cl-async)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-util.nix index b72be6f88bf..8bc2b61128f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-util.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-util.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz''; sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa''; }; + + packageName = "cl-async-util"; overrides = x: { postInstall = '' @@ -30,5 +32,7 @@ rec { } /* (SYSTEM cl-async-util DESCRIPTION Internal utilities for cl-async. SHA256 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async-util TESTNAME NIL - FILENAME cl-async-util DEPS ((NAME vom) (NAME fast-io) (NAME cl-ppcre) (NAME cl-libuv) (NAME cl-async-base) (NAME cffi)) DEPENDENCIES - (vom fast-io cl-ppcre cl-libuv cl-async-base cffi) VERSION cl-async-20160825-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test cl-async)) */ + FILENAME cl-async-util DEPS + ((NAME vom FILENAME vom) (NAME fast-io FILENAME fast-io) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-libuv FILENAME cl-libuv) + (NAME cl-async-base FILENAME cl-async-base) (NAME cffi FILENAME cffi)) + DEPENDENCIES (vom fast-io cl-ppcre cl-libuv cl-async-base cffi) VERSION cl-async-20160825-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test cl-async)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix index e484e1d991a..2e8a5ce83de 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz''; sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa''; }; + + packageName = "cl-async"; overrides = x: { postInstall = '' @@ -31,7 +33,8 @@ rec { /* (SYSTEM cl-async DESCRIPTION Asynchronous operations for Common Lisp. SHA256 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async TESTNAME NIL FILENAME cl-async DEPS - ((NAME uiop) (NAME trivial-gray-streams) (NAME trivial-features) (NAME static-vectors) (NAME cl-ppcre) (NAME cl-libuv) (NAME cl-async-util) - (NAME cl-async-base) (NAME cffi) (NAME babel)) + ((NAME uiop FILENAME uiop) (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME trivial-features FILENAME trivial-features) + (NAME static-vectors FILENAME static-vectors) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-libuv FILENAME cl-libuv) + (NAME cl-async-util FILENAME cl-async-util) (NAME cl-async-base FILENAME cl-async-base) (NAME cffi FILENAME cffi) (NAME babel FILENAME babel)) DEPENDENCIES (uiop trivial-gray-streams trivial-features static-vectors cl-ppcre cl-libuv cl-async-util cl-async-base cffi babel) VERSION 20160825-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix index 0ca5f7149f2..86cc31f5642 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cl-base64/2015-09-23/cl-base64-20150923-git.tgz''; sha256 = ''0haip5x0091r9xa8gdzr21s0rk432998nbxxfys35lhnyc1vgyhp''; }; + + packageName = "cl-base64"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix index 237fbfaea38..5abdac589dd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cl-colors/2015-12-18/cl-colors-20151218-git.tgz''; sha256 = ''032kswn6h2ib7v8v1dg0lmgfks7zk52wrv31q6p2zj2a156ccqp4''; }; + + packageName = "cl-colors"; overrides = x: { postInstall = '' @@ -30,4 +32,5 @@ rec { } /* (SYSTEM cl-colors DESCRIPTION Simple color library for Common Lisp SHA256 032kswn6h2ib7v8v1dg0lmgfks7zk52wrv31q6p2zj2a156ccqp4 URL http://beta.quicklisp.org/archive/cl-colors/2015-12-18/cl-colors-20151218-git.tgz MD5 2963c3e7aca2c5db2132394f83716515 NAME cl-colors TESTNAME NIL FILENAME - cl-colors DEPS ((NAME alexandria) (NAME let-plus)) DEPENDENCIES (alexandria let-plus) VERSION 20151218-git SIBLINGS NIL) */ + cl-colors DEPS ((NAME alexandria FILENAME alexandria) (NAME let-plus FILENAME let-plus)) DEPENDENCIES (alexandria let-plus) VERSION 20151218-git SIBLINGS + NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix new file mode 100644 index 00000000000..89627b22fbc --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-containers''; + version = ''20170403-git''; + + description = ''A generic container library for Common Lisp''; + + deps = [ args."metatilities-base" args."asdf-system-connections" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-containers/2017-04-03/cl-containers-20170403-git.tgz''; + sha256 = ''0wlwbz5xv3468iszvmfxnj924mdwx0lyzmhsggiq7iq7ip8wbbxg''; + }; + + packageName = "cl-containers"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-containers[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-containers DESCRIPTION A generic container library for Common Lisp SHA256 0wlwbz5xv3468iszvmfxnj924mdwx0lyzmhsggiq7iq7ip8wbbxg URL + http://beta.quicklisp.org/archive/cl-containers/2017-04-03/cl-containers-20170403-git.tgz MD5 17123cd2b018cd3eb048eceef78be3f8 NAME cl-containers TESTNAME + NIL FILENAME cl-containers DEPS ((NAME metatilities-base FILENAME metatilities-base) (NAME asdf-system-connections FILENAME asdf-system-connections)) + DEPENDENCIES (metatilities-base asdf-system-connections) VERSION 20170403-git SIBLINGS (cl-containers-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix index 4d2b56ac775..5aa6ad1c9c0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cl-cookie/2015-08-04/cl-cookie-20150804-git.tgz''; sha256 = ''0llh5d2p7wi5amzpckng1bzmf2bdfdwkfapcdq0znqlzd5bvbby8''; }; + + packageName = "cl-cookie"; overrides = x: { postInstall = '' @@ -30,5 +32,7 @@ rec { } /* (SYSTEM cl-cookie DESCRIPTION HTTP cookie manager SHA256 0llh5d2p7wi5amzpckng1bzmf2bdfdwkfapcdq0znqlzd5bvbby8 URL http://beta.quicklisp.org/archive/cl-cookie/2015-08-04/cl-cookie-20150804-git.tgz MD5 d2c08a71afd47b3ad42e1234ec1a3083 NAME cl-cookie TESTNAME NIL FILENAME - cl-cookie DEPS ((NAME quri) (NAME proc-parse) (NAME local-time) (NAME cl-ppcre) (NAME alexandria)) DEPENDENCIES - (quri proc-parse local-time cl-ppcre alexandria) VERSION 20150804-git SIBLINGS (cl-cookie-test)) */ + cl-cookie DEPS + ((NAME quri FILENAME quri) (NAME proc-parse FILENAME proc-parse) (NAME local-time FILENAME local-time) (NAME cl-ppcre FILENAME cl-ppcre) + (NAME alexandria FILENAME alexandria)) + DEPENDENCIES (quri proc-parse local-time cl-ppcre alexandria) VERSION 20150804-git SIBLINGS (cl-cookie-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix new file mode 100644 index 00000000000..3436e5a75a6 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-csv''; + version = ''20170403-git''; + + description = ''Facilities for reading and writing CSV format files''; + + deps = [ args."iterate" args."cl-interpol" args."alexandria" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-csv/2017-04-03/cl-csv-20170403-git.tgz''; + sha256 = ''1mz0hr0r7yxw1dzdbaqzxabmipp286zc6aglni9f46isjwmqpy6h''; + }; + + packageName = "cl-csv"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-csv[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-csv DESCRIPTION Facilities for reading and writing CSV format files SHA256 1mz0hr0r7yxw1dzdbaqzxabmipp286zc6aglni9f46isjwmqpy6h URL + http://beta.quicklisp.org/archive/cl-csv/2017-04-03/cl-csv-20170403-git.tgz MD5 1e71a90c5057371fab044d440c39f0a3 NAME cl-csv TESTNAME NIL FILENAME cl-csv + DEPS ((NAME iterate FILENAME iterate) (NAME cl-interpol FILENAME cl-interpol) (NAME alexandria FILENAME alexandria)) DEPENDENCIES + (iterate cl-interpol alexandria) VERSION 20170403-git SIBLINGS (cl-csv-clsql cl-csv-data-table)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix index 781ae6c1d33..489147c881b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz''; sha256 = ''0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj''; }; + + packageName = "cl-dbi"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix index 7b4c40632a5..067e09ab0e1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cl-emb/2017-02-27/cl-emb-20170227-git.tgz''; sha256 = ''03n97xvh3v8bz1p75v1vhryfkjm74v0cr5jwg4rakq9zkchhfk80''; }; + + packageName = "cl-emb"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix index 2063f2f4be3..43651428bd0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cl-fad/2016-08-25/cl-fad-0.7.4.tgz''; sha256 = ''1avp5j66vrpv5symgw4n4szlc2cyqz4haa0cxzy1pl8p0a8k0v9x''; }; + + packageName = "cl-fad"; overrides = x: { postInstall = '' @@ -30,4 +32,5 @@ rec { } /* (SYSTEM cl-fad DESCRIPTION Portable pathname library SHA256 1avp5j66vrpv5symgw4n4szlc2cyqz4haa0cxzy1pl8p0a8k0v9x URL http://beta.quicklisp.org/archive/cl-fad/2016-08-25/cl-fad-0.7.4.tgz MD5 8ee53f2249eca9d7d54e268662b41845 NAME cl-fad TESTNAME NIL FILENAME cl-fad DEPS - ((NAME alexandria) (NAME bordeaux-threads)) DEPENDENCIES (alexandria bordeaux-threads) VERSION 0.7.4 SIBLINGS NIL) */ + ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads)) DEPENDENCIES (alexandria bordeaux-threads) VERSION 0.7.4 SIBLINGS + NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix index 9d3d779ab48..681b9205e9b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2015-06-08/cl-fuse-meta-fs-20150608-git.tgz''; sha256 = ''1i3yw237ygwlkhbcbm9q54ad9g4fi63fw4mg508hr7bz9gzg36q2''; }; + + packageName = "cl-fuse-meta-fs"; overrides = x: { postInstall = '' @@ -30,5 +32,6 @@ rec { } /* (SYSTEM cl-fuse-meta-fs DESCRIPTION CFFI bindings to FUSE (Filesystem in user space) SHA256 1i3yw237ygwlkhbcbm9q54ad9g4fi63fw4mg508hr7bz9gzg36q2 URL http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2015-06-08/cl-fuse-meta-fs-20150608-git.tgz MD5 eb80b959dd6494cd787cff4f8c2f214b NAME cl-fuse-meta-fs - TESTNAME NIL FILENAME cl-fuse-meta-fs DEPS ((NAME bordeaux-threads) (NAME cl-fuse) (NAME iterate) (NAME pcall)) DEPENDENCIES - (bordeaux-threads cl-fuse iterate pcall) VERSION 20150608-git SIBLINGS NIL) */ + TESTNAME NIL FILENAME cl-fuse-meta-fs DEPS + ((NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-fuse FILENAME cl-fuse) (NAME iterate FILENAME iterate) (NAME pcall FILENAME pcall)) + DEPENDENCIES (bordeaux-threads cl-fuse iterate pcall) VERSION 20150608-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix index 576edbfdbf2..8681110c22e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cl-fuse/2016-03-18/cl-fuse-20160318-git.tgz''; sha256 = ''1yllmnnhqp42s37a2y7h7vph854xgna62l1pidvlyskc90bl5jf6''; }; + + packageName = "cl-fuse"; overrides = x: { postInstall = '' @@ -30,5 +32,8 @@ rec { } /* (SYSTEM cl-fuse DESCRIPTION CFFI bindings to FUSE (Filesystem in user space) SHA256 1yllmnnhqp42s37a2y7h7vph854xgna62l1pidvlyskc90bl5jf6 URL http://beta.quicklisp.org/archive/cl-fuse/2016-03-18/cl-fuse-20160318-git.tgz MD5 ce2e907e5ae2cece72fa314be1ced44c NAME cl-fuse TESTNAME NIL FILENAME - cl-fuse DEPS ((NAME bordeaux-threads) (NAME cffi) (NAME cffi-grovel) (NAME cl-utilities) (NAME iterate) (NAME trivial-backtrace) (NAME trivial-utf-8)) + cl-fuse DEPS + ((NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel) + (NAME cl-utilities FILENAME cl-utilities) (NAME iterate FILENAME iterate) (NAME trivial-backtrace FILENAME trivial-backtrace) + (NAME trivial-utf-8 FILENAME trivial-utf-8)) DEPENDENCIES (bordeaux-threads cffi cffi-grovel cl-utilities iterate trivial-backtrace trivial-utf-8) VERSION 20160318-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix new file mode 100644 index 00000000000..5dae43b6e59 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-interpol''; + version = ''0.2.6''; + + description = ''''; + + deps = [ args."cl-unicode" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-interpol/2016-09-29/cl-interpol-0.2.6.tgz''; + sha256 = ''172iy4bp4fxyfhz7n6jbqz4j8xqnzpvmh981bbi5waflg58x9h8b''; + }; + + packageName = "cl-interpol"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-interpol[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-interpol DESCRIPTION NIL SHA256 172iy4bp4fxyfhz7n6jbqz4j8xqnzpvmh981bbi5waflg58x9h8b URL + http://beta.quicklisp.org/archive/cl-interpol/2016-09-29/cl-interpol-0.2.6.tgz MD5 1adc92924670601ebb92546ef8bdc6a7 NAME cl-interpol TESTNAME NIL FILENAME + cl-interpol DEPS ((NAME cl-unicode FILENAME cl-unicode)) DEPENDENCIES (cl-unicode) VERSION 0.2.6 SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix index 7babd1a459f..20afe70c796 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cl-json/2014-12-17/cl-json-20141217-git.tgz''; sha256 = ''00cfppyi6njsbpv1x03jcv4zwplg0q1138174l3wjkvi3gsql17g''; }; + + packageName = "cl-json"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix index f782c99a68a..74d40aa8e79 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cl-l10n-cldr/2012-09-09/cl-l10n-cldr-20120909-darcs.tgz''; sha256 = ''03l81bx8izvzwzw0qah34l4k47l4gmhr917phhhl81qp55x7zbiv''; }; + + packageName = "cl-l10n-cldr"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix index 6c465f14858..eabcda82eab 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cl-l10n/2016-12-04/cl-l10n-20161204-darcs.tgz''; sha256 = ''1r8jgwks21az78c5kdxgw5llk9ml423vjkv1f93qg1vx3zma6vzl''; }; + + packageName = "cl-l10n"; overrides = x: { postInstall = '' @@ -31,6 +33,7 @@ rec { /* (SYSTEM cl-l10n DESCRIPTION Portable CL Locale Support SHA256 1r8jgwks21az78c5kdxgw5llk9ml423vjkv1f93qg1vx3zma6vzl URL http://beta.quicklisp.org/archive/cl-l10n/2016-12-04/cl-l10n-20161204-darcs.tgz MD5 c7cb0bb584b061799abaaaf2bd65c9c5 NAME cl-l10n TESTNAME NIL FILENAME cl-l10n DEPS - ((NAME alexandria) (NAME cl-fad) (NAME cl-l10n-cldr) (NAME cl-ppcre) (NAME closer-mop) (NAME cxml) (NAME flexi-streams) (NAME iterate) (NAME local-time) - (NAME metabang-bind)) + ((NAME alexandria FILENAME alexandria) (NAME cl-fad FILENAME cl-fad) (NAME cl-l10n-cldr FILENAME cl-l10n-cldr) (NAME cl-ppcre FILENAME cl-ppcre) + (NAME closer-mop FILENAME closer-mop) (NAME cxml FILENAME cxml) (NAME flexi-streams FILENAME flexi-streams) (NAME iterate FILENAME iterate) + (NAME local-time FILENAME local-time) (NAME metabang-bind FILENAME metabang-bind)) DEPENDENCIES (alexandria cl-fad cl-l10n-cldr cl-ppcre closer-mop cxml flexi-streams iterate local-time metabang-bind) VERSION 20161204-darcs SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix index cca51585e5d..c08467fdd20 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cl-libuv/2016-08-25/cl-libuv-20160825-git.tgz''; sha256 = ''02vi9ph9pxbxgp9jsbgzb9nijsv0vyk3f1jyhhm88i0y1kb3595r''; }; + + packageName = "cl-libuv"; overrides = x: { postInstall = '' @@ -30,4 +32,5 @@ rec { } /* (SYSTEM cl-libuv DESCRIPTION Low-level libuv bindings for Common Lisp. SHA256 02vi9ph9pxbxgp9jsbgzb9nijsv0vyk3f1jyhhm88i0y1kb3595r URL http://beta.quicklisp.org/archive/cl-libuv/2016-08-25/cl-libuv-20160825-git.tgz MD5 ba5e3cfaadcf710eaee67cc9e716e45a NAME cl-libuv TESTNAME NIL FILENAME - cl-libuv DEPS ((NAME alexandria) (NAME cffi) (NAME cffi-grovel)) DEPENDENCIES (alexandria cffi cffi-grovel) VERSION 20160825-git SIBLINGS NIL) */ + cl-libuv DEPS ((NAME alexandria FILENAME alexandria) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)) DEPENDENCIES + (alexandria cffi cffi-grovel) VERSION 20160825-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix new file mode 100644 index 00000000000..cc0a45b6e38 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-log''; + version = ''cl-log.1.0.1''; + + description = ''CL-LOG - a general purpose logging utility''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-log/2013-01-28/cl-log.1.0.1.tgz''; + sha256 = ''0wdbq0x6xn21qp3zd49giss3viv8wbs3ga8bg2grfnmzwfwl0y2d''; + }; + + packageName = "cl-log"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-log[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-log DESCRIPTION CL-LOG - a general purpose logging utility SHA256 0wdbq0x6xn21qp3zd49giss3viv8wbs3ga8bg2grfnmzwfwl0y2d URL + http://beta.quicklisp.org/archive/cl-log/2013-01-28/cl-log.1.0.1.tgz MD5 fb960933eb748c14adc3ccb376ac8066 NAME cl-log TESTNAME NIL FILENAME cl-log DEPS NIL + DEPENDENCIES NIL VERSION cl-log.1.0.1 SIBLINGS (cl-log-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix new file mode 100644 index 00000000000..791b1e55827 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix @@ -0,0 +1,39 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-markdown''; + version = ''20101006-darcs''; + + description = ''''; + + deps = [ args."metatilities-base" args."metabang-bind" args."dynamic-classes" args."cl-ppcre" args."cl-containers" args."anaphora" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-markdown/2010-10-06/cl-markdown-20101006-darcs.tgz''; + sha256 = ''1hrv7szhmhxgbadwrmf6wx4kwkbg3dnabbsz4hfffzjgprwac79w''; + }; + + packageName = "cl-markdown"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-markdown[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-markdown DESCRIPTION NIL SHA256 1hrv7szhmhxgbadwrmf6wx4kwkbg3dnabbsz4hfffzjgprwac79w URL + http://beta.quicklisp.org/archive/cl-markdown/2010-10-06/cl-markdown-20101006-darcs.tgz MD5 3e748529531ad1dcbee5443fe24b6300 NAME cl-markdown TESTNAME NIL + FILENAME cl-markdown DEPS + ((NAME metatilities-base FILENAME metatilities-base) (NAME metabang-bind FILENAME metabang-bind) (NAME dynamic-classes FILENAME dynamic-classes) + (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-containers FILENAME cl-containers) (NAME anaphora FILENAME anaphora)) + DEPENDENCIES (metatilities-base metabang-bind dynamic-classes cl-ppcre cl-containers anaphora) VERSION 20101006-darcs SIBLINGS + (cl-markdown-comparisons cl-markdown-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix index 282b05fefd8..a8f218d3756 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cl-markup/2013-10-03/cl-markup-20131003-git.tgz''; sha256 = ''1ik3a5k6axq941zbf6zyig553i5gnypbcxdq9l7bfxp8w18vbj0r''; }; + + packageName = "cl-markup"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix index f54fc00950a..90983764cda 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cl-mysql/2016-06-28/cl-mysql-20160628-git.tgz''; sha256 = ''1zkijanw34nc91dn9jv30590ir6jw7bbcwjsqbvli69fh4b03319''; }; + + packageName = "cl-mysql"; overrides = x: { postInstall = '' @@ -30,4 +32,4 @@ rec { } /* (SYSTEM cl-mysql DESCRIPTION Common Lisp MySQL library bindings SHA256 1zkijanw34nc91dn9jv30590ir6jw7bbcwjsqbvli69fh4b03319 URL http://beta.quicklisp.org/archive/cl-mysql/2016-06-28/cl-mysql-20160628-git.tgz MD5 349615d041c2f2177b678088f9c22409 NAME cl-mysql TESTNAME NIL FILENAME - cl-mysql DEPS ((NAME cffi)) DEPENDENCIES (cffi) VERSION 20160628-git SIBLINGS (cl-mysql-test)) */ + cl-mysql DEPS ((NAME cffi FILENAME cffi)) DEPENDENCIES (cffi) VERSION 20160628-git SIBLINGS (cl-mysql-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix index 38f57fc61b1..964c94c95d5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix @@ -1,16 +1,18 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-paths-ttf''; - version = ''cl-vectors-20150407-git''; + version = ''cl-vectors-20170516-git''; description = ''cl-paths-ttf: vectorial paths manipulation''; - deps = [ args."zpb-ttf" ]; + deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-vectors/2015-04-07/cl-vectors-20150407-git.tgz''; - sha256 = ''1qd7ywc2ayiyd5nw7shnjgh0nc14h328h0cw921g5b2n8j6y959w''; + url = ''http://beta.quicklisp.org/archive/cl-vectors/2017-05-16/cl-vectors-20170516-git.tgz''; + sha256 = ''0j7cdg6akq5giv8rgbxdv8rwpzkv98r5bv78p5nnrixpprvjhvzx''; }; + + packageName = "cl-paths-ttf"; overrides = x: { postInstall = '' @@ -28,6 +30,6 @@ rec { ''; }; } -/* (SYSTEM cl-paths-ttf DESCRIPTION cl-paths-ttf: vectorial paths manipulation SHA256 1qd7ywc2ayiyd5nw7shnjgh0nc14h328h0cw921g5b2n8j6y959w URL - http://beta.quicklisp.org/archive/cl-vectors/2015-04-07/cl-vectors-20150407-git.tgz MD5 9e255503bf4559912ea1511c919c474a NAME cl-paths-ttf TESTNAME NIL - FILENAME cl-paths-ttf DEPS ((NAME zpb-ttf)) DEPENDENCIES (zpb-ttf) VERSION cl-vectors-20150407-git SIBLINGS (cl-aa-misc cl-aa cl-paths cl-vectors)) */ +/* (SYSTEM cl-paths-ttf DESCRIPTION cl-paths-ttf: vectorial paths manipulation SHA256 0j7cdg6akq5giv8rgbxdv8rwpzkv98r5bv78p5nnrixpprvjhvzx URL + http://beta.quicklisp.org/archive/cl-vectors/2017-05-16/cl-vectors-20170516-git.tgz MD5 0258ae7face22f2035c1a85379ee0aae NAME cl-paths-ttf TESTNAME NIL + FILENAME cl-paths-ttf DEPS NIL DEPENDENCIES NIL VERSION cl-vectors-20170516-git SIBLINGS (cl-aa-misc cl-aa cl-paths cl-vectors)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix index 66b42fec175..7766454c193 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz''; sha256 = ''1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p''; }; + + packageName = "cl-postgres"; overrides = x: { postInstall = '' @@ -30,4 +32,4 @@ rec { } /* (SYSTEM cl-postgres DESCRIPTION Low-level client library for PostgreSQL SHA256 1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p URL http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz MD5 7a4145a0a5ff5bcb7a4bf29b5c2915d2 NAME cl-postgres TESTNAME NIL - FILENAME cl-postgres DEPS ((NAME md5)) DEPENDENCIES (md5) VERSION postmodern-20170403-git SIBLINGS (postmodern s-sql simple-date)) */ + FILENAME cl-postgres DEPS ((NAME md5 FILENAME md5)) DEPENDENCIES (md5) VERSION postmodern-20170403-git SIBLINGS (postmodern s-sql simple-date)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix index 8e687ce64a8..cf46246063f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-ppcre-template''; - version = ''cl-unification-20170124-git''; + version = ''cl-unification-20170516-git''; description = ''A system used to conditionally load the CL-PPCRE Template. @@ -9,12 +9,14 @@ This system is not required and it is handled only if CL-PPCRE is available. If it is, then the library provides the REGULAR-EXPRESSION-TEMPLATE.''; - deps = [ args."cl-ppcre" ]; + deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-unification/2017-01-24/cl-unification-20170124-git.tgz''; - sha256 = ''0gwk40y5byg6q0hhd41rqf8g8i1my0h4lshc63xfnh3mfgcc8bx9''; + url = ''http://beta.quicklisp.org/archive/cl-unification/2017-05-16/cl-unification-20170516-git.tgz''; + sha256 = ''0yg2i0vn11skfz0b1zc8wnsqr24gf7fc4hzmwrwj15iz3xzqy9b0''; }; + + packageName = "cl-ppcre-template"; overrides = x: { postInstall = '' @@ -37,6 +39,6 @@ REGULAR-EXPRESSION-TEMPLATE.''; This system is not required and it is handled only if CL-PPCRE is available. If it is, then the library provides the REGULAR-EXPRESSION-TEMPLATE. - SHA256 0gwk40y5byg6q0hhd41rqf8g8i1my0h4lshc63xfnh3mfgcc8bx9 URL http://beta.quicklisp.org/archive/cl-unification/2017-01-24/cl-unification-20170124-git.tgz - MD5 dd277adaf3a0ee41fd0731f78519b1b1 NAME cl-ppcre-template TESTNAME NIL FILENAME cl-ppcre-template DEPS ((NAME cl-ppcre)) DEPENDENCIES (cl-ppcre) VERSION - cl-unification-20170124-git SIBLINGS (cl-unification-lib cl-unification-test cl-unification)) */ + SHA256 0yg2i0vn11skfz0b1zc8wnsqr24gf7fc4hzmwrwj15iz3xzqy9b0 URL http://beta.quicklisp.org/archive/cl-unification/2017-05-16/cl-unification-20170516-git.tgz + MD5 70bcdd486f3444ddd41b5c2c3add119c NAME cl-ppcre-template TESTNAME NIL FILENAME cl-ppcre-template DEPS NIL DEPENDENCIES NIL VERSION + cl-unification-20170516-git SIBLINGS (cl-unification-lib cl-unification-test cl-unification)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix index 3872bfd5f93..b79a00f672f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz''; sha256 = ''1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2''; }; + + packageName = "cl-ppcre-unicode"; overrides = x: { postInstall = '' @@ -30,4 +32,4 @@ rec { } /* (SYSTEM cl-ppcre-unicode DESCRIPTION Perl-compatible regular expression library (Unicode) SHA256 1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2 URL http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz MD5 6d5250467c05eb661a76d395186a1da0 NAME cl-ppcre-unicode TESTNAME NIL FILENAME - cl-ppcre-unicode DEPS ((NAME cl-unicode)) DEPENDENCIES (cl-unicode) VERSION cl-ppcre-2.0.11 SIBLINGS (cl-ppcre)) */ + cl-ppcre-unicode DEPS ((NAME cl-unicode FILENAME cl-unicode)) DEPENDENCIES (cl-unicode) VERSION cl-ppcre-2.0.11 SIBLINGS (cl-ppcre)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix index ecf4a5de399..b7c60a16696 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz''; sha256 = ''1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2''; }; + + packageName = "cl-ppcre"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix index 3a933d2b11d..74c1213cc6d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cl-project/2016-05-31/cl-project-20160531-git.tgz''; sha256 = ''1xwjgs5pzkdnd9i5lcic9z41d1c4yf7pvarrvawfxcicg6rrfw81''; }; + + packageName = "cl-project"; overrides = x: { postInstall = '' @@ -30,5 +32,7 @@ rec { } /* (SYSTEM cl-project DESCRIPTION Generate a skeleton for modern project SHA256 1xwjgs5pzkdnd9i5lcic9z41d1c4yf7pvarrvawfxcicg6rrfw81 URL http://beta.quicklisp.org/archive/cl-project/2016-05-31/cl-project-20160531-git.tgz MD5 63de5ce6f0f3e5f60094a86d32c2f1a9 NAME cl-project TESTNAME NIL - FILENAME cl-project DEPS ((NAME uiop) (NAME prove) (NAME local-time) (NAME cl-ppcre) (NAME cl-emb)) DEPENDENCIES (uiop prove local-time cl-ppcre cl-emb) - VERSION 20160531-git SIBLINGS (cl-project-test)) */ + FILENAME cl-project DEPS + ((NAME uiop FILENAME uiop) (NAME prove FILENAME prove) (NAME local-time FILENAME local-time) (NAME cl-ppcre FILENAME cl-ppcre) + (NAME cl-emb FILENAME cl-emb)) + DEPENDENCIES (uiop prove local-time cl-ppcre cl-emb) VERSION 20160531-git SIBLINGS (cl-project-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix index cad670acab1..03d863f2122 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cl-reexport/2015-07-09/cl-reexport-20150709-git.tgz''; sha256 = ''1y6qlyps7g0wl4rbmzvw6s1kjdwwmh33layyjclsjp9j5nm8mdmi''; }; + + packageName = "cl-reexport"; overrides = x: { postInstall = '' @@ -30,4 +32,4 @@ rec { } /* (SYSTEM cl-reexport DESCRIPTION Reexport external symbols in other packages. SHA256 1y6qlyps7g0wl4rbmzvw6s1kjdwwmh33layyjclsjp9j5nm8mdmi URL http://beta.quicklisp.org/archive/cl-reexport/2015-07-09/cl-reexport-20150709-git.tgz MD5 207d02771cbd906d033ff704ca5c3a3d NAME cl-reexport TESTNAME NIL - FILENAME cl-reexport DEPS ((NAME alexandria)) DEPENDENCIES (alexandria) VERSION 20150709-git SIBLINGS (cl-reexport-test)) */ + FILENAME cl-reexport DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION 20150709-git SIBLINGS (cl-reexport-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix index 0098abf59d3..1d525c7a675 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cl-smtp/2016-08-25/cl-smtp-20160825-git.tgz''; sha256 = ''0svkvy6x458a7rgvp3wki0lmhdxpaa1j0brwsw2mlpl2jqkx5dxh''; }; + + packageName = "cl-smtp"; overrides = x: { postInstall = '' @@ -30,5 +32,7 @@ rec { } /* (SYSTEM cl-smtp DESCRIPTION Common Lisp smtp client. SHA256 0svkvy6x458a7rgvp3wki0lmhdxpaa1j0brwsw2mlpl2jqkx5dxh URL http://beta.quicklisp.org/archive/cl-smtp/2016-08-25/cl-smtp-20160825-git.tgz MD5 e6bb60e66b0f7d9cc5e4f98aba56998a NAME cl-smtp TESTNAME NIL FILENAME - cl-smtp DEPS ((NAME cl+ssl) (NAME cl-base64) (NAME flexi-streams) (NAME trivial-gray-streams) (NAME usocket)) DEPENDENCIES - (cl+ssl cl-base64 flexi-streams trivial-gray-streams usocket) VERSION 20160825-git SIBLINGS NIL) */ + cl-smtp DEPS + ((NAME cl+ssl FILENAME cl+ssl) (NAME cl-base64 FILENAME cl-base64) (NAME flexi-streams FILENAME flexi-streams) + (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME usocket FILENAME usocket)) + DEPENDENCIES (cl+ssl cl-base64 flexi-streams trivial-gray-streams usocket) VERSION 20160825-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix index ba16a64a9f6..9a49e468ce1 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cl-store/2016-05-31/cl-store-20160531-git.tgz''; sha256 = ''0j1pfgvzy6l7hb68xsz2dghsa94lip7caq6f6608jsqadmdswljz''; }; + + packageName = "cl-store"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix index abdfc65ec1f..e82cb4d501f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz''; sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n''; }; + + packageName = "cl-syntax-annot"; overrides = x: { postInstall = '' @@ -30,5 +32,5 @@ rec { } /* (SYSTEM cl-syntax-annot DESCRIPTION CL-Syntax Reader Syntax for cl-annot SHA256 1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n URL http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz MD5 602b84143aafe59d65f4e08ac20a124a NAME cl-syntax-annot TESTNAME NIL - FILENAME cl-syntax-annot DEPS ((NAME cl-annot)) DEPENDENCIES (cl-annot) VERSION cl-syntax-20150407-git SIBLINGS + FILENAME cl-syntax-annot DEPS ((NAME cl-annot FILENAME cl-annot)) DEPENDENCIES (cl-annot) VERSION cl-syntax-20150407-git SIBLINGS (cl-syntax-anonfun cl-syntax-clsql cl-syntax-fare-quasiquote cl-syntax-interpol cl-syntax-markup cl-syntax)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix index 32c1a0c0ccc..6680fc51cbc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz''; sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n''; }; + + packageName = "cl-syntax-anonfun"; overrides = x: { postInstall = '' @@ -30,5 +32,5 @@ rec { } /* (SYSTEM cl-syntax-anonfun DESCRIPTION CL-Syntax Reader Syntax for cl-anonfun SHA256 1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n URL http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz MD5 602b84143aafe59d65f4e08ac20a124a NAME cl-syntax-anonfun TESTNAME NIL - FILENAME cl-syntax-anonfun DEPS ((NAME cl-anonfun)) DEPENDENCIES (cl-anonfun) VERSION cl-syntax-20150407-git SIBLINGS + FILENAME cl-syntax-anonfun DEPS ((NAME cl-anonfun FILENAME cl-anonfun)) DEPENDENCIES (cl-anonfun) VERSION cl-syntax-20150407-git SIBLINGS (cl-syntax-annot cl-syntax-clsql cl-syntax-fare-quasiquote cl-syntax-interpol cl-syntax-markup cl-syntax)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix index 34c5a2e6628..2150b64cb6f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz''; sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n''; }; + + packageName = "cl-syntax-markup"; overrides = x: { postInstall = '' @@ -30,5 +32,5 @@ rec { } /* (SYSTEM cl-syntax-markup DESCRIPTION CL-Syntax Reader Syntax for CL-Markup SHA256 1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n URL http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz MD5 602b84143aafe59d65f4e08ac20a124a NAME cl-syntax-markup TESTNAME NIL - FILENAME cl-syntax-markup DEPS ((NAME cl-markup)) DEPENDENCIES (cl-markup) VERSION cl-syntax-20150407-git SIBLINGS + FILENAME cl-syntax-markup DEPS ((NAME cl-markup FILENAME cl-markup)) DEPENDENCIES (cl-markup) VERSION cl-syntax-20150407-git SIBLINGS (cl-syntax-annot cl-syntax-anonfun cl-syntax-clsql cl-syntax-fare-quasiquote cl-syntax-interpol cl-syntax)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix index bccba7ca8ea..264d74e2db4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz''; sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n''; }; + + packageName = "cl-syntax"; overrides = x: { postInstall = '' @@ -30,5 +32,6 @@ rec { } /* (SYSTEM cl-syntax DESCRIPTION Reader Syntax Coventions for Common Lisp and SLIME SHA256 1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n URL http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz MD5 602b84143aafe59d65f4e08ac20a124a NAME cl-syntax TESTNAME NIL FILENAME - cl-syntax DEPS ((NAME trivial-types) (NAME named-readtables)) DEPENDENCIES (trivial-types named-readtables) VERSION 20150407-git SIBLINGS + cl-syntax DEPS ((NAME trivial-types FILENAME trivial-types) (NAME named-readtables FILENAME named-readtables)) DEPENDENCIES + (trivial-types named-readtables) VERSION 20150407-git SIBLINGS (cl-syntax-annot cl-syntax-anonfun cl-syntax-clsql cl-syntax-fare-quasiquote cl-syntax-interpol cl-syntax-markup)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix index c0d004c4009..2e7f97cf66a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/prove/2017-04-03/prove-20170403-git.tgz''; sha256 = ''091xxkn9zj22c4gmm8x714k29bs4j0j7akppwh55zjsmrxdhqcpl''; }; + + packageName = "cl-test-more"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix index d514c1f26a4..8b0d35253f4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cl-unicode/2014-12-17/cl-unicode-0.1.5.tgz''; sha256 = ''1jd5qq5ji6l749c4x415z22y9r0k9z18pdi9p9fqvamzh854i46n''; }; + + packageName = "cl-unicode"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix index 4c0b0c5c762..7c5e16973ef 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix @@ -1,7 +1,7 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-unification''; - version = ''20170124-git''; + version = ''20170516-git''; description = ''The CL-UNIFICATION system. @@ -10,9 +10,11 @@ The system contains the definitions for the 'unification' machinery.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-unification/2017-01-24/cl-unification-20170124-git.tgz''; - sha256 = ''0gwk40y5byg6q0hhd41rqf8g8i1my0h4lshc63xfnh3mfgcc8bx9''; + url = ''http://beta.quicklisp.org/archive/cl-unification/2017-05-16/cl-unification-20170516-git.tgz''; + sha256 = ''0yg2i0vn11skfz0b1zc8wnsqr24gf7fc4hzmwrwj15iz3xzqy9b0''; }; + + packageName = "cl-unification"; overrides = x: { postInstall = '' @@ -33,6 +35,6 @@ The system contains the definitions for the 'unification' machinery.''; /* (SYSTEM cl-unification DESCRIPTION The CL-UNIFICATION system. The system contains the definitions for the 'unification' machinery. - SHA256 0gwk40y5byg6q0hhd41rqf8g8i1my0h4lshc63xfnh3mfgcc8bx9 URL http://beta.quicklisp.org/archive/cl-unification/2017-01-24/cl-unification-20170124-git.tgz - MD5 dd277adaf3a0ee41fd0731f78519b1b1 NAME cl-unification TESTNAME NIL FILENAME cl-unification DEPS NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS + SHA256 0yg2i0vn11skfz0b1zc8wnsqr24gf7fc4hzmwrwj15iz3xzqy9b0 URL http://beta.quicklisp.org/archive/cl-unification/2017-05-16/cl-unification-20170516-git.tgz + MD5 70bcdd486f3444ddd41b5c2c3add119c NAME cl-unification TESTNAME NIL FILENAME cl-unification DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (cl-unification-lib cl-unification-test cl-ppcre-template)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix index 099c63daf28..da23cbc9499 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cl-utilities/2010-10-06/cl-utilities-1.2.4.tgz''; sha256 = ''1z2ippnv2wgyxpz15zpif7j7sp1r20fkjhm4n6am2fyp6a3k3a87''; }; + + packageName = "cl-utilities"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix index e2e2c956e7d..fef996a845b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix @@ -1,16 +1,18 @@ args @ { fetchurl, ... }: rec { baseName = ''cl-vectors''; - version = ''20150407-git''; + version = ''20170516-git''; description = ''cl-paths: vectorial paths manipulation''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/cl-vectors/2015-04-07/cl-vectors-20150407-git.tgz''; - sha256 = ''1qd7ywc2ayiyd5nw7shnjgh0nc14h328h0cw921g5b2n8j6y959w''; + url = ''http://beta.quicklisp.org/archive/cl-vectors/2017-05-16/cl-vectors-20170516-git.tgz''; + sha256 = ''0j7cdg6akq5giv8rgbxdv8rwpzkv98r5bv78p5nnrixpprvjhvzx''; }; + + packageName = "cl-vectors"; overrides = x: { postInstall = '' @@ -28,6 +30,6 @@ rec { ''; }; } -/* (SYSTEM cl-vectors DESCRIPTION cl-paths: vectorial paths manipulation SHA256 1qd7ywc2ayiyd5nw7shnjgh0nc14h328h0cw921g5b2n8j6y959w URL - http://beta.quicklisp.org/archive/cl-vectors/2015-04-07/cl-vectors-20150407-git.tgz MD5 9e255503bf4559912ea1511c919c474a NAME cl-vectors TESTNAME NIL - FILENAME cl-vectors DEPS NIL DEPENDENCIES NIL VERSION 20150407-git SIBLINGS (cl-aa-misc cl-aa cl-paths-ttf cl-paths)) */ +/* (SYSTEM cl-vectors DESCRIPTION cl-paths: vectorial paths manipulation SHA256 0j7cdg6akq5giv8rgbxdv8rwpzkv98r5bv78p5nnrixpprvjhvzx URL + http://beta.quicklisp.org/archive/cl-vectors/2017-05-16/cl-vectors-20170516-git.tgz MD5 0258ae7face22f2035c1a85379ee0aae NAME cl-vectors TESTNAME NIL + FILENAME cl-vectors DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (cl-aa-misc cl-aa cl-paths-ttf cl-paths)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix index ca1303e9d1d..e5888844c82 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cl-who/2014-12-17/cl-who-1.1.4.tgz''; sha256 = ''0r9wc92njz1cc7nghgbhdmd7jy216ylhlabfj0vc45bmfa4w44rq''; }; + + packageName = "cl-who"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix index b9d894e3f47..e00c430581f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix @@ -1,16 +1,18 @@ args @ { fetchurl, ... }: rec { baseName = ''clack-v1-compat''; - version = ''clack-20170403-git''; + version = ''clack-20170516-git''; description = ''''; - deps = [ args."uiop" args."trivial-types" args."trivial-mimes" args."trivial-backtrace" args."split-sequence" args."quri" args."marshal" args."local-time" args."lack-util" args."lack" args."ironclad" args."http-body" args."flexi-streams" args."cl-syntax-annot" args."cl-ppcre" args."cl-base64" args."circular-streams" args."alexandria" ]; + deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2017-04-03/clack-20170403-git.tgz''; - sha256 = ''1n6rbiz5ybwr1fbzynlmqmx2di5kqxrsniqx9mzy7034hqpk54ss''; + url = ''http://beta.quicklisp.org/archive/clack/2017-05-16/clack-20170516-git.tgz''; + sha256 = ''1161lsv739z02ijp0p95cb3vbybqhffp03sipb7l1vmmj24d8wgw''; }; + + packageName = "clack-v1-compat"; overrides = x: { postInstall = '' @@ -28,16 +30,9 @@ rec { ''; }; } -/* (SYSTEM clack-v1-compat DESCRIPTION NIL SHA256 1n6rbiz5ybwr1fbzynlmqmx2di5kqxrsniqx9mzy7034hqpk54ss URL - http://beta.quicklisp.org/archive/clack/2017-04-03/clack-20170403-git.tgz MD5 98643f671285c11e91d2c81d4c8fc52a NAME clack-v1-compat TESTNAME NIL FILENAME - clack-v1-compat DEPS - ((NAME uiop) (NAME trivial-types) (NAME trivial-mimes) (NAME trivial-backtrace) (NAME split-sequence) (NAME quri) (NAME marshal) (NAME local-time) - (NAME lack-util) (NAME lack) (NAME ironclad) (NAME http-body) (NAME flexi-streams) (NAME cl-syntax-annot) (NAME cl-ppcre) (NAME cl-base64) - (NAME circular-streams) (NAME alexandria)) - DEPENDENCIES - (uiop trivial-types trivial-mimes trivial-backtrace split-sequence quri marshal local-time lack-util lack ironclad http-body flexi-streams cl-syntax-annot - cl-ppcre cl-base64 circular-streams alexandria) - VERSION clack-20170403-git SIBLINGS +/* (SYSTEM clack-v1-compat DESCRIPTION NIL SHA256 1161lsv739z02ijp0p95cb3vbybqhffp03sipb7l1vmmj24d8wgw URL + http://beta.quicklisp.org/archive/clack/2017-05-16/clack-20170516-git.tgz MD5 ecda950881158c3bf209b29f4717fb0a NAME clack-v1-compat TESTNAME NIL FILENAME + clack-v1-compat DEPS NIL DEPENDENCIES NIL VERSION clack-20170516-git SIBLINGS (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-test clack t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie t-clack-v1-compat clack-middleware-auth-basic clack-middleware-clsql clack-middleware-csrf clack-middleware-dbi clack-middleware-oauth clack-middleware-postmodern clack-middleware-rucksack clack-session-store-dbi diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix index 2d0d3b3d0bc..43c75bdd6e8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix @@ -1,16 +1,18 @@ args @ { fetchurl, ... }: rec { baseName = ''clack''; - version = ''20170403-git''; + version = ''20170516-git''; description = ''Web application environment for Common Lisp''; - deps = [ args."uiop" args."lack-util" args."lack-middleware-backtrace" args."lack" args."bordeaux-threads" args."alexandria" ]; + deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clack/2017-04-03/clack-20170403-git.tgz''; - sha256 = ''1n6rbiz5ybwr1fbzynlmqmx2di5kqxrsniqx9mzy7034hqpk54ss''; + url = ''http://beta.quicklisp.org/archive/clack/2017-05-16/clack-20170516-git.tgz''; + sha256 = ''1161lsv739z02ijp0p95cb3vbybqhffp03sipb7l1vmmj24d8wgw''; }; + + packageName = "clack"; overrides = x: { postInstall = '' @@ -28,10 +30,9 @@ rec { ''; }; } -/* (SYSTEM clack DESCRIPTION Web application environment for Common Lisp SHA256 1n6rbiz5ybwr1fbzynlmqmx2di5kqxrsniqx9mzy7034hqpk54ss URL - http://beta.quicklisp.org/archive/clack/2017-04-03/clack-20170403-git.tgz MD5 98643f671285c11e91d2c81d4c8fc52a NAME clack TESTNAME NIL FILENAME clack DEPS - ((NAME uiop) (NAME lack-util) (NAME lack-middleware-backtrace) (NAME lack) (NAME bordeaux-threads) (NAME alexandria)) DEPENDENCIES - (uiop lack-util lack-middleware-backtrace lack bordeaux-threads alexandria) VERSION 20170403-git SIBLINGS +/* (SYSTEM clack DESCRIPTION Web application environment for Common Lisp SHA256 1161lsv739z02ijp0p95cb3vbybqhffp03sipb7l1vmmj24d8wgw URL + http://beta.quicklisp.org/archive/clack/2017-05-16/clack-20170516-git.tgz MD5 ecda950881158c3bf209b29f4717fb0a NAME clack TESTNAME NIL FILENAME clack DEPS + NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-test clack-v1-compat t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie t-clack-v1-compat clack-middleware-auth-basic clack-middleware-clsql clack-middleware-csrf clack-middleware-dbi clack-middleware-oauth clack-middleware-postmodern clack-middleware-rucksack clack-session-store-dbi diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix index 432da3069d2..d73de2e941c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix @@ -1,16 +1,18 @@ args @ { fetchurl, ... }: rec { baseName = ''closer-mop''; - version = ''20170403-git''; + version = ''20170516-git''; description = ''Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/closer-mop/2017-04-03/closer-mop-20170403-git.tgz''; - sha256 = ''166k9r55zf0lyvdacvih5y63xv2kp0kqmx9z6jmkyb3snrdghijf''; + url = ''http://beta.quicklisp.org/archive/closer-mop/2017-05-16/closer-mop-20170516-git.tgz''; + sha256 = ''072nf6d0gg76vkb1wkkzlfcck5ksril4anmjbmylbrwm3mn61p5w''; }; + + packageName = "closer-mop"; overrides = x: { postInstall = '' @@ -30,5 +32,5 @@ rec { } /* (SYSTEM closer-mop DESCRIPTION Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations. - SHA256 166k9r55zf0lyvdacvih5y63xv2kp0kqmx9z6jmkyb3snrdghijf URL http://beta.quicklisp.org/archive/closer-mop/2017-04-03/closer-mop-20170403-git.tgz MD5 - 806918d9975d0c82fc471f95f40972a1 NAME closer-mop TESTNAME NIL FILENAME closer-mop DEPS NIL DEPENDENCIES NIL VERSION 20170403-git SIBLINGS NIL) */ + SHA256 072nf6d0gg76vkb1wkkzlfcck5ksril4anmjbmylbrwm3mn61p5w URL http://beta.quicklisp.org/archive/closer-mop/2017-05-16/closer-mop-20170516-git.tgz MD5 + 169ba62f7f8f436e45f182cbe7dd8614 NAME closer-mop TESTNAME NIL FILENAME closer-mop DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix index 4e7579dba88..8dca87dc182 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/closure-common/2010-11-07/closure-common-20101107-git.tgz''; sha256 = ''1982dpn2z7rlznn74gxy9biqybh2d4r1n688h9pn1s2bssgv3hk4''; }; + + packageName = "closure-common"; overrides = x: { postInstall = '' @@ -30,5 +32,5 @@ rec { } /* (SYSTEM closure-common DESCRIPTION NIL SHA256 1982dpn2z7rlznn74gxy9biqybh2d4r1n688h9pn1s2bssgv3hk4 URL http://beta.quicklisp.org/archive/closure-common/2010-11-07/closure-common-20101107-git.tgz MD5 12c45a2f0420b2e86fa06cb6575b150a NAME closure-common - TESTNAME NIL FILENAME closure-common DEPS ((NAME babel) (NAME trivial-gray-streams)) DEPENDENCIES (babel trivial-gray-streams) VERSION 20101107-git - SIBLINGS NIL) */ + TESTNAME NIL FILENAME closure-common DEPS ((NAME babel FILENAME babel) (NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES + (babel trivial-gray-streams) VERSION 20101107-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix index f5dba03d08e..76eae519de9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/clsql/2016-02-08/clsql-20160208-git.tgz''; sha256 = ''0hc97rlfpanp6c1ziis47mrq2fgxbk0h51bhczn8k9xin2qbhhgn''; }; + + packageName = "clsql"; overrides = x: { postInstall = '' @@ -30,6 +32,6 @@ rec { } /* (SYSTEM clsql DESCRIPTION Common Lisp SQL Interface library SHA256 0hc97rlfpanp6c1ziis47mrq2fgxbk0h51bhczn8k9xin2qbhhgn URL http://beta.quicklisp.org/archive/clsql/2016-02-08/clsql-20160208-git.tgz MD5 d1da7688361337a7de4fe7452c225a06 NAME clsql TESTNAME NIL FILENAME clsql DEPS - ((NAME uffi)) DEPENDENCIES (uffi) VERSION 20160208-git SIBLINGS + ((NAME uffi FILENAME uffi)) DEPENDENCIES (uffi) VERSION 20160208-git SIBLINGS (clsql-aodbc clsql-cffi clsql-mysql clsql-odbc clsql-postgresql-socket clsql-postgresql-socket3 clsql-postgresql clsql-sqlite clsql-sqlite3 clsql-tests clsql-uffi)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix index e8af9d041e0..81e50db852b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix @@ -1,16 +1,18 @@ args @ { fetchurl, ... }: rec { baseName = ''clss''; - version = ''20170124-git''; + version = ''20170516-git''; description = ''A DOM tree searching engine based on CSS selectors.''; - deps = [ args."array-utils" args."plump" ]; + deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clss/2017-01-24/clss-20170124-git.tgz''; - sha256 = ''0rrg3brzash1b14n686xjx6d5glm2vg32g0i8hyvaffqd82493pb''; + url = ''http://beta.quicklisp.org/archive/clss/2017-05-16/clss-20170516-git.tgz''; + sha256 = ''1c3fizlf4509hj4l6m9gjc64ijvlwnavwvvw3198cvvn6lp49r5f''; }; + + packageName = "clss"; overrides = x: { postInstall = '' @@ -28,6 +30,6 @@ rec { ''; }; } -/* (SYSTEM clss DESCRIPTION A DOM tree searching engine based on CSS selectors. SHA256 0rrg3brzash1b14n686xjx6d5glm2vg32g0i8hyvaffqd82493pb URL - http://beta.quicklisp.org/archive/clss/2017-01-24/clss-20170124-git.tgz MD5 f05606cab3a75e01c57fd264d1c71863 NAME clss TESTNAME NIL FILENAME clss DEPS - ((NAME array-utils) (NAME plump)) DEPENDENCIES (array-utils plump) VERSION 20170124-git SIBLINGS NIL) */ +/* (SYSTEM clss DESCRIPTION A DOM tree searching engine based on CSS selectors. SHA256 1c3fizlf4509hj4l6m9gjc64ijvlwnavwvvw3198cvvn6lp49r5f URL + http://beta.quicklisp.org/archive/clss/2017-05-16/clss-20170516-git.tgz MD5 2e69a5197694a9654c0e9c5fced4152f NAME clss TESTNAME NIL FILENAME clss DEPS NIL + DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix index bf1b1a5e00c..dfd8669b59f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/clx-truetype/2016-08-25/clx-truetype-20160825-git.tgz''; sha256 = ''0ndy067rg9w6636gxwlpnw7f3ck9nrnjb03444pprik9r3c9in67''; }; + + packageName = "clx-truetype"; overrides = x: { postInstall = '' @@ -31,5 +33,6 @@ rec { /* (SYSTEM clx-truetype DESCRIPTION clx-truetype is pure common lisp solution for antialiased TrueType font rendering using CLX and XRender extension. SHA256 0ndy067rg9w6636gxwlpnw7f3ck9nrnjb03444pprik9r3c9in67 URL http://beta.quicklisp.org/archive/clx-truetype/2016-08-25/clx-truetype-20160825-git.tgz MD5 7c9dedb21d52dedf727de741ac6d9c60 NAME clx-truetype TESTNAME NIL FILENAME clx-truetype DEPS - ((NAME cl-aa) (NAME cl-fad) (NAME cl-paths-ttf) (NAME cl-store) (NAME cl-vectors) (NAME clx) (NAME trivial-features) (NAME zpb-ttf)) DEPENDENCIES - (cl-aa cl-fad cl-paths-ttf cl-store cl-vectors clx trivial-features zpb-ttf) VERSION 20160825-git SIBLINGS NIL) */ + ((NAME cl-aa FILENAME cl-aa) (NAME cl-fad FILENAME cl-fad) (NAME cl-paths-ttf FILENAME cl-paths-ttf) (NAME cl-store FILENAME cl-store) + (NAME cl-vectors FILENAME cl-vectors) (NAME clx FILENAME clx) (NAME trivial-features FILENAME trivial-features) (NAME zpb-ttf FILENAME zpb-ttf)) + DEPENDENCIES (cl-aa cl-fad cl-paths-ttf cl-store cl-vectors clx trivial-features zpb-ttf) VERSION 20160825-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix index e9e1acfcefc..b47a7cbd7d4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix @@ -1,16 +1,18 @@ args @ { fetchurl, ... }: rec { baseName = ''clx''; - version = ''20170227-git''; + version = ''20170516-git''; description = ''An implementation of the X Window System protocol in Lisp.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/clx/2017-02-27/clx-20170227-git.tgz''; - sha256 = ''0zgp1yqy0lm528bhil93ap7df01qdyfhnbxhckjv87xk8rs0g5nx''; + url = ''http://beta.quicklisp.org/archive/clx/2017-05-16/clx-20170516-git.tgz''; + sha256 = ''00lzm4m74bm5gvy6nss8ab735ddnijbsvimlrkx37sp9v3zln5gs''; }; + + packageName = "clx"; overrides = x: { postInstall = '' @@ -28,6 +30,6 @@ rec { ''; }; } -/* (SYSTEM clx DESCRIPTION An implementation of the X Window System protocol in Lisp. SHA256 0zgp1yqy0lm528bhil93ap7df01qdyfhnbxhckjv87xk8rs0g5nx URL - http://beta.quicklisp.org/archive/clx/2017-02-27/clx-20170227-git.tgz MD5 fe5fc4bd65ced7a0164abc0ed34afffd NAME clx TESTNAME NIL FILENAME clx DEPS NIL - DEPENDENCIES NIL VERSION 20170227-git SIBLINGS NIL) */ +/* (SYSTEM clx DESCRIPTION An implementation of the X Window System protocol in Lisp. SHA256 00lzm4m74bm5gvy6nss8ab735ddnijbsvimlrkx37sp9v3zln5gs URL + http://beta.quicklisp.org/archive/clx/2017-05-16/clx-20170516-git.tgz MD5 1f5d7963802a503d7f7fcf73e1f42dd8 NAME clx TESTNAME NIL FILENAME clx DEPS NIL + DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix index 62010efd047..276b13e1bd0 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/command-line-arguments/2015-12-18/command-line-arguments-20151218-git.tgz''; sha256 = ''07yv3vj9kjd84q09d6kvgryqxb71bsa7jl22fd1an6inmk0a3yyh''; }; + + packageName = "command-line-arguments"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix index 3f8886915a0..695164566ba 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/css-lite/2012-04-07/css-lite-20120407-git.tgz''; sha256 = ''1gf1qqaxhly6ixh9ykqhg9b52s8p5wlwi46vp2k29qy7gmx4f1qg''; }; + + packageName = "css-lite"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-dom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-dom.nix index 041cc5b8481..924b61cae6e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-dom.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-dom.nix @@ -13,6 +13,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz''; sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk''; }; + + packageName = "cxml-dom"; overrides = x: { postInstall = '' @@ -32,4 +34,4 @@ rec { } /* (SYSTEM cxml-dom DESCRIPTION NIL SHA256 04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk URL http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz MD5 587755dff60416d4f716f4e785cf747e NAME cxml-dom TESTNAME cxml FILENAME cxml-dom - DEPS ((NAME cxml-xml)) DEPENDENCIES (cxml-xml) VERSION cxml-20110619-git SIBLINGS (cxml)) */ + DEPS ((NAME cxml-xml FILENAME cxml-xml)) DEPENDENCIES (cxml-xml) VERSION cxml-20110619-git SIBLINGS (cxml)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-klacks.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-klacks.nix index 15dd75fbfa6..f8418ccf27f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-klacks.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-klacks.nix @@ -13,6 +13,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz''; sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk''; }; + + packageName = "cxml-klacks"; overrides = x: { postInstall = '' @@ -32,4 +34,4 @@ rec { } /* (SYSTEM cxml-klacks DESCRIPTION NIL SHA256 04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk URL http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz MD5 587755dff60416d4f716f4e785cf747e NAME cxml-klacks TESTNAME cxml FILENAME - cxml-klacks DEPS ((NAME cxml-xml)) DEPENDENCIES (cxml-xml) VERSION cxml-20110619-git SIBLINGS (cxml)) */ + cxml-klacks DEPS ((NAME cxml-xml FILENAME cxml-xml)) DEPENDENCIES (cxml-xml) VERSION cxml-20110619-git SIBLINGS (cxml)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-test.nix index 4a872802ecb..e8856352dcd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-test.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-test.nix @@ -13,6 +13,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz''; sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk''; }; + + packageName = "cxml-test"; overrides = x: { postInstall = '' @@ -32,4 +34,5 @@ rec { } /* (SYSTEM cxml-test DESCRIPTION NIL SHA256 04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk URL http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz MD5 587755dff60416d4f716f4e785cf747e NAME cxml-test TESTNAME cxml FILENAME - cxml-test DEPS ((NAME cxml-xml) (NAME cxml-klacks) (NAME cxml-dom)) DEPENDENCIES (cxml-xml cxml-klacks cxml-dom) VERSION cxml-20110619-git SIBLINGS (cxml)) */ + cxml-test DEPS ((NAME cxml-xml FILENAME cxml-xml) (NAME cxml-klacks FILENAME cxml-klacks) (NAME cxml-dom FILENAME cxml-dom)) DEPENDENCIES + (cxml-xml cxml-klacks cxml-dom) VERSION cxml-20110619-git SIBLINGS (cxml)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-xml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-xml.nix index 9674eca3d1a..5d8ef158772 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-xml.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-xml.nix @@ -13,6 +13,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz''; sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk''; }; + + packageName = "cxml-xml"; overrides = x: { postInstall = '' @@ -32,5 +34,5 @@ rec { } /* (SYSTEM cxml-xml DESCRIPTION NIL SHA256 04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk URL http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz MD5 587755dff60416d4f716f4e785cf747e NAME cxml-xml TESTNAME cxml FILENAME cxml-xml - DEPS ((NAME trivial-gray-streams) (NAME puri) (NAME closure-common)) DEPENDENCIES (trivial-gray-streams puri closure-common) VERSION cxml-20110619-git - SIBLINGS (cxml)) */ + DEPS ((NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME puri FILENAME puri) (NAME closure-common FILENAME closure-common)) DEPENDENCIES + (trivial-gray-streams puri closure-common) VERSION cxml-20110619-git SIBLINGS (cxml)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix index 3c17f72b42a..baab538ca38 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz''; sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk''; }; + + packageName = "cxml"; overrides = x: { postInstall = '' @@ -30,4 +32,5 @@ rec { } /* (SYSTEM cxml DESCRIPTION NIL SHA256 04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk URL http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz MD5 587755dff60416d4f716f4e785cf747e NAME cxml TESTNAME NIL FILENAME cxml DEPS - ((NAME cxml-dom) (NAME cxml-klacks) (NAME cxml-test)) DEPENDENCIES (cxml-dom cxml-klacks cxml-test) VERSION 20110619-git SIBLINGS NIL) */ + ((NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks) (NAME cxml-test FILENAME cxml-test)) DEPENDENCIES + (cxml-dom cxml-klacks cxml-test) VERSION 20110619-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix new file mode 100644 index 00000000000..06ffeb9ad69 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''db3''; + version = ''cl-20150302-git''; + + description = ''DB3 file reader''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-db3/2015-03-02/cl-db3-20150302-git.tgz''; + sha256 = ''0mwdpb7cdvxdcbyg3ags6xzwhblai170q3p20njs3v73s30dbzxi''; + }; + + packageName = "db3"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/db3[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM db3 DESCRIPTION DB3 file reader SHA256 0mwdpb7cdvxdcbyg3ags6xzwhblai170q3p20njs3v73s30dbzxi URL + http://beta.quicklisp.org/archive/cl-db3/2015-03-02/cl-db3-20150302-git.tgz MD5 578896a3f60f474742f240b703f8c5f5 NAME db3 TESTNAME NIL FILENAME db3 DEPS + NIL DEPENDENCIES NIL VERSION cl-20150302-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix index 4ba68b6c545..93d0e3d599b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz''; sha256 = ''0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj''; }; + + packageName = "dbd-mysql"; overrides = x: { postInstall = '' @@ -30,5 +32,5 @@ rec { } /* (SYSTEM dbd-mysql DESCRIPTION Database driver for MySQL. SHA256 0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj URL http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz MD5 c48d284eda4aac1ff9a10891884f52e5 NAME dbd-mysql TESTNAME NIL FILENAME - dbd-mysql DEPS ((NAME cl-syntax-annot) (NAME cl-syntax) (NAME cl-mysql)) DEPENDENCIES (cl-syntax-annot cl-syntax cl-mysql) VERSION cl-dbi-20170124-git - SIBLINGS (cl-dbi dbd-postgres dbd-sqlite3 dbi-test dbi)) */ + dbd-mysql DEPS ((NAME cl-syntax-annot FILENAME cl-syntax-annot) (NAME cl-syntax FILENAME cl-syntax) (NAME cl-mysql FILENAME cl-mysql)) DEPENDENCIES + (cl-syntax-annot cl-syntax cl-mysql) VERSION cl-dbi-20170124-git SIBLINGS (cl-dbi dbd-postgres dbd-sqlite3 dbi-test dbi)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix index 0d0c3f153ef..3c963b5141e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz''; sha256 = ''0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj''; }; + + packageName = "dbd-postgres"; overrides = x: { postInstall = '' @@ -30,5 +32,7 @@ rec { } /* (SYSTEM dbd-postgres DESCRIPTION Database driver for PostgreSQL. SHA256 0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj URL http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz MD5 c48d284eda4aac1ff9a10891884f52e5 NAME dbd-postgres TESTNAME NIL FILENAME - dbd-postgres DEPS ((NAME trivial-garbage) (NAME cl-syntax-annot) (NAME cl-syntax) (NAME cl-postgres)) DEPENDENCIES - (trivial-garbage cl-syntax-annot cl-syntax cl-postgres) VERSION cl-dbi-20170124-git SIBLINGS (cl-dbi dbd-mysql dbd-sqlite3 dbi-test dbi)) */ + dbd-postgres DEPS + ((NAME trivial-garbage FILENAME trivial-garbage) (NAME cl-syntax-annot FILENAME cl-syntax-annot) (NAME cl-syntax FILENAME cl-syntax) + (NAME cl-postgres FILENAME cl-postgres)) + DEPENDENCIES (trivial-garbage cl-syntax-annot cl-syntax cl-postgres) VERSION cl-dbi-20170124-git SIBLINGS (cl-dbi dbd-mysql dbd-sqlite3 dbi-test dbi)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix index f4c38e485f9..e19565fc277 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz''; sha256 = ''0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj''; }; + + packageName = "dbd-sqlite3"; overrides = x: { postInstall = '' @@ -30,5 +32,6 @@ rec { } /* (SYSTEM dbd-sqlite3 DESCRIPTION Database driver for SQLite3. SHA256 0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj URL http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz MD5 c48d284eda4aac1ff9a10891884f52e5 NAME dbd-sqlite3 TESTNAME NIL FILENAME - dbd-sqlite3 DEPS ((NAME uiop) (NAME sqlite) (NAME cl-syntax-annot) (NAME cl-syntax)) DEPENDENCIES (uiop sqlite cl-syntax-annot cl-syntax) VERSION - cl-dbi-20170124-git SIBLINGS (cl-dbi dbd-mysql dbd-postgres dbi-test dbi)) */ + dbd-sqlite3 DEPS + ((NAME uiop FILENAME uiop) (NAME sqlite FILENAME sqlite) (NAME cl-syntax-annot FILENAME cl-syntax-annot) (NAME cl-syntax FILENAME cl-syntax)) DEPENDENCIES + (uiop sqlite cl-syntax-annot cl-syntax) VERSION cl-dbi-20170124-git SIBLINGS (cl-dbi dbd-mysql dbd-postgres dbi-test dbi)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix index 95672b7296f..54f1cf78e40 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix @@ -1,16 +1,18 @@ args @ { fetchurl, ... }: rec { baseName = ''dexador''; - version = ''20170403-git''; + version = ''20170516-git''; description = ''Yet another HTTP client for Common Lisp''; - deps = [ args."usocket" args."trivial-mimes" args."trivial-gray-streams" args."quri" args."fast-io" args."fast-http" args."cl-reexport" args."cl-ppcre" args."cl-cookie" args."cl-base64" args."cl+ssl" args."chunga" args."chipz" args."bordeaux-threads" args."babel" args."alexandria" ]; + deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/dexador/2017-04-03/dexador-20170403-git.tgz''; - sha256 = ''0lnz36215wccpjgvrv9r7fa1i94jcdyw6q3hlgx9h8b7pwdlcfbn''; + url = ''http://beta.quicklisp.org/archive/dexador/2017-05-16/dexador-20170516-git.tgz''; + sha256 = ''129ar4z972wl3prhzsfy0mb4r41b0j179zs3mglq6gl7awafq8r6''; }; + + packageName = "dexador"; overrides = x: { postInstall = '' @@ -28,12 +30,6 @@ rec { ''; }; } -/* (SYSTEM dexador DESCRIPTION Yet another HTTP client for Common Lisp SHA256 0lnz36215wccpjgvrv9r7fa1i94jcdyw6q3hlgx9h8b7pwdlcfbn URL - http://beta.quicklisp.org/archive/dexador/2017-04-03/dexador-20170403-git.tgz MD5 0330a50a117313dbe0ba3f136b0fa416 NAME dexador TESTNAME NIL FILENAME - dexador DEPS - ((NAME usocket) (NAME trivial-mimes) (NAME trivial-gray-streams) (NAME quri) (NAME fast-io) (NAME fast-http) (NAME cl-reexport) (NAME cl-ppcre) - (NAME cl-cookie) (NAME cl-base64) (NAME cl+ssl) (NAME chunga) (NAME chipz) (NAME bordeaux-threads) (NAME babel) (NAME alexandria)) - DEPENDENCIES - (usocket trivial-mimes trivial-gray-streams quri fast-io fast-http cl-reexport cl-ppcre cl-cookie cl-base64 cl+ssl chunga chipz bordeaux-threads babel - alexandria) - VERSION 20170403-git SIBLINGS (dexador-test)) */ +/* (SYSTEM dexador DESCRIPTION Yet another HTTP client for Common Lisp SHA256 129ar4z972wl3prhzsfy0mb4r41b0j179zs3mglq6gl7awafq8r6 URL + http://beta.quicklisp.org/archive/dexador/2017-05-16/dexador-20170516-git.tgz MD5 463972f0b98fd2a641ce2bfab4400dc7 NAME dexador TESTNAME NIL FILENAME + dexador DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (dexador-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix index 608cd6b3896..993a49bc9f9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/do-urlencode/2013-07-20/do-urlencode-20130720-git.tgz''; sha256 = ''19l4rwqc52w7nrpy994b3n2dcv8pjgc530yn2xmgqlqabpxpz3xa''; }; + + packageName = "do-urlencode"; overrides = x: { postInstall = '' @@ -30,4 +32,5 @@ rec { } /* (SYSTEM do-urlencode DESCRIPTION Percent Encoding (aka URL Encoding) library SHA256 19l4rwqc52w7nrpy994b3n2dcv8pjgc530yn2xmgqlqabpxpz3xa URL http://beta.quicklisp.org/archive/do-urlencode/2013-07-20/do-urlencode-20130720-git.tgz MD5 c8085e138711c225042acf83b4bf0507 NAME do-urlencode TESTNAME NIL - FILENAME do-urlencode DEPS ((NAME babel) (NAME babel-streams)) DEPENDENCIES (babel babel-streams) VERSION 20130720-git SIBLINGS NIL) */ + FILENAME do-urlencode DEPS ((NAME babel FILENAME babel) (NAME babel-streams FILENAME babel-streams)) DEPENDENCIES (babel babel-streams) VERSION + 20130720-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix index 43f6343b7eb..d9bacd96af8 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix @@ -1,16 +1,18 @@ args @ { fetchurl, ... }: rec { baseName = ''documentation-utils''; - version = ''20161204-git''; + version = ''20170516-git''; description = ''A few simple tools to help you with documenting your library.''; - deps = [ args."trivial-indent" ]; + deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/documentation-utils/2016-12-04/documentation-utils-20161204-git.tgz''; - sha256 = ''0vyj5nvy697w2fvp2rb42jxgqah85ivz1hg84amqfi4bvik2npvq''; + url = ''http://beta.quicklisp.org/archive/documentation-utils/2017-05-16/documentation-utils-20170516-git.tgz''; + sha256 = ''0jb6sv85xx0vl8p9qrhfsvz130d4gw6hpgnvw1mx7skhi6zs82s1''; }; + + packageName = "documentation-utils"; overrides = x: { postInstall = '' @@ -29,6 +31,6 @@ rec { }; } /* (SYSTEM documentation-utils DESCRIPTION A few simple tools to help you with documenting your library. SHA256 - 0vyj5nvy697w2fvp2rb42jxgqah85ivz1hg84amqfi4bvik2npvq URL - http://beta.quicklisp.org/archive/documentation-utils/2016-12-04/documentation-utils-20161204-git.tgz MD5 36a233bf438bfc067b074b6a05865c33 NAME - documentation-utils TESTNAME NIL FILENAME documentation-utils DEPS ((NAME trivial-indent)) DEPENDENCIES (trivial-indent) VERSION 20161204-git SIBLINGS NIL) */ + 0jb6sv85xx0vl8p9qrhfsvz130d4gw6hpgnvw1mx7skhi6zs82s1 URL + http://beta.quicklisp.org/archive/documentation-utils/2017-05-16/documentation-utils-20170516-git.tgz MD5 5e04421eb7fd48d8abe1757b5211e310 NAME + documentation-utils TESTNAME NIL FILENAME documentation-utils DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix index 82695e74bfe..16bbac4d03a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/drakma/2015-10-31/drakma-2.0.2.tgz''; sha256 = ''1bpwh19fxd1ncvwai2ab2363bk6qkpwch5sa4csbiawcihyawh2z''; }; + + packageName = "drakma"; overrides = x: { postInstall = '' @@ -30,5 +32,6 @@ rec { } /* (SYSTEM drakma DESCRIPTION Full-featured http/https client based on usocket SHA256 1bpwh19fxd1ncvwai2ab2363bk6qkpwch5sa4csbiawcihyawh2z URL http://beta.quicklisp.org/archive/drakma/2015-10-31/drakma-2.0.2.tgz MD5 eb51e1417c02c912c2b43bd9605dfb50 NAME drakma TESTNAME NIL FILENAME drakma DEPS - ((NAME usocket) (NAME puri) (NAME flexi-streams) (NAME cl-ppcre) (NAME cl-base64) (NAME cl+ssl) (NAME chunga) (NAME chipz)) DEPENDENCIES - (usocket puri flexi-streams cl-ppcre cl-base64 cl+ssl chunga chipz) VERSION 2.0.2 SIBLINGS (drakma-test)) */ + ((NAME usocket FILENAME usocket) (NAME puri FILENAME puri) (NAME flexi-streams FILENAME flexi-streams) (NAME cl-ppcre FILENAME cl-ppcre) + (NAME cl-base64 FILENAME cl-base64) (NAME cl+ssl FILENAME cl+ssl) (NAME chunga FILENAME chunga) (NAME chipz FILENAME chipz)) + DEPENDENCIES (usocket puri flexi-streams cl-ppcre cl-base64 cl+ssl chunga chipz) VERSION 2.0.2 SIBLINGS (drakma-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix new file mode 100644 index 00000000000..283dfe813ac --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''dynamic-classes''; + version = ''20130128-git''; + + description = ''''; + + deps = [ args."metatilities-base" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/dynamic-classes/2013-01-28/dynamic-classes-20130128-git.tgz''; + sha256 = ''0i2b9k8f8jgn86kz503z267w0zv4gdqajzw755xwhqfaknix74sa''; + }; + + packageName = "dynamic-classes"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/dynamic-classes[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM dynamic-classes DESCRIPTION NIL SHA256 0i2b9k8f8jgn86kz503z267w0zv4gdqajzw755xwhqfaknix74sa URL + http://beta.quicklisp.org/archive/dynamic-classes/2013-01-28/dynamic-classes-20130128-git.tgz MD5 a6ed01c4f21df2b6a142328b24ac7ba3 NAME dynamic-classes + TESTNAME NIL FILENAME dynamic-classes DEPS ((NAME metatilities-base FILENAME metatilities-base)) DEPENDENCIES (metatilities-base) VERSION 20130128-git + SIBLINGS (dynamic-classes-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix index 60db24e57d0..49c0ff6c8ce 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix @@ -1,16 +1,18 @@ args @ { fetchurl, ... }: rec { baseName = ''esrap''; - version = ''20170124-git''; + version = ''20170516-git''; description = ''A Packrat / Parsing Grammar / TDPL parser for Common Lisp.''; - deps = [ args."alexandria" ]; + deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/esrap/2017-01-24/esrap-20170124-git.tgz''; - sha256 = ''1182011bbhvkw2qsdqrccl879vf5k7bcda318n0xskk35hzircp8''; + url = ''http://beta.quicklisp.org/archive/esrap/2017-05-16/esrap-20170516-git.tgz''; + sha256 = ''06vksigkiprhmxkms2xfwq8ff09z4i4287k87n0m4id0nfl8rfq8''; }; + + packageName = "esrap"; overrides = x: { postInstall = '' @@ -28,6 +30,6 @@ rec { ''; }; } -/* (SYSTEM esrap DESCRIPTION A Packrat / Parsing Grammar / TDPL parser for Common Lisp. SHA256 1182011bbhvkw2qsdqrccl879vf5k7bcda318n0xskk35hzircp8 URL - http://beta.quicklisp.org/archive/esrap/2017-01-24/esrap-20170124-git.tgz MD5 72f7a7d8e5808586dfd3ab1698e3d11f NAME esrap TESTNAME NIL FILENAME esrap DEPS - ((NAME alexandria)) DEPENDENCIES (alexandria) VERSION 20170124-git SIBLINGS NIL) */ +/* (SYSTEM esrap DESCRIPTION A Packrat / Parsing Grammar / TDPL parser for Common Lisp. SHA256 06vksigkiprhmxkms2xfwq8ff09z4i4287k87n0m4id0nfl8rfq8 URL + http://beta.quicklisp.org/archive/esrap/2017-05-16/esrap-20170516-git.tgz MD5 6116df281050ee58e6ba195727154ac0 NAME esrap TESTNAME NIL FILENAME esrap DEPS + NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix index aa7963f3243..698189fc911 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/external-program/2016-08-25/external-program-20160825-git.tgz''; sha256 = ''0avnnhxxa1wfri9i3m1339nszyp1w2cilycc948nf5awz4mckq13''; }; + + packageName = "external-program"; overrides = x: { postInstall = '' @@ -30,4 +32,5 @@ rec { } /* (SYSTEM external-program DESCRIPTION NIL SHA256 0avnnhxxa1wfri9i3m1339nszyp1w2cilycc948nf5awz4mckq13 URL http://beta.quicklisp.org/archive/external-program/2016-08-25/external-program-20160825-git.tgz MD5 6902724c4f762a17645c46b0a1d8efde NAME external-program - TESTNAME NIL FILENAME external-program DEPS ((NAME trivial-features)) DEPENDENCIES (trivial-features) VERSION 20160825-git SIBLINGS NIL) */ + TESTNAME NIL FILENAME external-program DEPS ((NAME trivial-features FILENAME trivial-features)) DEPENDENCIES (trivial-features) VERSION 20160825-git + SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix index 1f83d562967..7b100d891b9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/fast-http/2017-02-27/fast-http-20170227-git.tgz''; sha256 = ''0kpfn4i5r12hfnb3j00cl9wq5dcl32n3q67lr2qsb6y3giz335hx''; }; + + packageName = "fast-http"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix index 52cbc8ddcdb..0e819493109 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix @@ -1,16 +1,18 @@ args @ { fetchurl, ... }: rec { baseName = ''fast-io''; - version = ''20170124-git''; + version = ''20170516-git''; description = ''Alternative I/O mechanism to a stream or vector''; - deps = [ args."trivial-gray-streams" args."static-vectors" args."alexandria" ]; + deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/fast-io/2017-01-24/fast-io-20170124-git.tgz''; - sha256 = ''0w57iddbpdcchnv3zg7agd3ydm36aw2mni4iasi8wd628gq9a6i2''; + url = ''http://beta.quicklisp.org/archive/fast-io/2017-05-16/fast-io-20170516-git.tgz''; + sha256 = ''1aw7fjvd7bpq2fh99r48f81vhmqczn8f4jk33i9cgpx217gxigm1''; }; + + packageName = "fast-io"; overrides = x: { postInstall = '' @@ -28,7 +30,6 @@ rec { ''; }; } -/* (SYSTEM fast-io DESCRIPTION Alternative I/O mechanism to a stream or vector SHA256 0w57iddbpdcchnv3zg7agd3ydm36aw2mni4iasi8wd628gq9a6i2 URL - http://beta.quicklisp.org/archive/fast-io/2017-01-24/fast-io-20170124-git.tgz MD5 e9fa77c0e75a9f32e56c27ef6861bce2 NAME fast-io TESTNAME NIL FILENAME - fast-io DEPS ((NAME trivial-gray-streams) (NAME static-vectors) (NAME alexandria)) DEPENDENCIES (trivial-gray-streams static-vectors alexandria) VERSION - 20170124-git SIBLINGS (fast-io-test)) */ +/* (SYSTEM fast-io DESCRIPTION Alternative I/O mechanism to a stream or vector SHA256 1aw7fjvd7bpq2fh99r48f81vhmqczn8f4jk33i9cgpx217gxigm1 URL + http://beta.quicklisp.org/archive/fast-io/2017-05-16/fast-io-20170516-git.tgz MD5 a9a96c0f6260271446fd43bf2e51e90f NAME fast-io TESTNAME NIL FILENAME + fast-io DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (fast-io-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix index 2348167ba65..1bb2b6b9c18 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/flexi-streams/2015-07-09/flexi-streams-1.0.15.tgz''; sha256 = ''0zkx335winqs7xigbmxhhkhcsfa9hjhf1q6r4q710y29fbhpc37p''; }; + + packageName = "flexi-streams"; overrides = x: { postInstall = '' @@ -30,4 +32,4 @@ rec { } /* (SYSTEM flexi-streams DESCRIPTION Flexible bivalent streams for Common Lisp SHA256 0zkx335winqs7xigbmxhhkhcsfa9hjhf1q6r4q710y29fbhpc37p URL http://beta.quicklisp.org/archive/flexi-streams/2015-07-09/flexi-streams-1.0.15.tgz MD5 02dbb5a0c5f982e0c7a88aad9a25004e NAME flexi-streams TESTNAME NIL - FILENAME flexi-streams DEPS ((NAME trivial-gray-streams)) DEPENDENCIES (trivial-gray-streams) VERSION 1.0.15 SIBLINGS NIL) */ + FILENAME flexi-streams DEPS ((NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES (trivial-gray-streams) VERSION 1.0.15 SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix index e12f3efb59a..754d2f8c869 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix @@ -1,16 +1,18 @@ args @ { fetchurl, ... }: rec { baseName = ''form-fiddle''; - version = ''20160929-git''; + version = ''20170516-git''; description = ''A collection of utilities to destructure lambda forms.''; - deps = [ args."documentation-utils" ]; + deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/form-fiddle/2016-09-29/form-fiddle-20160929-git.tgz''; - sha256 = ''1lmdxvwh0d81jlkc9qq2cw0bizjbmk7f5fjcb8ps65andfyj9bd7''; + url = ''http://beta.quicklisp.org/archive/form-fiddle/2017-05-16/form-fiddle-20170516-git.tgz''; + sha256 = ''00h38gh8absx9pclwlxgknbmbnj20sngkzaj2qa6whg5kgbgj4fh''; }; + + packageName = "form-fiddle"; overrides = x: { postInstall = '' @@ -28,6 +30,6 @@ rec { ''; }; } -/* (SYSTEM form-fiddle DESCRIPTION A collection of utilities to destructure lambda forms. SHA256 1lmdxvwh0d81jlkc9qq2cw0bizjbmk7f5fjcb8ps65andfyj9bd7 URL - http://beta.quicklisp.org/archive/form-fiddle/2016-09-29/form-fiddle-20160929-git.tgz MD5 d7c363b70125a65d909419b78fa7dc24 NAME form-fiddle TESTNAME NIL - FILENAME form-fiddle DEPS ((NAME documentation-utils)) DEPENDENCIES (documentation-utils) VERSION 20160929-git SIBLINGS NIL) */ +/* (SYSTEM form-fiddle DESCRIPTION A collection of utilities to destructure lambda forms. SHA256 00h38gh8absx9pclwlxgknbmbnj20sngkzaj2qa6whg5kgbgj4fh URL + http://beta.quicklisp.org/archive/form-fiddle/2017-05-16/form-fiddle-20170516-git.tgz MD5 8f0d8b920f6da0c7fd939b7096c30235 NAME form-fiddle TESTNAME NIL + FILENAME form-fiddle DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix new file mode 100644 index 00000000000..72403e8598a --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''garbage-pools''; + version = ''20130720-git''; + + description = ''''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/garbage-pools/2013-07-20/garbage-pools-20130720-git.tgz''; + sha256 = ''1idnba1pxayn0k5yzqp9lswg7ywjhavi59lrdnphfqajjpyi9w05''; + }; + + packageName = "garbage-pools"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/garbage-pools[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM garbage-pools DESCRIPTION NIL SHA256 1idnba1pxayn0k5yzqp9lswg7ywjhavi59lrdnphfqajjpyi9w05 URL + http://beta.quicklisp.org/archive/garbage-pools/2013-07-20/garbage-pools-20130720-git.tgz MD5 f691e2ddf6ba22b3451c24b61d4ee8b6 NAME garbage-pools TESTNAME + NIL FILENAME garbage-pools DEPS NIL DEPENDENCIES NIL VERSION 20130720-git SIBLINGS (garbage-pools-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix index ed38c44b0c1..e6510c59c30 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/http-body/2016-12-04/http-body-20161204-git.tgz''; sha256 = ''1y50yipsbl4j99igmfi83pr7p56hb31dcplpy05fp5alkb5rv0gi''; }; + + packageName = "http-body"; overrides = x: { postInstall = '' @@ -31,5 +33,7 @@ rec { /* (SYSTEM http-body DESCRIPTION HTTP POST data parser for Common Lisp SHA256 1y50yipsbl4j99igmfi83pr7p56hb31dcplpy05fp5alkb5rv0gi URL http://beta.quicklisp.org/archive/http-body/2016-12-04/http-body-20161204-git.tgz MD5 6eda50cf89aa3b6a8e9ccaf324734a0e NAME http-body TESTNAME NIL FILENAME http-body DEPS - ((NAME trivial-gray-streams) (NAME quri) (NAME jonathan) (NAME flexi-streams) (NAME fast-http) (NAME cl-utilities) (NAME cl-ppcre) (NAME babel)) + ((NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME quri FILENAME quri) (NAME jonathan FILENAME jonathan) + (NAME flexi-streams FILENAME flexi-streams) (NAME fast-http FILENAME fast-http) (NAME cl-utilities FILENAME cl-utilities) + (NAME cl-ppcre FILENAME cl-ppcre) (NAME babel FILENAME babel)) DEPENDENCIES (trivial-gray-streams quri jonathan flexi-streams fast-http cl-utilities cl-ppcre babel) VERSION 20161204-git SIBLINGS (http-body-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.asdf.nix index c37de8f6f8d..f36b4e931ec 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.asdf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.asdf.nix @@ -1,16 +1,18 @@ args @ { fetchurl, ... }: rec { baseName = ''hu.dwim.asdf''; - version = ''20170403-darcs''; + version = ''20170516-darcs''; description = ''Various ASDF extensions such as attached test and documentation system, explicit development support, etc.''; - deps = [ args."uiop" ]; + deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-04-03/hu.dwim.asdf-20170403-darcs.tgz''; - sha256 = ''0avhfdg2ypv0cnwzihq64zwd562c4ls4bx6014mwgdfggp4b00ll''; + url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-05-16/hu.dwim.asdf-20170516-darcs.tgz''; + sha256 = ''0ky8xby4zkqslgcb4glns8g4v8fzijx4v1888kil3ncxbvz0aqpw''; }; + + packageName = "hu.dwim.asdf"; overrides = x: { postInstall = '' @@ -29,6 +31,6 @@ rec { }; } /* (SYSTEM hu.dwim.asdf DESCRIPTION Various ASDF extensions such as attached test and documentation system, explicit development support, etc. SHA256 - 0avhfdg2ypv0cnwzihq64zwd562c4ls4bx6014mwgdfggp4b00ll URL http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-04-03/hu.dwim.asdf-20170403-darcs.tgz MD5 - 53cbeb56a8ee066116069d80c7fc3f65 NAME hu.dwim.asdf TESTNAME NIL FILENAME hu.dwim.asdf DEPS ((NAME uiop)) DEPENDENCIES (uiop) VERSION 20170403-darcs - SIBLINGS (hu.dwim.asdf.documentation)) */ + 0ky8xby4zkqslgcb4glns8g4v8fzijx4v1888kil3ncxbvz0aqpw URL http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-05-16/hu.dwim.asdf-20170516-darcs.tgz MD5 + 041447371d36ceb17f58854671c052f1 NAME hu.dwim.asdf TESTNAME NIL FILENAME hu.dwim.asdf DEPS NIL DEPENDENCIES NIL VERSION 20170516-darcs SIBLINGS + (hu.dwim.asdf.documentation)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.def.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.def.nix index 0649edb6fd3..2aedd0f6704 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.def.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.def.nix @@ -1,16 +1,18 @@ args @ { fetchurl, ... }: rec { baseName = ''hu.dwim.def''; - version = ''20161204-darcs''; + version = ''20170516-darcs''; description = ''General purpose, homogenous, extensible definer macro.''; - deps = [ args."metabang-bind" args."iterate" args."hu.dwim.asdf" args."anaphora" args."alexandria" ]; + deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/hu.dwim.def/2016-12-04/hu.dwim.def-20161204-darcs.tgz''; - sha256 = ''0znvcm4zi8rivyk0s840v8jaa52hzdiql88pk8hnaj8abxkvl3lj''; + url = ''http://beta.quicklisp.org/archive/hu.dwim.def/2017-05-16/hu.dwim.def-20170516-darcs.tgz''; + sha256 = ''1x333jiihgqydv234q8wjsy5n8nfr6n4mpwq08f1b497if4fc7by''; }; + + packageName = "hu.dwim.def"; overrides = x: { postInstall = '' @@ -28,9 +30,8 @@ rec { ''; }; } -/* (SYSTEM hu.dwim.def DESCRIPTION General purpose, homogenous, extensible definer macro. SHA256 0znvcm4zi8rivyk0s840v8jaa52hzdiql88pk8hnaj8abxkvl3lj URL - http://beta.quicklisp.org/archive/hu.dwim.def/2016-12-04/hu.dwim.def-20161204-darcs.tgz MD5 c4a85c220873a9edd1c2c49a6498baca NAME hu.dwim.def TESTNAME NIL - FILENAME hu.dwim.def DEPS ((NAME metabang-bind) (NAME iterate) (NAME hu.dwim.asdf) (NAME anaphora) (NAME alexandria)) DEPENDENCIES - (metabang-bind iterate hu.dwim.asdf anaphora alexandria) VERSION 20161204-darcs SIBLINGS +/* (SYSTEM hu.dwim.def DESCRIPTION General purpose, homogenous, extensible definer macro. SHA256 1x333jiihgqydv234q8wjsy5n8nfr6n4mpwq08f1b497if4fc7by URL + http://beta.quicklisp.org/archive/hu.dwim.def/2017-05-16/hu.dwim.def-20170516-darcs.tgz MD5 bd13311ab8da2a67f9247e825369b294 NAME hu.dwim.def TESTNAME NIL + FILENAME hu.dwim.def DEPS NIL DEPENDENCIES NIL VERSION 20170516-darcs SIBLINGS (hu.dwim.def+cl-l10n hu.dwim.def+contextl hu.dwim.def+hu.dwim.common hu.dwim.def+hu.dwim.delico hu.dwim.def+swank hu.dwim.def.documentation hu.dwim.def.namespace hu.dwim.def.test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix new file mode 100644 index 00000000000..b358ff0562d --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''hu_dot_dwim_dot_asdf''; + version = ''20170516-darcs''; + + description = ''Various ASDF extensions such as attached test and documentation system, explicit development support, etc.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-05-16/hu.dwim.asdf-20170516-darcs.tgz''; + sha256 = ''0ky8xby4zkqslgcb4glns8g4v8fzijx4v1888kil3ncxbvz0aqpw''; + }; + + packageName = "hu.dwim.asdf"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/hu.dwim.asdf[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM hu.dwim.asdf DESCRIPTION Various ASDF extensions such as attached test and documentation system, explicit development support, etc. SHA256 + 0ky8xby4zkqslgcb4glns8g4v8fzijx4v1888kil3ncxbvz0aqpw URL http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-05-16/hu.dwim.asdf-20170516-darcs.tgz MD5 + 041447371d36ceb17f58854671c052f1 NAME hu.dwim.asdf TESTNAME NIL FILENAME hu_dot_dwim_dot_asdf DEPS NIL DEPENDENCIES NIL VERSION 20170516-darcs SIBLINGS + (hu.dwim.asdf.documentation)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_def.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_def.nix new file mode 100644 index 00000000000..5e5e56be2e5 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_def.nix @@ -0,0 +1,37 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''hu_dot_dwim_dot_def''; + version = ''20170516-darcs''; + + description = ''General purpose, homogenous, extensible definer macro.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/hu.dwim.def/2017-05-16/hu.dwim.def-20170516-darcs.tgz''; + sha256 = ''1x333jiihgqydv234q8wjsy5n8nfr6n4mpwq08f1b497if4fc7by''; + }; + + packageName = "hu.dwim.def"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/hu.dwim.def[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM hu.dwim.def DESCRIPTION General purpose, homogenous, extensible definer macro. SHA256 1x333jiihgqydv234q8wjsy5n8nfr6n4mpwq08f1b497if4fc7by URL + http://beta.quicklisp.org/archive/hu.dwim.def/2017-05-16/hu.dwim.def-20170516-darcs.tgz MD5 bd13311ab8da2a67f9247e825369b294 NAME hu.dwim.def TESTNAME NIL + FILENAME hu_dot_dwim_dot_def DEPS NIL DEPENDENCIES NIL VERSION 20170516-darcs SIBLINGS + (hu.dwim.def+cl-l10n hu.dwim.def+contextl hu.dwim.def+hu.dwim.common hu.dwim.def+hu.dwim.delico hu.dwim.def+swank hu.dwim.def.documentation + hu.dwim.def.namespace hu.dwim.def.test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix index e77e977ea3f..e0a2d194f9e 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix @@ -14,6 +14,8 @@ rec { url = ''http://beta.quicklisp.org/archive/hunchentoot/2016-03-18/hunchentoot-1.2.35.tgz''; sha256 = ''0gp2rgndkijjydb1x3p8414ii1z372gzdy945jy0491bcbhygj74''; }; + + packageName = "hunchentoot"; overrides = x: { postInstall = '' @@ -37,6 +39,7 @@ rec { through subclassing. SHA256 0gp2rgndkijjydb1x3p8414ii1z372gzdy945jy0491bcbhygj74 URL http://beta.quicklisp.org/archive/hunchentoot/2016-03-18/hunchentoot-1.2.35.tgz MD5 d1ce17dec454cab119c0f263e8a176d1 NAME hunchentoot TESTNAME NIL FILENAME hunchentoot DEPS - ((NAME bordeaux-threads) (NAME chunga) (NAME cl+ssl) (NAME cl-base64) (NAME cl-fad) (NAME cl-ppcre) (NAME flexi-streams) (NAME md5) (NAME rfc2388) - (NAME trivial-backtrace) (NAME usocket)) + ((NAME bordeaux-threads FILENAME bordeaux-threads) (NAME chunga FILENAME chunga) (NAME cl+ssl FILENAME cl+ssl) (NAME cl-base64 FILENAME cl-base64) + (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre) (NAME flexi-streams FILENAME flexi-streams) (NAME md5 FILENAME md5) + (NAME rfc2388 FILENAME rfc2388) (NAME trivial-backtrace FILENAME trivial-backtrace) (NAME usocket FILENAME usocket)) DEPENDENCIES (bordeaux-threads chunga cl+ssl cl-base64 cl-fad cl-ppcre flexi-streams md5 rfc2388 trivial-backtrace usocket) VERSION 1.2.35 SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix index ea7dd30df0b..d849cf15272 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/idna/2012-01-07/idna-20120107-git.tgz''; sha256 = ''0q9hja9v5q7z89p0bzm2whchn05hymn3255fr5zj3fkja8akma5c''; }; + + packageName = "idna"; overrides = x: { postInstall = '' @@ -30,4 +32,4 @@ rec { } /* (SYSTEM idna DESCRIPTION IDNA (international domain names) string encoding and decoding routines SHA256 0q9hja9v5q7z89p0bzm2whchn05hymn3255fr5zj3fkja8akma5c URL http://beta.quicklisp.org/archive/idna/2012-01-07/idna-20120107-git.tgz MD5 85b91a66efe4381bf116cdb5d2b756b6 NAME idna TESTNAME NIL FILENAME idna DEPS - ((NAME split-sequence)) DEPENDENCIES (split-sequence) VERSION 20120107-git SIBLINGS NIL) */ + ((NAME split-sequence FILENAME split-sequence)) DEPENDENCIES (split-sequence) VERSION 20120107-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix new file mode 100644 index 00000000000..fb106aa54c5 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''ieee-floats''; + version = ''20160318-git''; + + description = ''''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/ieee-floats/2016-03-18/ieee-floats-20160318-git.tgz''; + sha256 = ''0vw4q6q5yygfxfwx5bki4kl9lqszmhnplcl55qh8raxmb03alyx4''; + }; + + packageName = "ieee-floats"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/ieee-floats[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM ieee-floats DESCRIPTION NIL SHA256 0vw4q6q5yygfxfwx5bki4kl9lqszmhnplcl55qh8raxmb03alyx4 URL + http://beta.quicklisp.org/archive/ieee-floats/2016-03-18/ieee-floats-20160318-git.tgz MD5 84d679a4dffddc3b0cff944adde623c5 NAME ieee-floats TESTNAME NIL + FILENAME ieee-floats DEPS NIL DEPENDENCIES NIL VERSION 20160318-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix index 55dd6b2a373..404c7a5dee9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix @@ -1,16 +1,18 @@ args @ { fetchurl, ... }: rec { baseName = ''iolib''; - version = ''v0.8.1''; + version = ''v0.8.2''; description = ''I/O library.''; - deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."idna" args."split-sequence" args."swap-bytes" args."trivial-features" args."uiop" ]; + deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/iolib/2016-03-18/iolib-v0.8.1.tgz''; - sha256 = ''090xmjzyx5d7arpk9g0fsyblwh6myq2d1cb7w52r3zy1394c9481''; + url = ''http://beta.quicklisp.org/archive/iolib/2017-05-16/iolib-v0.8.2.tgz''; + sha256 = ''1k0wkkgzy6fmq28dw6xbx86l1j9x3nrmrzpv6jcmcdb078h820pr''; }; + + packageName = "iolib"; overrides = x: { postInstall = '' @@ -28,8 +30,6 @@ rec { ''; }; } -/* (SYSTEM iolib DESCRIPTION I/O library. SHA256 090xmjzyx5d7arpk9g0fsyblwh6myq2d1cb7w52r3zy1394c9481 URL - http://beta.quicklisp.org/archive/iolib/2016-03-18/iolib-v0.8.1.tgz MD5 cd34c4f7db4af7391757ebc3f4f61422 NAME iolib TESTNAME NIL FILENAME iolib DEPS - ((NAME alexandria) (NAME babel) (NAME bordeaux-threads) (NAME cffi) (NAME idna) (NAME split-sequence) (NAME swap-bytes) (NAME trivial-features) - (NAME uiop)) - DEPENDENCIES (alexandria babel bordeaux-threads cffi idna split-sequence swap-bytes trivial-features uiop) VERSION v0.8.1 SIBLINGS NIL) */ +/* (SYSTEM iolib DESCRIPTION I/O library. SHA256 1k0wkkgzy6fmq28dw6xbx86l1j9x3nrmrzpv6jcmcdb078h820pr URL + http://beta.quicklisp.org/archive/iolib/2017-05-16/iolib-v0.8.2.tgz MD5 cd2d4d2893b7e6d0502d9a16e717a2e9 NAME iolib TESTNAME NIL FILENAME iolib DEPS NIL + DEPENDENCIES NIL VERSION v0.8.2 SIBLINGS (iolib.asdf iolib.base iolib.common-lisp iolib.conf iolib.examples iolib.grovel iolib.tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix index de5528bca5e..944781947fa 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix @@ -1,16 +1,18 @@ args @ { fetchurl, ... }: rec { baseName = ''ironclad''; - version = ''ironclad_0.33.0''; + version = ''v0.34''; description = ''A cryptographic toolkit written in pure Common Lisp''; - deps = [ args."nibbles" ]; + deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/ironclad/2014-11-06/ironclad_0.33.0.tgz''; - sha256 = ''1ld0xz8gmi566zxl1cva5yi86aw1wb6i6446gxxdw1lisxx3xwz7''; + url = ''http://beta.quicklisp.org/archive/ironclad/2017-05-16/ironclad-v0.34.tgz''; + sha256 = ''08xlnzs7hzbr0sa4aff4xb0b60dxcpad7fb5xsnjn3qjs7yydxk0''; }; + + packageName = "ironclad"; overrides = x: { postInstall = '' @@ -28,6 +30,6 @@ rec { ''; }; } -/* (SYSTEM ironclad DESCRIPTION A cryptographic toolkit written in pure Common Lisp SHA256 1ld0xz8gmi566zxl1cva5yi86aw1wb6i6446gxxdw1lisxx3xwz7 URL - http://beta.quicklisp.org/archive/ironclad/2014-11-06/ironclad_0.33.0.tgz MD5 2b7befe607e2fedffbdd45b2443db718 NAME ironclad TESTNAME NIL FILENAME ironclad - DEPS ((NAME nibbles)) DEPENDENCIES (nibbles) VERSION ironclad_0.33.0 SIBLINGS (ironclad-text)) */ +/* (SYSTEM ironclad DESCRIPTION A cryptographic toolkit written in pure Common Lisp SHA256 08xlnzs7hzbr0sa4aff4xb0b60dxcpad7fb5xsnjn3qjs7yydxk0 URL + http://beta.quicklisp.org/archive/ironclad/2017-05-16/ironclad-v0.34.tgz MD5 82db632975aa83b0dce3412c1aff4a80 NAME ironclad TESTNAME NIL FILENAME ironclad + DEPS NIL DEPENDENCIES NIL VERSION v0.34 SIBLINGS (ironclad-text)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix index 446b54a455a..5e02dceb84c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/iterate/2016-08-25/iterate-20160825-darcs.tgz''; sha256 = ''0kvz16gnxnkdz0fy1x8y5yr28nfm7i2qpvix7mgwccdpjmsb4pgm''; }; + + packageName = "iterate"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix new file mode 100644 index 00000000000..3d2da3fa6bc --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''ixf''; + version = ''cl-20170516-git''; + + description = ''Tools to handle IBM PC version of IXF file format''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-ixf/2017-05-16/cl-ixf-20170516-git.tgz''; + sha256 = ''0x32zlayynfj6g676afl0zna63jcgf333n3izapa84y5zgqp3nwf''; + }; + + packageName = "ixf"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/ixf[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM ixf DESCRIPTION Tools to handle IBM PC version of IXF file format SHA256 0x32zlayynfj6g676afl0zna63jcgf333n3izapa84y5zgqp3nwf URL + http://beta.quicklisp.org/archive/cl-ixf/2017-05-16/cl-ixf-20170516-git.tgz MD5 1c4c5ff76bb6fa9c19fe47d064c512b9 NAME ixf TESTNAME NIL FILENAME ixf DEPS + NIL DEPENDENCIES NIL VERSION cl-20170516-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix index 905a14b785c..841c210a5ae 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix @@ -1,16 +1,18 @@ args @ { fetchurl, ... }: rec { baseName = ''jonathan''; - version = ''20170124-git''; + version = ''20170516-git''; description = ''High performance JSON encoder and decoder. Currently support: SBCL, CCL.''; - deps = [ args."trivial-types" args."proc-parse" args."fast-io" args."cl-syntax-annot" args."cl-syntax" args."cl-ppcre" args."cl-annot" args."babel" ]; + deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/jonathan/2017-01-24/jonathan-20170124-git.tgz''; - sha256 = ''1r54w7i1fxaqz6q7idamcy3bvsg0pvfjcs2qq4dag519zwcpln5l''; + url = ''http://beta.quicklisp.org/archive/jonathan/2017-05-16/jonathan-20170516-git.tgz''; + sha256 = ''00bpmarfhcms2nnghyhh02ci9rjpjvzlmy2fdvlybfmv9d48lq3q''; }; + + packageName = "jonathan"; overrides = x: { postInstall = '' @@ -29,7 +31,5 @@ rec { }; } /* (SYSTEM jonathan DESCRIPTION High performance JSON encoder and decoder. Currently support: SBCL, CCL. SHA256 - 1r54w7i1fxaqz6q7idamcy3bvsg0pvfjcs2qq4dag519zwcpln5l URL http://beta.quicklisp.org/archive/jonathan/2017-01-24/jonathan-20170124-git.tgz MD5 - f33377a22a3b1d948f294985acec20ad NAME jonathan TESTNAME NIL FILENAME jonathan DEPS - ((NAME trivial-types) (NAME proc-parse) (NAME fast-io) (NAME cl-syntax-annot) (NAME cl-syntax) (NAME cl-ppcre) (NAME cl-annot) (NAME babel)) DEPENDENCIES - (trivial-types proc-parse fast-io cl-syntax-annot cl-syntax cl-ppcre cl-annot babel) VERSION 20170124-git SIBLINGS (jonathan-test)) */ + 00bpmarfhcms2nnghyhh02ci9rjpjvzlmy2fdvlybfmv9d48lq3q URL http://beta.quicklisp.org/archive/jonathan/2017-05-16/jonathan-20170516-git.tgz MD5 + b05ccc0140e70636240f216fdc14e4d3 NAME jonathan TESTNAME NIL FILENAME jonathan DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (jonathan-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix deleted file mode 100644 index ba24d7dd78c..00000000000 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix +++ /dev/null @@ -1,37 +0,0 @@ -args @ { fetchurl, ... }: -rec { - baseName = ''lack-middleware-backtrace''; - version = ''lack-20161204-git''; - - description = ''''; - - deps = [ args."uiop" ]; - - src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz''; - sha256 = ''10bnpgbh5nk9lw1xywmvh5661rq91v8sp43ds53x98865ni7flnv''; - }; - - overrides = x: { - postInstall = '' - find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/lack-middleware-backtrace[.]asd${"$"}' | - while read f; do - env -i \ - NIX_LISP="$NIX_LISP" \ - NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn - (asdf:load-system :$(basename "$f" .asd)) - (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) - (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) - )'" \ - "$out"/bin/*-lisp-launcher.sh || - mv "$f"{,.sibling}; done || true - ''; - }; -} -/* (SYSTEM lack-middleware-backtrace DESCRIPTION NIL SHA256 10bnpgbh5nk9lw1xywmvh5661rq91v8sp43ds53x98865ni7flnv URL - http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz MD5 bef444eeadf759226539318bee9f0ab5 NAME lack-middleware-backtrace TESTNAME NIL - FILENAME lack-middleware-backtrace DEPS ((NAME uiop)) DEPENDENCIES (uiop) VERSION lack-20161204-git SIBLINGS - (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-csrf lack-middleware-mount lack-middleware-session - lack-middleware-static lack-request lack-response lack-session-store-dbi lack-session-store-redis lack-test lack-util-writer-stream lack-util lack - t-lack-component t-lack-middleware-accesslog t-lack-middleware-auth-basic t-lack-middleware-backtrace t-lack-middleware-csrf t-lack-middleware-mount - t-lack-middleware-session t-lack-middleware-static t-lack-request t-lack-session-store-dbi t-lack-session-store-redis t-lack-util t-lack)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix deleted file mode 100644 index 9b60f52c87f..00000000000 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix +++ /dev/null @@ -1,38 +0,0 @@ -args @ { fetchurl, ... }: -rec { - baseName = ''lack-util''; - version = ''lack-20161204-git''; - - description = ''''; - - deps = [ args."ironclad" ]; - - src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz''; - sha256 = ''10bnpgbh5nk9lw1xywmvh5661rq91v8sp43ds53x98865ni7flnv''; - }; - - overrides = x: { - postInstall = '' - find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/lack-util[.]asd${"$"}' | - while read f; do - env -i \ - NIX_LISP="$NIX_LISP" \ - NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn - (asdf:load-system :$(basename "$f" .asd)) - (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) - (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) - )'" \ - "$out"/bin/*-lisp-launcher.sh || - mv "$f"{,.sibling}; done || true - ''; - }; -} -/* (SYSTEM lack-util DESCRIPTION NIL SHA256 10bnpgbh5nk9lw1xywmvh5661rq91v8sp43ds53x98865ni7flnv URL - http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz MD5 bef444eeadf759226539318bee9f0ab5 NAME lack-util TESTNAME NIL FILENAME lack-util - DEPS ((NAME ironclad)) DEPENDENCIES (ironclad) VERSION lack-20161204-git SIBLINGS - (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount - lack-middleware-session lack-middleware-static lack-request lack-response lack-session-store-dbi lack-session-store-redis lack-test - lack-util-writer-stream lack t-lack-component t-lack-middleware-accesslog t-lack-middleware-auth-basic t-lack-middleware-backtrace t-lack-middleware-csrf - t-lack-middleware-mount t-lack-middleware-session t-lack-middleware-static t-lack-request t-lack-session-store-dbi t-lack-session-store-redis t-lack-util - t-lack)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix index ceed4365966..2e8c2fe291f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz''; sha256 = ''10bnpgbh5nk9lw1xywmvh5661rq91v8sp43ds53x98865ni7flnv''; }; + + packageName = "lack"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix index c01500f0c3d..4082abbe656 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/let-plus/2017-01-24/let-plus-20170124-git.tgz''; sha256 = ''1hfsw4g36vccz2lx6gk375arjj6y85yh9ch3pq7yiybjlxx68xi8''; }; + + packageName = "let-plus"; overrides = x: { postInstall = '' @@ -30,4 +32,5 @@ rec { } /* (SYSTEM let-plus DESCRIPTION Destructuring extension of LET*. SHA256 1hfsw4g36vccz2lx6gk375arjj6y85yh9ch3pq7yiybjlxx68xi8 URL http://beta.quicklisp.org/archive/let-plus/2017-01-24/let-plus-20170124-git.tgz MD5 1180608e4da53f3866a99d4cca72e3b1 NAME let-plus TESTNAME NIL FILENAME - let-plus DEPS ((NAME alexandria) (NAME anaphora)) DEPENDENCIES (alexandria anaphora) VERSION 20170124-git SIBLINGS NIL) */ + let-plus DEPS ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)) DEPENDENCIES (alexandria anaphora) VERSION 20170124-git SIBLINGS + NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix index 9d4aa874d4c..f35ba345d1b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/lev/2015-05-05/lev-20150505-git.tgz''; sha256 = ''0lkkzb221ks4f0qjgh6pr5lyvb4884a87p96ir4m36x411pyk5xl''; }; + + packageName = "lev"; overrides = x: { postInstall = '' @@ -30,4 +32,4 @@ rec { } /* (SYSTEM lev DESCRIPTION libev bindings for Common Lisp SHA256 0lkkzb221ks4f0qjgh6pr5lyvb4884a87p96ir4m36x411pyk5xl URL http://beta.quicklisp.org/archive/lev/2015-05-05/lev-20150505-git.tgz MD5 10f340f7500beb98b5c0d4a9876131fb NAME lev TESTNAME NIL FILENAME lev DEPS - ((NAME cffi)) DEPENDENCIES (cffi) VERSION 20150505-git SIBLINGS NIL) */ + ((NAME cffi FILENAME cffi)) DEPENDENCIES (cffi) VERSION 20150505-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix new file mode 100644 index 00000000000..720afedb815 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''list-of''; + version = ''asdf-finalizers-20170403-git''; + + description = ''magic list-of deftype''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/asdf-finalizers/2017-04-03/asdf-finalizers-20170403-git.tgz''; + sha256 = ''1w2ka0123icbjba7ngdd6h93j72g236h6jw4bsmvsak69fj0ybxj''; + }; + + packageName = "list-of"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/list-of[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM list-of DESCRIPTION magic list-of deftype SHA256 1w2ka0123icbjba7ngdd6h93j72g236h6jw4bsmvsak69fj0ybxj URL + http://beta.quicklisp.org/archive/asdf-finalizers/2017-04-03/asdf-finalizers-20170403-git.tgz MD5 a9e3c960e6b6fdbd69640b520ef8044b NAME list-of TESTNAME + NIL FILENAME list-of DEPS NIL DEPENDENCIES NIL VERSION asdf-finalizers-20170403-git SIBLINGS (asdf-finalizers-test asdf-finalizers)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix index e2e7e71aadd..0740ec0779f 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix @@ -1,16 +1,18 @@ args @ { fetchurl, ... }: rec { baseName = ''local-time''; - version = ''20170124-git''; + version = ''20170516-git''; description = ''A library for manipulating dates and times, based on a paper by Erik Naggum''; - deps = [ args."cl-fad" ]; + deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/local-time/2017-01-24/local-time-20170124-git.tgz''; - sha256 = ''0nf21bhclr2cwpflf733wn6hr6mcz94dr796jk91f0ck28nf7ab1''; + url = ''http://beta.quicklisp.org/archive/local-time/2017-05-16/local-time-20170516-git.tgz''; + sha256 = ''0qqy13pc3mqy4vkrvyfvg66n80kzxga5iax2ps0150ir61hwz35p''; }; + + packageName = "local-time"; overrides = x: { postInstall = '' @@ -29,6 +31,6 @@ rec { }; } /* (SYSTEM local-time DESCRIPTION A library for manipulating dates and times, based on a paper by Erik Naggum SHA256 - 0nf21bhclr2cwpflf733wn6hr6mcz94dr796jk91f0ck28nf7ab1 URL http://beta.quicklisp.org/archive/local-time/2017-01-24/local-time-20170124-git.tgz MD5 - b345e5e74186eeddb85233df91d0dfe9 NAME local-time TESTNAME NIL FILENAME local-time DEPS ((NAME cl-fad)) DEPENDENCIES (cl-fad) VERSION 20170124-git SIBLINGS + 0qqy13pc3mqy4vkrvyfvg66n80kzxga5iax2ps0150ir61hwz35p URL http://beta.quicklisp.org/archive/local-time/2017-05-16/local-time-20170516-git.tgz MD5 + b2f5b94458f34f4b73cdd614e1304a9a NAME local-time TESTNAME NIL FILENAME local-time DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (cl-postgres+local-time local-time.test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix new file mode 100644 index 00000000000..a8d9d94c664 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''lparallel''; + version = ''20160825-git''; + + description = ''Parallelism for Common Lisp''; + + deps = [ args."bordeaux-threads" args."alexandria" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/lparallel/2016-08-25/lparallel-20160825-git.tgz''; + sha256 = ''0wwwwszbj6m0b2rsp8mpn4m6y7xk448bw8fb7gy0ggmsdfgchfr1''; + }; + + packageName = "lparallel"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/lparallel[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM lparallel DESCRIPTION Parallelism for Common Lisp SHA256 0wwwwszbj6m0b2rsp8mpn4m6y7xk448bw8fb7gy0ggmsdfgchfr1 URL + http://beta.quicklisp.org/archive/lparallel/2016-08-25/lparallel-20160825-git.tgz MD5 6393e8d0c0cc9ed1c88b6e7cca8de5df NAME lparallel TESTNAME NIL FILENAME + lparallel DEPS ((NAME bordeaux-threads FILENAME bordeaux-threads) (NAME alexandria FILENAME alexandria)) DEPENDENCIES (bordeaux-threads alexandria) VERSION + 20160825-git SIBLINGS (lparallel-bench lparallel-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix index 473581c3184..51c8af197fc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix @@ -1,16 +1,18 @@ args @ { fetchurl, ... }: rec { baseName = ''lquery''; - version = ''20160929-git''; + version = ''20170516-git''; description = ''A library to allow jQuery-like HTML/DOM manipulation.''; - deps = [ args."plump" args."form-fiddle" args."clss" args."array-utils" ]; + deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/lquery/2016-09-29/lquery-20160929-git.tgz''; - sha256 = ''1kqc0n4zh44yay9vbv6wirk3122q7if2999146lrgada5fy17r7x''; + url = ''http://beta.quicklisp.org/archive/lquery/2017-05-16/lquery-20170516-git.tgz''; + sha256 = ''11i6kwz4d8918a32z826v85qs2alpsfkvlcha4j7mnbfnzgy7gy7''; }; + + packageName = "lquery"; overrides = x: { postInstall = '' @@ -28,7 +30,6 @@ rec { ''; }; } -/* (SYSTEM lquery DESCRIPTION A library to allow jQuery-like HTML/DOM manipulation. SHA256 1kqc0n4zh44yay9vbv6wirk3122q7if2999146lrgada5fy17r7x URL - http://beta.quicklisp.org/archive/lquery/2016-09-29/lquery-20160929-git.tgz MD5 072a796075862c96dcd6f227d79dc2b7 NAME lquery TESTNAME NIL FILENAME lquery - DEPS ((NAME plump) (NAME form-fiddle) (NAME clss) (NAME array-utils)) DEPENDENCIES (plump form-fiddle clss array-utils) VERSION 20160929-git SIBLINGS - (lquery-test)) */ +/* (SYSTEM lquery DESCRIPTION A library to allow jQuery-like HTML/DOM manipulation. SHA256 11i6kwz4d8918a32z826v85qs2alpsfkvlcha4j7mnbfnzgy7gy7 URL + http://beta.quicklisp.org/archive/lquery/2017-05-16/lquery-20170516-git.tgz MD5 2190045b167685bfffdd01f5af9aa9a1 NAME lquery TESTNAME NIL FILENAME lquery + DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (lquery-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix index ad159edc5c9..b5c242530fe 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/map-set/2016-06-28/map-set-20160628-hg.tgz''; sha256 = ''15fbha43a5153ah836djp9dbg41728adjrzwryv68gcqs31rjk9v''; }; + + packageName = "map-set"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix index cb5041b6029..5729c898fdc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cl-marshal/2017-01-24/cl-marshal-20170124-git.tgz''; sha256 = ''0z43m3jspl4c4fcbbxm58hxd9k69308pyijgj7grmq6mirkq664d''; }; + + packageName = "marshal"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix index a24e9d99a2c..1384799d242 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix @@ -1,16 +1,18 @@ args @ { fetchurl, ... }: rec { baseName = ''md5''; - version = ''20150804-git''; + version = ''20170516-git''; description = ''The MD5 Message-Digest Algorithm RFC 1321''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/md5/2015-08-04/md5-20150804-git.tgz''; - sha256 = ''1sf79pjip19sx7zmznz1wm4563qc208lq49m0jnhxbv09wmm4vc5''; + url = ''http://beta.quicklisp.org/archive/md5/2017-05-16/md5-20170516-git.tgz''; + sha256 = ''1jmhww8wvd66ky5vppr0g8hi52w6z3q7svsqcmdrgzifr01r0pcv''; }; + + packageName = "md5"; overrides = x: { postInstall = '' @@ -28,6 +30,6 @@ rec { ''; }; } -/* (SYSTEM md5 DESCRIPTION The MD5 Message-Digest Algorithm RFC 1321 SHA256 1sf79pjip19sx7zmznz1wm4563qc208lq49m0jnhxbv09wmm4vc5 URL - http://beta.quicklisp.org/archive/md5/2015-08-04/md5-20150804-git.tgz MD5 69331e0d326cbc3286ac447e2868e7fd NAME md5 TESTNAME NIL FILENAME md5 DEPS NIL - DEPENDENCIES NIL VERSION 20150804-git SIBLINGS NIL) */ +/* (SYSTEM md5 DESCRIPTION The MD5 Message-Digest Algorithm RFC 1321 SHA256 1jmhww8wvd66ky5vppr0g8hi52w6z3q7svsqcmdrgzifr01r0pcv URL + http://beta.quicklisp.org/archive/md5/2017-05-16/md5-20170516-git.tgz MD5 1c90df8ab2c6d57b7abaac84cae30ab3 NAME md5 TESTNAME NIL FILENAME md5 DEPS NIL + DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix index 708fa41ca51..0bfbbbe14b2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/metabang-bind/2017-01-24/metabang-bind-20170124-git.tgz''; sha256 = ''1xyiyrc9c02ylg6b749h2ihn6922kb179x7k338dmglf4mpyqxwc''; }; + + packageName = "metabang-bind"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix new file mode 100644 index 00000000000..1e35369a9d0 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''metatilities-base''; + version = ''20170403-git''; + + description = ''These are metabang.com's Common Lisp basic utilities.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/metatilities-base/2017-04-03/metatilities-base-20170403-git.tgz''; + sha256 = ''14c1kzpg6ydnqca95rprzmhr09kk1jp2m8hpyn5vj2v68cvqm7br''; + }; + + packageName = "metatilities-base"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/metatilities-base[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM metatilities-base DESCRIPTION These are metabang.com's Common Lisp basic utilities. SHA256 14c1kzpg6ydnqca95rprzmhr09kk1jp2m8hpyn5vj2v68cvqm7br URL + http://beta.quicklisp.org/archive/metatilities-base/2017-04-03/metatilities-base-20170403-git.tgz MD5 8a3f429862a368e63b8fde731e9ab28a NAME + metatilities-base TESTNAME NIL FILENAME metatilities-base DEPS NIL DEPENDENCIES NIL VERSION 20170403-git SIBLINGS (metatilities-base-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix new file mode 100644 index 00000000000..3586d5cc21b --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''mssql''; + version = ''cl-20131003-git''; + + description = ''''; + + deps = [ args."cffi" args."garbage-pools" args."iterate" args."parse-number" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-mssql/2013-10-03/cl-mssql-20131003-git.tgz''; + sha256 = ''1ykk8g4h3n21ich60l495v6h5pplx9hfs0kasz8myc5xv8ndljnk''; + }; + + packageName = "mssql"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/mssql[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM mssql DESCRIPTION NIL SHA256 1ykk8g4h3n21ich60l495v6h5pplx9hfs0kasz8myc5xv8ndljnk URL + http://beta.quicklisp.org/archive/cl-mssql/2013-10-03/cl-mssql-20131003-git.tgz MD5 3e9d85a3b0ae7e000723a857ce7c2d44 NAME mssql TESTNAME NIL FILENAME mssql + DEPS ((NAME cffi FILENAME cffi) (NAME garbage-pools FILENAME garbage-pools) (NAME iterate FILENAME iterate) (NAME parse-number FILENAME parse-number)) + DEPENDENCIES (cffi garbage-pools iterate parse-number) VERSION cl-20131003-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix index 186550a15df..6580c322b04 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/myway/2015-03-02/myway-20150302-git.tgz''; sha256 = ''1spab9zzhwjg3r5xncr5ncha7phw72wp49cxxncgphh1lfaiyblh''; }; + + packageName = "myway"; overrides = x: { postInstall = '' @@ -30,5 +32,6 @@ rec { } /* (SYSTEM myway DESCRIPTION Sinatra-compatible routing library. SHA256 1spab9zzhwjg3r5xncr5ncha7phw72wp49cxxncgphh1lfaiyblh URL http://beta.quicklisp.org/archive/myway/2015-03-02/myway-20150302-git.tgz MD5 6a16b41eb3216c469bfc8783cce08b01 NAME myway TESTNAME NIL FILENAME myway DEPS - ((NAME quri) (NAME map-set) (NAME cl-utilities) (NAME cl-ppcre) (NAME alexandria)) DEPENDENCIES (quri map-set cl-utilities cl-ppcre alexandria) VERSION - 20150302-git SIBLINGS (myway-test)) */ + ((NAME quri FILENAME quri) (NAME map-set FILENAME map-set) (NAME cl-utilities FILENAME cl-utilities) (NAME cl-ppcre FILENAME cl-ppcre) + (NAME alexandria FILENAME alexandria)) + DEPENDENCIES (quri map-set cl-utilities cl-ppcre alexandria) VERSION 20150302-git SIBLINGS (myway-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix index c952ab5a1f7..53834f82431 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix @@ -12,6 +12,8 @@ rec { url = ''http://beta.quicklisp.org/archive/named-readtables/2017-01-24/named-readtables-20170124-git.tgz''; sha256 = ''1j0drddahdjab40dd9v9qy92xbvzwgbk6y3hv990sdp9f8ac1q45''; }; + + packageName = "named-readtables"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix index c5300698e54..622fd506b15 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/nibbles/2017-04-03/nibbles-20170403-git.tgz''; sha256 = ''0bg7jwhqhm3qmpzk21gjv50sl0grdn68d770cqfs7in62ny35lk4''; }; + + packageName = "nibbles"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix index 48bd3b7e542..74cb02155eb 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz''; sha256 = ''0vqyqrnx2d8qwa2jlg9l2wn6vrykraj8a1ysz0gxxxnwpqc29hdc''; }; + + packageName = "optima"; overrides = x: { postInstall = '' @@ -30,4 +32,5 @@ rec { } /* (SYSTEM optima DESCRIPTION Optimized Pattern Matching Library SHA256 0vqyqrnx2d8qwa2jlg9l2wn6vrykraj8a1ysz0gxxxnwpqc29hdc URL http://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz MD5 20523dc3dfc04bb2526008dff0842caa NAME optima TESTNAME NIL FILENAME optima - DEPS ((NAME closer-mop) (NAME alexandria)) DEPENDENCIES (closer-mop alexandria) VERSION 20150709-git SIBLINGS (optima.ppcre optima.test)) */ + DEPS ((NAME closer-mop FILENAME closer-mop) (NAME alexandria FILENAME alexandria)) DEPENDENCIES (closer-mop alexandria) VERSION 20150709-git SIBLINGS + (optima.ppcre optima.test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix index 56ae3473e2c..b7398d3973d 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/parenscript/2016-03-18/Parenscript-2.6.tgz''; sha256 = ''1hvr407fz7gzaxqbnki4k3l44qvl7vk6p5pn7811nrv6lk3kp5li''; }; + + packageName = "parenscript"; overrides = x: { postInstall = '' @@ -30,5 +32,5 @@ rec { } /* (SYSTEM parenscript DESCRIPTION Lisp to JavaScript transpiler SHA256 1hvr407fz7gzaxqbnki4k3l44qvl7vk6p5pn7811nrv6lk3kp5li URL http://beta.quicklisp.org/archive/parenscript/2016-03-18/Parenscript-2.6.tgz MD5 dadecc13f2918bc618fb143e893deb99 NAME parenscript TESTNAME NIL FILENAME - parenscript DEPS ((NAME named-readtables) (NAME cl-ppcre) (NAME anaphora)) DEPENDENCIES (named-readtables cl-ppcre anaphora) VERSION Parenscript-2.6 - SIBLINGS (parenscript.test)) */ + parenscript DEPS ((NAME named-readtables FILENAME named-readtables) (NAME cl-ppcre FILENAME cl-ppcre) (NAME anaphora FILENAME anaphora)) DEPENDENCIES + (named-readtables cl-ppcre anaphora) VERSION Parenscript-2.6 SIBLINGS (parenscript.test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix new file mode 100644 index 00000000000..726209f9617 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''parse-number''; + version = ''1.4''; + + description = ''Number parsing library''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/parse-number/2014-08-26/parse-number-1.4.tgz''; + sha256 = ''0y8jh7ss47z3asdxknad2g8h12nclvx0by750xniizj33b6h9blh''; + }; + + packageName = "parse-number"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/parse-number[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM parse-number DESCRIPTION Number parsing library SHA256 0y8jh7ss47z3asdxknad2g8h12nclvx0by750xniizj33b6h9blh URL + http://beta.quicklisp.org/archive/parse-number/2014-08-26/parse-number-1.4.tgz MD5 f189d474a2cd063f9743b452241e59a9 NAME parse-number TESTNAME NIL FILENAME + parse-number DEPS NIL DEPENDENCIES NIL VERSION 1.4 SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix index dae0d011e75..f12f7b68d00 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz''; sha256 = ''02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y''; }; + + packageName = "pcall"; overrides = x: { postInstall = '' @@ -30,4 +32,4 @@ rec { } /* (SYSTEM pcall DESCRIPTION NIL SHA256 02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y URL http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz MD5 019d85dfd1d5d0ee8d4ee475411caf6b NAME pcall TESTNAME NIL FILENAME pcall DEPS - ((NAME bordeaux-threads)) DEPENDENCIES (bordeaux-threads) VERSION 0.3 SIBLINGS (pcall-queue)) */ + ((NAME bordeaux-threads FILENAME bordeaux-threads)) DEPENDENCIES (bordeaux-threads) VERSION 0.3 SIBLINGS (pcall-queue)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix new file mode 100644 index 00000000000..d5ef8606f49 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix @@ -0,0 +1,47 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''pgloader''; + version = ''3.3.2''; + + description = ''Load data into PostgreSQL''; + + deps = [ args."abnf" args."alexandria" args."cl-base64" args."cl-csv" args."cl-fad" args."cl-log" args."cl-markdown" args."cl-postgres" args."cl-ppcre" args."command-line-arguments" args."db3" args."drakma" args."esrap" args."flexi-streams" args."ixf" args."local-time" args."lparallel" args."metabang-bind" args."mssql" args."postmodern" args."py-configparser" args."qmynd" args."quri" args."simple-date" args."split-sequence" args."sqlite" args."trivial-backtrace" args."uiop" args."usocket" args."uuid" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/pgloader/2016-12-04/pgloader-3.3.2.tgz''; + sha256 = ''1riz76jvjlszic48lndwfxjn9i72251frivaqi10k61gjfbx03qv''; + }; + + packageName = "pgloader"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/pgloader[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM pgloader DESCRIPTION Load data into PostgreSQL SHA256 1riz76jvjlszic48lndwfxjn9i72251frivaqi10k61gjfbx03qv URL + http://beta.quicklisp.org/archive/pgloader/2016-12-04/pgloader-3.3.2.tgz MD5 fb72ca0db46b80a74b7b31dc5b27e1b8 NAME pgloader TESTNAME NIL FILENAME pgloader + DEPS + ((NAME abnf FILENAME abnf) (NAME alexandria FILENAME alexandria) (NAME cl-base64 FILENAME cl-base64) (NAME cl-csv FILENAME cl-csv) + (NAME cl-fad FILENAME cl-fad) (NAME cl-log FILENAME cl-log) (NAME cl-markdown FILENAME cl-markdown) (NAME cl-postgres FILENAME cl-postgres) + (NAME cl-ppcre FILENAME cl-ppcre) (NAME command-line-arguments FILENAME command-line-arguments) (NAME db3 FILENAME db3) (NAME drakma FILENAME drakma) + (NAME esrap FILENAME esrap) (NAME flexi-streams FILENAME flexi-streams) (NAME ixf FILENAME ixf) (NAME local-time FILENAME local-time) + (NAME lparallel FILENAME lparallel) (NAME metabang-bind FILENAME metabang-bind) (NAME mssql FILENAME mssql) (NAME postmodern FILENAME postmodern) + (NAME py-configparser FILENAME py-configparser) (NAME qmynd FILENAME qmynd) (NAME quri FILENAME quri) (NAME simple-date FILENAME simple-date) + (NAME split-sequence FILENAME split-sequence) (NAME sqlite FILENAME sqlite) (NAME trivial-backtrace FILENAME trivial-backtrace) (NAME uiop FILENAME uiop) + (NAME usocket FILENAME usocket) (NAME uuid FILENAME uuid)) + DEPENDENCIES + (abnf alexandria cl-base64 cl-csv cl-fad cl-log cl-markdown cl-postgres cl-ppcre command-line-arguments db3 drakma esrap flexi-streams ixf local-time + lparallel metabang-bind mssql postmodern py-configparser qmynd quri simple-date split-sequence sqlite trivial-backtrace uiop usocket uuid) + VERSION 3.3.2 SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix index 17795e3a92a..d89e25f8819 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix @@ -1,16 +1,18 @@ args @ { fetchurl, ... }: rec { baseName = ''plump''; - version = ''20170124-git''; + version = ''20170516-git''; description = ''An XML / XHTML / HTML parser that aims to be as lenient as possible.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/plump/2017-01-24/plump-20170124-git.tgz''; - sha256 = ''1swl5kr6hgl7hkybixsx7h4ddc7c0a7pisgmmiz2bs2rv4inz69x''; + url = ''http://beta.quicklisp.org/archive/plump/2017-05-16/plump-20170516-git.tgz''; + sha256 = ''0i7fb1y4dfd7i97w33xf8d1ykza4irl89xkipainydigkk66xaz8''; }; + + packageName = "plump"; overrides = x: { postInstall = '' @@ -28,6 +30,6 @@ rec { ''; }; } -/* (SYSTEM plump DESCRIPTION An XML / XHTML / HTML parser that aims to be as lenient as possible. SHA256 1swl5kr6hgl7hkybixsx7h4ddc7c0a7pisgmmiz2bs2rv4inz69x - URL http://beta.quicklisp.org/archive/plump/2017-01-24/plump-20170124-git.tgz MD5 c49aeb37173aca79ee6ff5c89b0c4b1a NAME plump TESTNAME NIL FILENAME plump - DEPS NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS (plump-dom plump-lexer plump-parser)) */ +/* (SYSTEM plump DESCRIPTION An XML / XHTML / HTML parser that aims to be as lenient as possible. SHA256 0i7fb1y4dfd7i97w33xf8d1ykza4irl89xkipainydigkk66xaz8 + URL http://beta.quicklisp.org/archive/plump/2017-05-16/plump-20170516-git.tgz MD5 917a4f25691b3087ce24fd52ee42b4be NAME plump TESTNAME NIL FILENAME plump + DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (plump-dom plump-lexer plump-parser)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix new file mode 100644 index 00000000000..18dc40ff51a --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''postmodern''; + version = ''20170403-git''; + + description = ''PostgreSQL programming API''; + + deps = [ args."closer-mop" args."bordeaux-threads" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz''; + sha256 = ''1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p''; + }; + + packageName = "postmodern"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/postmodern[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM postmodern DESCRIPTION PostgreSQL programming API SHA256 1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p URL + http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz MD5 7a4145a0a5ff5bcb7a4bf29b5c2915d2 NAME postmodern TESTNAME NIL + FILENAME postmodern DEPS ((NAME closer-mop FILENAME closer-mop) (NAME bordeaux-threads FILENAME bordeaux-threads)) DEPENDENCIES + (closer-mop bordeaux-threads) VERSION 20170403-git SIBLINGS (cl-postgres s-sql simple-date)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix index 9e4e2effbd3..142d24f5e48 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/proc-parse/2016-03-18/proc-parse-20160318-git.tgz''; sha256 = ''00261w269w9chg6r3sh8hg8994njbsai1g3zni0whm2dzxxq6rnl''; }; + + packageName = "proc-parse"; overrides = x: { postInstall = '' @@ -30,4 +32,5 @@ rec { } /* (SYSTEM proc-parse DESCRIPTION Procedural vector parser SHA256 00261w269w9chg6r3sh8hg8994njbsai1g3zni0whm2dzxxq6rnl URL http://beta.quicklisp.org/archive/proc-parse/2016-03-18/proc-parse-20160318-git.tgz MD5 5e43f50284fa70c448a3df12d1eea2ea NAME proc-parse TESTNAME NIL - FILENAME proc-parse DEPS ((NAME babel) (NAME alexandria)) DEPENDENCIES (babel alexandria) VERSION 20160318-git SIBLINGS (proc-parse-test)) */ + FILENAME proc-parse DEPS ((NAME babel FILENAME babel) (NAME alexandria FILENAME alexandria)) DEPENDENCIES (babel alexandria) VERSION 20160318-git SIBLINGS + (proc-parse-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix index cf6fd03ba12..ae823959fdc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/prove/2017-04-03/prove-20170403-git.tgz''; sha256 = ''091xxkn9zj22c4gmm8x714k29bs4j0j7akppwh55zjsmrxdhqcpl''; }; + + packageName = "prove"; overrides = x: { postInstall = '' @@ -30,5 +32,6 @@ rec { } /* (SYSTEM prove DESCRIPTION NIL SHA256 091xxkn9zj22c4gmm8x714k29bs4j0j7akppwh55zjsmrxdhqcpl URL http://beta.quicklisp.org/archive/prove/2017-04-03/prove-20170403-git.tgz MD5 063b615692c8711d2392204ecf1b37b7 NAME prove TESTNAME NIL FILENAME prove DEPS - ((NAME uiop) (NAME cl-ppcre) (NAME cl-colors) (NAME cl-ansi-text) (NAME alexandria)) DEPENDENCIES (uiop cl-ppcre cl-colors cl-ansi-text alexandria) VERSION - 20170403-git SIBLINGS (cl-test-more prove-asdf prove-test)) */ + ((NAME uiop FILENAME uiop) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-colors FILENAME cl-colors) (NAME cl-ansi-text FILENAME cl-ansi-text) + (NAME alexandria FILENAME alexandria)) + DEPENDENCIES (uiop cl-ppcre cl-colors cl-ansi-text alexandria) VERSION 20170403-git SIBLINGS (cl-test-more prove-asdf prove-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix index fe48a580ee9..9a7e24cebdc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/puri/2015-09-23/puri-20150923-git.tgz''; sha256 = ''099ay2zji5ablj2jj56sb49hk2l9x5s11vpx6893qwwjsp2881qa''; }; + + packageName = "puri"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix new file mode 100644 index 00000000000..868aae61f6b --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''py-configparser''; + version = ''20131003-svn''; + + description = ''Common Lisp implementation of the Python ConfigParser module''; + + deps = [ args."parse-number" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/py-configparser/2013-10-03/py-configparser-20131003-svn.tgz''; + sha256 = ''10csqvl2acsha70igy75np2lf3bx7rrlrgryslsqay2xdzk6alwx''; + }; + + packageName = "py-configparser"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/py-configparser[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM py-configparser DESCRIPTION Common Lisp implementation of the Python ConfigParser module SHA256 10csqvl2acsha70igy75np2lf3bx7rrlrgryslsqay2xdzk6alwx + URL http://beta.quicklisp.org/archive/py-configparser/2013-10-03/py-configparser-20131003-svn.tgz MD5 da697259b68f536bcb6b77933b55a5d9 NAME py-configparser + TESTNAME NIL FILENAME py-configparser DEPS ((NAME parse-number FILENAME parse-number)) DEPENDENCIES (parse-number) VERSION 20131003-svn SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix new file mode 100644 index 00000000000..b9871752e58 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix @@ -0,0 +1,38 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''qmynd''; + version = ''20160208-git''; + + description = ''MySQL Native Driver''; + + deps = [ args."usocket" args."trivial-gray-streams" args."salza2" args."list-of" args."ironclad" args."flexi-streams" args."cl+ssl" args."chipz" args."babel" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/qmynd/2016-02-08/qmynd-20160208-git.tgz''; + sha256 = ''0x9ml8id3s8l0rsa108bcs5lmyhb2y5a5p7s9ppvmqd4cgxnramq''; + }; + + packageName = "qmynd"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/qmynd[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM qmynd DESCRIPTION MySQL Native Driver SHA256 0x9ml8id3s8l0rsa108bcs5lmyhb2y5a5p7s9ppvmqd4cgxnramq URL + http://beta.quicklisp.org/archive/qmynd/2016-02-08/qmynd-20160208-git.tgz MD5 9483ba5330a4240a9d5a8016c16a0084 NAME qmynd TESTNAME NIL FILENAME qmynd DEPS + ((NAME usocket FILENAME usocket) (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME salza2 FILENAME salza2) (NAME list-of FILENAME list-of) + (NAME ironclad FILENAME ironclad) (NAME flexi-streams FILENAME flexi-streams) (NAME cl+ssl FILENAME cl+ssl) (NAME chipz FILENAME chipz) + (NAME babel FILENAME babel)) + DEPENDENCIES (usocket trivial-gray-streams salza2 list-of ironclad flexi-streams cl+ssl chipz babel) VERSION 20160208-git SIBLINGS (qmynd-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix index 2a1219e48e7..1cfd62686c4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/query-fs/2016-05-31/query-fs-20160531-git.tgz''; sha256 = ''0wknr3rffihg1my8ihmpwssxpxj4bfmqcly0s37q51fllxkr1v5a''; }; + + packageName = "query-fs"; overrides = x: { postInstall = '' @@ -31,5 +33,7 @@ rec { /* (SYSTEM query-fs DESCRIPTION High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries SHA256 0wknr3rffihg1my8ihmpwssxpxj4bfmqcly0s37q51fllxkr1v5a URL http://beta.quicklisp.org/archive/query-fs/2016-05-31/query-fs-20160531-git.tgz MD5 dfbb3d0e7b5d990488a17b184771d049 NAME query-fs TESTNAME NIL FILENAME query-fs DEPS - ((NAME bordeaux-threads) (NAME cl-fuse) (NAME cl-fuse-meta-fs) (NAME cl-ppcre) (NAME command-line-arguments) (NAME iterate) (NAME trivial-backtrace)) + ((NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-fuse FILENAME cl-fuse) (NAME cl-fuse-meta-fs FILENAME cl-fuse-meta-fs) + (NAME cl-ppcre FILENAME cl-ppcre) (NAME command-line-arguments FILENAME command-line-arguments) (NAME iterate FILENAME iterate) + (NAME trivial-backtrace FILENAME trivial-backtrace)) DEPENDENCIES (bordeaux-threads cl-fuse cl-fuse-meta-fs cl-ppcre command-line-arguments iterate trivial-backtrace) VERSION 20160531-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix index 1c351669c9a..26fab0612e9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/quri/2016-12-04/quri-20161204-git.tgz''; sha256 = ''14if83kd2mv68p4g4ch2w796w3micpzv40z7xrcwzwj64wngwabv''; }; + + packageName = "quri"; overrides = x: { postInstall = '' @@ -30,5 +32,5 @@ rec { } /* (SYSTEM quri DESCRIPTION Yet another URI library for Common Lisp SHA256 14if83kd2mv68p4g4ch2w796w3micpzv40z7xrcwzwj64wngwabv URL http://beta.quicklisp.org/archive/quri/2016-12-04/quri-20161204-git.tgz MD5 8c87e99d4f7308d83aab361a6e36508a NAME quri TESTNAME NIL FILENAME quri DEPS - ((NAME split-sequence) (NAME cl-utilities) (NAME babel) (NAME alexandria)) DEPENDENCIES (split-sequence cl-utilities babel alexandria) VERSION 20161204-git - SIBLINGS (quri-test)) */ + ((NAME split-sequence FILENAME split-sequence) (NAME cl-utilities FILENAME cl-utilities) (NAME babel FILENAME babel) (NAME alexandria FILENAME alexandria)) + DEPENDENCIES (split-sequence cl-utilities babel alexandria) VERSION 20161204-git SIBLINGS (quri-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix index 572cd29c75b..e74c2c51b79 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/rfc2388/2013-07-20/rfc2388-20130720-git.tgz''; sha256 = ''1ky99cr4bgfyh0pfpl5f6fsmq1qdbgi4b8v0cfs4y73f78p1f8b6''; }; + + packageName = "rfc2388"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix index 38e9e4ecabd..9654a86b74b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix @@ -12,6 +12,8 @@ rec { url = ''http://beta.quicklisp.org/archive/salza2/2013-07-20/salza2-2.0.9.tgz''; sha256 = ''1m0hksgvq3njd9xa2nxlm161vgzw77djxmisq08v9pz2bz16v8va''; }; + + packageName = "salza2"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix new file mode 100644 index 00000000000..00e2b3dbd0f --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''simple-date''; + version = ''postmodern-20170403-git''; + + description = ''''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz''; + sha256 = ''1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p''; + }; + + packageName = "simple-date"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/simple-date[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM simple-date DESCRIPTION NIL SHA256 1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p URL + http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz MD5 7a4145a0a5ff5bcb7a4bf29b5c2915d2 NAME simple-date TESTNAME NIL + FILENAME simple-date DEPS NIL DEPENDENCIES NIL VERSION postmodern-20170403-git SIBLINGS (cl-postgres postmodern s-sql)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix index 597f8fcfe3a..9a04f3c64db 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/smart-buffer/2016-06-28/smart-buffer-20160628-git.tgz''; sha256 = ''1wp50snkc8739n91xlnfnq1dzz3kfp0awgp92m7xbpcw3hbaib1s''; }; + + packageName = "smart-buffer"; overrides = x: { postInstall = '' @@ -30,5 +32,5 @@ rec { } /* (SYSTEM smart-buffer DESCRIPTION Smart octets buffer SHA256 1wp50snkc8739n91xlnfnq1dzz3kfp0awgp92m7xbpcw3hbaib1s URL http://beta.quicklisp.org/archive/smart-buffer/2016-06-28/smart-buffer-20160628-git.tgz MD5 454d8510618da8111c7ca687549b7035 NAME smart-buffer TESTNAME NIL - FILENAME smart-buffer DEPS ((NAME xsubseq) (NAME uiop) (NAME flexi-streams)) DEPENDENCIES (xsubseq uiop flexi-streams) VERSION 20160628-git SIBLINGS - (smart-buffer-test)) */ + FILENAME smart-buffer DEPS ((NAME xsubseq FILENAME xsubseq) (NAME uiop FILENAME uiop) (NAME flexi-streams FILENAME flexi-streams)) DEPENDENCIES + (xsubseq uiop flexi-streams) VERSION 20160628-git SIBLINGS (smart-buffer-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix index 2712a1b8e1d..03331578764 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix @@ -12,6 +12,8 @@ rec { url = ''http://beta.quicklisp.org/archive/split-sequence/2015-08-04/split-sequence-1.2.tgz''; sha256 = ''12x5yfvinqz9jzxwlsg226103a9sdf67zpzn5izggvdlw0v5qp0l''; }; + + packageName = "split-sequence"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix index 1d2f8fd0122..73144329206 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/cl-sqlite/2013-06-15/cl-sqlite-20130615-git.tgz''; sha256 = ''0db1fvvnsrnxmp272ycnl2kwhymjwrimr8z4djvjlg6cvjxk6lqh''; }; + + packageName = "sqlite"; overrides = x: { postInstall = '' @@ -30,4 +32,4 @@ rec { } /* (SYSTEM sqlite DESCRIPTION NIL SHA256 0db1fvvnsrnxmp272ycnl2kwhymjwrimr8z4djvjlg6cvjxk6lqh URL http://beta.quicklisp.org/archive/cl-sqlite/2013-06-15/cl-sqlite-20130615-git.tgz MD5 93be7c68f587d830941be55f2c2f1c8b NAME sqlite TESTNAME NIL FILENAME - sqlite DEPS ((NAME cffi) (NAME iterate)) DEPENDENCIES (cffi iterate) VERSION cl-20130615-git SIBLINGS NIL) */ + sqlite DEPS ((NAME cffi FILENAME cffi) (NAME iterate FILENAME iterate)) DEPENDENCIES (cffi iterate) VERSION cl-20130615-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix index 1a7056e3fa2..e06fe790f76 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/static-vectors/2017-01-24/static-vectors-v1.8.2.tgz''; sha256 = ''0p35f0wrnv46bmmxlviwpsbxnlnkmxwd3xp858lhf0dy52cyra1g''; }; + + packageName = "static-vectors"; overrides = x: { postInstall = '' @@ -30,4 +32,5 @@ rec { } /* (SYSTEM static-vectors DESCRIPTION Create vectors allocated in static memory. SHA256 0p35f0wrnv46bmmxlviwpsbxnlnkmxwd3xp858lhf0dy52cyra1g URL http://beta.quicklisp.org/archive/static-vectors/2017-01-24/static-vectors-v1.8.2.tgz MD5 fd3ebe4e79a71c49e32ac87d6a1bcaf4 NAME static-vectors TESTNAME NIL - FILENAME static-vectors DEPS ((NAME alexandria) (NAME cffi) (NAME cffi-grovel)) DEPENDENCIES (alexandria cffi cffi-grovel) VERSION v1.8.2 SIBLINGS NIL) */ + FILENAME static-vectors DEPS ((NAME alexandria FILENAME alexandria) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)) DEPENDENCIES + (alexandria cffi cffi-grovel) VERSION v1.8.2 SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix index aaef5095dbb..6aa42000e73 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix @@ -1,16 +1,18 @@ args @ { fetchurl, ... }: rec { baseName = ''stumpwm''; - version = ''20170403-git''; + version = ''20170516-git''; description = ''A tiling, keyboard driven window manager''; - deps = [ args."alexandria" args."cl-ppcre" args."clx" ]; + deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/stumpwm/2017-04-03/stumpwm-20170403-git.tgz''; - sha256 = ''1aca1nvdzp957mvwxz6x0plkg915l24mjf89h8rgkgclkn6xk4rf''; + url = ''http://beta.quicklisp.org/archive/stumpwm/2017-05-16/stumpwm-20170516-git.tgz''; + sha256 = ''0x3x0w1akarp0rjmig9x6d729z6lv6ywfg00b6xszm5kqfbx1659''; }; + + packageName = "stumpwm"; overrides = x: { postInstall = '' @@ -28,6 +30,6 @@ rec { ''; }; } -/* (SYSTEM stumpwm DESCRIPTION A tiling, keyboard driven window manager SHA256 1aca1nvdzp957mvwxz6x0plkg915l24mjf89h8rgkgclkn6xk4rf URL - http://beta.quicklisp.org/archive/stumpwm/2017-04-03/stumpwm-20170403-git.tgz MD5 1081021518c5b6c36d39f12c47305ea1 NAME stumpwm TESTNAME NIL FILENAME - stumpwm DEPS ((NAME alexandria) (NAME cl-ppcre) (NAME clx)) DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20170403-git SIBLINGS NIL) */ +/* (SYSTEM stumpwm DESCRIPTION A tiling, keyboard driven window manager SHA256 0x3x0w1akarp0rjmig9x6d729z6lv6ywfg00b6xszm5kqfbx1659 URL + http://beta.quicklisp.org/archive/stumpwm/2017-05-16/stumpwm-20170516-git.tgz MD5 ed076f733ef138aca3b04b3c3ff748f0 NAME stumpwm TESTNAME NIL FILENAME + stumpwm DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix index 8ae38c45686..45d7a7800d5 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/swap-bytes/2016-09-29/swap-bytes-v1.1.tgz''; sha256 = ''0snwbfplqhg1y4y4m7lgvksg1hs0sygfikz3rlbkfl4gwg8pq8ky''; }; + + packageName = "swap-bytes"; overrides = x: { postInstall = '' @@ -30,4 +32,4 @@ rec { } /* (SYSTEM swap-bytes DESCRIPTION Optimized byte-swapping primitives. SHA256 0snwbfplqhg1y4y4m7lgvksg1hs0sygfikz3rlbkfl4gwg8pq8ky URL http://beta.quicklisp.org/archive/swap-bytes/2016-09-29/swap-bytes-v1.1.tgz MD5 dda8b3b0a4e345879e80a3cc398667bb NAME swap-bytes TESTNAME NIL FILENAME - swap-bytes DEPS ((NAME trivial-features)) DEPENDENCIES (trivial-features) VERSION v1.1 SIBLINGS NIL) */ + swap-bytes DEPS ((NAME trivial-features FILENAME trivial-features)) DEPENDENCIES (trivial-features) VERSION v1.1 SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix index e28637849af..0ed2e288760 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/trivial-backtrace/2016-05-31/trivial-backtrace-20160531-git.tgz''; sha256 = ''1vcvalcv2ljiv2gyh8xjcg62cjsripjwmnhc8zji35ja1xyqvxhx''; }; + + packageName = "trivial-backtrace"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix index 7b44cb90337..ea531d722d4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/trivial-features/2016-12-04/trivial-features-20161204-git.tgz''; sha256 = ''0i2zyc9c7jigljxll29sh9gv1fawdsf0kq7s86pwba5zi99q2ij2''; }; + + packageName = "trivial-features"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix index 3c439aae2e4..43bcd571304 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/trivial-garbage/2015-01-13/trivial-garbage-20150113-git.tgz''; sha256 = ''1yy1jyx7wz5rr7lr0jyyfxgzfddmrxrmkp46a21pcdc4jlss1h08''; }; + + packageName = "trivial-garbage"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix index 120f384a7a5..22011917022 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/trivial-gray-streams/2014-08-26/trivial-gray-streams-20140826-git.tgz''; sha256 = ''1nhbp0qizvqvy2mfl3i99hlwiy27h3gq0jglwzsj2fmnwqvpfx92''; }; + + packageName = "trivial-gray-streams"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix index d091ad3250f..05631ab2b93 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix @@ -1,16 +1,18 @@ args @ { fetchurl, ... }: rec { baseName = ''trivial-indent''; - version = ''20160929-git''; + version = ''20170516-git''; description = ''A very simple library to allow indentation hints for SWANK.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-indent/2016-09-29/trivial-indent-20160929-git.tgz''; - sha256 = ''0nc7d5xdx4h8jvvqif7f721z8296kl6jk5hqmgr0mj3g7svgfrir''; + url = ''http://beta.quicklisp.org/archive/trivial-indent/2017-05-16/trivial-indent-20170516-git.tgz''; + sha256 = ''0jvwmsn4z5sd2r1g3yml8mzra8pah5ly8n00p0sqqww61l9w06ma''; }; + + packageName = "trivial-indent"; overrides = x: { postInstall = '' @@ -28,6 +30,6 @@ rec { ''; }; } -/* (SYSTEM trivial-indent DESCRIPTION A very simple library to allow indentation hints for SWANK. SHA256 0nc7d5xdx4h8jvvqif7f721z8296kl6jk5hqmgr0mj3g7svgfrir - URL http://beta.quicklisp.org/archive/trivial-indent/2016-09-29/trivial-indent-20160929-git.tgz MD5 d93c0fa8e29d7d37170efd58b84ac188 NAME trivial-indent - TESTNAME NIL FILENAME trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20160929-git SIBLINGS NIL) */ +/* (SYSTEM trivial-indent DESCRIPTION A very simple library to allow indentation hints for SWANK. SHA256 0jvwmsn4z5sd2r1g3yml8mzra8pah5ly8n00p0sqqww61l9w06ma + URL http://beta.quicklisp.org/archive/trivial-indent/2017-05-16/trivial-indent-20170516-git.tgz MD5 6c8bde35ec010645c8d585c272ae01e8 NAME trivial-indent + TESTNAME NIL FILENAME trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix index e9d090a84aa..f4a84b5ceef 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix @@ -1,16 +1,18 @@ args @ { fetchurl, ... }: rec { baseName = ''trivial-mimes''; - version = ''20160929-git''; + version = ''20170516-git''; description = ''Tiny library to detect mime types in files.''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/trivial-mimes/2016-09-29/trivial-mimes-20160929-git.tgz''; - sha256 = ''1sdsplngi3civv9wjd9rxxj3ynqc3260cfykpid5lpy8rhbyiw0w''; + url = ''http://beta.quicklisp.org/archive/trivial-mimes/2017-05-16/trivial-mimes-20170516-git.tgz''; + sha256 = ''1prv15krlcwwb9jwqvskm588y2yh7r2n6c4c80fh0f2r73ysfnj2''; }; + + packageName = "trivial-mimes"; overrides = x: { postInstall = '' @@ -28,6 +30,6 @@ rec { ''; }; } -/* (SYSTEM trivial-mimes DESCRIPTION Tiny library to detect mime types in files. SHA256 1sdsplngi3civv9wjd9rxxj3ynqc3260cfykpid5lpy8rhbyiw0w URL - http://beta.quicklisp.org/archive/trivial-mimes/2016-09-29/trivial-mimes-20160929-git.tgz MD5 1075218aae1940bb3413b0edb6b73ac2 NAME trivial-mimes TESTNAME - NIL FILENAME trivial-mimes DEPS NIL DEPENDENCIES NIL VERSION 20160929-git SIBLINGS NIL) */ +/* (SYSTEM trivial-mimes DESCRIPTION Tiny library to detect mime types in files. SHA256 1prv15krlcwwb9jwqvskm588y2yh7r2n6c4c80fh0f2r73ysfnj2 URL + http://beta.quicklisp.org/archive/trivial-mimes/2017-05-16/trivial-mimes-20170516-git.tgz MD5 b9cbba4147647ded4042949db3c00f1e NAME trivial-mimes TESTNAME + NIL FILENAME trivial-mimes DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix index 064e67fef50..8aed5e9681c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/trivial-types/2012-04-07/trivial-types-20120407-git.tgz''; sha256 = ''0y3lfbbvi2qp2cwswzmk1awzqrsrrcfkcm1qn744bgm1fiqhxbxx''; }; + + packageName = "trivial-types"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix index d7a8721f298..efbdca21465 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/trivial-utf-8/2011-10-01/trivial-utf-8-20111001-darcs.tgz''; sha256 = ''1lmg185s6w3rzsz3xa41k5w9xw32bi288ifhrxincy8iv92w65wb''; }; + + packageName = "trivial-utf-8"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix index f3528d60524..78085ff1762 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/uffi/2015-09-23/uffi-20150923-git.tgz''; sha256 = ''1b3mb1ac5hqpn941pmgwkiy241rnin308haxbs2f4rwp2la7wzyy''; }; + + packageName = "uffi"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix index 3b340be7c1d..579ad469cda 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix @@ -1,16 +1,18 @@ args @ { fetchurl, ... }: rec { baseName = ''uiop''; - version = ''3.2.0''; + version = ''3.2.1''; description = ''''; deps = [ ]; src = fetchurl { - url = ''http://beta.quicklisp.org/archive/uiop/2017-01-24/uiop-3.2.0.tgz''; - sha256 = ''1rrn1mdcb4dmb517vrp3nzwpp1w8hfvpzarj36c7kkpjq23czdig''; + url = ''http://beta.quicklisp.org/archive/uiop/2017-05-16/uiop-3.2.1.tgz''; + sha256 = ''1zl661dkbg5clyl5fjj9466krk59xfdmmfzci5mj7n137m0zmf5v''; }; + + packageName = "uiop"; overrides = x: { postInstall = '' @@ -28,6 +30,6 @@ rec { ''; }; } -/* (SYSTEM uiop DESCRIPTION NIL SHA256 1rrn1mdcb4dmb517vrp3nzwpp1w8hfvpzarj36c7kkpjq23czdig URL - http://beta.quicklisp.org/archive/uiop/2017-01-24/uiop-3.2.0.tgz MD5 3c304efce790959b14a241db2e669fce NAME uiop TESTNAME NIL FILENAME uiop DEPS NIL - DEPENDENCIES NIL VERSION 3.2.0 SIBLINGS (asdf-driver)) */ +/* (SYSTEM uiop DESCRIPTION NIL SHA256 1zl661dkbg5clyl5fjj9466krk59xfdmmfzci5mj7n137m0zmf5v URL + http://beta.quicklisp.org/archive/uiop/2017-05-16/uiop-3.2.1.tgz MD5 3e9ef02ecf9005240b66552d85719700 NAME uiop TESTNAME NIL FILENAME uiop DEPS NIL + DEPENDENCIES NIL VERSION 3.2.1 SIBLINGS (asdf-driver)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix index 5b6a7fafd01..c071b2f3bbd 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/usocket/2016-10-31/usocket-0.7.0.1.tgz''; sha256 = ''1mpcfawbzd72cd841bb0hmgx4kinnvcnazc7vym83gv5iy6lwif2''; }; + + packageName = "usocket"; overrides = x: { postInstall = '' @@ -30,4 +32,4 @@ rec { } /* (SYSTEM usocket DESCRIPTION Universal socket library for Common Lisp SHA256 1mpcfawbzd72cd841bb0hmgx4kinnvcnazc7vym83gv5iy6lwif2 URL http://beta.quicklisp.org/archive/usocket/2016-10-31/usocket-0.7.0.1.tgz MD5 1dcb027187679211f9d277ce99ca2a5a NAME usocket TESTNAME NIL FILENAME usocket - DEPS ((NAME split-sequence)) DEPENDENCIES (split-sequence) VERSION 0.7.0.1 SIBLINGS (usocket-server usocket-test)) */ + DEPS ((NAME split-sequence FILENAME split-sequence)) DEPENDENCIES (split-sequence) VERSION 0.7.0.1 SIBLINGS (usocket-server usocket-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix new file mode 100644 index 00000000000..1f415f7142a --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''uuid''; + version = ''20130813-git''; + + description = ''UUID Generation''; + + deps = [ args."ironclad" args."trivial-utf-8" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/uuid/2013-08-13/uuid-20130813-git.tgz''; + sha256 = ''1ph88gizpkxqigfrkgmq0vd3qkgpxd9zjy6qyr0ic4xdyyymg1hf''; + }; + + packageName = "uuid"; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/uuid[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM uuid DESCRIPTION UUID Generation SHA256 1ph88gizpkxqigfrkgmq0vd3qkgpxd9zjy6qyr0ic4xdyyymg1hf URL + http://beta.quicklisp.org/archive/uuid/2013-08-13/uuid-20130813-git.tgz MD5 e9029d9437573ec2ffa2b474adf95daf NAME uuid TESTNAME NIL FILENAME uuid DEPS + ((NAME ironclad FILENAME ironclad) (NAME trivial-utf-8 FILENAME trivial-utf-8)) DEPENDENCIES (ironclad trivial-utf-8) VERSION 20130813-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix index ca9680ebd00..7be98029ca2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/vom/2016-08-25/vom-20160825-git.tgz''; sha256 = ''0mvln0xx8qnrsmaj7c0f2ilgahvf078qvhqag7qs3j26xmamjm93''; }; + + packageName = "vom"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix index a225b323f36..086a374d6e7 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/woo/2017-02-27/woo-20170227-git.tgz''; sha256 = ''0myydz817mpkgs97p9y9n4z0kq00xxr2b65klsdkxasvvfyjw0d1''; }; + + packageName = "woo"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix index 3744526b25a..46262fb78f4 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/wookie/2017-02-27/wookie-20170227-git.tgz''; sha256 = ''0i1wrgr5grg387ldv1zfswws1g3xvrkxxvp1m58m9hj0c1vmm6v0''; }; + + packageName = "wookie"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix index 11fa1931f0b..4d1d902cf5c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/xmls/2015-04-07/xmls-1.7.tgz''; sha256 = ''1pch221g5jv02rb21ly9ik4cmbzv8ca6bnyrs4s0yfrrq0ji406b''; }; + + packageName = "xmls"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix index da2611d1f39..c1c699bd362 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/xsubseq/2015-01-13/xsubseq-20150113-git.tgz''; sha256 = ''0ykjhi7pkqcwm00yzhqvngnx07hsvwbj0c72b08rj4dkngg8is5q''; }; + + packageName = "xsubseq"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix index 32c7198b99f..d581891c7cc 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/yason/2016-02-08/yason-v0.7.6.tgz''; sha256 = ''00gfn14bvnw0in03y5m2ssgvhy3ppf5a3s0rf7mf4rq00c5ifchk''; }; + + packageName = "yason"; overrides = x: { postInstall = '' @@ -30,4 +32,5 @@ rec { } /* (SYSTEM yason DESCRIPTION JSON parser/encoder SHA256 00gfn14bvnw0in03y5m2ssgvhy3ppf5a3s0rf7mf4rq00c5ifchk URL http://beta.quicklisp.org/archive/yason/2016-02-08/yason-v0.7.6.tgz MD5 79de5d242c5e9ce49dfda153d5f442ec NAME yason TESTNAME NIL FILENAME yason DEPS - ((NAME alexandria) (NAME trivial-gray-streams)) DEPENDENCIES (alexandria trivial-gray-streams) VERSION v0.7.6 SIBLINGS NIL) */ + ((NAME alexandria FILENAME alexandria) (NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES (alexandria trivial-gray-streams) VERSION + v0.7.6 SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix index 06fc8502d6c..0a1a9ee2f81 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix @@ -11,6 +11,8 @@ rec { url = ''http://beta.quicklisp.org/archive/zpb-ttf/2013-07-20/zpb-ttf-1.0.3.tgz''; sha256 = ''1irv0d0pcbwi2wx6hhjjyxzw12lnw8pvyg6ljsljh8xmhppbg5j6''; }; + + packageName = "zpb-ttf"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index 2725c354d35..a760e0cb684 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -16,6 +16,9 @@ in export configureFlags="$configureFlags --with-$NIX_LISP=common-lisp.sh"; ''; }; + propagatedBuildInputs = (x.propagatedBuildInputs or []) ++ (with qlnp; [ + alexandria cl-ppcre clx + ]); }; iterate = skipBuildPhase; cl-fuse = x: { @@ -32,14 +35,24 @@ in }; }; hunchentoot = addNativeLibs [pkgs.openssl]; - iolib = x: { - propagatedBuildInputs = (x.propagatedBuildInputs or []) ++ - [pkgs.libfixposix pkgs.gcc]; - testSystems = (x.testSystems or ["iolib"]) ++ [ - "iolib/os" "iolib/zstreams" "iolib/common-lisp" "iolib/base" "iolib/asdf" - "iolib/conf" "iolib/grovel" "iolib/syscalls" "iolib/sockets" - "iolib/multiplex" "iolib/streams" "iolib/pathnames" - ]; + iolib = x: rec { + propagatedBuildInputs = (x.propagatedBuildInputs or []) + ++ (with pkgs; [libfixposix gcc]) + ++ (with qlnp; [ + alexandria split-sequence cffi bordeaux-threads idna swap-bytes + ]) + ; + testSystems = ["iolib" "iolib/syscalls" "iolib/multiplex" "iolib/streams" + "iolib/zstreams" "iolib/sockets" "iolib/trivial-sockets" + "iolib/pathnames" "iolib/os"]; + + version = "0.8.3"; + src = pkgs.fetchFromGitHub { + owner = "sionescu"; + repo = "iolib"; + rev = "v${version}"; + sha256 = "0pa86bf3jrysnmhasbc0lm6cid9xzril4jsg02g3gziav1xw5x2m"; + }; }; cl-unicode = addDeps (with qlnp; [cl-ppcre flexi-streams]); clack = addDeps (with qlnp;[lack bordeaux-threads prove]); @@ -110,6 +123,7 @@ in cffi = multiOverride [(addNativeLibs [pkgs.libffi]) (addDeps (with qlnp; [uffi uiop trivial-features]))]; cl-vectors = addDeps (with qlnp; [zpb-ttf]); + cl-paths-ttf = addDeps (with qlnp; [zpb-ttf]); "3bmd" = addDeps (with qlnp; [esrap split-sequence]); cl-dbi = addDeps (with qlnp; [ cl-syntax cl-syntax-annot split-sequence closer-mop bordeaux-threads @@ -124,13 +138,17 @@ in ln -s lib-dependent/*.asd . ''; }; + propagatedBuildInputs = (x.propagatedBuildInputs or []) ++ (with qlnp; [ + cl-ppcre + ]); }; cl-unification = addDeps (with qlnp; [cl-ppcre]); cl-syntax-annot = addDeps (with qlnp; [cl-syntax]); cl-syntax-anonfun = addDeps (with qlnp; [cl-syntax]); cl-syntax-markup = addDeps (with qlnp; [cl-syntax]); cl-test-more = addDeps (with qlnp; [prove]); - babel-streams = addDeps (with qlnp; [babel]); + babel-streams = addDeps (with qlnp; [babel trivial-gray-streams]); + babel = addDeps (with qlnp; [trivial-features alexandria]); plump = addDeps (with qlnp; [array-utils trivial-indent]); sqlite = addNativeLibs [pkgs.sqlite]; uiop = x: { @@ -143,4 +161,33 @@ in ''; }; }; + cl-containers = x: { + overrides = y: (x.overrides y) // { + postConfigure = "rm GNUmakefile"; + }; + }; + esrap = addDeps (with qlnp; [alexandria]); + fast-io = addDeps (with qlnp; [ + alexandria trivial-gray-streams static-vectors + ]); + hu_dot_dwim_dot_def = addDeps (with qlnp; [ + hu_dot_dwim_dot_asdf alexandria anaphora iterate metabang-bind + ]); + ironclad = addDeps (with qlnp; [nibbles flexi-streams]); + ixf = addDeps (with qlnp; [ + split-sequence md5 alexandria babel local-time cl-ppcre ieee-floats + ]); + jonathan = addDeps (with qlnp; [ + cl-syntax cl-syntax-annot fast-io proc-parse cl-ppcre + ]); + local-time = addDeps (with qlnp; [cl-fad]); + lquery = addDeps (with qlnp; [array-utils form-fiddle plump clss]); + clss = addDeps (with qlnp; [array-utils plump]); + form-fiddle = addDeps (with qlnp; [documentation-utils]); + documentation-utils = addDeps (with qlnp; [trivial-indent]); + mssql = x: { + testSystems = []; + }; + cl-postgres = addDeps (with qlnp; [cl-ppcre md5]); + postmodern = addDeps (with qlnp; [md5]); } diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt index 3d15319ad06..74946f07f07 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -1,5 +1,6 @@ 3bmd alexandria +array-utils babel blackbird bordeaux-threads @@ -31,6 +32,7 @@ cl-ppcre-unicode cl-reexport cl-smtp clsql +clss cl+ssl cl-syntax-annot cl-syntax-anonfun @@ -50,15 +52,20 @@ dbd-mysql dbd-postgres dbd-sqlite3 dexador +documentation-utils drakma esrap external-program fast-http fast-io flexi-streams +form-fiddle http-body +hu.dwim.asdf hu.dwim.def hunchentoot +idna +ieee-floats iolib ironclad iterate @@ -67,9 +74,11 @@ lev local-time lquery marshal +nibbles optima parenscript pcall +pgloader plump proc-parse prove @@ -80,7 +89,9 @@ smart-buffer split-sequence static-vectors stumpwm +swap-bytes trivial-backtrace +trivial-indent trivial-mimes trivial-types trivial-utf-8 diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix index 118045015e2..c87b827112c 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -6,10 +6,10 @@ let quicklisp-to-nix-packages = rec { buildLispPackage = callPackage ./define-package.nix; qlOverrides = callPackage ./quicklisp-to-nix-overrides.nix {}; - "trivial-indent" = buildLispPackage + "asdf-system-connections" = buildLispPackage ((f: x: (x // (f x))) - (qlOverrides."trivial-indent" or (x: {})) - (import ./quicklisp-to-nix-output/trivial-indent.nix { + (qlOverrides."asdf-system-connections" or (x: {})) + (import ./quicklisp-to-nix-output/asdf-system-connections.nix { inherit fetchurl; })); @@ -24,12 +24,63 @@ let quicklisp-to-nix-packages = rec { })); - "documentation-utils" = buildLispPackage + "list-of" = buildLispPackage ((f: x: (x // (f x))) - (qlOverrides."documentation-utils" or (x: {})) - (import ./quicklisp-to-nix-output/documentation-utils.nix { + (qlOverrides."list-of" or (x: {})) + (import ./quicklisp-to-nix-output/list-of.nix { inherit fetchurl; - "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; + })); + + + "parse-number" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."parse-number" or (x: {})) + (import ./quicklisp-to-nix-output/parse-number.nix { + inherit fetchurl; + })); + + + "garbage-pools" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."garbage-pools" or (x: {})) + (import ./quicklisp-to-nix-output/garbage-pools.nix { + inherit fetchurl; + })); + + + "cl-containers" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-containers" or (x: {})) + (import ./quicklisp-to-nix-output/cl-containers.nix { + inherit fetchurl; + "metatilities-base" = quicklisp-to-nix-packages."metatilities-base"; + "asdf-system-connections" = quicklisp-to-nix-packages."asdf-system-connections"; + })); + + + "dynamic-classes" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."dynamic-classes" or (x: {})) + (import ./quicklisp-to-nix-output/dynamic-classes.nix { + inherit fetchurl; + "metatilities-base" = quicklisp-to-nix-packages."metatilities-base"; + })); + + + "metatilities-base" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."metatilities-base" or (x: {})) + (import ./quicklisp-to-nix-output/metatilities-base.nix { + inherit fetchurl; + })); + + + "cl-interpol" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-interpol" or (x: {})) + (import ./quicklisp-to-nix-output/cl-interpol.nix { + inherit fetchurl; + "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; })); @@ -49,8 +100,6 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."babel-streams" or (x: {})) (import ./quicklisp-to-nix-output/babel-streams.nix { inherit fetchurl; - "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; - "alexandria" = quicklisp-to-nix-packages."alexandria"; })); @@ -72,6 +121,141 @@ let quicklisp-to-nix-packages = rec { })); + "uuid" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."uuid" or (x: {})) + (import ./quicklisp-to-nix-output/uuid.nix { + inherit fetchurl; + "ironclad" = quicklisp-to-nix-packages."ironclad"; + "trivial-utf-8" = quicklisp-to-nix-packages."trivial-utf-8"; + })); + + + "simple-date" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."simple-date" or (x: {})) + (import ./quicklisp-to-nix-output/simple-date.nix { + inherit fetchurl; + })); + + + "qmynd" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."qmynd" or (x: {})) + (import ./quicklisp-to-nix-output/qmynd.nix { + inherit fetchurl; + "usocket" = quicklisp-to-nix-packages."usocket"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "salza2" = quicklisp-to-nix-packages."salza2"; + "list-of" = quicklisp-to-nix-packages."list-of"; + "ironclad" = quicklisp-to-nix-packages."ironclad"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "cl+ssl" = quicklisp-to-nix-packages."cl+ssl"; + "chipz" = quicklisp-to-nix-packages."chipz"; + "babel" = quicklisp-to-nix-packages."babel"; + })); + + + "py-configparser" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."py-configparser" or (x: {})) + (import ./quicklisp-to-nix-output/py-configparser.nix { + inherit fetchurl; + "parse-number" = quicklisp-to-nix-packages."parse-number"; + })); + + + "postmodern" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."postmodern" or (x: {})) + (import ./quicklisp-to-nix-output/postmodern.nix { + inherit fetchurl; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + })); + + + "mssql" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."mssql" or (x: {})) + (import ./quicklisp-to-nix-output/mssql.nix { + inherit fetchurl; + "cffi" = quicklisp-to-nix-packages."cffi"; + "garbage-pools" = quicklisp-to-nix-packages."garbage-pools"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "parse-number" = quicklisp-to-nix-packages."parse-number"; + })); + + + "lparallel" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."lparallel" or (x: {})) + (import ./quicklisp-to-nix-output/lparallel.nix { + inherit fetchurl; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + + "ixf" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."ixf" or (x: {})) + (import ./quicklisp-to-nix-output/ixf.nix { + inherit fetchurl; + })); + + + "db3" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."db3" or (x: {})) + (import ./quicklisp-to-nix-output/db3.nix { + inherit fetchurl; + })); + + + "cl-markdown" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-markdown" or (x: {})) + (import ./quicklisp-to-nix-output/cl-markdown.nix { + inherit fetchurl; + "metatilities-base" = quicklisp-to-nix-packages."metatilities-base"; + "metabang-bind" = quicklisp-to-nix-packages."metabang-bind"; + "dynamic-classes" = quicklisp-to-nix-packages."dynamic-classes"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-containers" = quicklisp-to-nix-packages."cl-containers"; + "anaphora" = quicklisp-to-nix-packages."anaphora"; + })); + + + "cl-log" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-log" or (x: {})) + (import ./quicklisp-to-nix-output/cl-log.nix { + inherit fetchurl; + })); + + + "cl-csv" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-csv" or (x: {})) + (import ./quicklisp-to-nix-output/cl-csv.nix { + inherit fetchurl; + "iterate" = quicklisp-to-nix-packages."iterate"; + "cl-interpol" = quicklisp-to-nix-packages."cl-interpol"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + + "abnf" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."abnf" or (x: {})) + (import ./quicklisp-to-nix-output/abnf.nix { + inherit fetchurl; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "esrap" = quicklisp-to-nix-packages."esrap"; + })); + + "named-readtables" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."named-readtables" or (x: {})) @@ -80,59 +264,6 @@ let quicklisp-to-nix-packages = rec { })); - "array-utils" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."array-utils" or (x: {})) - (import ./quicklisp-to-nix-output/array-utils.nix { - inherit fetchurl; - })); - - - "clss" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."clss" or (x: {})) - (import ./quicklisp-to-nix-output/clss.nix { - inherit fetchurl; - "array-utils" = quicklisp-to-nix-packages."array-utils"; - "plump" = quicklisp-to-nix-packages."plump"; - })); - - - "form-fiddle" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."form-fiddle" or (x: {})) - (import ./quicklisp-to-nix-output/form-fiddle.nix { - inherit fetchurl; - "documentation-utils" = quicklisp-to-nix-packages."documentation-utils"; - })); - - - "nibbles" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."nibbles" or (x: {})) - (import ./quicklisp-to-nix-output/nibbles.nix { - inherit fetchurl; - })); - - - "swap-bytes" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."swap-bytes" or (x: {})) - (import ./quicklisp-to-nix-output/swap-bytes.nix { - inherit fetchurl; - "trivial-features" = quicklisp-to-nix-packages."trivial-features"; - })); - - - "idna" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."idna" or (x: {})) - (import ./quicklisp-to-nix-output/idna.nix { - inherit fetchurl; - "split-sequence" = quicklisp-to-nix-packages."split-sequence"; - })); - - "rfc2388" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."rfc2388" or (x: {})) @@ -149,35 +280,10 @@ let quicklisp-to-nix-packages = rec { })); - "hu.dwim.asdf" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."hu.dwim.asdf" or (x: {})) - (import ./quicklisp-to-nix-output/hu.dwim.asdf.nix { - inherit fetchurl; - "uiop" = quicklisp-to-nix-packages."uiop"; - })); - - "jonathan" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."jonathan" or (x: {})) (import ./quicklisp-to-nix-output/jonathan.nix { - inherit fetchurl; - "trivial-types" = quicklisp-to-nix-packages."trivial-types"; - "proc-parse" = quicklisp-to-nix-packages."proc-parse"; - "fast-io" = quicklisp-to-nix-packages."fast-io"; - "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; - "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; - "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; - "cl-annot" = quicklisp-to-nix-packages."cl-annot"; - "babel" = quicklisp-to-nix-packages."babel"; - })); - - - "puri" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."puri" or (x: {})) - (import ./quicklisp-to-nix-output/puri.nix { inherit fetchurl; })); @@ -191,6 +297,14 @@ let quicklisp-to-nix-packages = rec { })); + "puri" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."puri" or (x: {})) + (import ./quicklisp-to-nix-output/puri.nix { + inherit fetchurl; + })); + + "sqlite" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."sqlite" or (x: {})) @@ -260,7 +374,6 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."cl-paths-ttf" or (x: {})) (import ./quicklisp-to-nix-output/cl-paths-ttf.nix { inherit fetchurl; - "zpb-ttf" = quicklisp-to-nix-packages."zpb-ttf"; })); @@ -372,24 +485,6 @@ let quicklisp-to-nix-packages = rec { })); - "lack-middleware-backtrace" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."lack-middleware-backtrace" or (x: {})) - (import ./quicklisp-to-nix-output/lack-middleware-backtrace.nix { - inherit fetchurl; - "uiop" = quicklisp-to-nix-packages."uiop"; - })); - - - "lack-util" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."lack-util" or (x: {})) - (import ./quicklisp-to-nix-output/lack-util.nix { - inherit fetchurl; - "ironclad" = quicklisp-to-nix-packages."ironclad"; - })); - - "trivial-gray-streams" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."trivial-gray-streams" or (x: {})) @@ -398,6 +493,14 @@ let quicklisp-to-nix-packages = rec { })); + "trivial-features" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."trivial-features" or (x: {})) + (import ./quicklisp-to-nix-output/trivial-features.nix { + inherit fetchurl; + })); + + "uiop" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."uiop" or (x: {})) @@ -468,14 +571,6 @@ let quicklisp-to-nix-packages = rec { })); - "trivial-features" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."trivial-features" or (x: {})) - (import ./quicklisp-to-nix-output/trivial-features.nix { - inherit fetchurl; - })); - - "yason" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."yason" or (x: {})) @@ -551,6 +646,14 @@ let quicklisp-to-nix-packages = rec { })); + "trivial-indent" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."trivial-indent" or (x: {})) + (import ./quicklisp-to-nix-output/trivial-indent.nix { + inherit fetchurl; + })); + + "trivial-backtrace" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."trivial-backtrace" or (x: {})) @@ -559,14 +662,20 @@ let quicklisp-to-nix-packages = rec { })); + "swap-bytes" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."swap-bytes" or (x: {})) + (import ./quicklisp-to-nix-output/swap-bytes.nix { + inherit fetchurl; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + })); + + "stumpwm" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."stumpwm" or (x: {})) (import ./quicklisp-to-nix-output/stumpwm.nix { inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; - "clx" = quicklisp-to-nix-packages."clx"; })); @@ -666,6 +775,44 @@ let quicklisp-to-nix-packages = rec { })); + "pgloader" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."pgloader" or (x: {})) + (import ./quicklisp-to-nix-output/pgloader.nix { + inherit fetchurl; + "abnf" = quicklisp-to-nix-packages."abnf"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "cl-base64" = quicklisp-to-nix-packages."cl-base64"; + "cl-csv" = quicklisp-to-nix-packages."cl-csv"; + "cl-fad" = quicklisp-to-nix-packages."cl-fad"; + "cl-log" = quicklisp-to-nix-packages."cl-log"; + "cl-markdown" = quicklisp-to-nix-packages."cl-markdown"; + "cl-postgres" = quicklisp-to-nix-packages."cl-postgres"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "command-line-arguments" = quicklisp-to-nix-packages."command-line-arguments"; + "db3" = quicklisp-to-nix-packages."db3"; + "drakma" = quicklisp-to-nix-packages."drakma"; + "esrap" = quicklisp-to-nix-packages."esrap"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "ixf" = quicklisp-to-nix-packages."ixf"; + "local-time" = quicklisp-to-nix-packages."local-time"; + "lparallel" = quicklisp-to-nix-packages."lparallel"; + "metabang-bind" = quicklisp-to-nix-packages."metabang-bind"; + "mssql" = quicklisp-to-nix-packages."mssql"; + "postmodern" = quicklisp-to-nix-packages."postmodern"; + "py-configparser" = quicklisp-to-nix-packages."py-configparser"; + "qmynd" = quicklisp-to-nix-packages."qmynd"; + "quri" = quicklisp-to-nix-packages."quri"; + "simple-date" = quicklisp-to-nix-packages."simple-date"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "sqlite" = quicklisp-to-nix-packages."sqlite"; + "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace"; + "uiop" = quicklisp-to-nix-packages."uiop"; + "usocket" = quicklisp-to-nix-packages."usocket"; + "uuid" = quicklisp-to-nix-packages."uuid"; + })); + + "pcall" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."pcall" or (x: {})) @@ -696,6 +843,14 @@ let quicklisp-to-nix-packages = rec { })); + "nibbles" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."nibbles" or (x: {})) + (import ./quicklisp-to-nix-output/nibbles.nix { + inherit fetchurl; + })); + + "marshal" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."marshal" or (x: {})) @@ -709,10 +864,6 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."lquery" or (x: {})) (import ./quicklisp-to-nix-output/lquery.nix { inherit fetchurl; - "plump" = quicklisp-to-nix-packages."plump"; - "form-fiddle" = quicklisp-to-nix-packages."form-fiddle"; - "clss" = quicklisp-to-nix-packages."clss"; - "array-utils" = quicklisp-to-nix-packages."array-utils"; })); @@ -721,7 +872,6 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."local-time" or (x: {})) (import ./quicklisp-to-nix-output/local-time.nix { inherit fetchurl; - "cl-fad" = quicklisp-to-nix-packages."cl-fad"; })); @@ -755,7 +905,6 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."ironclad" or (x: {})) (import ./quicklisp-to-nix-output/ironclad.nix { inherit fetchurl; - "nibbles" = quicklisp-to-nix-packages."nibbles"; })); @@ -764,15 +913,23 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."iolib" or (x: {})) (import ./quicklisp-to-nix-output/iolib.nix { inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; - "babel" = quicklisp-to-nix-packages."babel"; - "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; - "cffi" = quicklisp-to-nix-packages."cffi"; - "idna" = quicklisp-to-nix-packages."idna"; + })); + + + "ieee-floats" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."ieee-floats" or (x: {})) + (import ./quicklisp-to-nix-output/ieee-floats.nix { + inherit fetchurl; + })); + + + "idna" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."idna" or (x: {})) + (import ./quicklisp-to-nix-output/idna.nix { + inherit fetchurl; "split-sequence" = quicklisp-to-nix-packages."split-sequence"; - "swap-bytes" = quicklisp-to-nix-packages."swap-bytes"; - "trivial-features" = quicklisp-to-nix-packages."trivial-features"; - "uiop" = quicklisp-to-nix-packages."uiop"; })); @@ -795,16 +952,19 @@ let quicklisp-to-nix-packages = rec { })); - "hu.dwim.def" = buildLispPackage + "hu_dot_dwim_dot_def" = buildLispPackage ((f: x: (x // (f x))) - (qlOverrides."hu.dwim.def" or (x: {})) - (import ./quicklisp-to-nix-output/hu.dwim.def.nix { + (qlOverrides."hu_dot_dwim_dot_def" or (x: {})) + (import ./quicklisp-to-nix-output/hu_dot_dwim_dot_def.nix { + inherit fetchurl; + })); + + + "hu_dot_dwim_dot_asdf" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."hu_dot_dwim_dot_asdf" or (x: {})) + (import ./quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix { inherit fetchurl; - "metabang-bind" = quicklisp-to-nix-packages."metabang-bind"; - "iterate" = quicklisp-to-nix-packages."iterate"; - "hu.dwim.asdf" = quicklisp-to-nix-packages."hu.dwim.asdf"; - "anaphora" = quicklisp-to-nix-packages."anaphora"; - "alexandria" = quicklisp-to-nix-packages."alexandria"; })); @@ -824,6 +984,14 @@ let quicklisp-to-nix-packages = rec { })); + "form-fiddle" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."form-fiddle" or (x: {})) + (import ./quicklisp-to-nix-output/form-fiddle.nix { + inherit fetchurl; + })); + + "flexi-streams" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."flexi-streams" or (x: {})) @@ -838,9 +1006,6 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."fast-io" or (x: {})) (import ./quicklisp-to-nix-output/fast-io.nix { inherit fetchurl; - "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; - "static-vectors" = quicklisp-to-nix-packages."static-vectors"; - "alexandria" = quicklisp-to-nix-packages."alexandria"; })); @@ -866,7 +1031,6 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."esrap" or (x: {})) (import ./quicklisp-to-nix-output/esrap.nix { inherit fetchurl; - "alexandria" = quicklisp-to-nix-packages."alexandria"; })); @@ -886,27 +1050,19 @@ let quicklisp-to-nix-packages = rec { })); + "documentation-utils" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."documentation-utils" or (x: {})) + (import ./quicklisp-to-nix-output/documentation-utils.nix { + inherit fetchurl; + })); + + "dexador" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."dexador" or (x: {})) (import ./quicklisp-to-nix-output/dexador.nix { inherit fetchurl; - "usocket" = quicklisp-to-nix-packages."usocket"; - "trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes"; - "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; - "quri" = quicklisp-to-nix-packages."quri"; - "fast-io" = quicklisp-to-nix-packages."fast-io"; - "fast-http" = quicklisp-to-nix-packages."fast-http"; - "cl-reexport" = quicklisp-to-nix-packages."cl-reexport"; - "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; - "cl-cookie" = quicklisp-to-nix-packages."cl-cookie"; - "cl-base64" = quicklisp-to-nix-packages."cl-base64"; - "cl+ssl" = quicklisp-to-nix-packages."cl+ssl"; - "chunga" = quicklisp-to-nix-packages."chunga"; - "chipz" = quicklisp-to-nix-packages."chipz"; - "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; - "babel" = quicklisp-to-nix-packages."babel"; - "alexandria" = quicklisp-to-nix-packages."alexandria"; })); @@ -1085,6 +1241,14 @@ let quicklisp-to-nix-packages = rec { })); + "clss" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clss" or (x: {})) + (import ./quicklisp-to-nix-output/clss.nix { + inherit fetchurl; + })); + + "clsql" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."clsql" or (x: {})) @@ -1130,7 +1294,6 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."cl-ppcre-template" or (x: {})) (import ./quicklisp-to-nix-output/cl-ppcre-template.nix { inherit fetchurl; - "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; })); @@ -1323,24 +1486,6 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."clack-v1-compat" or (x: {})) (import ./quicklisp-to-nix-output/clack-v1-compat.nix { inherit fetchurl; - "uiop" = quicklisp-to-nix-packages."uiop"; - "trivial-types" = quicklisp-to-nix-packages."trivial-types"; - "trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes"; - "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace"; - "split-sequence" = quicklisp-to-nix-packages."split-sequence"; - "quri" = quicklisp-to-nix-packages."quri"; - "marshal" = quicklisp-to-nix-packages."marshal"; - "local-time" = quicklisp-to-nix-packages."local-time"; - "lack-util" = quicklisp-to-nix-packages."lack-util"; - "lack" = quicklisp-to-nix-packages."lack"; - "ironclad" = quicklisp-to-nix-packages."ironclad"; - "http-body" = quicklisp-to-nix-packages."http-body"; - "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; - "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; - "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; - "cl-base64" = quicklisp-to-nix-packages."cl-base64"; - "circular-streams" = quicklisp-to-nix-packages."circular-streams"; - "alexandria" = quicklisp-to-nix-packages."alexandria"; })); @@ -1349,12 +1494,6 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."clack" or (x: {})) (import ./quicklisp-to-nix-output/clack.nix { inherit fetchurl; - "uiop" = quicklisp-to-nix-packages."uiop"; - "lack-util" = quicklisp-to-nix-packages."lack-util"; - "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace"; - "lack" = quicklisp-to-nix-packages."lack"; - "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; - "alexandria" = quicklisp-to-nix-packages."alexandria"; })); @@ -1429,8 +1568,14 @@ let quicklisp-to-nix-packages = rec { (qlOverrides."babel" or (x: {})) (import ./quicklisp-to-nix-output/babel.nix { inherit fetchurl; - "trivial-features" = quicklisp-to-nix-packages."trivial-features"; - "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + + "array-utils" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."array-utils" or (x: {})) + (import ./quicklisp-to-nix-output/array-utils.nix { + inherit fetchurl; })); @@ -1442,10 +1587,10 @@ let quicklisp-to-nix-packages = rec { })); - "3bmd" = buildLispPackage + "_3bmd" = buildLispPackage ((f: x: (x // (f x))) - (qlOverrides."3bmd" or (x: {})) - (import ./quicklisp-to-nix-output/3bmd.nix { + (qlOverrides."_3bmd" or (x: {})) + (import ./quicklisp-to-nix-output/_3bmd.nix { inherit fetchurl; "split-sequence" = quicklisp-to-nix-packages."split-sequence"; "esrap" = quicklisp-to-nix-packages."esrap"; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/invocation.emb b/pkgs/development/lisp-modules/quicklisp-to-nix/invocation.emb index a13cedf3dfe..3a0c5cb5fc2 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix/invocation.emb +++ b/pkgs/development/lisp-modules/quicklisp-to-nix/invocation.emb @@ -1,8 +1,7 @@ - "<% @var name %>" = buildLispPackage + "<% @var filename %>" = buildLispPackage ((f: x: (x // (f x))) - (qlOverrides."<% @var name %>" or (x: {})) + (qlOverrides."<% @var filename %>" or (x: {})) (import ./quicklisp-to-nix-output/<% @var filename %>.nix { inherit fetchurl;<% @loop deps %> - "<% @var name %>" = quicklisp-to-nix-packages."<% @var name %>";<% @endloop %> - }));<% @ifequal name filename %><% @else %> - "<% @var filename %>" = quicklisp-to-nix-packages."<% @var name %>";<% @endif %> + "<% @var filename %>" = quicklisp-to-nix-packages."<% @var filename %>";<% @endloop %> + })); diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb b/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb index 3b71ade03f7..baedbd1553a 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb +++ b/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb @@ -7,12 +7,14 @@ rec { description = ''<% @var description %>''; - deps = [ <% @loop deps %>args."<% @var name %>" <% @endloop %>]; + deps = [ <% @loop deps %>args."<% @var filename %>" <% @endloop %>]; src = fetchurl { url = ''<% @var url %>''; sha256 = ''<% @var sha256 %>''; }; + + packageName = "<% @var name %>"; overrides = x: { postInstall = '' diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp index 18cf6d097a2..141fb0f34eb 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp +++ b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp @@ -36,19 +36,27 @@ (map 'list 'identity (md5:md5sum-file path)))))))) (defun escape-filename (s) - (format nil "~{~a~}" - (loop - for x in (map 'list 'identity s) - collect - (case x - (#\/ "_slash_") - (#\\ "_backslash_") - (#\_ "__") - (t x))))) + (format + nil "~a~{~a~}" + (if (cl-ppcre:scan "^[a-zA-Z_]" s) "" "_") + (loop + for x in (map 'list 'identity s) + collect + (case x + (#\/ "_slash_") + (#\\ "_backslash_") + (#\_ "__") + (#\. "_dot_") + (t x))))) (defun system-data (system) (let* - ((asdf-system (asdf:find-system system)) + ((asdf-system + (or + (ignore-errors (asdf:find-system system)) + (progn + (ql:quickload system) + (asdf:find-system system)))) (ql-system (ql-dist:find-system system)) (ql-release (ql-dist:release ql-system)) (ql-sibling-systems (ql-dist:provided-systems ql-release)) @@ -73,7 +81,8 @@ :test 'equal) ql-sibling-names :test 'equal)) - (deps (mapcar (lambda (x) (list :name x)) dependencies)) + (deps (mapcar (lambda (x) (list :name x :filename (escape-filename x))) + dependencies)) (description (asdf:system-description asdf-system)) (release-name (ql-dist:short-description ql-release)) (version (cl-ppcre:regex-replace-all diff --git a/pkgs/development/mobile/adbfs-rootless/default.nix b/pkgs/development/mobile/adbfs-rootless/default.nix new file mode 100644 index 00000000000..38ecfcdf9a9 --- /dev/null +++ b/pkgs/development/mobile/adbfs-rootless/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, fuse, adb }: + +stdenv.mkDerivation rec { + name = "adbfs-rootless-${version}"; + version = "2016-10-02"; + + src = fetchFromGitHub { + owner = "spion"; + repo = "adbfs-rootless"; + rev = "b58963430e40c9246710a16cec58e7ffc88baa48"; + sha256 = "1kjibl86k6pf7vciwaaxwv5m4q28zdpd2g7yhp71av32jq6j3wm8"; + }; + + patches = [ + (fetchpatch { + # https://github.com/spion/adbfs-rootless/issues/14 + url = "https://github.com/kronenpj/adbfs-rootless/commit/35f87ce0a7aeddaaad118daed3022e01453b838d.patch"; + sha256 = "1iigla74n3hphnyx9ffli9wqk7v71ylvsxama868czlg7851jqj9"; + }) + ]; + + buildInputs = [ fuse pkgconfig ]; + + postPatch = '' + # very ugly way of replacing the adb calls + sed -e 's|"adb |"${stdenv.lib.getBin adb}/bin/adb |g' \ + -i adbfs.cpp + ''; + + installPhase = '' + install -D adbfs $out/bin/adbfs + ''; + + meta = with stdenv.lib; { + description = "Mount Android phones on Linux with adb, no root required"; + inherit (src.meta) homepage; + license = licenses.bsd3; + maintainers = with maintainers; [ profpatsch ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix index c8e51f53a9a..d22e217efbb 100644 --- a/pkgs/development/node-packages/node-packages-v4.nix +++ b/pkgs/development/node-packages/node-packages-v4.nix @@ -634,13 +634,13 @@ let sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; }; }; - "readable-stream-2.2.11" = { + "readable-stream-2.3.3" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.2.11"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.11.tgz"; - sha1 = "0796b31f8d7688007ff0b93a8088d34aa17c0f72"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz"; + sha1 = "368f2512d79f9d46fdfc71349ae7878bbc1eb95c"; }; }; "xtend-4.0.1" = { @@ -670,22 +670,22 @@ let sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; }; }; - "safe-buffer-5.0.1" = { + "safe-buffer-5.1.1" = { name = "safe-buffer"; packageName = "safe-buffer"; - version = "5.0.1"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz"; - sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7"; + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"; + sha1 = "893312af69b2123def71f57889001671eeb2c853"; }; }; - "string_decoder-1.0.2" = { + "string_decoder-1.0.3" = { name = "string_decoder"; packageName = "string_decoder"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.2.tgz"; - sha1 = "b29e1f4e1125fa97a10382b8a533737b7491e179"; + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz"; + sha1 = "0fc67d7c141825de94282dd536bec6b9bce860ab"; }; }; "util-deprecate-1.0.2" = { @@ -733,13 +733,13 @@ let sha1 = "40043929e7bc60adf0b7f4827c4c6e75a0deca12"; }; }; - "fined-1.0.2" = { + "fined-1.1.0" = { name = "fined"; packageName = "fined"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/fined/-/fined-1.0.2.tgz"; - sha1 = "5b28424b760d7598960b7ef8480dff8ad3660e97"; + url = "https://registry.npmjs.org/fined/-/fined-1.1.0.tgz"; + sha1 = "b37dc844b76a2f5e7081e884f7c0ae344f153476"; }; }; "flagged-respawn-0.3.2" = { @@ -949,13 +949,13 @@ let sha1 = "9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145"; }; }; - "arr-flatten-1.0.3" = { + "arr-flatten-1.1.0" = { name = "arr-flatten"; packageName = "arr-flatten"; - version = "1.0.3"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.3.tgz"; - sha1 = "a274ed85ac08849b6bd7847c4580745dc51adfb1"; + url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz"; + sha1 = "36048bbff4e7b47e136644316c99669ea5ae91f1"; }; }; "expand-range-1.8.2" = { @@ -1237,31 +1237,40 @@ let sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; }; }; - "lodash.assignwith-4.2.0" = { - name = "lodash.assignwith"; - packageName = "lodash.assignwith"; - version = "4.2.0"; + "expand-tilde-2.0.2" = { + name = "expand-tilde"; + packageName = "expand-tilde"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.assignwith/-/lodash.assignwith-4.2.0.tgz"; - sha1 = "127a97f02adc41751a954d24b0de17e100e038eb"; + url = "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz"; + sha1 = "97e801aa052df02454de46b02bf621642cdc8502"; }; }; - "lodash.isempty-4.4.0" = { - name = "lodash.isempty"; - packageName = "lodash.isempty"; - version = "4.4.0"; + "is-plain-object-2.0.4" = { + name = "is-plain-object"; + packageName = "is-plain-object"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz"; - sha1 = "6f86cbedd8be4ec987be9aaf33c9684db1b31e7e"; + url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"; + sha1 = "2c163b3fafb1b606d9d17928f05c2a1c38e07677"; }; }; - "lodash.pick-4.4.0" = { - name = "lodash.pick"; - packageName = "lodash.pick"; - version = "4.4.0"; + "object.defaults-1.1.0" = { + name = "object.defaults"; + packageName = "object.defaults"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz"; - sha1 = "52f05610fff9ded422611441ed1fc123a03001b3"; + url = "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz"; + sha1 = "3a7f868334b407dea06da16d88d5cd29e435fecf"; + }; + }; + "object.pick-1.2.0" = { + name = "object.pick"; + packageName = "object.pick"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object.pick/-/object.pick-1.2.0.tgz"; + sha1 = "b5392bee9782da6d9fb7d6afaf539779f1234c2b"; }; }; "parse-filepath-1.0.1" = { @@ -1273,6 +1282,42 @@ let sha1 = "159d6155d43904d16c10ef698911da1e91969b73"; }; }; + "isobject-3.0.1" = { + name = "isobject"; + packageName = "isobject"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz"; + sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; + }; + }; + "array-each-1.0.1" = { + name = "array-each"; + packageName = "array-each"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz"; + sha1 = "a794af0c05ab1752846ee753a1f211a05ba0c44f"; + }; + }; + "array-slice-1.0.0" = { + name = "array-slice"; + packageName = "array-slice"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-slice/-/array-slice-1.0.0.tgz"; + sha1 = "e73034f00dcc1f40876008fd20feae77bd4b7c2f"; + }; + }; + "for-own-1.0.0" = { + name = "for-own"; + packageName = "for-own"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz"; + sha1 = "c63332f415cedc4b04dbfe70cf836494c53cb44b"; + }; + }; "is-absolute-0.2.6" = { name = "is-absolute"; packageName = "is-absolute"; @@ -1678,13 +1723,13 @@ let sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; }; }; - "npmlog-4.1.0" = { + "npmlog-4.1.2" = { name = "npmlog"; packageName = "npmlog"; - version = "4.1.0"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.0.tgz"; - sha1 = "dc59bee85f64f00ed424efb2af0783df25d1c0b5"; + url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"; + sha1 = "08a7f2a8bf734604779a9efa4ad5cc717abb954b"; }; }; "osenv-0.1.4" = { @@ -2020,15 +2065,6 @@ let sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233"; }; }; - "safe-buffer-5.1.0" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.0.tgz"; - sha1 = "fe4c8460397f9eaaaa58e73be46273408a45e223"; - }; - }; "stringstream-0.0.5" = { name = "stringstream"; packageName = "stringstream"; @@ -2623,13 +2659,13 @@ let sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; }; }; - "normalize-package-data-2.3.8" = { + "normalize-package-data-2.4.0" = { name = "normalize-package-data"; packageName = "normalize-package-data"; - version = "2.3.8"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.8.tgz"; - sha1 = "d819eda2a9dedbd1ffa563ea4071d936782295bb"; + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; + sha1 = "12f95a307d58352075a04907b84ac8be98ac012f"; }; }; "read-pkg-up-1.0.1" = { @@ -2686,13 +2722,13 @@ let sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; }; }; - "hosted-git-info-2.4.2" = { + "hosted-git-info-2.5.0" = { name = "hosted-git-info"; packageName = "hosted-git-info"; - version = "2.4.2"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.2.tgz"; - sha1 = "0076b9f46a270506ddbaaea56496897460612a67"; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz"; + sha1 = "6d60e34b3abbc8313062c3b798ef8d901a07af3c"; }; }; "is-builtin-module-1.0.0" = { @@ -3253,6 +3289,15 @@ let sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; }; }; + "safe-buffer-5.0.1" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz"; + sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7"; + }; + }; "truncate-1.0.5" = { name = "truncate"; packageName = "truncate"; @@ -3406,6 +3451,15 @@ let sha1 = "707f761e01dae9e16f1bcf93703b78c70966579a"; }; }; + "ansi-regex-3.0.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz"; + sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + }; + }; "ansicolors-0.3.2" = { name = "ansicolors"; packageName = "ansicolors"; @@ -3433,13 +3487,13 @@ let sha1 = "791420d7f551eea2897453a8a77653f96606d67c"; }; }; - "cacache-9.2.8" = { + "cacache-9.2.9" = { name = "cacache"; packageName = "cacache"; - version = "9.2.8"; + version = "9.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/cacache/-/cacache-9.2.8.tgz"; - sha1 = "2e38b51161a3904e3b9fb35c0869b751f7d0bcf4"; + url = "https://registry.npmjs.org/cacache/-/cacache-9.2.9.tgz"; + sha1 = "f9d7ffe039851ec94c28290662afa4dd4bb9e8dd"; }; }; "call-limit-1.1.0" = { @@ -3568,6 +3622,15 @@ let sha1 = "84ddc4b370679ba8bd4cdcfa4c06b43d57111147"; }; }; + "libnpx-9.0.7" = { + name = "libnpx"; + packageName = "libnpx"; + version = "9.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/libnpx/-/libnpx-9.0.7.tgz"; + sha1 = "e30e4d5d0cc21c849541441855d0d334d00b009b"; + }; + }; "lockfile-1.0.3" = { name = "lockfile"; packageName = "lockfile"; @@ -3622,13 +3685,13 @@ let sha1 = "3cd4574a00b67bae373a94b748772640507b7aac"; }; }; - "lru-cache-4.0.2" = { + "lru-cache-4.1.1" = { name = "lru-cache"; packageName = "lru-cache"; - version = "4.0.2"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz"; - sha1 = "1d17679c069cda5d040991a09dbc2c0db377e55e"; + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz"; + sha1 = "622e32e82488b49279114a4f9ecf45e7cd6bba55"; }; }; "mississippi-1.3.0" = { @@ -3685,13 +3748,13 @@ let sha1 = "fb18d17bb61e60900d6312619919bd753755ab37"; }; }; - "npm-registry-client-8.3.0" = { + "npm-registry-client-8.4.0" = { name = "npm-registry-client"; packageName = "npm-registry-client"; - version = "8.3.0"; + version = "8.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.3.0.tgz"; - sha1 = "a86d5b1f97945de8df73c471d33602d5cd15130f"; + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.4.0.tgz"; + sha1 = "d52b901685647fc62a4c03eafecb6ceaa5018d4c"; }; }; "npm-user-validate-1.0.0" = { @@ -3712,13 +3775,13 @@ let sha1 = "5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"; }; }; - "pacote-2.7.36" = { + "pacote-2.7.38" = { name = "pacote"; packageName = "pacote"; - version = "2.7.36"; + version = "2.7.38"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-2.7.36.tgz"; - sha1 = "837734ad2e545123b8b8fe5caa5076c92b5c7b5c"; + url = "https://registry.npmjs.org/pacote/-/pacote-2.7.38.tgz"; + sha1 = "5091f8774298c26c3eca24606037f1bb73db74c1"; }; }; "path-is-inside-1.0.2" = { @@ -3766,13 +3829,13 @@ let sha1 = "ff9b8b67f187d1e4c29b9feb31f6b223acd19067"; }; }; - "read-package-json-2.0.5" = { + "read-package-json-2.0.10" = { name = "read-package-json"; packageName = "read-package-json"; - version = "2.0.5"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.5.tgz"; - sha1 = "f93a64e641529df68a08c64de46389e8a3f88845"; + url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.10.tgz"; + sha1 = "dc0229f6dde6b4b705b39e25b2d970ebe95685ae"; }; }; "read-package-tree-5.1.6" = { @@ -3838,6 +3901,15 @@ let sha1 = "0cb49b6ac84457e7bdd466cb730c3cb623e9a25b"; }; }; + "strip-ansi-4.0.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"; + sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; + }; + }; "text-table-0.2.0" = { name = "text-table"; packageName = "text-table"; @@ -3865,22 +3937,13 @@ let sha1 = "d05f2fe4032560871f30e93cbe735eea201514f3"; }; }; - "update-notifier-2.1.0" = { + "update-notifier-2.2.0" = { name = "update-notifier"; packageName = "update-notifier"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.1.0.tgz"; - sha1 = "ec0c1e53536b76647a24b77cb83966d9315123d9"; - }; - }; - "uuid-3.0.1" = { - name = "uuid"; - packageName = "uuid"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz"; - sha1 = "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"; + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.2.0.tgz"; + sha1 = "1b5837cf90c0736d88627732b661c138f86de72f"; }; }; "validate-npm-package-name-3.0.0" = { @@ -3892,6 +3955,15 @@ let sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e"; }; }; + "worker-farm-1.4.1" = { + name = "worker-farm"; + packageName = "worker-farm"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.4.1.tgz"; + sha1 = "a438bc993a7a7d133bcb6547c95eca7cff4897d8"; + }; + }; "write-file-atomic-2.1.0" = { name = "write-file-atomic"; packageName = "write-file-atomic"; @@ -4000,13 +4072,13 @@ let sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; }; }; - "asap-2.0.5" = { + "asap-2.0.6" = { name = "asap"; packageName = "asap"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/asap/-/asap-2.0.5.tgz"; - sha1 = "522765b50c3510490e52d7dcfe085ef9ba96958f"; + url = "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz"; + sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46"; }; }; "promzard-0.3.0" = { @@ -4018,6 +4090,285 @@ let sha1 = "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"; }; }; + "dotenv-4.0.0" = { + name = "dotenv"; + packageName = "dotenv"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dotenv/-/dotenv-4.0.0.tgz"; + sha1 = "864ef1379aced55ce6f95debecdce179f7a0cd1d"; + }; + }; + "yargs-8.0.2" = { + name = "yargs"; + packageName = "yargs"; + version = "8.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz"; + sha1 = "6299a9055b1cefc969ff7e79c1d918dceb22c360"; + }; + }; + "camelcase-4.1.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz"; + sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; + }; + }; + "get-caller-file-1.0.2" = { + name = "get-caller-file"; + packageName = "get-caller-file"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz"; + sha1 = "f702e63127e7e231c160a80c1554acb70d5047e5"; + }; + }; + "os-locale-2.0.0" = { + name = "os-locale"; + packageName = "os-locale"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-locale/-/os-locale-2.0.0.tgz"; + sha1 = "15918ded510522b81ee7ae5a309d54f639fc39a4"; + }; + }; + "read-pkg-up-2.0.0" = { + name = "read-pkg-up"; + packageName = "read-pkg-up"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz"; + sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be"; + }; + }; + "require-directory-2.1.1" = { + name = "require-directory"; + packageName = "require-directory"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; + sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + }; + }; + "require-main-filename-1.0.1" = { + name = "require-main-filename"; + packageName = "require-main-filename"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz"; + sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; + }; + }; + "string-width-2.1.0" = { + name = "string-width"; + packageName = "string-width"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-2.1.0.tgz"; + sha1 = "030664561fc146c9423ec7d978fe2457437fe6d0"; + }; + }; + "which-module-2.0.0" = { + name = "which-module"; + packageName = "which-module"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz"; + sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; + }; + }; + "yargs-parser-7.0.0" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz"; + sha1 = "8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"; + }; + }; + "execa-0.5.1" = { + name = "execa"; + packageName = "execa"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-0.5.1.tgz"; + sha1 = "de3fb85cb8d6e91c85bcbceb164581785cb57b36"; + }; + }; + "mem-1.1.0" = { + name = "mem"; + packageName = "mem"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz"; + sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76"; + }; + }; + "cross-spawn-4.0.2" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz"; + sha1 = "7b9247621c23adfdd3856004a823cbe397424d41"; + }; + }; + "get-stream-2.3.1" = { + name = "get-stream"; + packageName = "get-stream"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz"; + sha1 = "5f38f93f346009666ee0150a054167f91bdd95de"; + }; + }; + "is-stream-1.1.0" = { + name = "is-stream"; + packageName = "is-stream"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"; + sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + }; + }; + "npm-run-path-2.0.2" = { + name = "npm-run-path"; + packageName = "npm-run-path"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz"; + sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; + }; + }; + "p-finally-1.0.0" = { + name = "p-finally"; + packageName = "p-finally"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"; + sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; + }; + }; + "strip-eof-1.0.0" = { + name = "strip-eof"; + packageName = "strip-eof"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz"; + sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; + }; + }; + "path-key-2.0.1" = { + name = "path-key"; + packageName = "path-key"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"; + sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; + }; + }; + "mimic-fn-1.1.0" = { + name = "mimic-fn"; + packageName = "mimic-fn"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz"; + sha1 = "e667783d92e89dbd342818b5230b9d62a672ad18"; + }; + }; + "find-up-2.1.0" = { + name = "find-up"; + packageName = "find-up"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz"; + sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7"; + }; + }; + "read-pkg-2.0.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz"; + sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"; + }; + }; + "locate-path-2.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz"; + sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"; + }; + }; + "p-locate-2.0.0" = { + name = "p-locate"; + packageName = "p-locate"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz"; + sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43"; + }; + }; + "path-exists-3.0.0" = { + name = "path-exists"; + packageName = "path-exists"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz"; + sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; + }; + }; + "p-limit-1.1.0" = { + name = "p-limit"; + packageName = "p-limit"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz"; + sha1 = "b07ff2d9a5d88bec806035895a2bab66a27988bc"; + }; + }; + "load-json-file-2.0.0" = { + name = "load-json-file"; + packageName = "load-json-file"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz"; + sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8"; + }; + }; + "path-type-2.0.0" = { + name = "path-type"; + packageName = "path-type"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz"; + sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73"; + }; + }; + "strip-bom-3.0.0" = { + name = "strip-bom"; + packageName = "strip-bom"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz"; + sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; + }; + }; + "is-fullwidth-code-point-2.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; + sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + }; + }; "lodash._createset-4.0.3" = { name = "lodash._createset"; packageName = "lodash._createset"; @@ -4180,22 +4531,22 @@ let sha1 = "e848396f057d223f24386924618e25694161ec47"; }; }; - "make-fetch-happen-2.4.12" = { + "make-fetch-happen-2.4.13" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; - version = "2.4.12"; + version = "2.4.13"; src = fetchurl { - url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.4.12.tgz"; - sha1 = "5e16f97b3e1fc30017da82ba4b4a5529e773f399"; + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.4.13.tgz"; + sha1 = "3139ba2f4230a8384e7ba394534816c872ecbf4b"; }; }; - "npm-pick-manifest-1.0.3" = { + "npm-pick-manifest-1.0.4" = { name = "npm-pick-manifest"; packageName = "npm-pick-manifest"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-1.0.3.tgz"; - sha1 = "a56fed120b2d8adaec5334ddd07cf23b2389e8de"; + url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-1.0.4.tgz"; + sha1 = "a5ee6510c1fe7221c0bc0414e70924c14045f7e8"; }; }; "promise-retry-1.1.1" = { @@ -4234,13 +4585,13 @@ let sha1 = "36549cf04ed1aee9b2a30c0143252238daf94016"; }; }; - "agentkeepalive-3.2.0" = { + "agentkeepalive-3.3.0" = { name = "agentkeepalive"; packageName = "agentkeepalive"; - version = "3.2.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.2.0.tgz"; - sha1 = "dcc9b272541d2fd2e9cf79fb0fdb192a6c5d60cd"; + url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.3.0.tgz"; + sha1 = "6d5de5829afd3be2712201a39275fd11c651857c"; }; }; "http-cache-semantics-3.7.3" = { @@ -4252,22 +4603,22 @@ let sha1 = "2f35c532ecd29f1e5413b9af833b724a3c6f7f72"; }; }; - "http-proxy-agent-1.0.0" = { + "http-proxy-agent-2.0.0" = { name = "http-proxy-agent"; packageName = "http-proxy-agent"; - version = "1.0.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-1.0.0.tgz"; - sha1 = "cc1ce38e453bf984a0f7702d2dd59c73d081284a"; + url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.0.0.tgz"; + sha1 = "46482a2f0523a4d6082551709f469cb3e4a85ff4"; }; }; - "https-proxy-agent-1.0.0" = { + "https-proxy-agent-2.0.0" = { name = "https-proxy-agent"; packageName = "https-proxy-agent"; - version = "1.0.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz"; - sha1 = "35f7da6c48ce4ddbfa264891ac593ee5ff8671e6"; + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.0.0.tgz"; + sha1 = "ffaa4b6faf586ac340c18a140431e76b7d7f2944"; }; }; "node-fetch-npm-2.0.1" = { @@ -4279,13 +4630,13 @@ let sha1 = "4dd3355ce526c01bc5ab29ccdf48352dc8a79465"; }; }; - "socks-proxy-agent-2.1.1" = { + "socks-proxy-agent-3.0.0" = { name = "socks-proxy-agent"; packageName = "socks-proxy-agent"; - version = "2.1.1"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-2.1.1.tgz"; - sha1 = "86ebb07193258637870e13b7bd99f26c663df3d3"; + url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-3.0.0.tgz"; + sha1 = "ea23085cd2bde94d084a62448f31139ca7ed6245"; }; }; "humanize-ms-1.2.1" = { @@ -4297,22 +4648,31 @@ let sha1 = "c46e3159a293f6b896da29316d8b6fe8bb79bbed"; }; }; - "agent-base-2.1.1" = { + "agent-base-4.1.0" = { name = "agent-base"; packageName = "agent-base"; - version = "2.1.1"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz"; - sha1 = "d6de10d5af6132d5bd692427d46fc538539094c7"; + url = "https://registry.npmjs.org/agent-base/-/agent-base-4.1.0.tgz"; + sha1 = "20e17401cd49b3c076bf56a4bc6c5b436ffa8d55"; }; }; - "semver-5.0.3" = { - name = "semver"; - packageName = "semver"; - version = "5.0.3"; + "es6-promisify-5.0.0" = { + name = "es6-promisify"; + packageName = "es6-promisify"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz"; - sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a"; + url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz"; + sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203"; + }; + }; + "es6-promise-4.1.1" = { + name = "es6-promise"; + packageName = "es6-promise"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.1.1.tgz"; + sha1 = "8811e90915d9a0dba36274f0b242dbda78f9c92a"; }; }; "encoding-0.1.12" = { @@ -4450,13 +4810,13 @@ let sha1 = "db6676e7c7cc0629878ff196097c78855ae9f4ab"; }; }; - "boxen-1.1.0" = { + "boxen-1.2.0" = { name = "boxen"; packageName = "boxen"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/boxen/-/boxen-1.1.0.tgz"; - sha1 = "b1b69dd522305e807a99deee777dbd6e5167b102"; + url = "https://registry.npmjs.org/boxen/-/boxen-1.2.0.tgz"; + sha1 = "03478d84be7fe02189b80904d81d6a80384368f1"; }; }; "configstore-3.1.0" = { @@ -4468,6 +4828,15 @@ let sha1 = "45df907073e26dfa1cf4b2d52f5b60545eaa11d1"; }; }; + "import-lazy-2.1.0" = { + name = "import-lazy"; + packageName = "import-lazy"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz"; + sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43"; + }; + }; "is-npm-1.0.0" = { name = "is-npm"; packageName = "is-npm"; @@ -4486,15 +4855,6 @@ let sha1 = "a205383fea322b33b5ae3b18abee0dc2f356ee15"; }; }; - "lazy-req-2.0.0" = { - name = "lazy-req"; - packageName = "lazy-req"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lazy-req/-/lazy-req-2.0.0.tgz"; - sha1 = "c9450a363ecdda2e6f0c70132ad4f37f8f06f2b4"; - }; - }; "semver-diff-2.1.0" = { name = "semver-diff"; packageName = "semver-diff"; @@ -4522,13 +4882,13 @@ let sha1 = "c36aeccba563b89ceb556f3690f0b1d9e3547f7f"; }; }; - "camelcase-4.1.0" = { - name = "camelcase"; - packageName = "camelcase"; - version = "4.1.0"; + "chalk-2.0.1" = { + name = "chalk"; + packageName = "chalk"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz"; - sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; + url = "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz"; + sha1 = "dbec49436d2ae15f536114e76d14656cdbc0f44d"; }; }; "cli-boxes-1.0.0" = { @@ -4540,22 +4900,13 @@ let sha1 = "4fa917c3e59c94a004cd61f8ee509da651687143"; }; }; - "string-width-2.0.0" = { - name = "string-width"; - packageName = "string-width"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-2.0.0.tgz"; - sha1 = "635c5436cc72a6e0c387ceca278d4e2eec52687e"; - }; - }; - "term-size-0.1.1" = { + "term-size-1.2.0" = { name = "term-size"; packageName = "term-size"; - version = "0.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/term-size/-/term-size-0.1.1.tgz"; - sha1 = "87360b96396cab5760963714cda0d0cbeecad9ca"; + url = "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz"; + sha1 = "458b83887f288fc56d6fffbfad262e26638efa69"; }; }; "widest-line-1.0.0" = { @@ -4567,67 +4918,94 @@ let sha1 = "0c09c85c2a94683d0d7eaf8ee097d564bf0e105c"; }; }; - "is-fullwidth-code-point-2.0.0" = { - name = "is-fullwidth-code-point"; - packageName = "is-fullwidth-code-point"; + "ansi-styles-3.1.0" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.1.0.tgz"; + sha1 = "09c202d5c917ec23188caa5c9cb9179cd9547750"; + }; + }; + "supports-color-4.2.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-4.2.0.tgz"; + sha1 = "ad986dc7eb2315d009b4d77c8169c2231a684037"; + }; + }; + "color-convert-1.9.0" = { + name = "color-convert"; + packageName = "color-convert"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz"; + sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a"; + }; + }; + "color-name-1.1.2" = { + name = "color-name"; + packageName = "color-name"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz"; + sha1 = "5c8ab72b64bd2215d617ae9559ebb148475cf98d"; + }; + }; + "has-flag-2.0.0" = { + name = "has-flag"; + packageName = "has-flag"; version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; - sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + url = "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz"; + sha1 = "e8207af1cc7b30d446cc70b734b5e8be18f88d51"; }; }; - "execa-0.4.0" = { + "execa-0.7.0" = { name = "execa"; packageName = "execa"; - version = "0.4.0"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-0.4.0.tgz"; - sha1 = "4eb6467a36a095fabb2970ff9d5e3fb7bce6ebc3"; + url = "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz"; + sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777"; }; }; - "cross-spawn-async-2.2.5" = { - name = "cross-spawn-async"; - packageName = "cross-spawn-async"; - version = "2.2.5"; + "cross-spawn-5.1.0" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz"; - sha1 = "845ff0c0834a3ded9d160daca6d390906bb288cc"; + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz"; + sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449"; }; }; - "is-stream-1.1.0" = { - name = "is-stream"; - packageName = "is-stream"; - version = "1.1.0"; + "get-stream-3.0.0" = { + name = "get-stream"; + packageName = "get-stream"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"; - sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz"; + sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14"; }; }; - "npm-run-path-1.0.0" = { - name = "npm-run-path"; - packageName = "npm-run-path"; + "shebang-command-1.2.0" = { + name = "shebang-command"; + packageName = "shebang-command"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"; + sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; + }; + }; + "shebang-regex-1.0.0" = { + name = "shebang-regex"; + packageName = "shebang-regex"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-1.0.0.tgz"; - sha1 = "f5c32bf595fe81ae927daec52e82f8b000ac3c8f"; - }; - }; - "path-key-1.0.0" = { - name = "path-key"; - packageName = "path-key"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-key/-/path-key-1.0.0.tgz"; - sha1 = "5d53d578019646c0d68800db4e146e6bdc2ac7af"; - }; - }; - "strip-eof-1.0.0" = { - name = "strip-eof"; - packageName = "strip-eof"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz"; - sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; + url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"; + sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; }; }; "dot-prop-4.1.1" = { @@ -4729,15 +5107,6 @@ let sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; }; }; - "get-stream-3.0.0" = { - name = "get-stream"; - packageName = "get-stream"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz"; - sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14"; - }; - }; "is-redirect-1.0.0" = { name = "is-redirect"; packageName = "is-redirect"; @@ -4819,6 +5188,24 @@ let sha1 = "cb94faeb61c8696451db36534e1422f94f0aee88"; }; }; + "errno-0.1.4" = { + name = "errno"; + packageName = "errno"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz"; + sha1 = "b896e23a9e5e8ba33871fc996abd3635fc9a1c7d"; + }; + }; + "prr-0.0.0" = { + name = "prr"; + packageName = "prr"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz"; + sha1 = "1a84b85908325501411853d0081ee3fa86e2926a"; + }; + }; "adm-zip-0.4.7" = { name = "adm-zip"; packageName = "adm-zip"; @@ -5215,13 +5602,13 @@ let sha1 = "6373db76909fe570e08d73583365ed828a74eeeb"; }; }; - "commander-2.9.0" = { + "commander-2.11.0" = { name = "commander"; packageName = "commander"; - version = "2.9.0"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"; - sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; + url = "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz"; + sha1 = "157152fd1e7a6c8d98a5b715cf376df928004563"; }; }; "is-my-json-valid-2.16.0" = { @@ -5233,15 +5620,6 @@ let sha1 = "f079dd9bfdae65ee2038aae8acbc86ab109e3693"; }; }; - "graceful-readlink-1.0.1" = { - name = "graceful-readlink"; - packageName = "graceful-readlink"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; - sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; - }; - }; "generate-function-2.0.0" = { name = "generate-function"; packageName = "generate-function"; @@ -5513,14 +5891,14 @@ in sources."replace-ext-0.0.1" (sources."through2-2.0.3" // { dependencies = [ - (sources."readable-stream-2.2.11" // { + (sources."readable-stream-2.3.3" // { dependencies = [ sources."core-util-is-1.0.2" sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" ]; }) @@ -5555,7 +5933,7 @@ in dependencies = [ (sources."arr-diff-2.0.0" // { dependencies = [ - sources."arr-flatten-1.0.3" + sources."arr-flatten-1.1.0" ]; }) sources."array-unique-0.2.1" @@ -5675,16 +6053,43 @@ in }) ]; }) - (sources."fined-1.0.2" // { + (sources."fined-1.1.0" // { dependencies = [ - (sources."expand-tilde-1.2.2" // { + (sources."expand-tilde-2.0.2" // { dependencies = [ - sources."os-homedir-1.0.2" + (sources."homedir-polyfill-1.0.1" // { + dependencies = [ + sources."parse-passwd-1.0.0" + ]; + }) + ]; + }) + (sources."is-plain-object-2.0.4" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + (sources."object.defaults-1.1.0" // { + dependencies = [ + sources."array-each-1.0.1" + sources."array-slice-1.0.0" + (sources."for-own-1.0.0" // { + dependencies = [ + sources."for-in-1.0.2" + ]; + }) + sources."isobject-3.0.1" + ]; + }) + (sources."object.pick-1.2.0" // { + dependencies = [ + (sources."isobject-2.1.0" // { + dependencies = [ + sources."isarray-1.0.0" + ]; + }) ]; }) - sources."lodash.assignwith-4.2.0" - sources."lodash.isempty-4.4.0" - sources."lodash.pick-4.4.0" (sources."parse-filepath-1.0.1" // { dependencies = [ (sources."is-absolute-0.2.6" // { @@ -5917,19 +6322,19 @@ in sources."abbrev-1.1.0" ]; }) - (sources."npmlog-4.1.0" // { + (sources."npmlog-4.1.2" // { dependencies = [ (sources."are-we-there-yet-1.1.4" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.11" // { + (sources."readable-stream-2.3.3" // { dependencies = [ sources."core-util-is-1.0.2" sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" ]; }) @@ -6045,7 +6450,7 @@ in sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" sources."qs-6.4.0" - sources."safe-buffer-5.1.0" + sources."safe-buffer-5.1.1" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { dependencies = [ @@ -6157,9 +6562,9 @@ in ]; }) sources."map-obj-1.0.1" - (sources."normalize-package-data-2.3.8" // { + (sources."normalize-package-data-2.4.0" // { dependencies = [ - sources."hosted-git-info-2.4.2" + sources."hosted-git-info-2.5.0" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -6421,19 +6826,19 @@ in }) ]; }) - (sources."npmlog-4.1.0" // { + (sources."npmlog-4.1.2" // { dependencies = [ (sources."are-we-there-yet-1.1.4" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.11" // { + (sources."readable-stream-2.3.3" // { dependencies = [ sources."core-util-is-1.0.2" sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" ]; }) @@ -6543,7 +6948,7 @@ in sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" sources."qs-6.4.0" - sources."safe-buffer-5.1.0" + sources."safe-buffer-5.1.1" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { dependencies = [ @@ -6624,14 +7029,14 @@ in sources."wrappy-1.0.2" ]; }) - (sources."readable-stream-2.2.11" // { + (sources."readable-stream-2.3.3" // { dependencies = [ sources."core-util-is-1.0.2" sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" ]; }) @@ -6663,19 +7068,19 @@ in }) ]; }) - (sources."npmlog-4.1.0" // { + (sources."npmlog-4.1.2" // { dependencies = [ (sources."are-we-there-yet-1.1.4" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.11" // { + (sources."readable-stream-2.3.3" // { dependencies = [ sources."core-util-is-1.0.2" sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" ]; }) @@ -6785,7 +7190,7 @@ in sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" sources."qs-6.4.0" - sources."safe-buffer-5.1.0" + sources."safe-buffer-5.1.1" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { dependencies = [ @@ -6866,14 +7271,14 @@ in sources."wrappy-1.0.2" ]; }) - (sources."readable-stream-2.2.11" // { + (sources."readable-stream-2.3.3" // { dependencies = [ sources."core-util-is-1.0.2" sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" ]; }) @@ -6970,19 +7375,19 @@ in }) ]; }) - (sources."npmlog-4.1.0" // { + (sources."npmlog-4.1.2" // { dependencies = [ (sources."are-we-there-yet-1.1.4" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.11" // { + (sources."readable-stream-2.3.3" // { dependencies = [ sources."core-util-is-1.0.2" sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" ]; }) @@ -7100,7 +7505,7 @@ in sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" sources."qs-6.4.0" - sources."safe-buffer-5.1.0" + sources."safe-buffer-5.1.1" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { dependencies = [ @@ -7187,14 +7592,14 @@ in sources."wrappy-1.0.2" ]; }) - (sources."readable-stream-2.2.11" // { + (sources."readable-stream-2.3.3" // { dependencies = [ sources."core-util-is-1.0.2" sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" ]; }) @@ -7213,10 +7618,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "5.0.3"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-5.0.3.tgz"; - sha1 = "abd1c397ede6edd8f93453e7ad2b7a1887861856"; + url = "https://registry.npmjs.org/npm/-/npm-5.2.0.tgz"; + sha1 = "0014eb05ead6870587fa1c068108935c898e9847"; }; dependencies = [ (sources."JSONStream-1.3.1" // { @@ -7226,13 +7631,13 @@ in ]; }) sources."abbrev-1.1.0" - sources."ansi-regex-2.1.1" + sources."ansi-regex-3.0.0" sources."ansicolors-0.3.2" sources."ansistyles-0.1.3" sources."aproba-1.1.2" sources."archy-1.0.0" sources."bluebird-3.5.0" - (sources."cacache-9.2.8" // { + (sources."cacache-9.2.9" // { dependencies = [ sources."y18n-3.2.1" ]; @@ -7242,6 +7647,11 @@ in sources."cmd-shim-2.0.2" (sources."columnify-1.5.4" // { dependencies = [ + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) (sources."wcwidth-1.0.1" // { dependencies = [ (sources."defaults-1.0.3" // { @@ -7261,7 +7671,7 @@ in sources."detect-indent-5.0.0" (sources."dezalgo-1.0.3" // { dependencies = [ - sources."asap-2.0.5" + sources."asap-2.0.6" ]; }) sources."editor-1.0.0" @@ -7304,7 +7714,7 @@ in }) sources."graceful-fs-4.1.11" sources."has-unicode-2.0.1" - sources."hosted-git-info-2.4.2" + sources."hosted-git-info-2.5.0" sources."iferr-0.1.5" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -7315,6 +7725,129 @@ in ]; }) sources."lazy-property-1.0.0" + (sources."libnpx-9.0.7" // { + dependencies = [ + sources."dotenv-4.0.0" + sources."y18n-3.2.1" + (sources."yargs-8.0.2" // { + dependencies = [ + sources."camelcase-4.1.0" + (sources."cliui-3.2.0" // { + dependencies = [ + (sources."string-width-1.0.2" // { + dependencies = [ + sources."code-point-at-1.1.0" + (sources."is-fullwidth-code-point-1.0.0" // { + dependencies = [ + sources."number-is-nan-1.0.1" + ]; + }) + ]; + }) + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + sources."wrap-ansi-2.1.0" + ]; + }) + sources."decamelize-1.2.0" + sources."get-caller-file-1.0.2" + (sources."os-locale-2.0.0" // { + dependencies = [ + (sources."execa-0.5.1" // { + dependencies = [ + sources."cross-spawn-4.0.2" + (sources."get-stream-2.3.1" // { + dependencies = [ + sources."object-assign-4.1.1" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + ]; + }) + sources."is-stream-1.1.0" + (sources."npm-run-path-2.0.2" // { + dependencies = [ + sources."path-key-2.0.1" + ]; + }) + sources."p-finally-1.0.0" + sources."signal-exit-3.0.2" + sources."strip-eof-1.0.0" + ]; + }) + (sources."lcid-1.0.0" // { + dependencies = [ + sources."invert-kv-1.0.0" + ]; + }) + (sources."mem-1.1.0" // { + dependencies = [ + sources."mimic-fn-1.1.0" + ]; + }) + ]; + }) + (sources."read-pkg-up-2.0.0" // { + dependencies = [ + (sources."find-up-2.1.0" // { + dependencies = [ + (sources."locate-path-2.0.0" // { + dependencies = [ + (sources."p-locate-2.0.0" // { + dependencies = [ + sources."p-limit-1.1.0" + ]; + }) + sources."path-exists-3.0.0" + ]; + }) + ]; + }) + (sources."read-pkg-2.0.0" // { + dependencies = [ + (sources."load-json-file-2.0.0" // { + dependencies = [ + (sources."parse-json-2.2.0" // { + dependencies = [ + (sources."error-ex-1.3.1" // { + dependencies = [ + sources."is-arrayish-0.2.1" + ]; + }) + ]; + }) + sources."pify-2.3.0" + sources."strip-bom-3.0.0" + ]; + }) + (sources."path-type-2.0.0" // { + dependencies = [ + sources."pify-2.3.0" + ]; + }) + ]; + }) + ]; + }) + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."set-blocking-2.0.0" + (sources."string-width-2.1.0" // { + dependencies = [ + sources."is-fullwidth-code-point-2.0.0" + ]; + }) + sources."which-module-2.0.0" + sources."yargs-parser-7.0.0" + ]; + }) + ]; + }) sources."lockfile-1.0.3" (sources."lodash._baseuniq-4.6.0" // { dependencies = [ @@ -7326,7 +7859,7 @@ in sources."lodash.union-4.6.0" sources."lodash.uniq-4.5.0" sources."lodash.without-4.4.0" - (sources."lru-cache-4.0.2" // { + (sources."lru-cache-4.1.1" // { dependencies = [ sources."pseudomap-1.0.2" sources."yallist-2.1.2" @@ -7398,7 +7931,7 @@ in ]; }) sources."nopt-4.0.1" - (sources."normalize-package-data-2.3.8" // { + (sources."normalize-package-data-2.4.0" // { dependencies = [ (sources."is-builtin-module-1.0.0" // { dependencies = [ @@ -7410,7 +7943,7 @@ in sources."npm-cache-filename-1.0.2" sources."npm-install-checks-3.0.0" sources."npm-package-arg-5.1.2" - (sources."npm-registry-client-8.3.0" // { + (sources."npm-registry-client-8.4.0" // { dependencies = [ (sources."concat-stream-1.6.0" // { dependencies = [ @@ -7420,7 +7953,7 @@ in ]; }) sources."npm-user-validate-1.0.0" - (sources."npmlog-4.1.0" // { + (sources."npmlog-4.1.2" // { dependencies = [ (sources."are-we-there-yet-1.1.4" // { dependencies = [ @@ -7442,6 +7975,11 @@ in }) ]; }) + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) sources."wide-align-1.1.2" ]; }) @@ -7456,11 +7994,11 @@ in sources."os-tmpdir-1.0.2" ]; }) - (sources."pacote-2.7.36" // { + (sources."pacote-2.7.38" // { dependencies = [ - (sources."make-fetch-happen-2.4.12" // { + (sources."make-fetch-happen-2.4.13" // { dependencies = [ - (sources."agentkeepalive-3.2.0" // { + (sources."agentkeepalive-3.3.0" // { dependencies = [ (sources."humanize-ms-1.2.1" // { dependencies = [ @@ -7470,14 +8008,17 @@ in ]; }) sources."http-cache-semantics-3.7.3" - (sources."http-proxy-agent-1.0.0" // { + (sources."http-proxy-agent-2.0.0" // { dependencies = [ - (sources."agent-base-2.1.1" // { + (sources."agent-base-4.1.0" // { dependencies = [ - sources."semver-5.0.3" + (sources."es6-promisify-5.0.0" // { + dependencies = [ + sources."es6-promise-4.1.1" + ]; + }) ]; }) - sources."extend-3.0.1" (sources."debug-2.6.8" // { dependencies = [ sources."ms-2.0.0" @@ -7485,11 +8026,15 @@ in }) ]; }) - (sources."https-proxy-agent-1.0.0" // { + (sources."https-proxy-agent-2.0.0" // { dependencies = [ - (sources."agent-base-2.1.1" // { + (sources."agent-base-4.1.0" // { dependencies = [ - sources."semver-5.0.3" + (sources."es6-promisify-5.0.0" // { + dependencies = [ + sources."es6-promise-4.1.1" + ]; + }) ]; }) (sources."debug-2.6.8" // { @@ -7497,7 +8042,6 @@ in sources."ms-2.0.0" ]; }) - sources."extend-3.0.1" ]; }) (sources."node-fetch-npm-2.0.1" // { @@ -7514,14 +8058,17 @@ in }) ]; }) - (sources."socks-proxy-agent-2.1.1" // { + (sources."socks-proxy-agent-3.0.0" // { dependencies = [ - (sources."agent-base-2.1.1" // { + (sources."agent-base-4.1.0" // { dependencies = [ - sources."semver-5.0.3" + (sources."es6-promisify-5.0.0" // { + dependencies = [ + sources."es6-promise-4.1.1" + ]; + }) ]; }) - sources."extend-3.0.1" (sources."socks-1.1.10" // { dependencies = [ sources."ip-1.1.5" @@ -7542,7 +8089,7 @@ in }) ]; }) - sources."npm-pick-manifest-1.0.3" + sources."npm-pick-manifest-1.0.4" (sources."promise-retry-1.1.1" // { dependencies = [ sources."err-code-1.1.2" @@ -7584,7 +8131,7 @@ in sources."util-extend-1.0.3" ]; }) - (sources."read-package-json-2.0.5" // { + (sources."read-package-json-2.0.10" // { dependencies = [ (sources."json-parse-helpfulerror-1.0.3" // { dependencies = [ @@ -7594,13 +8141,12 @@ in ]; }) sources."read-package-tree-5.1.6" - (sources."readable-stream-2.2.11" // { + (sources."readable-stream-2.3.3" // { dependencies = [ sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" ]; }) @@ -7691,7 +8237,7 @@ in }) sources."retry-0.10.1" sources."rimraf-2.6.1" - sources."safe-buffer-5.1.0" + sources."safe-buffer-5.1.1" sources."semver-5.3.0" sources."sha-2.0.1" sources."slide-1.1.6" @@ -7717,7 +8263,7 @@ in ]; }) sources."ssri-4.1.6" - sources."strip-ansi-3.0.1" + sources."strip-ansi-4.0.0" (sources."tar-2.2.1" // { dependencies = [ sources."block-stream-0.0.9" @@ -7732,27 +8278,59 @@ in ]; }) sources."unpipe-1.0.0" - (sources."update-notifier-2.1.0" // { + (sources."update-notifier-2.2.0" // { dependencies = [ - (sources."boxen-1.1.0" // { + (sources."boxen-1.2.0" // { dependencies = [ sources."ansi-align-2.0.0" sources."camelcase-4.1.0" + (sources."chalk-2.0.1" // { + dependencies = [ + (sources."ansi-styles-3.1.0" // { + dependencies = [ + (sources."color-convert-1.9.0" // { + dependencies = [ + sources."color-name-1.1.2" + ]; + }) + ]; + }) + sources."escape-string-regexp-1.0.5" + (sources."supports-color-4.2.0" // { + dependencies = [ + sources."has-flag-2.0.0" + ]; + }) + ]; + }) sources."cli-boxes-1.0.0" - (sources."string-width-2.0.0" // { + (sources."string-width-2.1.0" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" ]; }) - (sources."term-size-0.1.1" // { + (sources."term-size-1.2.0" // { dependencies = [ - (sources."execa-0.4.0" // { + (sources."execa-0.7.0" // { dependencies = [ - sources."cross-spawn-async-2.2.5" + (sources."cross-spawn-5.1.0" // { + dependencies = [ + (sources."shebang-command-1.2.0" // { + dependencies = [ + sources."shebang-regex-1.0.0" + ]; + }) + ]; + }) + sources."get-stream-3.0.0" sources."is-stream-1.1.0" - sources."npm-run-path-1.0.0" - sources."object-assign-4.1.1" - sources."path-key-1.0.0" + (sources."npm-run-path-2.0.2" // { + dependencies = [ + sources."path-key-2.0.1" + ]; + }) + sources."p-finally-1.0.0" + sources."signal-exit-3.0.2" sources."strip-eof-1.0.0" ]; }) @@ -7768,6 +8346,11 @@ in sources."number-is-nan-1.0.1" ]; }) + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) ]; }) ]; @@ -7778,7 +8361,16 @@ in dependencies = [ sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" + (sources."has-ansi-2.0.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) sources."supports-color-2.0.0" ]; }) @@ -7801,6 +8393,7 @@ in }) ]; }) + sources."import-lazy-2.1.0" sources."is-npm-1.0.0" (sources."latest-version-3.1.0" // { dependencies = [ @@ -7854,12 +8447,11 @@ in }) ]; }) - sources."lazy-req-2.0.0" sources."semver-diff-2.1.0" sources."xdg-basedir-3.0.0" ]; }) - sources."uuid-3.0.1" + sources."uuid-3.1.0" (sources."validate-npm-package-name-3.0.0" // { dependencies = [ sources."builtins-1.0.3" @@ -7870,6 +8462,16 @@ in sources."isexe-2.0.0" ]; }) + (sources."worker-farm-1.4.1" // { + dependencies = [ + (sources."errno-0.1.4" // { + dependencies = [ + sources."prr-0.0.0" + ]; + }) + sources."xtend-4.0.1" + ]; + }) sources."wrappy-1.0.2" sources."write-file-atomic-2.1.0" sources."debuglog-1.0.1" @@ -8042,11 +8644,7 @@ in sources."supports-color-2.0.0" ]; }) - (sources."commander-2.9.0" // { - dependencies = [ - sources."graceful-readlink-1.0.1" - ]; - }) + sources."commander-2.11.0" (sources."is-my-json-valid-2.16.0" // { dependencies = [ sources."generate-function-2.0.0" diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json index b362281ee21..627f6bf4b88 100644 --- a/pkgs/development/node-packages/node-packages-v6.json +++ b/pkgs/development/node-packages/node-packages-v6.json @@ -15,6 +15,7 @@ , "eslint" , "eslint_d" , "emojione" +, "fast-cli" , "fetch-bower" , "forever" , "git-run" @@ -30,6 +31,7 @@ , "jayschema" , "jshint" , "json" +, "js-beautify" , "jsontool" , "json-server" , "js-yaml" diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index 1fca6530808..e241864f082 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -4,51 +4,6 @@ let sources = { - "async-2.4.1" = { - name = "async"; - packageName = "async"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.4.1.tgz"; - sha1 = "62a56b279c98a11d0987096a01cc3eeb8eb7bbd7"; - }; - }; - "babel-core-6.25.0" = { - name = "babel-core"; - packageName = "babel-core"; - version = "6.25.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-core/-/babel-core-6.25.0.tgz"; - sha1 = "7dd42b0463c742e9d5296deb3ec67a9322dad729"; - }; - }; - "babel-traverse-6.25.0" = { - name = "babel-traverse"; - packageName = "babel-traverse"; - version = "6.25.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.25.0.tgz"; - sha1 = "2257497e2fcd19b89edc13c4c91381f9512496f1"; - }; - }; - "babel-types-6.25.0" = { - name = "babel-types"; - packageName = "babel-types"; - version = "6.25.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-types/-/babel-types-6.25.0.tgz"; - sha1 = "70afb248d5660e5d18f811d91c8303b54134a18e"; - }; - }; - "babylon-6.17.3" = { - name = "babylon"; - packageName = "babylon"; - version = "6.17.3"; - src = fetchurl { - url = "https://registry.npmjs.org/babylon/-/babylon-6.17.3.tgz"; - sha1 = "1327d709950b558f204e5352587fd0290f8d8e48"; - }; - }; "colors-0.6.0-1" = { name = "colors"; packageName = "colors"; @@ -58,24 +13,6 @@ let sha1 = "6dbb68ceb8bc60f2b313dcc5ce1599f06d19e67a"; }; }; - "commander-0.6.1" = { - name = "commander"; - packageName = "commander"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz"; - sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"; - }; - }; - "deasync-0.1.10" = { - name = "deasync"; - packageName = "deasync"; - version = "0.1.10"; - src = fetchurl { - url = "https://registry.npmjs.org/deasync/-/deasync-0.1.10.tgz"; - sha1 = "4e4a6836fbe0477bd5f908308bd2a96557d5d7fe"; - }; - }; "ejs-2.3.4" = { name = "ejs"; packageName = "ejs"; @@ -85,13 +22,40 @@ let sha1 = "3c76caa09664b3583b0037af9dc136e79ec68b98"; }; }; - "global-paths-0.1.2" = { - name = "global-paths"; - packageName = "global-paths"; - version = "0.1.2"; + "pkginfo-0.2.2" = { + name = "pkginfo"; + packageName = "pkginfo"; + version = "0.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/global-paths/-/global-paths-0.1.2.tgz"; - sha1 = "8869ecb2a8c80995be8a459f27ae5db7a0b03299"; + url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.2.tgz"; + sha1 = "97e1100dbbb275ff6fab583a256a7eea85120c8e"; + }; + }; + "commander-0.6.1" = { + name = "commander"; + packageName = "commander"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz"; + sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"; + }; + }; + "wrench-1.3.9" = { + name = "wrench"; + packageName = "wrench"; + version = "1.3.9"; + src = fetchurl { + url = "https://registry.npmjs.org/wrench/-/wrench-1.3.9.tgz"; + sha1 = "6f13ec35145317eb292ca5f6531391b244111411"; + }; + }; + "xmldom-0.1.19" = { + name = "xmldom"; + packageName = "xmldom"; + version = "0.1.19"; + src = fetchurl { + url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz"; + sha1 = "631fc07776efd84118bf25171b37ed4d075a0abc"; }; }; "jsonlint-1.5.1" = { @@ -103,6 +67,51 @@ let sha1 = "3cf436dcc9f3477ef3d7fa55a5bdf6d893f1c6c6"; }; }; + "uglify-js-2.6.1" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "2.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.1.tgz"; + sha1 = "edbbe1888ba3525ded3a7bf836b30b3405d3161b"; + }; + }; + "resolve-1.3.3" = { + name = "resolve"; + packageName = "resolve"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.3.3.tgz"; + sha1 = "655907c3469a8680dc2de3a275a8fdd69691f0e5"; + }; + }; + "global-paths-0.1.2" = { + name = "global-paths"; + packageName = "global-paths"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/global-paths/-/global-paths-0.1.2.tgz"; + sha1 = "8869ecb2a8c80995be8a459f27ae5db7a0b03299"; + }; + }; + "source-map-0.1.9" = { + name = "source-map"; + packageName = "source-map"; + version = "0.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.1.9.tgz"; + sha1 = "250224e4e9ef7e91f4cad76cae714b90f6218599"; + }; + }; + "xml2tss-0.0.5" = { + name = "xml2tss"; + packageName = "xml2tss"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/xml2tss/-/xml2tss-0.0.5.tgz"; + sha1 = "d76a310d6b8a7ba9e4825bb3d43f5427e9fe8f6e"; + }; + }; "moment-2.17.1" = { name = "moment"; packageName = "moment"; @@ -121,193 +130,76 @@ let sha1 = "3269bddf81c54535f408abc784c32b0d2bd55f6f"; }; }; - "pkginfo-0.2.2" = { - name = "pkginfo"; - packageName = "pkginfo"; - version = "0.2.2"; + "nomnom-1.8.1" = { + name = "nomnom"; + packageName = "nomnom"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.2.tgz"; - sha1 = "97e1100dbbb275ff6fab583a256a7eea85120c8e"; + url = "https://registry.npmjs.org/nomnom/-/nomnom-1.8.1.tgz"; + sha1 = "2151f722472ba79e50a76fc125bb8c8f2e4dc2a7"; }; }; - "resolve-1.3.3" = { - name = "resolve"; - packageName = "resolve"; - version = "1.3.3"; + "JSV-4.0.2" = { + name = "JSV"; + packageName = "JSV"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.3.3.tgz"; - sha1 = "655907c3469a8680dc2de3a275a8fdd69691f0e5"; + url = "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz"; + sha1 = "d077f6825571f82132f9dffaed587b4029feff57"; }; }; - "source-map-0.1.9" = { - name = "source-map"; - packageName = "source-map"; - version = "0.1.9"; + "underscore-1.6.0" = { + name = "underscore"; + packageName = "underscore"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.1.9.tgz"; - sha1 = "250224e4e9ef7e91f4cad76cae714b90f6218599"; + url = "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"; + sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8"; }; }; - "wrench-1.3.9" = { - name = "wrench"; - packageName = "wrench"; - version = "1.3.9"; + "chalk-0.4.0" = { + name = "chalk"; + packageName = "chalk"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/wrench/-/wrench-1.3.9.tgz"; - sha1 = "6f13ec35145317eb292ca5f6531391b244111411"; + url = "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz"; + sha1 = "5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"; }; }; - "xml2tss-0.0.5" = { - name = "xml2tss"; - packageName = "xml2tss"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/xml2tss/-/xml2tss-0.0.5.tgz"; - sha1 = "d76a310d6b8a7ba9e4825bb3d43f5427e9fe8f6e"; - }; - }; - "xmldom-0.1.19" = { - name = "xmldom"; - packageName = "xmldom"; - version = "0.1.19"; - src = fetchurl { - url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz"; - sha1 = "631fc07776efd84118bf25171b37ed4d075a0abc"; - }; - }; - "lodash-4.17.4" = { - name = "lodash"; - packageName = "lodash"; - version = "4.17.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"; - sha1 = "78203a4d1c328ae1d86dca6460e369b57f4055ae"; - }; - }; - "babel-code-frame-6.22.0" = { - name = "babel-code-frame"; - packageName = "babel-code-frame"; - version = "6.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz"; - sha1 = "027620bee567a88c32561574e7fd0801d33118e4"; - }; - }; - "babel-generator-6.25.0" = { - name = "babel-generator"; - packageName = "babel-generator"; - version = "6.25.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-generator/-/babel-generator-6.25.0.tgz"; - sha1 = "33a1af70d5f2890aeb465a4a7793c1df6a9ea9fc"; - }; - }; - "babel-helpers-6.24.1" = { - name = "babel-helpers"; - packageName = "babel-helpers"; - version = "6.24.1"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz"; - sha1 = "3471de9caec388e5c850e597e58a26ddf37602b2"; - }; - }; - "babel-messages-6.23.0" = { - name = "babel-messages"; - packageName = "babel-messages"; - version = "6.23.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz"; - sha1 = "f3cdf4703858035b2a2951c6ec5edf6c62f2630e"; - }; - }; - "babel-template-6.25.0" = { - name = "babel-template"; - packageName = "babel-template"; - version = "6.25.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-template/-/babel-template-6.25.0.tgz"; - sha1 = "665241166b7c2aa4c619d71e192969552b10c071"; - }; - }; - "babel-runtime-6.23.0" = { - name = "babel-runtime"; - packageName = "babel-runtime"; - version = "6.23.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz"; - sha1 = "0a9489f144de70efb3ce4300accdb329e2fc543b"; - }; - }; - "babel-register-6.24.1" = { - name = "babel-register"; - packageName = "babel-register"; - version = "6.24.1"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-register/-/babel-register-6.24.1.tgz"; - sha1 = "7e10e13a2f71065bdfad5a1787ba45bca6ded75f"; - }; - }; - "convert-source-map-1.5.0" = { - name = "convert-source-map"; - packageName = "convert-source-map"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz"; - sha1 = "9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"; - }; - }; - "debug-2.6.8" = { - name = "debug"; - packageName = "debug"; - version = "2.6.8"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz"; - sha1 = "e731531ca2ede27d188222427da17821d68ff4fc"; - }; - }; - "json5-0.5.1" = { - name = "json5"; - packageName = "json5"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz"; - sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; - }; - }; - "minimatch-3.0.4" = { - name = "minimatch"; - packageName = "minimatch"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; - sha1 = "5166e286457f03306064be5497e8dbb0c3d32083"; - }; - }; - "path-is-absolute-1.0.1" = { - name = "path-is-absolute"; - packageName = "path-is-absolute"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; - }; - }; - "private-0.1.7" = { - name = "private"; - packageName = "private"; + "has-color-0.1.7" = { + name = "has-color"; + packageName = "has-color"; version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/private/-/private-0.1.7.tgz"; - sha1 = "68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"; + url = "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz"; + sha1 = "67144a5260c34fc3cca677d041daf52fe7b78b2f"; }; }; - "slash-1.0.0" = { - name = "slash"; - packageName = "slash"; + "ansi-styles-1.0.0" = { + name = "ansi-styles"; + packageName = "ansi-styles"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz"; - sha1 = "c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"; + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz"; + sha1 = "cb102df1c56f5123eab8b67cd7b98027a0279178"; + }; + }; + "strip-ansi-0.1.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz"; + sha1 = "39e8a98d044d150660abe4a6808acf70bb7bc991"; + }; + }; + "async-0.2.10" = { + name = "async"; + packageName = "async"; + version = "0.2.10"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz"; + sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; }; }; "source-map-0.5.6" = { @@ -319,301 +211,148 @@ let sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412"; }; }; - "chalk-1.1.3" = { - name = "chalk"; - packageName = "chalk"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; - sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; - }; - }; - "esutils-2.0.2" = { - name = "esutils"; - packageName = "esutils"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz"; - sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"; - }; - }; - "js-tokens-3.0.1" = { - name = "js-tokens"; - packageName = "js-tokens"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz"; - sha1 = "08e9f132484a2c45a30907e9dc4d5567b7f114d7"; - }; - }; - "ansi-styles-2.2.1" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"; - sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; - }; - }; - "escape-string-regexp-1.0.5" = { - name = "escape-string-regexp"; - packageName = "escape-string-regexp"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; - }; - }; - "has-ansi-2.0.0" = { - name = "has-ansi"; - packageName = "has-ansi"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; - sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; - }; - }; - "strip-ansi-3.0.1" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; - sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; - }; - }; - "supports-color-2.0.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; - sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; - }; - }; - "ansi-regex-2.1.1" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; - sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; - }; - }; - "detect-indent-4.0.0" = { - name = "detect-indent"; - packageName = "detect-indent"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz"; - sha1 = "f76d064352cdf43a1cb6ce619c4ee3a9475de208"; - }; - }; - "jsesc-1.3.0" = { - name = "jsesc"; - packageName = "jsesc"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz"; - sha1 = "46c3fec8c1892b12b0833db9bc7622176dbab34b"; - }; - }; - "trim-right-1.0.1" = { - name = "trim-right"; - packageName = "trim-right"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz"; - sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003"; - }; - }; - "repeating-2.0.1" = { - name = "repeating"; - packageName = "repeating"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz"; - sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; - }; - }; - "is-finite-1.0.2" = { - name = "is-finite"; - packageName = "is-finite"; + "uglify-to-browserify-1.0.2" = { + name = "uglify-to-browserify"; + packageName = "uglify-to-browserify"; version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"; - sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa"; + url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"; + sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; }; }; - "number-is-nan-1.0.1" = { - name = "number-is-nan"; - packageName = "number-is-nan"; - version = "1.0.1"; + "yargs-3.10.0" = { + name = "yargs"; + packageName = "yargs"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; - sha1 = "097b602b53422a522c1afb8790318336941a011d"; + url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"; + sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; }; }; - "core-js-2.4.1" = { - name = "core-js"; - packageName = "core-js"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz"; - sha1 = "4de911e667b0eae9124e34254b53aea6fc618d3e"; - }; - }; - "regenerator-runtime-0.10.5" = { - name = "regenerator-runtime"; - packageName = "regenerator-runtime"; - version = "0.10.5"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz"; - sha1 = "336c3efc1220adcedda2c9fab67b5a7955a33658"; - }; - }; - "home-or-tmp-2.0.0" = { - name = "home-or-tmp"; - packageName = "home-or-tmp"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz"; - sha1 = "e36c3f2d2cae7d746a857e38d18d5f32a7882db8"; - }; - }; - "mkdirp-0.5.1" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; - }; - }; - "source-map-support-0.4.15" = { - name = "source-map-support"; - packageName = "source-map-support"; - version = "0.4.15"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.15.tgz"; - sha1 = "03202df65c06d2bd8c7ec2362a193056fef8d3b1"; - }; - }; - "os-homedir-1.0.2" = { - name = "os-homedir"; - packageName = "os-homedir"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; - sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; - }; - }; - "os-tmpdir-1.0.2" = { - name = "os-tmpdir"; - packageName = "os-tmpdir"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; - sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; - }; - }; - "minimist-0.0.8" = { - name = "minimist"; - packageName = "minimist"; - version = "0.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; - }; - }; - "ms-2.0.0" = { - name = "ms"; - packageName = "ms"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; - sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; - }; - }; - "brace-expansion-1.1.8" = { - name = "brace-expansion"; - packageName = "brace-expansion"; - version = "1.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz"; - sha1 = "c07b211c7c952ec1f8efd51a77ef0d1d3990a292"; - }; - }; - "balanced-match-1.0.0" = { - name = "balanced-match"; - packageName = "balanced-match"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; - sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; - }; - }; - "concat-map-0.0.1" = { - name = "concat-map"; - packageName = "concat-map"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; - sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; - }; - }; - "globals-9.18.0" = { - name = "globals"; - packageName = "globals"; - version = "9.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz"; - sha1 = "aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"; - }; - }; - "invariant-2.2.2" = { - name = "invariant"; - packageName = "invariant"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz"; - sha1 = "9e1f56ac0acdb6bf303306f338be3b204ae60360"; - }; - }; - "loose-envify-1.3.1" = { - name = "loose-envify"; - packageName = "loose-envify"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz"; - sha1 = "d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"; - }; - }; - "to-fast-properties-1.0.3" = { - name = "to-fast-properties"; - packageName = "to-fast-properties"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz"; - sha1 = "b83571fa4d8c25b82e231b06e3a3055de4ca1a47"; - }; - }; - "bindings-1.2.1" = { - name = "bindings"; - packageName = "bindings"; + "camelcase-1.2.1" = { + name = "camelcase"; + packageName = "camelcase"; version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"; - sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; + url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"; + sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"; }; }; - "nan-2.6.2" = { - name = "nan"; - packageName = "nan"; - version = "2.6.2"; + "cliui-2.1.0" = { + name = "cliui"; + packageName = "cliui"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz"; - sha1 = "e4ff34e6c95fdfb5aecc08de6596f43605a7db45"; + url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz"; + sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1"; + }; + }; + "decamelize-1.2.0" = { + name = "decamelize"; + packageName = "decamelize"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + }; + }; + "window-size-0.1.0" = { + name = "window-size"; + packageName = "window-size"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"; + sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"; + }; + }; + "center-align-0.1.3" = { + name = "center-align"; + packageName = "center-align"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz"; + sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad"; + }; + }; + "right-align-0.1.3" = { + name = "right-align"; + packageName = "right-align"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz"; + sha1 = "61339b722fe6a3515689210d24e14c96148613ef"; + }; + }; + "wordwrap-0.0.2" = { + name = "wordwrap"; + packageName = "wordwrap"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; + sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; + }; + }; + "align-text-0.1.4" = { + name = "align-text"; + packageName = "align-text"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz"; + sha1 = "0cd90a561093f35d0a99256c22b7069433fad117"; + }; + }; + "lazy-cache-1.0.4" = { + name = "lazy-cache"; + packageName = "lazy-cache"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz"; + sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; + }; + }; + "kind-of-3.2.2" = { + name = "kind-of"; + packageName = "kind-of"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"; + sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; + }; + }; + "longest-1.0.1" = { + name = "longest"; + packageName = "longest"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"; + sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097"; + }; + }; + "repeat-string-1.6.1" = { + name = "repeat-string"; + packageName = "repeat-string"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"; + sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; + }; + }; + "is-buffer-1.1.5" = { + name = "is-buffer"; + packageName = "is-buffer"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz"; + sha1 = "1f3b26ef613b214b88cbca23cc6c01d87961eecc"; + }; + }; + "path-parse-1.0.5" = { + name = "path-parse"; + packageName = "path-parse"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz"; + sha1 = "3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"; }; }; "array-unique-0.2.1" = { @@ -706,87 +445,6 @@ let sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; }; }; - "nomnom-1.8.1" = { - name = "nomnom"; - packageName = "nomnom"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/nomnom/-/nomnom-1.8.1.tgz"; - sha1 = "2151f722472ba79e50a76fc125bb8c8f2e4dc2a7"; - }; - }; - "JSV-4.0.2" = { - name = "JSV"; - packageName = "JSV"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz"; - sha1 = "d077f6825571f82132f9dffaed587b4029feff57"; - }; - }; - "underscore-1.6.0" = { - name = "underscore"; - packageName = "underscore"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"; - sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8"; - }; - }; - "chalk-0.4.0" = { - name = "chalk"; - packageName = "chalk"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz"; - sha1 = "5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"; - }; - }; - "has-color-0.1.7" = { - name = "has-color"; - packageName = "has-color"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz"; - sha1 = "67144a5260c34fc3cca677d041daf52fe7b78b2f"; - }; - }; - "ansi-styles-1.0.0" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz"; - sha1 = "cb102df1c56f5123eab8b67cd7b98027a0279178"; - }; - }; - "strip-ansi-0.1.1" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz"; - sha1 = "39e8a98d044d150660abe4a6808acf70bb7bc991"; - }; - }; - "is-0.3.0" = { - name = "is"; - packageName = "is"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is/-/is-0.3.0.tgz"; - sha1 = "a8f71dfc8a6e28371627f26c929098c6f4d5d5d7"; - }; - }; - "path-parse-1.0.5" = { - name = "path-parse"; - packageName = "path-parse"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz"; - sha1 = "3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"; - }; - }; "amdefine-1.0.1" = { name = "amdefine"; packageName = "amdefine"; @@ -814,6 +472,15 @@ let sha1 = "d472db228eb331c2506b0e8c15524adb939d12c1"; }; }; + "is-0.3.0" = { + name = "is"; + packageName = "is"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is/-/is-0.3.0.tgz"; + sha1 = "a8f71dfc8a6e28371627f26c929098c6f4d5d5d7"; + }; + }; "adal-node-0.1.21" = { name = "adal-node"; packageName = "adal-node"; @@ -940,13 +607,13 @@ let sha1 = "937f87a8aeceb641a8210a9ba837323f0206eb47"; }; }; - "azure-arm-network-1.1.0-preview" = { + "azure-arm-network-2.0.0" = { name = "azure-arm-network"; packageName = "azure-arm-network"; - version = "1.1.0-preview"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-1.1.0-preview.tgz"; - sha1 = "e6ca3e27a0169ff49849f0378bc6c531b08a2b8b"; + url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-2.0.0.tgz"; + sha1 = "95e3d2658a68ecb0a2f90f611966f9852877f625"; }; }; "azure-arm-powerbiembedded-0.1.0" = { @@ -1336,22 +1003,22 @@ let sha1 = "c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"; }; }; - "ms-rest-1.15.7" = { + "ms-rest-2.2.1" = { name = "ms-rest"; packageName = "ms-rest"; - version = "1.15.7"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.7.tgz"; - sha1 = "400515e05b1924889cb61a1ec6054290a68e1207"; + url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.2.1.tgz"; + sha1 = "652f09dee89c115e5b672bd3de4d16dcc7961377"; }; }; - "ms-rest-azure-1.15.7" = { + "ms-rest-azure-2.2.1" = { name = "ms-rest-azure"; packageName = "ms-rest-azure"; - version = "1.15.7"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.7.tgz"; - sha1 = "8bce09f053b1565dbaa8bd022ca40155c35b0fde"; + url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.2.1.tgz"; + sha1 = "ca9a9fb492b1fe1a41ca8e472edc1dd0922323e6"; }; }; "node-forge-0.6.23" = { @@ -1516,15 +1183,6 @@ let sha1 = "3c9349d196207fd1bdff9d4bc43ef72510e3a12e"; }; }; - "wordwrap-0.0.2" = { - name = "wordwrap"; - packageName = "wordwrap"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; - sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; - }; - }; "xml2js-0.1.14" = { name = "xml2js"; packageName = "xml2js"; @@ -1606,13 +1264,13 @@ let sha1 = "a0552ce0220742cd52e153774a32905c30e756e5"; }; }; - "safe-buffer-5.1.0" = { + "safe-buffer-5.1.1" = { name = "safe-buffer"; packageName = "safe-buffer"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.0.tgz"; - sha1 = "fe4c8460397f9eaaaa58e73be46273408a45e223"; + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz"; + sha1 = "893312af69b2123def71f57889001671eeb2c853"; }; }; "buffer-equal-constant-time-1.0.1" = { @@ -1687,76 +1345,22 @@ let sha1 = "735ffaa39a1cff8ffb9598f0223abdb03a9fb2ea"; }; }; - "ms-rest-2.2.0" = { + "ms-rest-1.15.7" = { name = "ms-rest"; packageName = "ms-rest"; - version = "2.2.0"; + version = "1.15.7"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest/-/ms-rest-2.2.0.tgz"; - sha1 = "5f2507522f1585e26666815588dbacbcec7fb79f"; + url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.7.tgz"; + sha1 = "400515e05b1924889cb61a1ec6054290a68e1207"; }; }; - "ms-rest-azure-2.1.2" = { + "ms-rest-azure-1.15.7" = { name = "ms-rest-azure"; packageName = "ms-rest-azure"; - version = "2.1.2"; + version = "1.15.7"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-2.1.2.tgz"; - sha1 = "9774b1d4141c8a3a250ae5da36fc2654542be738"; - }; - }; - "@types/node-7.0.31" = { - name = "@types/node"; - packageName = "@types/node"; - version = "7.0.31"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-7.0.31.tgz"; - sha1 = "80ea4d175599b2a00149c29a10a4eb2dff592e86"; - }; - }; - "@types/request-0.0.42" = { - name = "@types/request"; - packageName = "@types/request"; - version = "0.0.42"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/request/-/request-0.0.42.tgz"; - sha1 = "e47a53bf0b130464854fb693297746a0c0479c31"; - }; - }; - "@types/uuid-2.0.30" = { - name = "@types/uuid"; - packageName = "@types/uuid"; - version = "2.0.30"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/uuid/-/uuid-2.0.30.tgz"; - sha1 = "4dca12da43ae530f89f46d6d203935d2199652d5"; - }; - }; - "is-buffer-1.1.5" = { - name = "is-buffer"; - packageName = "is-buffer"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz"; - sha1 = "1f3b26ef613b214b88cbca23cc6c01d87961eecc"; - }; - }; - "is-stream-1.1.0" = { - name = "is-stream"; - packageName = "is-stream"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"; - sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; - }; - }; - "@types/form-data-0.0.33" = { - name = "@types/form-data"; - packageName = "@types/form-data"; - version = "0.0.33"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/form-data/-/form-data-0.0.33.tgz"; - sha1 = "c9ac85b2a5fd18435b8c85d9ecb50e6d6c893ff8"; + url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.7.tgz"; + sha1 = "8bce09f053b1565dbaa8bd022ca40155c35b0fde"; }; }; "async-0.2.7" = { @@ -2011,6 +1615,51 @@ let sha1 = "0e3c4f24a3f052b231b12d5049085a0a099be782"; }; }; + "@types/node-7.0.37" = { + name = "@types/node"; + packageName = "@types/node"; + version = "7.0.37"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-7.0.37.tgz"; + sha1 = "f129fff94d14a60c3d99eadb9fe0c98119e09c8f"; + }; + }; + "@types/request-0.0.45" = { + name = "@types/request"; + packageName = "@types/request"; + version = "0.0.45"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/request/-/request-0.0.45.tgz"; + sha1 = "c6e52be8b108eb035c35aa9af56a38a260c3e7e6"; + }; + }; + "@types/uuid-2.0.30" = { + name = "@types/uuid"; + packageName = "@types/uuid"; + version = "2.0.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/uuid/-/uuid-2.0.30.tgz"; + sha1 = "4dca12da43ae530f89f46d6d203935d2199652d5"; + }; + }; + "is-stream-1.1.0" = { + name = "is-stream"; + packageName = "is-stream"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"; + sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + }; + }; + "@types/form-data-0.0.33" = { + name = "@types/form-data"; + packageName = "@types/form-data"; + version = "0.0.33"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/form-data/-/form-data-0.0.33.tgz"; + sha1 = "c9ac85b2a5fd18435b8c85d9ecb50e6d6c893ff8"; + }; + }; "debug-0.7.4" = { name = "debug"; packageName = "debug"; @@ -2065,15 +1714,6 @@ let sha1 = "64b6abf4cd01adcaefd5009393b1d8e8bec19db0"; }; }; - "async-0.2.10" = { - name = "async"; - packageName = "async"; - version = "0.2.10"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz"; - sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; - }; - }; "deep-equal-1.0.1" = { name = "deep-equal"; packageName = "deep-equal"; @@ -2092,6 +1732,15 @@ let sha1 = "1d2b854158ec8169113c6cb7f6b6801e99e211d5"; }; }; + "mkdirp-0.5.1" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; + sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + }; + }; "ncp-0.4.2" = { name = "ncp"; packageName = "ncp"; @@ -2110,6 +1759,15 @@ let sha1 = "c2338ec643df7a1b7fe5c54fa86f57428a55f33d"; }; }; + "minimist-0.0.8" = { + name = "minimist"; + packageName = "minimist"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + }; + }; "glob-7.1.2" = { name = "glob"; packageName = "glob"; @@ -2137,6 +1795,15 @@ let sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; }; }; + "minimatch-3.0.4" = { + name = "minimatch"; + packageName = "minimatch"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; + sha1 = "5166e286457f03306064be5497e8dbb0c3d32083"; + }; + }; "once-1.4.0" = { name = "once"; packageName = "once"; @@ -2146,6 +1813,15 @@ let sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; }; }; + "path-is-absolute-1.0.1" = { + name = "path-is-absolute"; + packageName = "path-is-absolute"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + }; "wrappy-1.0.2" = { name = "wrappy"; packageName = "wrappy"; @@ -2155,6 +1831,33 @@ let sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; }; }; + "brace-expansion-1.1.8" = { + name = "brace-expansion"; + packageName = "brace-expansion"; + version = "1.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz"; + sha1 = "c07b211c7c952ec1f8efd51a77ef0d1d3990a292"; + }; + }; + "balanced-match-1.0.0" = { + name = "balanced-match"; + packageName = "balanced-match"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; + sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + }; + }; + "concat-map-0.0.1" = { + name = "concat-map"; + packageName = "concat-map"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + }; "colors-0.6.2" = { name = "colors"; packageName = "colors"; @@ -2380,13 +2083,40 @@ let sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; }; }; - "commander-2.9.0" = { + "async-2.5.0" = { + name = "async"; + packageName = "async"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-2.5.0.tgz"; + sha1 = "843190fd6b7357a0b9e1c956edddd5ec8462b54d"; + }; + }; + "lodash-4.17.4" = { + name = "lodash"; + packageName = "lodash"; + version = "4.17.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"; + sha1 = "78203a4d1c328ae1d86dca6460e369b57f4055ae"; + }; + }; + "chalk-1.1.3" = { + name = "chalk"; + packageName = "chalk"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; + sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + }; + }; + "commander-2.11.0" = { name = "commander"; packageName = "commander"; - version = "2.9.0"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"; - sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; + url = "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz"; + sha1 = "157152fd1e7a6c8d98a5b715cf376df928004563"; }; }; "is-my-json-valid-2.16.0" = { @@ -2407,13 +2137,58 @@ let sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; }; }; - "graceful-readlink-1.0.1" = { - name = "graceful-readlink"; - packageName = "graceful-readlink"; - version = "1.0.1"; + "ansi-styles-2.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; - sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"; + sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; + }; + }; + "escape-string-regexp-1.0.5" = { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + }; + "has-ansi-2.0.0" = { + name = "has-ansi"; + packageName = "has-ansi"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; + sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + }; + }; + "strip-ansi-3.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + }; + "supports-color-2.0.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; + sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; + }; + }; + "ansi-regex-2.1.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; }; }; "generate-function-2.0.0" = { @@ -2731,31 +2506,22 @@ let sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; }; }; - "readable-stream-2.2.11" = { + "readable-stream-2.3.3" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.2.11"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.11.tgz"; - sha1 = "0796b31f8d7688007ff0b93a8088d34aa17c0f72"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz"; + sha1 = "368f2512d79f9d46fdfc71349ae7878bbc1eb95c"; }; }; - "safe-buffer-5.0.1" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz"; - sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7"; - }; - }; - "string_decoder-1.0.2" = { + "string_decoder-1.0.3" = { name = "string_decoder"; packageName = "string_decoder"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.2.tgz"; - sha1 = "b29e1f4e1125fa97a10382b8a533737b7491e179"; + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz"; + sha1 = "0fc67d7c141825de94282dd536bec6b9bce860ab"; }; }; "http-basic-2.5.1" = { @@ -2767,22 +2533,31 @@ let sha1 = "8ce447bdb5b6c577f8a63e3fa78056ec4bb4dbfb"; }; }; - "promise-7.3.0" = { + "promise-7.3.1" = { name = "promise"; packageName = "promise"; - version = "7.3.0"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/promise/-/promise-7.3.0.tgz"; - sha1 = "e7feec5aa87a2cbb81acf47d9a3adbd9d4642d7b"; + url = "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz"; + sha1 = "064b72602b18f90f29192b8b1bc418ffd1ebd3bf"; }; }; - "asap-2.0.5" = { + "asap-2.0.6" = { name = "asap"; packageName = "asap"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/asap/-/asap-2.0.5.tgz"; - sha1 = "522765b50c3510490e52d7dcfe085ef9ba96958f"; + url = "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz"; + sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46"; + }; + }; + "os-homedir-1.0.2" = { + name = "os-homedir"; + packageName = "os-homedir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; + sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; }; }; "async-1.0.0" = { @@ -2992,13 +2767,13 @@ let sha1 = "9cb6f4f4e9e48155a6aa0671edd336ff1479a188"; }; }; - "mime-db-1.28.0" = { + "mime-db-1.29.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.28.0"; + version = "1.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.28.0.tgz"; - sha1 = "fedd349be06d2865b7fc57d837c6de4f17d7ac3c"; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.29.0.tgz"; + sha1 = "48d26d235589651704ac5916ca06001914266878"; }; }; "camelcase-keys-2.1.0" = { @@ -3010,15 +2785,6 @@ let sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7"; }; }; - "decamelize-1.2.0" = { - name = "decamelize"; - packageName = "decamelize"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; - sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; - }; - }; "loud-rejection-1.6.0" = { name = "loud-rejection"; packageName = "loud-rejection"; @@ -3046,13 +2812,13 @@ let sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; }; }; - "normalize-package-data-2.3.8" = { + "normalize-package-data-2.4.0" = { name = "normalize-package-data"; packageName = "normalize-package-data"; - version = "2.3.8"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.8.tgz"; - sha1 = "d819eda2a9dedbd1ffa563ea4071d936782295bb"; + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; + sha1 = "12f95a307d58352075a04907b84ac8be98ac012f"; }; }; "object-assign-4.1.1" = { @@ -3127,13 +2893,13 @@ let sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; }; }; - "hosted-git-info-2.4.2" = { + "hosted-git-info-2.5.0" = { name = "hosted-git-info"; packageName = "hosted-git-info"; - version = "2.4.2"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.2.tgz"; - sha1 = "0076b9f46a270506ddbaaea56496897460612a67"; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz"; + sha1 = "6d60e34b3abbc8313062c3b798ef8d901a07af3c"; }; }; "is-builtin-module-1.0.0" = { @@ -3316,6 +3082,33 @@ let sha1 = "0c7962a6adefa7bbd4ac366460a638552ae1a0a2"; }; }; + "repeating-2.0.1" = { + name = "repeating"; + packageName = "repeating"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz"; + sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; + }; + }; + "is-finite-1.0.2" = { + name = "is-finite"; + packageName = "is-finite"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"; + sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa"; + }; + }; + "number-is-nan-1.0.1" = { + name = "number-is-nan"; + packageName = "number-is-nan"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; + }; + }; "get-stdin-4.0.1" = { name = "get-stdin"; packageName = "get-stdin"; @@ -3379,6 +3172,33 @@ let sha1 = "dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"; }; }; + "debug-2.6.8" = { + name = "debug"; + packageName = "debug"; + version = "2.6.8"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz"; + sha1 = "e731531ca2ede27d188222427da17821d68ff4fc"; + }; + }; + "ms-2.0.0" = { + name = "ms"; + packageName = "ms"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + }; + "os-tmpdir-1.0.2" = { + name = "os-tmpdir"; + packageName = "os-tmpdir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + }; + }; "rimraf-2.2.8" = { name = "rimraf"; packageName = "rimraf"; @@ -3478,13 +3298,13 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "crypto-browserify-3.11.0" = { + "crypto-browserify-3.11.1" = { name = "crypto-browserify"; packageName = "crypto-browserify"; - version = "3.11.0"; + version = "3.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.0.tgz"; - sha1 = "3652a0906ab9b2a7e0c3ce66a408e957a2485522"; + url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.1.tgz"; + sha1 = "948945efc6757a400d6e5e5af47194d10064279f"; }; }; "defined-1.0.0" = { @@ -3829,13 +3649,13 @@ let sha1 = "f3f7522f4ef782348da8161bad9ecfd51bf83a75"; }; }; - "base64-js-1.2.0" = { + "base64-js-1.2.1" = { name = "base64-js"; packageName = "base64-js"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz"; - sha1 = "a39992d723584811982be5e290bb6a53d86700f1"; + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz"; + sha1 = "a91947da1f4a516ea38e5b4ec0ec3773675e0886"; }; }; "ieee754-1.1.8" = { @@ -3973,13 +3793,13 @@ let sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9"; }; }; - "cipher-base-1.0.3" = { + "cipher-base-1.0.4" = { name = "cipher-base"; packageName = "cipher-base"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.3.tgz"; - sha1 = "eeabf194419ce900da3018c207d212f2a6df0a07"; + url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz"; + sha1 = "8760e4ecc272f4c363532f926d874aae2c1397de"; }; }; "des.js-1.0.0" = { @@ -4000,13 +3820,13 @@ let sha1 = "702be2dda6b37f4836bcb3f5db56641b64a1d3d3"; }; }; - "bn.js-4.11.6" = { + "bn.js-4.11.7" = { name = "bn.js"; packageName = "bn.js"; - version = "4.11.6"; + version = "4.11.7"; src = fetchurl { - url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz"; - sha1 = "53344adb14617a13f6e8dd2ce28905d1c0ba3215"; + url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.7.tgz"; + sha1 = "ddb048e50d9482790094c13eb3fcfc833ce7ab46"; }; }; "browserify-rsa-4.0.1" = { @@ -4045,13 +3865,13 @@ let sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f"; }; }; - "hash.js-1.0.3" = { + "hash.js-1.1.3" = { name = "hash.js"; packageName = "hash.js"; - version = "1.0.3"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/hash.js/-/hash.js-1.0.3.tgz"; - sha1 = "1332ff00156c0a0ffdd8236013d07b77a0451573"; + url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz"; + sha1 = "340dedbe6290187151c1ea1d777a3448935df846"; }; }; "hmac-drbg-1.0.1" = { @@ -4846,6 +4666,15 @@ let sha1 = "394288bf07c8fe16cf36bb2e40a3bb947ed24963"; }; }; + "base64-js-1.2.0" = { + name = "base64-js"; + packageName = "base64-js"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz"; + sha1 = "a39992d723584811982be5e290bb6a53d86700f1"; + }; + }; "xmlbuilder-8.2.2" = { name = "xmlbuilder"; packageName = "xmlbuilder"; @@ -4954,13 +4783,13 @@ let sha1 = "8f8016ab74c415f274f4fb1943faaf7e92030eff"; }; }; - "parse-torrent-file-4.0.2" = { + "parse-torrent-file-4.0.3" = { name = "parse-torrent-file"; packageName = "parse-torrent-file"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.0.2.tgz"; - sha1 = "981a22143832abbcd99052d889d31a39ae3f9bfe"; + url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.0.3.tgz"; + sha1 = "3e2ab0a464a803cc35d1357a1029d1cbd11dae37"; }; }; "simple-get-2.6.0" = { @@ -4990,13 +4819,13 @@ let sha1 = "b31c5ae8254844a3a8281541ce2b04b865a734ff"; }; }; - "bencode-0.11.0" = { + "bencode-1.0.0" = { name = "bencode"; packageName = "bencode"; - version = "0.11.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/bencode/-/bencode-0.11.0.tgz"; - sha1 = "7ea65d4ce00300393a43a92d5640b6fb0204dc64"; + url = "https://registry.npmjs.org/bencode/-/bencode-1.0.0.tgz"; + sha1 = "0b83aea885b3547b579ada0c6a5e7739fe4d073e"; }; }; "simple-sha1-2.1.0" = { @@ -5431,13 +5260,13 @@ let sha1 = "58cccb244f563326ba893bf5c06a35f644846daa"; }; }; - "k-rpc-socket-1.6.2" = { + "k-rpc-socket-1.7.1" = { name = "k-rpc-socket"; packageName = "k-rpc-socket"; - version = "1.6.2"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.6.2.tgz"; - sha1 = "5c9e9f34a058f43ffe6512354d98957a41694f21"; + url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.7.1.tgz"; + sha1 = "e6e92a00b2c74906ad69c42b6ea213dce8914d95"; }; }; "bencode-0.8.0" = { @@ -5512,13 +5341,13 @@ let sha1 = "57f40d036832e5f5055662a397c4de76ed66bf61"; }; }; - "ipaddr.js-1.3.0" = { + "ipaddr.js-1.4.0" = { name = "ipaddr.js"; packageName = "ipaddr.js"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.3.0.tgz"; - sha1 = "1e03a52fdad83a8bbb2b25cbf4998b4cffcd3dec"; + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.4.0.tgz"; + sha1 = "296aca878a821816e5b85d0a285a99bcff4582f0"; }; }; "get-browser-rtc-1.0.2" = { @@ -5539,6 +5368,15 @@ let sha1 = "6b94b3e447cb6a363f785eaf94af6359e8e81c80"; }; }; + "safe-buffer-5.0.1" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz"; + sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7"; + }; + }; "ultron-1.1.0" = { name = "ultron"; packageName = "ultron"; @@ -5854,13 +5692,13 @@ let sha1 = "f6e0579c8214d33a08109fd6e2e5c1dbc70463fc"; }; }; - "sax-1.2.2" = { + "sax-1.2.4" = { name = "sax"; packageName = "sax"; - version = "1.2.2"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-1.2.2.tgz"; - sha1 = "fd8631a23bc7826bef5d871bdb87378c95647828"; + url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"; + sha1 = "2816234e2378bddc4e5354fab5caa895df7100d9"; }; }; "xmlbuilder-4.2.1" = { @@ -6313,13 +6151,13 @@ let sha1 = "96bb17761daba94f46d001738b3cedf3a67fe06c"; }; }; - "acorn-5.0.3" = { + "acorn-5.1.1" = { name = "acorn"; packageName = "acorn"; - version = "5.0.3"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-5.0.3.tgz"; - sha1 = "c460df08491463f028ccb82eab3730bf01087b3d"; + url = "https://registry.npmjs.org/acorn/-/acorn-5.1.1.tgz"; + sha1 = "53fe161111f912ab999ee887a90a0bc52822fd75"; }; }; "foreach-2.0.5" = { @@ -6430,13 +6268,13 @@ let sha1 = "3f91365cabe60b77ed0ebba24b454e3e09d95a82"; }; }; - "compression-1.6.2" = { + "compression-1.7.0" = { name = "compression"; packageName = "compression"; - version = "1.6.2"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/compression/-/compression-1.6.2.tgz"; - sha1 = "cceb121ecc9d09c52d7ad0c3350ea93ddd402bc3"; + url = "https://registry.npmjs.org/compression/-/compression-1.7.0.tgz"; + sha1 = "030c9f198f1643a057d776a738e922da4373012d"; }; }; "express-4.15.3" = { @@ -6457,13 +6295,13 @@ let sha1 = "c3ca7434938648c3e0d9c1e328dd68b622c284ca"; }; }; - "bytes-2.3.0" = { + "bytes-2.5.0" = { name = "bytes"; packageName = "bytes"; - version = "2.3.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-2.3.0.tgz"; - sha1 = "d5b680a165b6201739acb611542aabc2d8ceb070"; + url = "https://registry.npmjs.org/bytes/-/bytes-2.5.0.tgz"; + sha1 = "4c9423ea2d252c270c41b2bdefeff9bb6b62c06a"; }; }; "compressible-2.0.10" = { @@ -6475,15 +6313,6 @@ let sha1 = "feda1c7f7617912732b29bf8cf26252a20b9eecd"; }; }; - "debug-2.2.0" = { - name = "debug"; - packageName = "debug"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; - sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; - }; - }; "on-headers-1.0.1" = { name = "on-headers"; packageName = "on-headers"; @@ -6511,15 +6340,6 @@ let sha1 = "2b327184e8992101177b28563fb5e7102acd0ca9"; }; }; - "ms-0.7.1" = { - name = "ms"; - packageName = "ms"; - version = "0.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; - sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; - }; - }; "array-flatten-1.1.1" = { name = "array-flatten"; packageName = "array-flatten"; @@ -6772,6 +6592,15 @@ let sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363"; }; }; + "ipaddr.js-1.3.0" = { + name = "ipaddr.js"; + packageName = "ipaddr.js"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.3.0.tgz"; + sha1 = "1e03a52fdad83a8bbb2b25cbf4998b4cffcd3dec"; + }; + }; "destroy-1.0.4" = { name = "destroy"; packageName = "destroy"; @@ -6835,13 +6664,13 @@ let sha1 = "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"; }; }; - "read-package-json-2.0.5" = { + "read-package-json-2.0.10" = { name = "read-package-json"; packageName = "read-package-json"; - version = "2.0.5"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.5.tgz"; - sha1 = "f93a64e641529df68a08c64de46389e8a3f88845"; + url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.10.tgz"; + sha1 = "dc0229f6dde6b4b705b39e25b2d970ebe95685ae"; }; }; "validate-npm-package-name-3.0.0" = { @@ -7132,6 +6961,15 @@ let sha1 = "8e5f14be0bdaedb73e07200310aa416c27350fc4"; }; }; + "normalize-package-data-2.3.8" = { + name = "normalize-package-data"; + packageName = "normalize-package-data"; + version = "2.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.8.tgz"; + sha1 = "d819eda2a9dedbd1ffa563ea4071d936782295bb"; + }; + }; "npm-cache-filename-1.0.2" = { name = "npm-cache-filename"; packageName = "npm-cache-filename"; @@ -8321,6 +8159,24 @@ let sha1 = "3d0c63180f458eb10d325aaa37d7c58ae312e9d7"; }; }; + "bindings-1.2.1" = { + name = "bindings"; + packageName = "bindings"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"; + sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; + }; + }; + "nan-2.6.2" = { + name = "nan"; + packageName = "nan"; + version = "2.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz"; + sha1 = "e4ff34e6c95fdfb5aecc08de6596f43605a7db45"; + }; + }; "jsonparse-0.0.6" = { name = "jsonparse"; packageName = "jsonparse"; @@ -8567,13 +8423,13 @@ let sha1 = "45221ee429f7ee1e5035be3f51533f1cdfd29884"; }; }; - "cors-2.8.3" = { + "cors-2.8.4" = { name = "cors"; packageName = "cors"; - version = "2.8.3"; + version = "2.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/cors/-/cors-2.8.3.tgz"; - sha1 = "4cf78e1d23329a7496b2fc2225b77ca5bb5eb802"; + url = "https://registry.npmjs.org/cors/-/cors-2.8.4.tgz"; + sha1 = "2bd381f2eb201020105cd50ea59da63090694686"; }; }; "docker-parse-image-3.0.1" = { @@ -9062,13 +8918,13 @@ let sha1 = "cac328f7bee45730d404b692203fcb590e172d5e"; }; }; - "aws-sdk-2.72.0" = { + "aws-sdk-2.85.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.72.0"; + version = "2.85.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.72.0.tgz"; - sha1 = "59021c14e354f34a4fb4f229ac10f8e36428f4d4"; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.85.0.tgz"; + sha1 = "e3860761c9a2f8a9017461ab7f3bd075f69dfa8f"; }; }; "request-2.81.0" = { @@ -9485,6 +9341,24 @@ let sha1 = "dbbd5b54ba30f287e2a8d5a249da6c0cef369459"; }; }; + "ajv-5.2.2" = { + name = "ajv"; + packageName = "ajv"; + version = "5.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-5.2.2.tgz"; + sha1 = "47c68d69e86f5d953103b0074a9430dc63da5e39"; + }; + }; + "babel-code-frame-6.22.0" = { + name = "babel-code-frame"; + packageName = "babel-code-frame"; + version = "6.22.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz"; + sha1 = "027620bee567a88c32561574e7fd0801d33118e4"; + }; + }; "doctrine-2.0.0" = { name = "doctrine"; packageName = "doctrine"; @@ -9530,6 +9404,15 @@ let sha1 = "0dee3fed31fcd469618ce7342099fc1afa0bdb13"; }; }; + "esutils-2.0.2" = { + name = "esutils"; + packageName = "esutils"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz"; + sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"; + }; + }; "file-entry-cache-2.0.0" = { name = "file-entry-cache"; packageName = "file-entry-cache"; @@ -9539,6 +9422,15 @@ let sha1 = "c392990c3e684783d838b8c84a45d8a048458361"; }; }; + "globals-9.18.0" = { + name = "globals"; + packageName = "globals"; + version = "9.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz"; + sha1 = "aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"; + }; + }; "ignore-3.3.3" = { name = "ignore"; packageName = "ignore"; @@ -9548,13 +9440,13 @@ let sha1 = "432352e57accd87ab3110e82d3fea0e47812156d"; }; }; - "inquirer-3.1.0" = { + "inquirer-3.2.0" = { name = "inquirer"; packageName = "inquirer"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-3.1.0.tgz"; - sha1 = "e05400d48b94937c2d3caa7038663ba9189aab01"; + url = "https://registry.npmjs.org/inquirer/-/inquirer-3.2.0.tgz"; + sha1 = "45b44c2160c729d7578c54060b3eed94487bb42b"; }; }; "is-resolvable-1.0.0" = { @@ -9566,13 +9458,13 @@ let sha1 = "8df57c61ea2e3c501408d100fb013cf8d6e0cc62"; }; }; - "js-yaml-3.8.4" = { + "js-yaml-3.9.0" = { name = "js-yaml"; packageName = "js-yaml"; - version = "3.8.4"; + version = "3.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.4.tgz"; - sha1 = "520b4564f86573ba96662af85a8cafa7b4b5a6f6"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.0.tgz"; + sha1 = "4ffbbf25c2ac963b8299dc74da7e3740de1c18ce"; }; }; "levn-0.3.0" = { @@ -9638,22 +9530,40 @@ let sha1 = "a8116c133fac2c61f4a420ab6cdf5c4d61f0e435"; }; }; - "esrecurse-4.1.0" = { - name = "esrecurse"; - packageName = "esrecurse"; - version = "4.1.0"; + "fast-deep-equal-1.0.0" = { + name = "fast-deep-equal"; + packageName = "fast-deep-equal"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.1.0.tgz"; - sha1 = "4713b6536adf7f2ac4f327d559e7756bff648220"; + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz"; + sha1 = "96256a3bc975595eb36d82e9929d060d893439ff"; }; }; - "estraverse-4.1.1" = { - name = "estraverse"; - packageName = "estraverse"; - version = "4.1.1"; + "json-schema-traverse-0.3.1" = { + name = "json-schema-traverse"; + packageName = "json-schema-traverse"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-4.1.1.tgz"; - sha1 = "f6caca728933a850ef90661d0e17982ba47111a2"; + url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz"; + sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340"; + }; + }; + "js-tokens-3.0.2" = { + name = "js-tokens"; + packageName = "js-tokens"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz"; + sha1 = "9866df395102130e38f7f996bceb65443209c25b"; + }; + }; + "esrecurse-4.2.0" = { + name = "esrecurse"; + packageName = "esrecurse"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz"; + sha1 = "fa9568d98d3823f9a41d91e902dcab9ea6e5b163"; }; }; "acorn-jsx-3.0.1" = { @@ -9782,6 +9692,15 @@ let sha1 = "5bae52be424878dd9783e8910e3fc2922e83c81b"; }; }; + "chalk-2.0.1" = { + name = "chalk"; + packageName = "chalk"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz"; + sha1 = "dbec49436d2ae15f536114e76d14656cdbc0f44d"; + }; + }; "cli-cursor-2.1.0" = { name = "cli-cursor"; packageName = "cli-cursor"; @@ -9845,13 +9764,67 @@ let sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be"; }; }; - "string-width-2.0.0" = { + "string-width-2.1.0" = { name = "string-width"; packageName = "string-width"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-2.1.0.tgz"; + sha1 = "030664561fc146c9423ec7d978fe2457437fe6d0"; + }; + }; + "strip-ansi-4.0.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"; + sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; + }; + }; + "ansi-styles-3.1.0" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.1.0.tgz"; + sha1 = "09c202d5c917ec23188caa5c9cb9179cd9547750"; + }; + }; + "supports-color-4.2.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-4.2.0.tgz"; + sha1 = "ad986dc7eb2315d009b4d77c8169c2231a684037"; + }; + }; + "color-convert-1.9.0" = { + name = "color-convert"; + packageName = "color-convert"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz"; + sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a"; + }; + }; + "color-name-1.1.2" = { + name = "color-name"; + packageName = "color-name"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz"; + sha1 = "5c8ab72b64bd2215d617ae9559ebb148475cf98d"; + }; + }; + "has-flag-2.0.0" = { + name = "has-flag"; + packageName = "has-flag"; version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-2.0.0.tgz"; - sha1 = "635c5436cc72a6e0c387ceca278d4e2eec52687e"; + url = "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz"; + sha1 = "e8207af1cc7b30d446cc70b734b5e8be18f88d51"; }; }; "restore-cursor-2.0.0" = { @@ -9917,6 +9890,15 @@ let sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; }; }; + "ansi-regex-3.0.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz"; + sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + }; + }; "tryit-1.0.3" = { name = "tryit"; packageName = "tryit"; @@ -9935,13 +9917,13 @@ let sha1 = "73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"; }; }; - "esprima-3.1.3" = { + "esprima-4.0.0" = { name = "esprima"; packageName = "esprima"; - version = "3.1.3"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz"; - sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633"; + url = "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz"; + sha1 = "4499eddcd1110e0b218bacf2fa7f7f59f55ca804"; }; }; "prelude-ls-1.1.2" = { @@ -10034,13 +10016,13 @@ let sha1 = "edbf8903f66f7ce2f8eafd6ceed65e264c831b35"; }; }; - "eslint-3.19.0" = { + "eslint-4.2.0" = { name = "eslint"; packageName = "eslint"; - version = "3.19.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz"; - sha1 = "c8fc6201c7f40dd08941b87c085767386a679acc"; + url = "https://registry.npmjs.org/eslint/-/eslint-4.2.0.tgz"; + sha1 = "a2b3184111b198e02e9c7f3cca625a5e01c56b3d"; }; }; "supports-color-3.2.3" = { @@ -10052,132 +10034,6 @@ let sha1 = "65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"; }; }; - "escope-3.6.0" = { - name = "escope"; - packageName = "escope"; - version = "3.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz"; - sha1 = "e01975e812781a163a6dadfdd80398dc64c889c3"; - }; - }; - "inquirer-0.12.0" = { - name = "inquirer"; - packageName = "inquirer"; - version = "0.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz"; - sha1 = "1ef2bfd63504df0bc75785fff8c2c41df12f077e"; - }; - }; - "pluralize-1.2.1" = { - name = "pluralize"; - packageName = "pluralize"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz"; - sha1 = "d1a21483fd22bb41e58a12fa3421823140897c45"; - }; - }; - "strip-bom-3.0.0" = { - name = "strip-bom"; - packageName = "strip-bom"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz"; - sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; - }; - }; - "table-3.8.3" = { - name = "table"; - packageName = "table"; - version = "3.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-3.8.3.tgz"; - sha1 = "2bbc542f0fda9861a755d3947fefd8b3f513855f"; - }; - }; - "es6-map-0.1.5" = { - name = "es6-map"; - packageName = "es6-map"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz"; - sha1 = "9136e0503dcc06a301690f0bb14ff4e364e949f0"; - }; - }; - "es6-weak-map-2.0.2" = { - name = "es6-weak-map"; - packageName = "es6-weak-map"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz"; - sha1 = "5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"; - }; - }; - "d-1.0.0" = { - name = "d"; - packageName = "d"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/d/-/d-1.0.0.tgz"; - sha1 = "754bb5bfe55451da69a58b94d45f4c5b0462d58f"; - }; - }; - "es5-ext-0.10.23" = { - name = "es5-ext"; - packageName = "es5-ext"; - version = "0.10.23"; - src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.23.tgz"; - sha1 = "7578b51be974207a5487821b56538c224e4e7b38"; - }; - }; - "es6-iterator-2.0.1" = { - name = "es6-iterator"; - packageName = "es6-iterator"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz"; - sha1 = "8e319c9f0453bf575d374940a655920e59ca5512"; - }; - }; - "es6-set-0.1.5" = { - name = "es6-set"; - packageName = "es6-set"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz"; - sha1 = "d2b3ec5d4d800ced818db538d28974db0a73ccb1"; - }; - }; - "es6-symbol-3.1.1" = { - name = "es6-symbol"; - packageName = "es6-symbol"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz"; - sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"; - }; - }; - "event-emitter-0.3.5" = { - name = "event-emitter"; - packageName = "event-emitter"; - version = "0.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz"; - sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39"; - }; - }; - "string-width-1.0.2" = { - name = "string-width"; - packageName = "string-width"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; - sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; - }; - }; "has-flag-1.0.0" = { name = "has-flag"; packageName = "has-flag"; @@ -10187,6 +10043,186 @@ let sha1 = "9d9e793165ce017a00f00418c43f942a7b1d11fa"; }; }; + "ora-1.3.0" = { + name = "ora"; + packageName = "ora"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ora/-/ora-1.3.0.tgz"; + sha1 = "80078dd2b92a934af66a3ad72a5b910694ede51a"; + }; + }; + "phantomjs-prebuilt-2.1.14" = { + name = "phantomjs-prebuilt"; + packageName = "phantomjs-prebuilt"; + version = "2.1.14"; + src = fetchurl { + url = "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.14.tgz"; + sha1 = "d53d311fcfb7d1d08ddb24014558f1188c516da0"; + }; + }; + "promise-phantom-3.1.6" = { + name = "promise-phantom"; + packageName = "promise-phantom"; + version = "3.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-phantom/-/promise-phantom-3.1.6.tgz"; + sha1 = "bbcfd248725259f2bb115a27bfa8d65dc420f931"; + }; + }; + "zen-observable-0.5.2" = { + name = "zen-observable"; + packageName = "zen-observable"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/zen-observable/-/zen-observable-0.5.2.tgz"; + sha1 = "845a1cfda804a13419ec8ec12343e1f4c45cd07a"; + }; + }; + "cli-spinners-1.0.0" = { + name = "cli-spinners"; + packageName = "cli-spinners"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.0.0.tgz"; + sha1 = "ef987ed3d48391ac3dab9180b406a742180d6e6a"; + }; + }; + "log-symbols-1.0.2" = { + name = "log-symbols"; + packageName = "log-symbols"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz"; + sha1 = "376ff7b58ea3086a0f09facc74617eca501e1a18"; + }; + }; + "es6-promise-4.0.5" = { + name = "es6-promise"; + packageName = "es6-promise"; + version = "4.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.0.5.tgz"; + sha1 = "7882f30adde5b240ccfa7f7d78c548330951ae42"; + }; + }; + "extract-zip-1.5.0" = { + name = "extract-zip"; + packageName = "extract-zip"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.5.0.tgz"; + sha1 = "92ccf6d81ef70a9fa4c1747114ccef6d8688a6c4"; + }; + }; + "fs-extra-1.0.0" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz"; + sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950"; + }; + }; + "hasha-2.2.0" = { + name = "hasha"; + packageName = "hasha"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz"; + sha1 = "78d7cbfc1e6d66303fe79837365984517b2f6ee1"; + }; + }; + "kew-0.7.0" = { + name = "kew"; + packageName = "kew"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz"; + sha1 = "79d93d2d33363d6fdd2970b335d9141ad591d79b"; + }; + }; + "request-progress-2.0.1" = { + name = "request-progress"; + packageName = "request-progress"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz"; + sha1 = "5d36bb57961c673aa5b788dbc8141fdf23b44e08"; + }; + }; + "concat-stream-1.5.0" = { + name = "concat-stream"; + packageName = "concat-stream"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.0.tgz"; + sha1 = "53f7d43c51c5e43f81c8fdd03321c631be68d611"; + }; + }; + "mkdirp-0.5.0" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz"; + sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12"; + }; + }; + "yauzl-2.4.1" = { + name = "yauzl"; + packageName = "yauzl"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz"; + sha1 = "9528f442dab1b2284e58b4379bb194e22e0c4005"; + }; + }; + "fd-slicer-1.0.1" = { + name = "fd-slicer"; + packageName = "fd-slicer"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz"; + sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"; + }; + }; + "pend-1.2.0" = { + name = "pend"; + packageName = "pend"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz"; + sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; + }; + }; + "throttleit-1.0.0" = { + name = "throttleit"; + packageName = "throttleit"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz"; + sha1 = "9e785836daf46743145a5984b6268d828528ac6c"; + }; + }; + "mkpath-1.0.0" = { + name = "mkpath"; + packageName = "mkpath"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mkpath/-/mkpath-1.0.0.tgz"; + sha1 = "ebb3a977e7af1c683ae6fda12b545a6ba6c5853d"; + }; + }; + "node-phantom-simple-2.2.4" = { + name = "node-phantom-simple"; + packageName = "node-phantom-simple"; + version = "2.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/node-phantom-simple/-/node-phantom-simple-2.2.4.tgz"; + sha1 = "4fc4effbb02f241fb5082bd4fbab398e4aecb64d"; + }; + }; "glob-3.2.11" = { name = "glob"; packageName = "glob"; @@ -10475,15 +10511,6 @@ let sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0"; }; }; - "kind-of-3.2.2" = { - name = "kind-of"; - packageName = "kind-of"; - version = "3.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"; - sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; - }; - }; "normalize-path-2.1.1" = { name = "normalize-path"; packageName = "normalize-path"; @@ -10520,13 +10547,13 @@ let sha1 = "9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145"; }; }; - "arr-flatten-1.0.3" = { + "arr-flatten-1.1.0" = { name = "arr-flatten"; packageName = "arr-flatten"; - version = "1.0.3"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.3.tgz"; - sha1 = "a274ed85ac08849b6bd7847c4580745dc51adfb1"; + url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz"; + sha1 = "36048bbff4e7b47e136644316c99669ea5ae91f1"; }; }; "expand-range-1.8.2" = { @@ -10592,15 +10619,6 @@ let sha1 = "c7abe9cc8b87c0baa876b19fde83fd464797e38c"; }; }; - "repeat-string-1.6.1" = { - name = "repeat-string"; - packageName = "repeat-string"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"; - sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; - }; - }; "is-number-3.0.0" = { name = "is-number"; packageName = "is-number"; @@ -10727,13 +10745,13 @@ let sha1 = "db604112cb74e0d477554e9b505b17abddfab786"; }; }; - "npmlog-4.1.0" = { + "npmlog-4.1.2" = { name = "npmlog"; packageName = "npmlog"; - version = "4.1.0"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.0.tgz"; - sha1 = "dc59bee85f64f00ed424efb2af0783df25d1c0b5"; + url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"; + sha1 = "08a7f2a8bf734604779a9efa4ad5cc717abb954b"; }; }; "tar-pack-3.4.0" = { @@ -10781,6 +10799,15 @@ let sha1 = "45c6629094de4e96f693ef7eab74ae079c240fc1"; }; }; + "string-width-1.0.2" = { + name = "string-width"; + packageName = "string-width"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; + sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + }; + }; "wide-align-1.1.2" = { name = "wide-align"; packageName = "wide-align"; @@ -10980,13 +11007,13 @@ let sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6"; }; }; - "clean-css-3.4.27" = { + "clean-css-3.4.28" = { name = "clean-css"; packageName = "clean-css"; - version = "3.4.27"; + version = "3.4.28"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.27.tgz"; - sha1 = "adef75b31c160ffa5d72f4de67966e2660c1a255"; + url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.28.tgz"; + sha1 = "bf1945e82fc808f55695e6ddeaec01400efd03ff"; }; }; "commander-2.6.0" = { @@ -11070,6 +11097,15 @@ let sha1 = "eba4f5da9c0dc999de68032d8b4f76173652036b"; }; }; + "graceful-readlink-1.0.1" = { + name = "graceful-readlink"; + packageName = "graceful-readlink"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; + sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; + }; + }; "acorn-2.7.0" = { name = "acorn"; packageName = "acorn"; @@ -11160,96 +11196,6 @@ let sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9"; }; }; - "yargs-3.10.0" = { - name = "yargs"; - packageName = "yargs"; - version = "3.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"; - sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; - }; - }; - "uglify-to-browserify-1.0.2" = { - name = "uglify-to-browserify"; - packageName = "uglify-to-browserify"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"; - sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; - }; - }; - "camelcase-1.2.1" = { - name = "camelcase"; - packageName = "camelcase"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"; - sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"; - }; - }; - "cliui-2.1.0" = { - name = "cliui"; - packageName = "cliui"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz"; - sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1"; - }; - }; - "window-size-0.1.0" = { - name = "window-size"; - packageName = "window-size"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"; - sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"; - }; - }; - "center-align-0.1.3" = { - name = "center-align"; - packageName = "center-align"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz"; - sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad"; - }; - }; - "right-align-0.1.3" = { - name = "right-align"; - packageName = "right-align"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz"; - sha1 = "61339b722fe6a3515689210d24e14c96148613ef"; - }; - }; - "align-text-0.1.4" = { - name = "align-text"; - packageName = "align-text"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz"; - sha1 = "0cd90a561093f35d0a99256c22b7069433fad117"; - }; - }; - "lazy-cache-1.0.4" = { - name = "lazy-cache"; - packageName = "lazy-cache"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz"; - sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; - }; - }; - "longest-1.0.1" = { - name = "longest"; - packageName = "longest"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"; - sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097"; - }; - }; "acorn-1.2.2" = { name = "acorn"; packageName = "acorn"; @@ -11637,13 +11583,13 @@ let sha1 = "40043929e7bc60adf0b7f4827c4c6e75a0deca12"; }; }; - "fined-1.0.2" = { + "fined-1.1.0" = { name = "fined"; packageName = "fined"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/fined/-/fined-1.0.2.tgz"; - sha1 = "5b28424b760d7598960b7ef8480dff8ad3660e97"; + url = "https://registry.npmjs.org/fined/-/fined-1.1.0.tgz"; + sha1 = "b37dc844b76a2f5e7081e884f7c0ae344f153476"; }; }; "flagged-respawn-0.3.2" = { @@ -11718,31 +11664,40 @@ let sha1 = "0b81eba897e5a3d31d1c3d102f8f01441e559449"; }; }; - "lodash.assignwith-4.2.0" = { - name = "lodash.assignwith"; - packageName = "lodash.assignwith"; - version = "4.2.0"; + "expand-tilde-2.0.2" = { + name = "expand-tilde"; + packageName = "expand-tilde"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.assignwith/-/lodash.assignwith-4.2.0.tgz"; - sha1 = "127a97f02adc41751a954d24b0de17e100e038eb"; + url = "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz"; + sha1 = "97e801aa052df02454de46b02bf621642cdc8502"; }; }; - "lodash.isempty-4.4.0" = { - name = "lodash.isempty"; - packageName = "lodash.isempty"; - version = "4.4.0"; + "is-plain-object-2.0.4" = { + name = "is-plain-object"; + packageName = "is-plain-object"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz"; - sha1 = "6f86cbedd8be4ec987be9aaf33c9684db1b31e7e"; + url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"; + sha1 = "2c163b3fafb1b606d9d17928f05c2a1c38e07677"; }; }; - "lodash.pick-4.4.0" = { - name = "lodash.pick"; - packageName = "lodash.pick"; - version = "4.4.0"; + "object.defaults-1.1.0" = { + name = "object.defaults"; + packageName = "object.defaults"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz"; - sha1 = "52f05610fff9ded422611441ed1fc123a03001b3"; + url = "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz"; + sha1 = "3a7f868334b407dea06da16d88d5cd29e435fecf"; + }; + }; + "object.pick-1.2.0" = { + name = "object.pick"; + packageName = "object.pick"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object.pick/-/object.pick-1.2.0.tgz"; + sha1 = "b5392bee9782da6d9fb7d6afaf539779f1234c2b"; }; }; "parse-filepath-1.0.1" = { @@ -11754,6 +11709,42 @@ let sha1 = "159d6155d43904d16c10ef698911da1e91969b73"; }; }; + "isobject-3.0.1" = { + name = "isobject"; + packageName = "isobject"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz"; + sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; + }; + }; + "array-each-1.0.1" = { + name = "array-each"; + packageName = "array-each"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz"; + sha1 = "a794af0c05ab1752846ee753a1f211a05ba0c44f"; + }; + }; + "array-slice-1.0.0" = { + name = "array-slice"; + packageName = "array-slice"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-slice/-/array-slice-1.0.0.tgz"; + sha1 = "e73034f00dcc1f40876008fd20feae77bd4b7c2f"; + }; + }; + "for-own-1.0.0" = { + name = "for-own"; + packageName = "for-own"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz"; + sha1 = "c63332f415cedc4b04dbfe70cf836494c53cb44b"; + }; + }; "is-absolute-0.2.6" = { name = "is-absolute"; packageName = "is-absolute"; @@ -12240,40 +12231,40 @@ let sha1 = "dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"; }; }; - "@reactivex/rxjs-5.4.1" = { + "@reactivex/rxjs-5.4.2" = { name = "@reactivex/rxjs"; packageName = "@reactivex/rxjs"; - version = "5.4.1"; + version = "5.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@reactivex/rxjs/-/rxjs-5.4.1.tgz"; - sha1 = "e472c38c84eb411690f281253d3a93a3466ad041"; + url = "https://registry.npmjs.org/@reactivex/rxjs/-/rxjs-5.4.2.tgz"; + sha1 = "ab530dbbdab71071369828ef11c8d7ae558d5116"; }; }; - "chai-4.0.2" = { + "chai-4.1.0" = { name = "chai"; packageName = "chai"; - version = "4.0.2"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/chai/-/chai-4.0.2.tgz"; - sha1 = "2f7327c4de6f385dd7787999e2ab02697a32b83b"; + url = "https://registry.npmjs.org/chai/-/chai-4.1.0.tgz"; + sha1 = "331a0391b55c3af8740ae9c3b7458bc1c3805e6d"; }; }; - "chai-as-promised-7.0.0" = { + "chai-as-promised-7.1.1" = { name = "chai-as-promised"; packageName = "chai-as-promised"; - version = "7.0.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.0.0.tgz"; - sha1 = "c87ee613eaa196766393da6fbb4052f112acf675"; + url = "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.1.tgz"; + sha1 = "08645d825deb8696ee61725dbf590c012eb00ca0"; }; }; - "fast-json-patch-1.2.2" = { + "fast-json-patch-2.0.3" = { name = "fast-json-patch"; packageName = "fast-json-patch"; - version = "1.2.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-1.2.2.tgz"; - sha1 = "d377d97c6911dbdd2a1c80bfacda048a4f83bbf9"; + url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-2.0.3.tgz"; + sha1 = "d17ab0b94d742ec200bef297a378b57368a47f09"; }; }; "iterare-0.0.8" = { @@ -12339,13 +12330,13 @@ let sha1 = "3d38321828231e434f287514959c37a82b629f42"; }; }; - "vscode-jsonrpc-3.3.0" = { + "vscode-jsonrpc-3.3.1" = { name = "vscode-jsonrpc"; packageName = "vscode-jsonrpc"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.3.0.tgz"; - sha1 = "03bdab0b10f04727ec3b8d403cd511a8a365b13d"; + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.3.1.tgz"; + sha1 = "b7857be58b97af664a8cdd071c91891d6c7d6a67"; }; }; "vscode-languageserver-3.3.0" = { @@ -12483,6 +12474,33 @@ let sha1 = "22817534f24bfa4950c34d532d48ecbc621b8c14"; }; }; + "editorconfig-0.13.2" = { + name = "editorconfig"; + packageName = "editorconfig"; + version = "0.13.2"; + src = fetchurl { + url = "https://registry.npmjs.org/editorconfig/-/editorconfig-0.13.2.tgz"; + sha1 = "8e57926d9ee69ab6cb999f027c2171467acceb35"; + }; + }; + "bluebird-3.5.0" = { + name = "bluebird"; + packageName = "bluebird"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz"; + sha1 = "791420d7f551eea2897453a8a77653f96606d67c"; + }; + }; + "lru-cache-3.2.0" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz"; + sha1 = "71789b3b7f5399bec8565dda38aa30d2a097efee"; + }; + }; "body-parser-1.17.2" = { name = "body-parser"; packageName = "body-parser"; @@ -12510,6 +12528,15 @@ let sha1 = "eaba64ca5d542a311ac945f582defc336165d9f4"; }; }; + "express-urlrewrite-1.2.0" = { + name = "express-urlrewrite"; + packageName = "express-urlrewrite"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/express-urlrewrite/-/express-urlrewrite-1.2.0.tgz"; + sha1 = "8e667b7761ff1c7ffdb0efa05d64035387c823eb"; + }; + }; "lodash-id-0.13.0" = { name = "lodash-id"; packageName = "lodash-id"; @@ -12546,6 +12573,15 @@ let sha1 = "784ac7734e4a453a9c6e6e8680a9329275c8b687"; }; }; + "please-upgrade-node-1.0.1" = { + name = "please-upgrade-node"; + packageName = "please-upgrade-node"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-1.0.1.tgz"; + sha1 = "f92dd3443d9797f5742510ea2fd205f811b3b1f7"; + }; + }; "pluralize-3.1.0" = { name = "pluralize"; packageName = "pluralize"; @@ -12618,6 +12654,15 @@ let sha1 = "994976cf6a5096a41162840492f0bdc5d6e7fb96"; }; }; + "path-to-regexp-1.7.0" = { + name = "path-to-regexp"; + packageName = "path-to-regexp"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz"; + sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d"; + }; + }; "steno-0.4.4" = { name = "steno"; packageName = "steno"; @@ -12852,15 +12897,6 @@ let sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; }; }; - "bluebird-3.5.0" = { - name = "bluebird"; - packageName = "bluebird"; - version = "3.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz"; - sha1 = "791420d7f551eea2897453a8a77653f96606d67c"; - }; - }; "combine-lists-1.0.1" = { name = "combine-lists"; packageName = "combine-lists"; @@ -12879,6 +12915,15 @@ let sha1 = "694e8d20681bfe490282c8ab886be98f09f42fe7"; }; }; + "core-js-2.4.1" = { + name = "core-js"; + packageName = "core-js"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz"; + sha1 = "4de911e667b0eae9124e34254b53aea6fc618d3e"; + }; + }; "di-0.0.1" = { name = "di"; packageName = "di"; @@ -12951,13 +12996,13 @@ let sha1 = "b8af9caba00949e568e369f1327ea9be9ea2461b"; }; }; - "useragent-2.1.13" = { + "useragent-2.2.1" = { name = "useragent"; packageName = "useragent"; - version = "2.1.13"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/useragent/-/useragent-2.1.13.tgz"; - sha1 = "bba43e8aa24d5ceb83c2937473e102e21df74c10"; + url = "https://registry.npmjs.org/useragent/-/useragent-2.2.1.tgz"; + sha1 = "cf593ef4f2d175875e8bb658ea92e18a4fd06d8e"; }; }; "custom-event-1.0.1" = { @@ -13320,6 +13365,15 @@ let sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20"; }; }; + "debug-2.2.0" = { + name = "debug"; + packageName = "debug"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; + sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; + }; + }; "json3-3.3.2" = { name = "json3"; packageName = "json3"; @@ -13329,6 +13383,15 @@ let sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1"; }; }; + "ms-0.7.1" = { + name = "ms"; + packageName = "ms"; + version = "0.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; + sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; + }; + }; "lru-cache-2.2.4" = { name = "lru-cache"; packageName = "lru-cache"; @@ -14004,6 +14067,15 @@ let sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; }; }; + "convert-source-map-1.5.0" = { + name = "convert-source-map"; + packageName = "convert-source-map"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz"; + sha1 = "9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"; + }; + }; "express-2.5.11" = { name = "express"; packageName = "express"; @@ -14130,6 +14202,15 @@ let sha1 = "f351d32969d32fa5d7a5567154263d928ae3bd1f"; }; }; + "commander-2.9.0" = { + name = "commander"; + packageName = "commander"; + version = "2.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"; + sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; + }; + }; "debug-2.6.0" = { name = "debug"; packageName = "debug"; @@ -14589,22 +14670,13 @@ let sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee"; }; }; - "bcryptjs-2.4.0" = { + "bcryptjs-2.4.3" = { name = "bcryptjs"; packageName = "bcryptjs"; - version = "2.4.0"; + version = "2.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.0.tgz"; - sha1 = "fb7f4a0b133854503fe1b2da3f25db834cf0e678"; - }; - }; - "body-parser-1.15.2" = { - name = "body-parser"; - packageName = "body-parser"; - version = "1.15.2"; - src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.15.2.tgz"; - sha1 = "d7578cf4f1d11d5f6ea804cef35dc7a7ff6dae67"; + url = "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz"; + sha1 = "9ab5627b93e60621ff7cdac5da9733027df1d0cb"; }; }; "cheerio-0.22.0" = { @@ -14616,15 +14688,6 @@ let sha1 = "a9baa860a3f9b595a6b81b1a86873121ed3a269e"; }; }; - "clone-2.1.0" = { - name = "clone"; - packageName = "clone"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/clone/-/clone-2.1.0.tgz"; - sha1 = "9c715bfbd39aa197c8ee0f8e65c3912ba34f8cd6"; - }; - }; "cookie-parser-1.4.3" = { name = "cookie-parser"; packageName = "cookie-parser"; @@ -14634,13 +14697,13 @@ let sha1 = "0fe31fa19d000b95f4aadf1f53fdc2b8a203baa5"; }; }; - "cors-2.8.1" = { + "cors-2.8.3" = { name = "cors"; packageName = "cors"; - version = "2.8.1"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/cors/-/cors-2.8.1.tgz"; - sha1 = "6181aa56abb45a2825be3304703747ae4e9d2383"; + url = "https://registry.npmjs.org/cors/-/cors-2.8.3.tgz"; + sha1 = "4cf78e1d23329a7496b2fc2225b77ca5bb5eb802"; }; }; "cron-1.2.1" = { @@ -14652,31 +14715,13 @@ let sha1 = "3a86c09b41b8f261ac863a7cc85ea4735857eab2"; }; }; - "express-4.14.0" = { - name = "express"; - packageName = "express"; - version = "4.14.0"; - src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.14.0.tgz"; - sha1 = "c1ee3f42cdc891fb3dc650a8922d51ec847d0d66"; - }; - }; - "follow-redirects-1.2.1" = { + "follow-redirects-1.2.4" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.2.1"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.2.1.tgz"; - sha1 = "796c716970df4fb0096165393545040f61b00f59"; - }; - }; - "fs-extra-1.0.0" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz"; - sha1 = "cd3ce5f7e7cb6145883fcae3191e9877f8587950"; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.2.4.tgz"; + sha1 = "355e8f4d16876b43f577b0d5ce2668b9723214ea"; }; }; "fs.notify-0.0.4" = { @@ -14688,6 +14733,15 @@ let sha1 = "63284d45a34b52ce60088a6ddbec5b776d3c013d"; }; }; + "hash-sum-1.0.2" = { + name = "hash-sum"; + packageName = "hash-sum"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz"; + sha1 = "33b40777754c6432573c120cc3808bbd10d47f04"; + }; + }; "i18next-1.10.6" = { name = "i18next"; packageName = "i18next"; @@ -14697,31 +14751,40 @@ let sha1 = "fddd8b491502c48967a62963bc722ff897cddea0"; }; }; - "js-yaml-3.7.0" = { + "js-yaml-3.8.4" = { name = "js-yaml"; packageName = "js-yaml"; - version = "3.7.0"; + version = "3.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz"; - sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.4.tgz"; + sha1 = "520b4564f86573ba96662af85a8cafa7b4b5a6f6"; }; }; - "jsonata-1.0.10" = { + "jsonata-1.2.6" = { name = "jsonata"; packageName = "jsonata"; - version = "1.0.10"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/jsonata/-/jsonata-1.0.10.tgz"; - sha1 = "5177b5aa3ec66e7b5894412b2f9ad170c6107b96"; + url = "https://registry.npmjs.org/jsonata/-/jsonata-1.2.6.tgz"; + sha1 = "d44fea5a54145600c1a3875e942ab6727adbddb5"; }; }; - "mqtt-2.2.1" = { + "mqtt-2.9.0" = { name = "mqtt"; packageName = "mqtt"; - version = "2.2.1"; + version = "2.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt/-/mqtt-2.2.1.tgz"; - sha1 = "b3efff8adff78dee07e09cfe89e2d2fb364a1852"; + url = "https://registry.npmjs.org/mqtt/-/mqtt-2.9.0.tgz"; + sha1 = "379ceb787a52fc15cb8fc96d558a32c123f12a9d"; + }; + }; + "multer-1.3.0" = { + name = "multer"; + packageName = "multer"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/multer/-/multer-1.3.0.tgz"; + sha1 = "092b2670f6846fa4914965efc8cf94c20fec6cd2"; }; }; "mustache-2.3.0" = { @@ -14733,13 +14796,13 @@ let sha1 = "4028f7778b17708a489930a6e52ac3bca0da41d0"; }; }; - "oauth2orize-1.7.0" = { + "oauth2orize-1.8.0" = { name = "oauth2orize"; packageName = "oauth2orize"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.7.0.tgz"; - sha1 = "94c2a511cd0b58bde548548ffcde14fd81f257cc"; + url = "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.8.0.tgz"; + sha1 = "f2ddc0115d635d0480746249c00f0ea1a9c51ba8"; }; }; "passport-http-bearer-1.0.1" = { @@ -14769,22 +14832,22 @@ let sha1 = "33279100c35c38519ca5e435245186c512fe0fdc"; }; }; - "uglify-js-2.7.5" = { + "uglify-js-3.0.20" = { name = "uglify-js"; packageName = "uglify-js"; - version = "2.7.5"; + version = "3.0.20"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz"; - sha1 = "4612c0c7baaee2ba7c487de4904ae122079f2ca8"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.20.tgz"; + sha1 = "cb35b2bcfe478051b6f3282be8db4e4add49a1e5"; }; }; - "when-3.7.7" = { + "when-3.7.8" = { name = "when"; packageName = "when"; - version = "3.7.7"; + version = "3.7.8"; src = fetchurl { - url = "https://registry.npmjs.org/when/-/when-3.7.7.tgz"; - sha1 = "aba03fc3bb736d6c88b091d013d8a8e590d84718"; + url = "https://registry.npmjs.org/when/-/when-3.7.8.tgz"; + sha1 = "c7130b6a7ea04693e842cdc9e7a1f2aa39a39f82"; }; }; "ws-1.1.1" = { @@ -14841,33 +14904,6 @@ let sha1 = "d05fc5d223173e0e28ec381c0f00cc25ffaf2736"; }; }; - "http-errors-1.5.1" = { - name = "http-errors"; - packageName = "http-errors"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.5.1.tgz"; - sha1 = "788c0d2c1de2c81b9e6e8c01843b6b97eb920750"; - }; - }; - "qs-6.2.0" = { - name = "qs"; - packageName = "qs"; - version = "6.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.2.0.tgz"; - sha1 = "3b7848c03c2dece69a9522b0fae8c4126d745f3b"; - }; - }; - "setprototypeof-1.0.2" = { - name = "setprototypeof"; - packageName = "setprototypeof"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.2.tgz"; - sha1 = "81a552141ec104b88e89ce383103ad5c66564d08"; - }; - }; "css-select-1.2.0" = { name = "css-select"; packageName = "css-select"; @@ -14958,6 +14994,15 @@ let sha1 = "69884ba144ac33fe699737a6086deffadd0f89c5"; }; }; + "lodash.pick-4.4.0" = { + name = "lodash.pick"; + packageName = "lodash.pick"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz"; + sha1 = "52f05610fff9ded422611441ed1fc123a03001b3"; + }; + }; "lodash.reduce-4.6.0" = { name = "lodash.reduce"; packageName = "lodash.reduce"; @@ -15030,51 +15075,6 @@ let sha1 = "99ce5c7d827262eb0f1f702044177f60745d7b90"; }; }; - "content-disposition-0.5.1" = { - name = "content-disposition"; - packageName = "content-disposition"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.1.tgz"; - sha1 = "87476c6a67c8daa87e32e87616df883ba7fb071b"; - }; - }; - "finalhandler-0.5.0" = { - name = "finalhandler"; - packageName = "finalhandler"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz"; - sha1 = "e9508abece9b6dba871a6942a1d7911b91911ac7"; - }; - }; - "send-0.14.1" = { - name = "send"; - packageName = "send"; - version = "0.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.14.1.tgz"; - sha1 = "a954984325392f51532a7760760e459598c89f7a"; - }; - }; - "serve-static-1.11.2" = { - name = "serve-static"; - packageName = "serve-static"; - version = "1.11.2"; - src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.11.2.tgz"; - sha1 = "2cf9889bd4435a320cc36895c9aa57bd662e6ac7"; - }; - }; - "send-0.14.2" = { - name = "send"; - packageName = "send"; - version = "0.14.2"; - src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.14.2.tgz"; - sha1 = "39b0438b3f510be5dc6f667a11f71689368cdeef"; - }; - }; "retry-0.6.1" = { name = "retry"; packageName = "retry"; @@ -15120,6 +15120,15 @@ let sha1 = "b02fa4816eef21a8c4b35ca9e52921ffc89a30e9"; }; }; + "esprima-3.1.3" = { + name = "esprima"; + packageName = "esprima"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz"; + sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633"; + }; + }; "commist-1.0.0" = { name = "commist"; packageName = "commist"; @@ -15138,13 +15147,13 @@ let sha1 = "8f2d508d0600b4a456da2f086556e7e5c056a3c6"; }; }; - "mqtt-packet-5.3.0" = { + "mqtt-packet-5.4.0" = { name = "mqtt-packet"; packageName = "mqtt-packet"; - version = "5.3.0"; + version = "5.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.3.0.tgz"; - sha1 = "078ed59ae4c06febf3b3eaca90b50e97e269f206"; + url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.4.0.tgz"; + sha1 = "387104c06aa68fbb9f8159d0c722dd5c3e45df22"; }; }; "reinterval-1.1.0" = { @@ -15156,13 +15165,13 @@ let sha1 = "3361ecfa3ca6c18283380dd0bb9546f390f5ece7"; }; }; - "websocket-stream-3.3.3" = { + "websocket-stream-5.0.0" = { name = "websocket-stream"; packageName = "websocket-stream"; - version = "3.3.3"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-3.3.3.tgz"; - sha1 = "361da5404a337e60cfbc29b4a46368762679df0b"; + url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-5.0.0.tgz"; + sha1 = "1d1318f0576ce20a12555372108ae9418a403634"; }; }; "leven-1.0.2" = { @@ -15219,6 +15228,51 @@ let sha1 = "70c375805b9e3105e899ee8dbdd6a9aa108f407b"; }; }; + "ws-3.0.0" = { + name = "ws"; + packageName = "ws"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-3.0.0.tgz"; + sha1 = "98ddb00056c8390cb751e7788788497f99103b6c"; + }; + }; + "append-field-0.1.0" = { + name = "append-field"; + packageName = "append-field"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/append-field/-/append-field-0.1.0.tgz"; + sha1 = "6ddc58fa083c7bc545d3c5995b2830cc2366d44a"; + }; + }; + "busboy-0.2.14" = { + name = "busboy"; + packageName = "busboy"; + version = "0.2.14"; + src = fetchurl { + url = "https://registry.npmjs.org/busboy/-/busboy-0.2.14.tgz"; + sha1 = "6c2a622efcf47c57bbbe1e2a9c37ad36c7925453"; + }; + }; + "dicer-0.2.5" = { + name = "dicer"; + packageName = "dicer"; + version = "0.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/dicer/-/dicer-0.2.5.tgz"; + sha1 = "5996c086bb33218c812c090bddc09cd12facb70f"; + }; + }; + "streamsearch-0.1.2" = { + name = "streamsearch"; + packageName = "streamsearch"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz"; + sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a"; + }; + }; "feedparser-1.1.3" = { name = "feedparser"; packageName = "feedparser"; @@ -16092,13 +16146,13 @@ let sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"; }; }; - "cacache-9.2.8" = { + "cacache-9.2.9" = { name = "cacache"; packageName = "cacache"; - version = "9.2.8"; + version = "9.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/cacache/-/cacache-9.2.8.tgz"; - sha1 = "2e38b51161a3904e3b9fb35c0869b751f7d0bcf4"; + url = "https://registry.npmjs.org/cacache/-/cacache-9.2.9.tgz"; + sha1 = "f9d7ffe039851ec94c28290662afa4dd4bb9e8dd"; }; }; "call-limit-1.1.0" = { @@ -16137,6 +16191,15 @@ let sha1 = "84ddc4b370679ba8bd4cdcfa4c06b43d57111147"; }; }; + "libnpx-9.2.0" = { + name = "libnpx"; + packageName = "libnpx"; + version = "9.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/libnpx/-/libnpx-9.2.0.tgz"; + sha1 = "ce721ffc7bdfa275c18677b82728e6ee96a50642"; + }; + }; "lodash._baseuniq-4.6.0" = { name = "lodash._baseuniq"; packageName = "lodash._baseuniq"; @@ -16209,13 +16272,13 @@ let sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7"; }; }; - "npm-registry-client-8.3.0" = { + "npm-registry-client-8.4.0" = { name = "npm-registry-client"; packageName = "npm-registry-client"; - version = "8.3.0"; + version = "8.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.3.0.tgz"; - sha1 = "a86d5b1f97945de8df73c471d33602d5cd15130f"; + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.4.0.tgz"; + sha1 = "d52b901685647fc62a4c03eafecb6ceaa5018d4c"; }; }; "npm-user-validate-1.0.0" = { @@ -16236,13 +16299,13 @@ let sha1 = "5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"; }; }; - "pacote-2.7.36" = { + "pacote-2.7.38" = { name = "pacote"; packageName = "pacote"; - version = "2.7.36"; + version = "2.7.38"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-2.7.36.tgz"; - sha1 = "837734ad2e545123b8b8fe5caa5076c92b5c7b5c"; + url = "https://registry.npmjs.org/pacote/-/pacote-2.7.38.tgz"; + sha1 = "5091f8774298c26c3eca24606037f1bb73db74c1"; }; }; "promise-inflight-1.0.1" = { @@ -16299,13 +16362,22 @@ let sha1 = "d05f2fe4032560871f30e93cbe735eea201514f3"; }; }; - "update-notifier-2.1.0" = { + "update-notifier-2.2.0" = { name = "update-notifier"; packageName = "update-notifier"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.1.0.tgz"; - sha1 = "ec0c1e53536b76647a24b77cb83966d9315123d9"; + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.2.0.tgz"; + sha1 = "1b5837cf90c0736d88627732b661c138f86de72f"; + }; + }; + "worker-farm-1.4.1" = { + name = "worker-farm"; + packageName = "worker-farm"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.4.1.tgz"; + sha1 = "a438bc993a7a7d133bcb6547c95eca7cff4897d8"; }; }; "write-file-atomic-2.1.0" = { @@ -16344,6 +16416,105 @@ let sha1 = "56d6a064017625e79ebca6b8018e17440bdcf093"; }; }; + "dotenv-4.0.0" = { + name = "dotenv"; + packageName = "dotenv"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dotenv/-/dotenv-4.0.0.tgz"; + sha1 = "864ef1379aced55ce6f95debecdce179f7a0cd1d"; + }; + }; + "yargs-8.0.2" = { + name = "yargs"; + packageName = "yargs"; + version = "8.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz"; + sha1 = "6299a9055b1cefc969ff7e79c1d918dceb22c360"; + }; + }; + "camelcase-4.1.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz"; + sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; + }; + }; + "os-locale-2.0.0" = { + name = "os-locale"; + packageName = "os-locale"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-locale/-/os-locale-2.0.0.tgz"; + sha1 = "15918ded510522b81ee7ae5a309d54f639fc39a4"; + }; + }; + "read-pkg-up-2.0.0" = { + name = "read-pkg-up"; + packageName = "read-pkg-up"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz"; + sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be"; + }; + }; + "which-module-2.0.0" = { + name = "which-module"; + packageName = "which-module"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz"; + sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; + }; + }; + "yargs-parser-7.0.0" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz"; + sha1 = "8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"; + }; + }; + "read-pkg-2.0.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz"; + sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"; + }; + }; + "load-json-file-2.0.0" = { + name = "load-json-file"; + packageName = "load-json-file"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz"; + sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8"; + }; + }; + "path-type-2.0.0" = { + name = "path-type"; + packageName = "path-type"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz"; + sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73"; + }; + }; + "strip-bom-3.0.0" = { + name = "strip-bom"; + packageName = "strip-bom"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz"; + sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; + }; + }; "lodash._createset-4.0.3" = { name = "lodash._createset"; packageName = "lodash._createset"; @@ -16416,22 +16587,22 @@ let sha1 = "e848396f057d223f24386924618e25694161ec47"; }; }; - "make-fetch-happen-2.4.12" = { + "make-fetch-happen-2.4.13" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; - version = "2.4.12"; + version = "2.4.13"; src = fetchurl { - url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.4.12.tgz"; - sha1 = "5e16f97b3e1fc30017da82ba4b4a5529e773f399"; + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-2.4.13.tgz"; + sha1 = "3139ba2f4230a8384e7ba394534816c872ecbf4b"; }; }; - "npm-pick-manifest-1.0.3" = { + "npm-pick-manifest-1.0.4" = { name = "npm-pick-manifest"; packageName = "npm-pick-manifest"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-1.0.3.tgz"; - sha1 = "a56fed120b2d8adaec5334ddd07cf23b2389e8de"; + url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-1.0.4.tgz"; + sha1 = "a5ee6510c1fe7221c0bc0414e70924c14045f7e8"; }; }; "promise-retry-1.1.1" = { @@ -16461,13 +16632,13 @@ let sha1 = "eccf935e941493d8151028e636e51ce4c3ca7f20"; }; }; - "agentkeepalive-3.2.0" = { + "agentkeepalive-3.3.0" = { name = "agentkeepalive"; packageName = "agentkeepalive"; - version = "3.2.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.2.0.tgz"; - sha1 = "dcc9b272541d2fd2e9cf79fb0fdb192a6c5d60cd"; + url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.3.0.tgz"; + sha1 = "6d5de5829afd3be2712201a39275fd11c651857c"; }; }; "http-cache-semantics-3.7.3" = { @@ -16479,22 +16650,22 @@ let sha1 = "2f35c532ecd29f1e5413b9af833b724a3c6f7f72"; }; }; - "http-proxy-agent-1.0.0" = { + "http-proxy-agent-2.0.0" = { name = "http-proxy-agent"; packageName = "http-proxy-agent"; - version = "1.0.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-1.0.0.tgz"; - sha1 = "cc1ce38e453bf984a0f7702d2dd59c73d081284a"; + url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.0.0.tgz"; + sha1 = "46482a2f0523a4d6082551709f469cb3e4a85ff4"; }; }; - "https-proxy-agent-1.0.0" = { + "https-proxy-agent-2.0.0" = { name = "https-proxy-agent"; packageName = "https-proxy-agent"; - version = "1.0.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz"; - sha1 = "35f7da6c48ce4ddbfa264891ac593ee5ff8671e6"; + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.0.0.tgz"; + sha1 = "ffaa4b6faf586ac340c18a140431e76b7d7f2944"; }; }; "node-fetch-npm-2.0.1" = { @@ -16506,13 +16677,13 @@ let sha1 = "4dd3355ce526c01bc5ab29ccdf48352dc8a79465"; }; }; - "socks-proxy-agent-2.1.1" = { + "socks-proxy-agent-3.0.0" = { name = "socks-proxy-agent"; packageName = "socks-proxy-agent"; - version = "2.1.1"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-2.1.1.tgz"; - sha1 = "86ebb07193258637870e13b7bd99f26c663df3d3"; + url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-3.0.0.tgz"; + sha1 = "ea23085cd2bde94d084a62448f31139ca7ed6245"; }; }; "humanize-ms-1.2.1" = { @@ -16524,22 +16695,31 @@ let sha1 = "c46e3159a293f6b896da29316d8b6fe8bb79bbed"; }; }; - "agent-base-2.1.1" = { + "agent-base-4.1.0" = { name = "agent-base"; packageName = "agent-base"; - version = "2.1.1"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz"; - sha1 = "d6de10d5af6132d5bd692427d46fc538539094c7"; + url = "https://registry.npmjs.org/agent-base/-/agent-base-4.1.0.tgz"; + sha1 = "20e17401cd49b3c076bf56a4bc6c5b436ffa8d55"; }; }; - "semver-5.0.3" = { - name = "semver"; - packageName = "semver"; - version = "5.0.3"; + "es6-promisify-5.0.0" = { + name = "es6-promisify"; + packageName = "es6-promisify"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz"; - sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a"; + url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz"; + sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203"; + }; + }; + "es6-promise-4.1.1" = { + name = "es6-promise"; + packageName = "es6-promise"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.1.1.tgz"; + sha1 = "8811e90915d9a0dba36274f0b242dbda78f9c92a"; }; }; "socks-1.1.10" = { @@ -16596,13 +16776,13 @@ let sha1 = "db6676e7c7cc0629878ff196097c78855ae9f4ab"; }; }; - "boxen-1.1.0" = { + "boxen-1.2.0" = { name = "boxen"; packageName = "boxen"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/boxen/-/boxen-1.1.0.tgz"; - sha1 = "b1b69dd522305e807a99deee777dbd6e5167b102"; + url = "https://registry.npmjs.org/boxen/-/boxen-1.2.0.tgz"; + sha1 = "03478d84be7fe02189b80904d81d6a80384368f1"; }; }; "configstore-3.1.0" = { @@ -16614,6 +16794,15 @@ let sha1 = "45df907073e26dfa1cf4b2d52f5b60545eaa11d1"; }; }; + "import-lazy-2.1.0" = { + name = "import-lazy"; + packageName = "import-lazy"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz"; + sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43"; + }; + }; "latest-version-3.1.0" = { name = "latest-version"; packageName = "latest-version"; @@ -16623,15 +16812,6 @@ let sha1 = "a205383fea322b33b5ae3b18abee0dc2f356ee15"; }; }; - "lazy-req-2.0.0" = { - name = "lazy-req"; - packageName = "lazy-req"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lazy-req/-/lazy-req-2.0.0.tgz"; - sha1 = "c9450a363ecdda2e6f0c70132ad4f37f8f06f2b4"; - }; - }; "xdg-basedir-3.0.0" = { name = "xdg-basedir"; packageName = "xdg-basedir"; @@ -16650,58 +16830,49 @@ let sha1 = "c36aeccba563b89ceb556f3690f0b1d9e3547f7f"; }; }; - "camelcase-4.1.0" = { - name = "camelcase"; - packageName = "camelcase"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz"; - sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; - }; - }; - "term-size-0.1.1" = { + "term-size-1.2.0" = { name = "term-size"; packageName = "term-size"; - version = "0.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/term-size/-/term-size-0.1.1.tgz"; - sha1 = "87360b96396cab5760963714cda0d0cbeecad9ca"; + url = "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz"; + sha1 = "458b83887f288fc56d6fffbfad262e26638efa69"; }; }; - "execa-0.4.0" = { + "execa-0.7.0" = { name = "execa"; packageName = "execa"; - version = "0.4.0"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-0.4.0.tgz"; - sha1 = "4eb6467a36a095fabb2970ff9d5e3fb7bce6ebc3"; + url = "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz"; + sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777"; }; }; - "cross-spawn-async-2.2.5" = { - name = "cross-spawn-async"; - packageName = "cross-spawn-async"; - version = "2.2.5"; + "cross-spawn-5.1.0" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz"; - sha1 = "845ff0c0834a3ded9d160daca6d390906bb288cc"; + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz"; + sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449"; }; }; - "npm-run-path-1.0.0" = { - name = "npm-run-path"; - packageName = "npm-run-path"; + "shebang-command-1.2.0" = { + name = "shebang-command"; + packageName = "shebang-command"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"; + sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; + }; + }; + "shebang-regex-1.0.0" = { + name = "shebang-regex"; + packageName = "shebang-regex"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-1.0.0.tgz"; - sha1 = "f5c32bf595fe81ae927daec52e82f8b000ac3c8f"; - }; - }; - "path-key-1.0.0" = { - name = "path-key"; - packageName = "path-key"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-key/-/path-key-1.0.0.tgz"; - sha1 = "5d53d578019646c0d68800db4e146e6bdc2ac7af"; + url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"; + sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; }; }; "unique-string-1.0.0" = { @@ -16983,22 +17154,22 @@ let sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df"; }; }; - "snyk-1.34.4" = { + "snyk-1.36.2" = { name = "snyk"; packageName = "snyk"; - version = "1.34.4"; + version = "1.36.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.34.4.tgz"; - sha1 = "9f0d50ab4f0544b125fa21c67dd162de1e7ce91b"; + url = "https://registry.npmjs.org/snyk/-/snyk-1.36.2.tgz"; + sha1 = "88be72a8da75a02e920f2be7f5830402b5e0eb41"; }; }; - "spawn-please-0.2.0" = { + "spawn-please-0.3.0" = { name = "spawn-please"; packageName = "spawn-please"; - version = "0.2.0"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/spawn-please/-/spawn-please-0.2.0.tgz"; - sha1 = "bdd85991b80409f9c0dac709bc44a0a318a9760d"; + url = "https://registry.npmjs.org/spawn-please/-/spawn-please-0.3.0.tgz"; + sha1 = "db338ec4cff63abc69f1d0e08cee9eb8bebd9d11"; }; }; "aproba-1.0.4" = { @@ -17064,6 +17235,42 @@ let sha1 = "ec56a749ee103e4e08c790b9c353df16055b97f9"; }; }; + "es6-symbol-3.1.1" = { + name = "es6-symbol"; + packageName = "es6-symbol"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz"; + sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"; + }; + }; + "d-1.0.0" = { + name = "d"; + packageName = "d"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/d/-/d-1.0.0.tgz"; + sha1 = "754bb5bfe55451da69a58b94d45f4c5b0462d58f"; + }; + }; + "es5-ext-0.10.24" = { + name = "es5-ext"; + packageName = "es5-ext"; + version = "0.10.24"; + src = fetchurl { + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.24.tgz"; + sha1 = "a55877c9924bc0c8d9bd3c2cbe17495ac1709b14"; + }; + }; + "es6-iterator-2.0.1" = { + name = "es6-iterator"; + packageName = "es6-iterator"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz"; + sha1 = "8e319c9f0453bf575d374940a655920e59ca5512"; + }; + }; "form-data-2.0.0" = { name = "form-data"; packageName = "form-data"; @@ -17100,6 +17307,15 @@ let sha1 = "f27aec2498b24027ac719214026521591111508f"; }; }; + "snyk-gradle-plugin-1.0.2" = { + name = "snyk-gradle-plugin"; + packageName = "snyk-gradle-plugin"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-1.0.2.tgz"; + sha1 = "364550d5f388673400296d3ab31df358c678bb9e"; + }; + }; "snyk-module-1.8.1" = { name = "snyk-module"; packageName = "snyk-module"; @@ -17109,6 +17325,15 @@ let sha1 = "31d5080fb1c0dfd6fa8567dd34a523fd02bf1fca"; }; }; + "snyk-mvn-plugin-1.0.0" = { + name = "snyk-mvn-plugin"; + packageName = "snyk-mvn-plugin"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-1.0.0.tgz"; + sha1 = "99ae297b7ae40fa8df78a39fa13816dc513c2d10"; + }; + }; "snyk-policy-1.7.1" = { name = "snyk-policy"; packageName = "snyk-policy"; @@ -17118,13 +17343,13 @@ let sha1 = "e413b6bd4af6050c5e5f445287909e4e98a09b22"; }; }; - "snyk-python-plugin-1.0.0" = { + "snyk-python-plugin-1.2.2" = { name = "snyk-python-plugin"; packageName = "snyk-python-plugin"; - version = "1.0.0"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.0.0.tgz"; - sha1 = "d3915fbd933305d9988d86a56a7381e73c4565f7"; + url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.2.2.tgz"; + sha1 = "296948cba5ac80d2ce178a5cb7ecfcff88fdf263"; }; }; "snyk-recursive-readdir-2.0.0" = { @@ -17154,6 +17379,15 @@ let sha1 = "13743a058437dff890baaf437c333c966a743cb6"; }; }; + "snyk-sbt-plugin-1.0.2" = { + name = "snyk-sbt-plugin"; + packageName = "snyk-sbt-plugin"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-1.0.2.tgz"; + sha1 = "ce2aa9a3b08af6680d5ee8a007ecb6ae55fb72d1"; + }; + }; "snyk-tree-1.0.0" = { name = "snyk-tree"; packageName = "snyk-tree"; @@ -17226,6 +17460,60 @@ let sha1 = "3d9446ef21fb3791b3985690662e4b9683c7f181"; }; }; + "clone-deep-0.3.0" = { + name = "clone-deep"; + packageName = "clone-deep"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clone-deep/-/clone-deep-0.3.0.tgz"; + sha1 = "348c61ae9cdbe0edfe053d91ff4cc521d790ede8"; + }; + }; + "shallow-clone-0.1.2" = { + name = "shallow-clone"; + packageName = "shallow-clone"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz"; + sha1 = "5909e874ba77106d73ac414cfec1ffca87d97060"; + }; + }; + "kind-of-2.0.1" = { + name = "kind-of"; + packageName = "kind-of"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz"; + sha1 = "018ec7a4ce7e3a86cb9141be519d24c8faa981b5"; + }; + }; + "lazy-cache-0.2.7" = { + name = "lazy-cache"; + packageName = "lazy-cache"; + version = "0.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz"; + sha1 = "7feddf2dcb6edb77d11ef1d117ab5ffdf0ab1b65"; + }; + }; + "mixin-object-2.0.1" = { + name = "mixin-object"; + packageName = "mixin-object"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz"; + sha1 = "4fb949441dab182540f1fe035ba60e1947a5e57e"; + }; + }; + "for-in-0.1.8" = { + name = "for-in"; + packageName = "for-in"; + version = "0.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz"; + sha1 = "d8773908e31256109952b1fdb9b3fa867d2775e1"; + }; + }; "minimatch-3.0.2" = { name = "minimatch"; packageName = "minimatch"; @@ -17454,33 +17742,6 @@ let sha1 = "07e30ad79531844179b642d2d8399435182c8727"; }; }; - "busboy-0.2.14" = { - name = "busboy"; - packageName = "busboy"; - version = "0.2.14"; - src = fetchurl { - url = "https://registry.npmjs.org/busboy/-/busboy-0.2.14.tgz"; - sha1 = "6c2a622efcf47c57bbbe1e2a9c37ad36c7925453"; - }; - }; - "dicer-0.2.5" = { - name = "dicer"; - packageName = "dicer"; - version = "0.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/dicer/-/dicer-0.2.5.tgz"; - sha1 = "5996c086bb33218c812c090bddc09cd12facb70f"; - }; - }; - "streamsearch-0.1.2" = { - name = "streamsearch"; - packageName = "streamsearch"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz"; - sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a"; - }; - }; "object.assign-4.0.4" = { name = "object.assign"; packageName = "object.assign"; @@ -17770,6 +18031,15 @@ let sha1 = "4aa7bfd43f03f0b81c9702b13d6a858ddb326f3e"; }; }; + "winreg-1.2.3" = { + name = "winreg"; + packageName = "winreg"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/winreg/-/winreg-1.2.3.tgz"; + sha1 = "93ad116b2696da87d58f7265a8fcea5254a965d5"; + }; + }; "airplay-protocol-2.0.2" = { name = "airplay-protocol"; packageName = "airplay-protocol"; @@ -17995,24 +18265,6 @@ let sha1 = "3c43c7fcb1896e17460436a9dd0b6ef1668e4f94"; }; }; - "fd-slicer-1.0.1" = { - name = "fd-slicer"; - packageName = "fd-slicer"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz"; - sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"; - }; - }; - "pend-1.2.0" = { - name = "pend"; - packageName = "pend"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz"; - sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; - }; - }; "engine.io-1.8.4" = { name = "engine.io"; packageName = "engine.io"; @@ -18040,33 +18292,6 @@ let sha1 = "9fe85dee25853ca6babe25bd2ad68710863e91c2"; }; }; - "extract-zip-1.5.0" = { - name = "extract-zip"; - packageName = "extract-zip"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.5.0.tgz"; - sha1 = "92ccf6d81ef70a9fa4c1747114ccef6d8688a6c4"; - }; - }; - "hasha-2.2.0" = { - name = "hasha"; - packageName = "hasha"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz"; - sha1 = "78d7cbfc1e6d66303fe79837365984517b2f6ee1"; - }; - }; - "kew-0.7.0" = { - name = "kew"; - packageName = "kew"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz"; - sha1 = "79d93d2d33363d6fdd2970b335d9141ad591d79b"; - }; - }; "request-2.67.0" = { name = "request"; packageName = "request"; @@ -18076,42 +18301,6 @@ let sha1 = "8af74780e2bf11ea0ae9aa965c11f11afd272742"; }; }; - "request-progress-2.0.1" = { - name = "request-progress"; - packageName = "request-progress"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz"; - sha1 = "5d36bb57961c673aa5b788dbc8141fdf23b44e08"; - }; - }; - "concat-stream-1.5.0" = { - name = "concat-stream"; - packageName = "concat-stream"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.0.tgz"; - sha1 = "53f7d43c51c5e43f81c8fdd03321c631be68d611"; - }; - }; - "mkdirp-0.5.0" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz"; - sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12"; - }; - }; - "yauzl-2.4.1" = { - name = "yauzl"; - packageName = "yauzl"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz"; - sha1 = "9528f442dab1b2284e58b4379bb194e22e0c4005"; - }; - }; "bl-1.0.3" = { name = "bl"; packageName = "bl"; @@ -18139,15 +18328,6 @@ let sha1 = "c83a1830f4e5ef0b93ef2a3488e724f8de016ac7"; }; }; - "throttleit-1.0.0" = { - name = "throttleit"; - packageName = "throttleit"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz"; - sha1 = "9e785836daf46743145a5984b6268d828528ac6c"; - }; - }; "commoner-0.10.8" = { name = "commoner"; packageName = "commoner"; @@ -18166,6 +18346,15 @@ let sha1 = "b4c49bf63f162c108b0348399a8737c713b0a83a"; }; }; + "private-0.1.7" = { + name = "private"; + packageName = "private"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/private/-/private-0.1.7.tgz"; + sha1 = "68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"; + }; + }; "recast-0.11.23" = { name = "recast"; packageName = "recast"; @@ -19139,13 +19328,22 @@ let sha1 = "321f6cf73782a6ff751111390fc05e2c657d8c9b"; }; }; - "coa-1.0.3" = { + "coa-1.0.4" = { name = "coa"; packageName = "coa"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/coa/-/coa-1.0.3.tgz"; - sha1 = "1b54a5e1dcf77c990455d4deea98c564416dc893"; + url = "https://registry.npmjs.org/coa/-/coa-1.0.4.tgz"; + sha1 = "a9ef153660d6a86a8bdec0289a5c684d217432fd"; + }; + }; + "js-yaml-3.7.0" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz"; + sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80"; }; }; "whet.extend-0.9.9" = { @@ -19211,6 +19409,15 @@ let sha1 = "7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20"; }; }; + "async-2.4.1" = { + name = "async"; + packageName = "async"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-2.4.1.tgz"; + sha1 = "62a56b279c98a11d0987096a01cc3eeb8eb7bbd7"; + }; + }; "blueimp-md5-2.7.0" = { name = "blueimp-md5"; packageName = "blueimp-md5"; @@ -19337,6 +19544,15 @@ let sha1 = "f8eb1ad00dc58a5514363b41ca5342817f0bd646"; }; }; + "npm-registry-client-8.3.0" = { + name = "npm-registry-client"; + packageName = "npm-registry-client"; + version = "8.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-8.3.0.tgz"; + sha1 = "a86d5b1f97945de8df73c471d33602d5cd15130f"; + }; + }; "octicons-3.5.0" = { name = "octicons"; packageName = "octicons"; @@ -19382,6 +19598,15 @@ let sha1 = "0caf52c79189a290746fc446cc5e863f6bdddfe3"; }; }; + "superagent-3.5.2" = { + name = "superagent"; + packageName = "superagent"; + version = "3.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/superagent/-/superagent-3.5.2.tgz"; + sha1 = "3361a3971567504c351063abeaae0faa23dbf3f8"; + }; + }; "winston-2.3.1" = { name = "winston"; packageName = "winston"; @@ -19391,24 +19616,6 @@ let sha1 = "0b48420d978c01804cf0230b648861598225a119"; }; }; - "yargs-8.0.2" = { - name = "yargs"; - packageName = "yargs"; - version = "8.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz"; - sha1 = "6299a9055b1cefc969ff7e79c1d918dceb22c360"; - }; - }; - "color-convert-1.9.0" = { - name = "color-convert"; - packageName = "color-convert"; - version = "1.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz"; - sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a"; - }; - }; "color-string-1.5.2" = { name = "color-string"; packageName = "color-string"; @@ -19418,15 +19625,6 @@ let sha1 = "26e45814bc3c9a7cbd6751648a41434514a773a9"; }; }; - "color-name-1.1.2" = { - name = "color-name"; - packageName = "color-name"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz"; - sha1 = "5c8ab72b64bd2215d617ae9559ebb148475cf98d"; - }; - }; "simple-swizzle-0.2.2" = { name = "simple-swizzle"; packageName = "simple-swizzle"; @@ -19445,6 +19643,15 @@ let sha1 = "c2dfc386abaa0c3e33c48db3fe87059e69065efd"; }; }; + "diff-3.3.0" = { + name = "diff"; + packageName = "diff"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-3.3.0.tgz"; + sha1 = "056695150d7aa93237ca7e378ac3b1682b7963b9"; + }; + }; "hogan.js-3.0.2" = { name = "hogan.js"; packageName = "hogan.js"; @@ -19598,6 +19805,15 @@ let sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; }; }; + "hosted-git-info-2.4.2" = { + name = "hosted-git-info"; + packageName = "hosted-git-info"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.2.tgz"; + sha1 = "0076b9f46a270506ddbaaea56496897460612a67"; + }; + }; "npm-registry-client-8.1.1" = { name = "npm-registry-client"; packageName = "npm-registry-client"; @@ -19607,6 +19823,33 @@ let sha1 = "831476455423ca0a265c6ffdb6100fcc042b36cf"; }; }; + "readable-stream-2.2.11" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.2.11"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.11.tgz"; + sha1 = "0796b31f8d7688007ff0b93a8088d34aa17c0f72"; + }; + }; + "update-notifier-2.1.0" = { + name = "update-notifier"; + packageName = "update-notifier"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.1.0.tgz"; + sha1 = "ec0c1e53536b76647a24b77cb83966d9315123d9"; + }; + }; + "lazy-req-2.0.0" = { + name = "lazy-req"; + packageName = "lazy-req"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lazy-req/-/lazy-req-2.0.0.tgz"; + sha1 = "c9450a363ecdda2e6f0c70132ad4f37f8f06f2b4"; + }; + }; "lsmod-1.0.0" = { name = "lsmod"; packageName = "lsmod"; @@ -19643,67 +19886,22 @@ let sha1 = "67d080b9725291d7e389e34c26860dd97f1debaa"; }; }; - "os-locale-2.0.0" = { - name = "os-locale"; - packageName = "os-locale"; - version = "2.0.0"; + "cookiejar-2.1.1" = { + name = "cookiejar"; + packageName = "cookiejar"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/os-locale/-/os-locale-2.0.0.tgz"; - sha1 = "15918ded510522b81ee7ae5a309d54f639fc39a4"; + url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.1.tgz"; + sha1 = "41ad57b1b555951ec171412a81942b1e8200d34a"; }; }; - "read-pkg-up-2.0.0" = { - name = "read-pkg-up"; - packageName = "read-pkg-up"; - version = "2.0.0"; + "form-data-2.2.0" = { + name = "form-data"; + packageName = "form-data"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz"; - sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be"; - }; - }; - "which-module-2.0.0" = { - name = "which-module"; - packageName = "which-module"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz"; - sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; - }; - }; - "yargs-parser-7.0.0" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz"; - sha1 = "8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"; - }; - }; - "read-pkg-2.0.0" = { - name = "read-pkg"; - packageName = "read-pkg"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz"; - sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"; - }; - }; - "load-json-file-2.0.0" = { - name = "load-json-file"; - packageName = "load-json-file"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz"; - sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8"; - }; - }; - "path-type-2.0.0" = { - name = "path-type"; - packageName = "path-type"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz"; - sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73"; + url = "https://registry.npmjs.org/form-data/-/form-data-2.2.0.tgz"; + sha1 = "9a5e3b9295f980b2623cf64fa238b14cebca707b"; }; }; "adm-zip-0.4.7" = { @@ -19760,13 +19958,31 @@ let sha1 = "c752bd210bef679501b6c6cb7fc84f8f47158cc4"; }; }; - "enhanced-resolve-3.1.0" = { + "ajv-keywords-2.1.0" = { + name = "ajv-keywords"; + packageName = "ajv-keywords"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.0.tgz"; + sha1 = "a296e17f7bfae7c1ce4f7e0de53d29cb32162df0"; + }; + }; + "enhanced-resolve-3.3.0" = { name = "enhanced-resolve"; packageName = "enhanced-resolve"; - version = "3.1.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz"; - sha1 = "9f4b626f577245edcf4b2ad83d86e17f4f421dec"; + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.3.0.tgz"; + sha1 = "950964ecc7f0332a42321b673b38dc8ff15535b3"; + }; + }; + "escope-3.6.0" = { + name = "escope"; + packageName = "escope"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz"; + sha1 = "e01975e812781a163a6dadfdd80398dc64c889c3"; }; }; "json-loader-0.5.4" = { @@ -19778,6 +19994,15 @@ let sha1 = "8baa1365a632f58a3c46d20175fc6002c96e37de"; }; }; + "json5-0.5.1" = { + name = "json5"; + packageName = "json5"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz"; + sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; + }; + }; "loader-runner-2.3.0" = { name = "loader-runner"; packageName = "loader-runner"; @@ -19787,13 +20012,13 @@ let sha1 = "f482aea82d543e07921700d5a46ef26fdac6b8a2"; }; }; - "loader-utils-0.2.17" = { + "loader-utils-1.1.0" = { name = "loader-utils"; packageName = "loader-utils"; - version = "0.2.17"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz"; - sha1 = "f86e6374d43205a6e6c60e9196f17c0299bfb348"; + url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz"; + sha1 = "c98aef488bcceda2ffb5e2de646d6a754429f5cd"; }; }; "memory-fs-0.4.1" = { @@ -19814,6 +20039,15 @@ let sha1 = "a3a59ec97024985b46e958379646f96c4b616646"; }; }; + "uglifyjs-webpack-plugin-0.4.6" = { + name = "uglifyjs-webpack-plugin"; + packageName = "uglifyjs-webpack-plugin"; + version = "0.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz"; + sha1 = "b951f4abb6bd617e66f63eb891498e391763e309"; + }; + }; "watchpack-1.3.1" = { name = "watchpack"; packageName = "watchpack"; @@ -19823,13 +20057,49 @@ let sha1 = "7d8693907b28ce6013e7f3610aa2a1acf07dad87"; }; }; - "webpack-sources-0.2.3" = { + "webpack-sources-1.0.1" = { name = "webpack-sources"; packageName = "webpack-sources"; - version = "0.2.3"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.2.3.tgz"; - sha1 = "17c62bfaf13c707f9d02c479e0dcdde8380697fb"; + url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.1.tgz"; + sha1 = "c7356436a4d13123be2e2426a05d1dad9cbe65cf"; + }; + }; + "es6-map-0.1.5" = { + name = "es6-map"; + packageName = "es6-map"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz"; + sha1 = "9136e0503dcc06a301690f0bb14ff4e364e949f0"; + }; + }; + "es6-weak-map-2.0.2" = { + name = "es6-weak-map"; + packageName = "es6-weak-map"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz"; + sha1 = "5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"; + }; + }; + "es6-set-0.1.5" = { + name = "es6-set"; + packageName = "es6-set"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz"; + sha1 = "d2b3ec5d4d800ced818db538d28974db0a73ccb1"; + }; + }; + "event-emitter-0.3.5" = { + name = "event-emitter"; + packageName = "event-emitter"; + version = "0.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz"; + sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39"; }; }; "big.js-3.1.3" = { @@ -19877,22 +20147,22 @@ let sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285"; }; }; - "source-list-map-1.1.2" = { + "source-list-map-2.0.0" = { name = "source-list-map"; packageName = "source-list-map"; - version = "1.1.2"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/source-list-map/-/source-list-map-1.1.2.tgz"; - sha1 = "9889019d1024cce55cdc069498337ef6186a11a1"; + url = "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz"; + sha1 = "aaa47403f7b245a92fbc97ea08f250d6087ed085"; }; }; - "bytes-2.5.0" = { - name = "bytes"; - packageName = "bytes"; - version = "2.5.0"; + "babel-runtime-6.23.0" = { + name = "babel-runtime"; + packageName = "babel-runtime"; + version = "6.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-2.5.0.tgz"; - sha1 = "4c9423ea2d252c270c41b2bdefeff9bb6b62c06a"; + url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz"; + sha1 = "0a9489f144de70efb3ce4300accdb329e2fc543b"; }; }; "death-1.1.0" = { @@ -19904,13 +20174,22 @@ let sha1 = "01aa9c401edd92750514470b8266390c66c67318"; }; }; - "gunzip-maybe-1.4.0" = { + "gunzip-maybe-1.4.1" = { name = "gunzip-maybe"; packageName = "gunzip-maybe"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/gunzip-maybe/-/gunzip-maybe-1.4.0.tgz"; - sha1 = "7d8316c8d0571e1d08a5a79e46fff0afe8172b19"; + url = "https://registry.npmjs.org/gunzip-maybe/-/gunzip-maybe-1.4.1.tgz"; + sha1 = "39c72ed89d1b49ba708e18776500488902a52027"; + }; + }; + "invariant-2.2.2" = { + name = "invariant"; + packageName = "invariant"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz"; + sha1 = "9e1f56ac0acdb6bf303306f338be3b204ae60360"; }; }; "is-ci-1.0.10" = { @@ -19931,13 +20210,13 @@ let sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580"; }; }; - "node-emoji-1.5.1" = { + "node-emoji-1.7.0" = { name = "node-emoji"; packageName = "node-emoji"; - version = "1.5.1"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.5.1.tgz"; - sha1 = "fd918e412769bf8c448051238233840b2aff16a1"; + url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.7.0.tgz"; + sha1 = "a400490aac409b616d13941532200f128af037f9"; }; }; "object-path-0.11.4" = { @@ -19976,6 +20255,15 @@ let sha1 = "1dc2a340fb8e5f800a32bcdbfb8c23cd747021b9"; }; }; + "regenerator-runtime-0.10.5" = { + name = "regenerator-runtime"; + packageName = "regenerator-runtime"; + version = "0.10.5"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz"; + sha1 = "336c3efc1220adcedda2c9fab67b5a7955a33658"; + }; + }; "is-deflate-1.0.0" = { name = "is-deflate"; packageName = "is-deflate"; @@ -20003,6 +20291,15 @@ let sha1 = "97eb76365bcfd8c89e287f55c8b69d4c3e9bcc52"; }; }; + "loose-envify-1.3.1" = { + name = "loose-envify"; + packageName = "loose-envify"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz"; + sha1 = "d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"; + }; + }; "ci-info-1.0.0" = { name = "ci-info"; packageName = "ci-info"; @@ -20012,6 +20309,15 @@ let sha1 = "dc5285f2b4e251821683681c381c3388f46ec534"; }; }; + "lodash.toarray-4.4.0" = { + name = "lodash.toarray"; + packageName = "lodash.toarray"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.toarray/-/lodash.toarray-4.4.0.tgz"; + sha1 = "24c4bfcd6b2fba38bfd0594db1179d8e9b656561"; + }; + }; "cli-list-0.2.0" = { name = "cli-list"; packageName = "cli-list"; @@ -20021,15 +20327,6 @@ let sha1 = "7e673ee0dd39a611a486476e53f3c6b3941cb582"; }; }; - "cross-spawn-5.1.0" = { - name = "cross-spawn"; - packageName = "cross-spawn"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz"; - sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449"; - }; - }; "fullname-3.3.0" = { name = "fullname"; packageName = "fullname"; @@ -20120,15 +20417,6 @@ let sha1 = "7d350722061830ba6617631e0cfd3ea08398d95a"; }; }; - "update-notifier-2.2.0" = { - name = "update-notifier"; - packageName = "update-notifier"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.2.0.tgz"; - sha1 = "1b5837cf90c0736d88627732b661c138f86de72f"; - }; - }; "yeoman-character-1.1.0" = { name = "yeoman-character"; packageName = "yeoman-character"; @@ -20165,24 +20453,6 @@ let sha1 = "0f3d2bb01f7f25362c127212f53c1572906333fe"; }; }; - "shebang-command-1.2.0" = { - name = "shebang-command"; - packageName = "shebang-command"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"; - sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; - }; - }; - "shebang-regex-1.0.0" = { - name = "shebang-regex"; - packageName = "shebang-regex"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"; - sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; - }; - }; "execa-0.6.3" = { name = "execa"; packageName = "execa"; @@ -20264,6 +20534,42 @@ let sha1 = "08ff4334603388399b329e6b9538dc7a3cf5de7d"; }; }; + "execa-0.4.0" = { + name = "execa"; + packageName = "execa"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-0.4.0.tgz"; + sha1 = "4eb6467a36a095fabb2970ff9d5e3fb7bce6ebc3"; + }; + }; + "cross-spawn-async-2.2.5" = { + name = "cross-spawn-async"; + packageName = "cross-spawn-async"; + version = "2.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz"; + sha1 = "845ff0c0834a3ded9d160daca6d390906bb288cc"; + }; + }; + "npm-run-path-1.0.0" = { + name = "npm-run-path"; + packageName = "npm-run-path"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-1.0.0.tgz"; + sha1 = "f5c32bf595fe81ae927daec52e82f8b000ac3c8f"; + }; + }; + "path-key-1.0.0" = { + name = "path-key"; + packageName = "path-key"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-key/-/path-key-1.0.0.tgz"; + sha1 = "5d53d578019646c0d68800db4e146e6bdc2ac7af"; + }; + }; "execall-1.0.0" = { name = "execall"; packageName = "execall"; @@ -20345,15 +20651,6 @@ let sha1 = "f04374d4eee5310e9a8e113bf1495411e46176a1"; }; }; - "import-lazy-2.1.0" = { - name = "import-lazy"; - packageName = "import-lazy"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz"; - sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43"; - }; - }; "bin-version-check-2.1.0" = { name = "bin-version-check"; packageName = "bin-version-check"; @@ -20372,15 +20669,6 @@ let sha1 = "dee5229bdf0ab6ba2012a395e1b869abf8813473"; }; }; - "log-symbols-1.0.2" = { - name = "log-symbols"; - packageName = "log-symbols"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz"; - sha1 = "376ff7b58ea3086a0f09facc74617eca501e1a18"; - }; - }; "object-values-1.0.0" = { name = "object-values"; packageName = "object-values"; @@ -20516,15 +20804,6 @@ let sha1 = "1bdecdb8e083c0664b91945581577a43a9f31d70"; }; }; - "ansi-styles-3.1.0" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.1.0.tgz"; - sha1 = "09c202d5c917ec23188caa5c9cb9179cd9547750"; - }; - }; "pad-component-0.0.1" = { name = "pad-component"; packageName = "pad-component"; @@ -20549,91 +20828,54 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.10.2"; + version = "1.9.13"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.10.2.tgz"; - sha1 = "998e5cc410fc8eec02fb9007ef95c76ab4ac586f"; + url = "https://registry.npmjs.org/alloy/-/alloy-1.9.13.tgz"; + sha1 = "5ab8089cee9a9bf4ba46298d87c7039a4f2a7410"; }; dependencies = [ - sources."async-2.4.1" - (sources."babel-core-6.25.0" // { + sources."colors-0.6.0-1" + sources."ejs-2.3.4" + sources."pkginfo-0.2.2" + sources."commander-0.6.1" + sources."wrench-1.3.9" + sources."xmldom-0.1.19" + sources."jsonlint-1.5.1" + (sources."uglify-js-2.6.1" // { dependencies = [ sources."source-map-0.5.6" ]; }) - sources."babel-traverse-6.25.0" - sources."babel-types-6.25.0" - sources."babylon-6.17.3" - sources."colors-0.6.0-1" - sources."commander-0.6.1" - sources."deasync-0.1.10" - sources."ejs-2.3.4" + sources."resolve-1.3.3" sources."global-paths-0.1.2" - sources."jsonlint-1.5.1" + sources."source-map-0.1.9" + sources."xml2tss-0.0.5" sources."moment-2.17.1" sources."node.extend-1.0.10" - sources."pkginfo-0.2.2" - sources."resolve-1.3.3" - sources."source-map-0.1.9" - sources."wrench-1.3.9" - sources."xml2tss-0.0.5" - sources."xmldom-0.1.19" - sources."lodash-4.17.4" - sources."babel-code-frame-6.22.0" - (sources."babel-generator-6.25.0" // { - dependencies = [ - sources."source-map-0.5.6" - ]; - }) - sources."babel-helpers-6.24.1" - sources."babel-messages-6.23.0" - sources."babel-template-6.25.0" - sources."babel-runtime-6.23.0" - sources."babel-register-6.24.1" - sources."convert-source-map-1.5.0" - sources."debug-2.6.8" - sources."json5-0.5.1" - sources."minimatch-3.0.4" - sources."path-is-absolute-1.0.1" - sources."private-0.1.7" - sources."slash-1.0.0" - sources."chalk-1.1.3" - sources."esutils-2.0.2" - sources."js-tokens-3.0.1" - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - sources."ansi-regex-2.1.1" - sources."detect-indent-4.0.0" - sources."jsesc-1.3.0" - sources."trim-right-1.0.1" - sources."repeating-2.0.1" - sources."is-finite-1.0.2" - sources."number-is-nan-1.0.1" - sources."core-js-2.4.1" - sources."regenerator-runtime-0.10.5" - sources."home-or-tmp-2.0.0" - sources."mkdirp-0.5.1" - (sources."source-map-support-0.4.15" // { - dependencies = [ - sources."source-map-0.5.6" - ]; - }) - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - sources."minimist-0.0.8" - sources."ms-2.0.0" - sources."brace-expansion-1.1.8" - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - sources."globals-9.18.0" - sources."invariant-2.2.2" - sources."loose-envify-1.3.1" - sources."to-fast-properties-1.0.3" - sources."bindings-1.2.1" - sources."nan-2.6.2" + sources."nomnom-1.8.1" + sources."JSV-4.0.2" + sources."underscore-1.6.0" + sources."chalk-0.4.0" + sources."has-color-0.1.7" + sources."ansi-styles-1.0.0" + sources."strip-ansi-0.1.1" + sources."async-0.2.10" + sources."uglify-to-browserify-1.0.2" + sources."yargs-3.10.0" + sources."camelcase-1.2.1" + sources."cliui-2.1.0" + sources."decamelize-1.2.0" + sources."window-size-0.1.0" + sources."center-align-0.1.3" + sources."right-align-0.1.3" + sources."wordwrap-0.0.2" + sources."align-text-0.1.4" + sources."lazy-cache-1.0.4" + sources."kind-of-3.2.2" + sources."longest-1.0.1" + sources."repeat-string-1.6.1" + sources."is-buffer-1.1.5" + sources."path-parse-1.0.5" sources."array-unique-0.2.1" (sources."global-modules-0.2.3" // { dependencies = [ @@ -20651,21 +20893,10 @@ in sources."which-1.2.14" sources."parse-passwd-1.0.0" sources."isexe-2.0.0" - (sources."nomnom-1.8.1" // { - dependencies = [ - sources."chalk-0.4.0" - sources."ansi-styles-1.0.0" - sources."strip-ansi-0.1.1" - ]; - }) - sources."JSV-4.0.2" - sources."underscore-1.6.0" - sources."has-color-0.1.7" - sources."is-0.3.0" - sources."path-parse-1.0.5" sources."amdefine-1.0.1" sources."xml2js-0.2.8" sources."sax-0.5.8" + sources."is-0.3.0" ]; buildInputs = globalBuildInputs; meta = { @@ -20678,10 +20909,10 @@ in azure-cli = nodeEnv.buildNodePackage { name = "azure-cli"; packageName = "azure-cli"; - version = "0.10.14"; + version = "0.10.15"; src = fetchurl { - url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.14.tgz"; - sha1 = "e702e81a68b2b52db11e707796b484001b22063e"; + url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.15.tgz"; + sha1 = "15386d528bcd2521147934e3f183b53897a18c2c"; }; dependencies = [ sources."adal-node-0.1.21" @@ -20693,56 +20924,92 @@ in ]; }) sources."azure-arm-authorization-2.0.0" - sources."azure-arm-cdn-1.0.3" - sources."azure-arm-commerce-0.2.0" - (sources."azure-arm-compute-3.0.0-preview" // { + (sources."azure-arm-cdn-1.0.3" // { dependencies = [ - sources."ms-rest-2.2.0" - sources."ms-rest-azure-2.1.2" + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" + sources."async-0.2.7" + ]; + }) + (sources."azure-arm-commerce-0.2.0" // { + dependencies = [ + sources."ms-rest-azure-1.15.7" + sources."ms-rest-1.15.7" + sources."async-0.2.7" + ]; + }) + sources."azure-arm-compute-3.0.0-preview" + (sources."azure-arm-datalake-analytics-1.0.2-preview" // { + dependencies = [ + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" + sources."async-0.2.7" + ]; + }) + (sources."azure-arm-datalake-store-1.0.2-preview" // { + dependencies = [ + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" sources."async-0.2.7" ]; }) - sources."azure-arm-datalake-analytics-1.0.2-preview" - sources."azure-arm-datalake-store-1.0.2-preview" sources."azure-arm-hdinsight-0.2.2" sources."azure-arm-hdinsight-jobs-0.1.0" sources."azure-arm-insights-0.11.3" - (sources."azure-arm-iothub-1.0.1-preview" // { + sources."azure-arm-iothub-1.0.1-preview" + (sources."azure-arm-servermanagement-0.1.2" // { dependencies = [ - sources."ms-rest-2.2.0" - sources."ms-rest-azure-2.1.2" + sources."ms-rest-azure-1.15.7" + sources."ms-rest-1.15.7" sources."async-0.2.7" ]; }) - sources."azure-arm-servermanagement-0.1.2" - (sources."azure-arm-network-1.1.0-preview" // { + sources."azure-arm-network-2.0.0" + (sources."azure-arm-powerbiembedded-0.1.0" // { dependencies = [ - sources."ms-rest-2.2.0" - sources."ms-rest-azure-2.1.2" + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" sources."async-0.2.7" ]; }) - sources."azure-arm-powerbiembedded-0.1.0" - (sources."azure-arm-trafficmanager-1.1.0-preview" // { + sources."azure-arm-trafficmanager-1.1.0-preview" + (sources."azure-arm-dns-0.11.1" // { dependencies = [ - sources."ms-rest-azure-2.1.2" - sources."ms-rest-2.2.0" + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" sources."async-0.2.7" ]; }) - sources."azure-arm-dns-0.11.1" - sources."azure-arm-website-0.11.4" - sources."azure-arm-rediscache-0.2.3" - sources."azure-arm-devtestlabs-0.1.0" - (sources."azure-graph-2.1.0-preview" // { + (sources."azure-arm-website-0.11.4" // { dependencies = [ - sources."ms-rest-azure-2.1.2" - sources."ms-rest-2.2.0" + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" sources."async-0.2.7" ]; }) + (sources."azure-arm-rediscache-0.2.3" // { + dependencies = [ + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" + sources."async-0.2.7" + ]; + }) + (sources."azure-arm-devtestlabs-0.1.0" // { + dependencies = [ + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" + sources."async-0.2.7" + ]; + }) + sources."azure-graph-2.1.0-preview" sources."azure-gallery-2.0.0-pre.18" - sources."azure-keyvault-0.11.0" + (sources."azure-keyvault-0.11.0" // { + dependencies = [ + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" + sources."async-0.2.7" + ]; + }) sources."azure-asm-compute-0.18.0" sources."azure-asm-hdinsight-0.10.2" sources."azure-asm-trafficmanager-0.10.3" @@ -20753,8 +21020,20 @@ in ]; }) sources."azure-asm-network-0.13.0" - sources."azure-arm-resource-1.6.1-preview" - sources."azure-arm-storage-0.15.0-preview" + (sources."azure-arm-resource-1.6.1-preview" // { + dependencies = [ + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" + sources."async-0.2.7" + ]; + }) + (sources."azure-arm-storage-0.15.0-preview" // { + dependencies = [ + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" + sources."async-0.2.7" + ]; + }) sources."azure-asm-sb-0.10.1" sources."azure-asm-sql-0.10.1" sources."azure-asm-storage-0.12.0" @@ -20771,9 +21050,27 @@ in sources."xml2js-0.2.7" ]; }) - sources."azure-arm-batch-0.3.0" - sources."azure-batch-0.5.2" - sources."azure-servicefabric-0.1.5" + (sources."azure-arm-batch-0.3.0" // { + dependencies = [ + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" + sources."async-0.2.7" + ]; + }) + (sources."azure-batch-0.5.2" // { + dependencies = [ + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" + sources."async-0.2.7" + ]; + }) + (sources."azure-servicefabric-0.1.5" // { + dependencies = [ + sources."ms-rest-1.15.7" + sources."ms-rest-azure-1.15.7" + sources."async-0.2.7" + ]; + }) sources."applicationinsights-0.16.0" sources."caller-id-0.1.0" sources."colors-1.1.2" @@ -20796,8 +21093,8 @@ in ]; }) sources."moment-2.18.1" - sources."ms-rest-1.15.7" - (sources."ms-rest-azure-1.15.7" // { + sources."ms-rest-2.2.1" + (sources."ms-rest-azure-2.2.1" // { dependencies = [ sources."async-0.2.7" ]; @@ -20858,19 +21155,13 @@ in sources."xpath.js-1.0.7" sources."base64url-2.0.0" sources."jwa-1.1.5" - sources."safe-buffer-5.1.0" + sources."safe-buffer-5.1.1" sources."buffer-equal-constant-time-1.0.1" sources."ecdsa-sig-formatter-1.0.9" sources."dateformat-1.0.2-1.2.3" sources."envconf-0.0.4" sources."duplexer-0.1.1" sources."sax-0.5.2" - sources."@types/node-7.0.31" - sources."@types/request-0.0.42" - sources."@types/uuid-2.0.30" - sources."is-buffer-1.1.5" - sources."is-stream-1.1.0" - sources."@types/form-data-0.0.33" sources."browserify-mime-1.2.9" sources."extend-1.2.1" sources."json-edm-parser-0.1.2" @@ -20903,6 +21194,12 @@ in sources."has-color-0.1.7" sources."ansi-styles-1.0.0" sources."strip-ansi-0.1.1" + sources."@types/node-7.0.37" + sources."@types/request-0.0.45" + sources."@types/uuid-2.0.30" + sources."is-buffer-1.1.5" + sources."is-stream-1.1.0" + sources."@types/form-data-0.0.33" sources."debug-0.7.4" sources."q-0.9.7" sources."pkginfo-0.4.0" @@ -20942,13 +21239,13 @@ in sources."forever-agent-0.6.1" (sources."form-data-1.0.1" // { dependencies = [ - sources."async-2.4.1" + sources."async-2.5.0" ]; }) (sources."har-validator-2.0.6" // { dependencies = [ sources."chalk-1.1.3" - sources."commander-2.9.0" + sources."commander-2.11.0" sources."ansi-styles-2.2.1" sources."strip-ansi-3.0.1" ]; @@ -20971,7 +21268,6 @@ in sources."has-ansi-2.0.0" sources."supports-color-2.0.0" sources."ansi-regex-2.1.1" - sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" sources."jsonpointer-4.0.1" @@ -21020,17 +21316,16 @@ in sources."amdefine-1.0.1" (sources."concat-stream-1.6.0" // { dependencies = [ - sources."readable-stream-2.2.11" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."readable-stream-2.3.3" + sources."string_decoder-1.0.3" ]; }) sources."http-response-object-1.1.0" sources."then-request-2.2.0" sources."typedarray-0.0.6" sources."http-basic-2.5.1" - sources."promise-7.3.0" - sources."asap-2.0.5" + sources."promise-7.3.1" + sources."asap-2.0.6" sources."os-homedir-1.0.2" sources."mute-stream-0.0.7" ]; @@ -21095,13 +21390,13 @@ in sources."ext-list-2.2.2" sources."meow-3.7.0" sources."sort-keys-length-1.0.1" - sources."mime-db-1.28.0" + sources."mime-db-1.29.0" sources."camelcase-keys-2.1.0" sources."decamelize-1.2.0" sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" sources."minimist-1.2.0" - sources."normalize-package-data-2.3.8" + sources."normalize-package-data-2.4.0" sources."object-assign-4.1.1" sources."read-pkg-up-1.0.1" sources."redent-1.0.0" @@ -21110,7 +21405,7 @@ in sources."currently-unhandled-0.4.1" sources."signal-exit-3.0.2" sources."array-find-index-1.0.2" - sources."hosted-git-info-2.4.2" + sources."hosted-git-info-2.5.0" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" @@ -21218,7 +21513,7 @@ in }) sources."console-browserify-1.1.0" sources."constants-browserify-1.0.0" - sources."crypto-browserify-3.11.0" + sources."crypto-browserify-3.11.1" sources."defined-1.0.0" sources."deps-sort-2.0.0" sources."domain-browser-1.1.7" @@ -21243,21 +21538,13 @@ in sources."punycode-1.4.1" sources."querystring-es3-0.2.1" sources."read-only-stream-2.0.0" - (sources."readable-stream-2.2.11" // { - dependencies = [ - sources."safe-buffer-5.0.1" - ]; - }) + sources."readable-stream-2.3.3" sources."resolve-1.3.3" sources."shasum-1.0.2" sources."shell-quote-1.6.1" sources."stream-browserify-2.0.1" sources."stream-http-2.7.2" - (sources."string_decoder-1.0.2" // { - dependencies = [ - sources."safe-buffer-5.0.1" - ]; - }) + sources."string_decoder-1.0.3" sources."subarg-1.0.0" sources."syntax-error-1.3.0" sources."through2-2.0.3" @@ -21284,7 +21571,7 @@ in sources."lodash.memoize-3.0.4" sources."source-map-0.5.6" sources."pako-0.2.9" - sources."base64-js-1.2.0" + sources."base64-js-1.2.1" sources."ieee754-1.1.8" sources."typedarray-0.0.6" sources."core-util-is-1.0.2" @@ -21305,22 +21592,22 @@ in sources."browserify-des-1.0.0" sources."evp_bytestokey-1.0.0" sources."buffer-xor-1.0.3" - sources."cipher-base-1.0.3" + sources."cipher-base-1.0.4" + sources."safe-buffer-5.1.1" sources."des.js-1.0.0" sources."minimalistic-assert-1.0.0" - sources."bn.js-4.11.6" + sources."bn.js-4.11.7" sources."browserify-rsa-4.0.1" sources."elliptic-6.4.0" sources."parse-asn1-5.1.0" sources."brorand-1.1.0" - sources."hash.js-1.0.3" + sources."hash.js-1.1.3" sources."hmac-drbg-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."asn1.js-4.9.1" sources."ripemd160-2.0.1" sources."sha.js-2.4.8" sources."hash-base-2.0.2" - sources."safe-buffer-5.1.0" sources."miller-rabin-4.0.0" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" @@ -21456,7 +21743,7 @@ in sources."decamelize-1.2.0" sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" - sources."normalize-package-data-2.3.8" + sources."normalize-package-data-2.4.0" sources."read-pkg-up-1.0.1" sources."redent-1.0.0" sources."trim-newlines-1.0.0" @@ -21464,7 +21751,7 @@ in sources."currently-unhandled-0.4.1" sources."signal-exit-3.0.2" sources."array-find-index-1.0.2" - sources."hosted-git-info-2.4.2" + sources."hosted-git-info-2.5.0" sources."is-builtin-module-1.0.0" sources."semver-5.3.0" sources."validate-npm-package-license-3.0.1" @@ -21554,12 +21841,12 @@ in sources."wordwrap-0.0.3" sources."blob-to-buffer-1.2.6" sources."magnet-uri-5.1.7" - sources."parse-torrent-file-4.0.2" + sources."parse-torrent-file-4.0.3" sources."simple-get-2.6.0" - sources."safe-buffer-5.1.0" + sources."safe-buffer-5.1.1" sources."thirty-two-1.0.2" sources."uniq-1.0.1" - sources."bencode-0.11.0" + sources."bencode-1.0.0" sources."simple-sha1-2.1.0" sources."rusha-0.8.6" sources."once-1.4.0" @@ -21645,26 +21932,25 @@ in }) sources."lru-2.0.1" sources."buffer-equal-0.0.1" - sources."k-rpc-socket-1.6.2" - sources."bn.js-4.11.6" + sources."k-rpc-socket-1.7.1" + sources."bn.js-4.11.7" sources."compact2string-1.4.0" sources."random-iterate-1.0.1" sources."run-series-1.1.4" (sources."simple-peer-6.4.4" // { dependencies = [ - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."isarray-1.0.0" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."string_decoder-1.0.3" ]; }) (sources."simple-websocket-4.3.1" // { dependencies = [ - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."ws-2.3.1" sources."isarray-1.0.0" + sources."string_decoder-1.0.3" sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" ]; }) sources."string2compact-1.2.2" @@ -21673,7 +21959,7 @@ in sources."ultron-1.0.2" ]; }) - sources."ipaddr.js-1.3.0" + sources."ipaddr.js-1.4.0" sources."get-browser-rtc-1.0.2" sources."process-nextick-args-1.0.7" sources."util-deprecate-1.0.2" @@ -21713,17 +21999,15 @@ in sources."voc-0.5.0" (sources."concat-stream-1.6.0" // { dependencies = [ - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."isarray-1.0.0" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."string_decoder-1.0.3" ]; }) sources."exit-on-epipe-1.0.0" - sources."commander-2.9.0" + sources."commander-2.11.0" sources."typedarray-0.0.6" - sources."graceful-readlink-1.0.1" - sources."sax-1.2.2" + sources."sax-1.2.4" sources."underscore-1.6.0" ]; buildInputs = globalBuildInputs; @@ -21870,6 +22154,7 @@ in ]; }) sources."nopt-3.0.6" + sources."normalize-package-data-2.3.8" sources."npm-package-arg-4.1.1" sources."readable-stream-2.1.5" sources."request-2.74.0" @@ -21900,7 +22185,7 @@ in sources."browserify-transform-tools-1.7.0" sources."falafel-2.1.0" sources."through-2.3.8" - sources."acorn-5.0.3" + sources."acorn-5.1.1" sources."foreach-2.0.5" sources."isarray-0.0.1" sources."object-keys-1.0.11" @@ -21932,7 +22217,7 @@ in sources."browserify-zlib-0.1.4" (sources."buffer-4.9.1" // { dependencies = [ - sources."base64-js-1.2.0" + sources."base64-js-1.2.1" sources."isarray-1.0.0" ]; }) @@ -21945,7 +22230,7 @@ in }) sources."console-browserify-1.1.0" sources."constants-browserify-1.0.0" - sources."crypto-browserify-3.11.0" + sources."crypto-browserify-3.11.1" sources."defined-1.0.0" sources."deps-sort-2.0.0" sources."domain-browser-1.1.7" @@ -21964,11 +22249,10 @@ in sources."punycode-1.4.1" sources."querystring-es3-0.2.1" sources."read-only-stream-2.0.0" - (sources."readable-stream-2.2.11" // { + (sources."readable-stream-2.3.3" // { dependencies = [ sources."isarray-1.0.0" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."string_decoder-1.0.3" ]; }) sources."shasum-1.0.2" @@ -22027,22 +22311,22 @@ in sources."browserify-des-1.0.0" sources."evp_bytestokey-1.0.0" sources."buffer-xor-1.0.3" - sources."cipher-base-1.0.3" + sources."cipher-base-1.0.4" + sources."safe-buffer-5.1.1" sources."des.js-1.0.0" sources."minimalistic-assert-1.0.0" - sources."bn.js-4.11.6" + sources."bn.js-4.11.7" sources."browserify-rsa-4.0.1" sources."elliptic-6.4.0" sources."parse-asn1-5.1.0" sources."brorand-1.1.0" - sources."hash.js-1.0.3" + sources."hash.js-1.1.3" sources."hmac-drbg-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."asn1.js-4.9.1" sources."ripemd160-2.0.1" sources."sha.js-2.4.8" sources."hash-base-2.0.2" - sources."safe-buffer-5.1.0" sources."miller-rabin-4.0.0" sources."function-bind-1.1.0" sources."is-buffer-1.1.5" @@ -22070,11 +22354,10 @@ in sources."querystring-0.2.0" sources."indexof-0.0.1" sources."chalk-1.1.3" - sources."compression-1.6.2" + sources."compression-1.7.0" (sources."express-4.15.3" // { dependencies = [ sources."debug-2.6.7" - sources."ms-2.0.0" ]; }) sources."ansi-styles-2.2.1" @@ -22084,15 +22367,15 @@ in sources."supports-color-2.0.0" sources."ansi-regex-2.1.1" sources."accepts-1.3.3" - sources."bytes-2.3.0" + sources."bytes-2.5.0" sources."compressible-2.0.10" - sources."debug-2.2.0" + sources."debug-2.6.8" sources."on-headers-1.0.1" sources."vary-1.1.1" sources."mime-types-2.1.15" sources."negotiator-0.6.1" sources."mime-db-1.27.0" - sources."ms-0.7.1" + sources."ms-2.0.0" sources."array-flatten-1.1.1" sources."content-disposition-0.5.2" sources."content-type-1.0.2" @@ -22105,7 +22388,6 @@ in (sources."finalhandler-1.0.3" // { dependencies = [ sources."debug-2.6.7" - sources."ms-2.0.0" ]; }) sources."fresh-0.5.0" @@ -22120,7 +22402,6 @@ in (sources."send-0.15.3" // { dependencies = [ sources."debug-2.6.7" - sources."ms-2.0.0" ]; }) sources."serve-static-1.12.3" @@ -22139,17 +22420,17 @@ in sources."npm-package-arg-5.1.2" sources."promzard-0.3.0" sources."read-1.0.7" - (sources."read-package-json-2.0.5" // { + (sources."read-package-json-2.0.10" // { dependencies = [ sources."glob-7.1.2" ]; }) sources."validate-npm-package-license-3.0.1" sources."validate-npm-package-name-3.0.0" - sources."hosted-git-info-2.4.2" + sources."hosted-git-info-2.5.0" sources."mute-stream-0.0.7" sources."json-parse-helpfulerror-1.0.3" - sources."normalize-package-data-2.3.8" + sources."normalize-package-data-2.4.0" sources."jju-1.3.0" sources."is-builtin-module-1.0.0" sources."builtin-modules-1.1.1" @@ -22217,7 +22498,7 @@ in sources."defaults-1.0.3" sources."clone-1.0.2" sources."proto-list-1.2.4" - sources."asap-2.0.5" + sources."asap-2.0.6" sources."iferr-0.1.5" sources."fstream-ignore-1.0.5" sources."pseudomap-1.0.2" @@ -22258,15 +22539,14 @@ in sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" - (sources."async-2.4.1" // { + (sources."async-2.5.0" // { dependencies = [ sources."lodash-4.17.4" ]; }) - sources."commander-2.9.0" + sources."commander-2.11.0" sources."is-my-json-valid-2.16.0" sources."pinkie-promise-2.0.1" - sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" sources."jsonpointer-4.0.1" @@ -22560,7 +22840,7 @@ in sources."JSONStream-0.8.4" sources."basic-auth-1.1.0" sources."cookie-signature-1.0.6" - sources."cors-2.8.3" + sources."cors-2.8.4" sources."docker-parse-image-3.0.1" sources."end-of-stream-1.4.0" sources."from2-1.3.0" @@ -22601,9 +22881,9 @@ in sources."minimist-1.2.0" sources."split2-2.1.1" sources."through2-2.0.3" - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."isarray-1.0.0" - sources."string_decoder-1.0.2" + sources."string_decoder-1.0.3" ]; }) sources."pump-1.0.2" @@ -22616,9 +22896,9 @@ in (sources."tar-stream-1.5.4" // { dependencies = [ sources."bl-1.2.1" - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."isarray-1.0.0" - sources."string_decoder-1.0.2" + sources."string_decoder-1.0.3" ]; }) (sources."through2-0.6.5" // { @@ -22642,16 +22922,16 @@ in (sources."duplexify-3.5.0" // { dependencies = [ sources."end-of-stream-1.0.0" - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."once-1.3.3" sources."isarray-1.0.0" - sources."string_decoder-1.0.2" + sources."string_decoder-1.0.3" ]; }) sources."lru-cache-2.7.3" sources."stream-shift-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.0.1" + sources."safe-buffer-5.1.1" sources."util-deprecate-1.0.2" sources."level-packager-0.18.0" sources."bytewise-1.1.0" @@ -22712,17 +22992,18 @@ in }; dependencies = [ sources."JSONStream-1.3.1" - sources."async-2.4.1" + sources."async-2.5.0" sources."aws4-1.6.0" - sources."aws-sdk-2.72.0" + sources."aws-sdk-2.85.0" sources."ini-1.3.4" sources."optimist-0.6.1" sources."request-2.81.0" sources."jsonparse-1.3.1" sources."through-2.3.8" sources."lodash-4.17.4" - sources."buffer-5.0.6" + sources."buffer-4.9.1" sources."crypto-browserify-1.0.9" + sources."events-1.1.1" sources."jmespath-0.15.0" sources."querystring-0.2.0" sources."sax-1.2.1" @@ -22730,8 +23011,9 @@ in sources."uuid-3.0.1" sources."xml2js-0.4.17" sources."xmlbuilder-4.2.1" - sources."base64-js-1.2.0" + sources."base64-js-1.2.1" sources."ieee754-1.1.8" + sources."isarray-1.0.0" sources."punycode-1.3.2" sources."wordwrap-0.0.3" sources."minimist-0.0.10" @@ -22751,7 +23033,7 @@ in sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" sources."qs-6.4.0" - sources."safe-buffer-5.1.0" + sources."safe-buffer-5.1.1" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { dependencies = [ @@ -22870,7 +23152,7 @@ in sources."is-redirect-1.0.0" sources."is-retry-allowed-1.1.0" sources."lowercase-keys-1.0.0" - sources."safe-buffer-5.1.0" + sources."safe-buffer-5.1.1" sources."timed-out-4.0.1" sources."unzip-response-2.0.1" sources."url-parse-lax-1.0.0" @@ -22887,7 +23169,7 @@ in sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" sources."minimist-1.2.0" - sources."normalize-package-data-2.3.8" + sources."normalize-package-data-2.4.0" (sources."read-pkg-up-1.0.1" // { dependencies = [ sources."find-up-1.1.2" @@ -22899,7 +23181,7 @@ in sources."camelcase-2.1.1" sources."currently-unhandled-0.4.1" sources."array-find-index-1.0.2" - sources."hosted-git-info-2.4.2" + sources."hosted-git-info-2.5.0" sources."is-builtin-module-1.0.0" sources."semver-5.3.0" sources."validate-npm-package-license-3.0.1" @@ -22935,12 +23217,13 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "4.0.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-4.0.0.tgz"; - sha1 = "7277c01437fdf41dccd168d5aa0e49b75ca1f260"; + url = "https://registry.npmjs.org/eslint/-/eslint-4.2.0.tgz"; + sha1 = "a2b3184111b198e02e9c7f3cca625a5e01c56b3d"; }; dependencies = [ + sources."ajv-5.2.2" sources."babel-code-frame-6.22.0" sources."chalk-1.1.3" sources."concat-stream-1.6.0" @@ -22956,13 +23239,21 @@ in sources."globals-9.18.0" sources."ignore-3.3.3" sources."imurmurhash-0.1.4" - sources."inquirer-3.1.0" - sources."is-my-json-valid-2.16.0" + (sources."inquirer-3.2.0" // { + dependencies = [ + sources."chalk-2.0.1" + sources."strip-ansi-4.0.0" + sources."ansi-styles-3.1.0" + sources."supports-color-4.2.0" + sources."ansi-regex-3.0.0" + ]; + }) sources."is-resolvable-1.0.0" - sources."js-yaml-3.8.4" + sources."js-yaml-3.9.0" sources."json-stable-stringify-1.0.1" sources."levn-0.3.0" sources."lodash-4.17.4" + sources."minimatch-3.0.4" sources."mkdirp-0.5.1" sources."natural-compare-1.4.0" sources."optionator-0.8.2" @@ -22971,9 +23262,16 @@ in sources."progress-2.0.0" sources."require-uncached-1.0.3" sources."strip-json-comments-2.0.1" - sources."table-4.0.1" + (sources."table-4.0.1" // { + dependencies = [ + sources."ajv-4.11.8" + ]; + }) sources."text-table-0.2.0" - sources."js-tokens-3.0.1" + sources."co-4.6.0" + sources."fast-deep-equal-1.0.0" + sources."json-schema-traverse-0.3.1" + sources."js-tokens-3.0.2" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" @@ -22982,21 +23280,17 @@ in sources."ansi-regex-2.1.1" sources."inherits-2.0.3" sources."typedarray-0.0.6" - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."ms-2.0.0" - (sources."esrecurse-4.1.0" // { - dependencies = [ - sources."estraverse-4.1.1" - ]; - }) + sources."esrecurse-4.2.0" sources."object-assign-4.1.1" - sources."acorn-5.0.3" + sources."acorn-5.1.1" (sources."acorn-jsx-3.0.1" // { dependencies = [ sources."acorn-3.3.0" @@ -23020,13 +23314,9 @@ in sources."pinkie-2.0.4" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" - sources."minimatch-3.0.4" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.8" - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" sources."ansi-escapes-2.0.0" sources."cli-cursor-2.1.0" sources."cli-width-2.1.0" @@ -23036,8 +23326,16 @@ in sources."run-async-2.3.0" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" - sources."string-width-2.0.0" + (sources."string-width-2.1.0" // { + dependencies = [ + sources."strip-ansi-4.0.0" + sources."ansi-regex-3.0.0" + ]; + }) sources."through-2.3.8" + sources."color-convert-1.9.0" + sources."color-name-1.1.2" + sources."has-flag-2.0.0" sources."restore-cursor-2.0.0" sources."onetime-2.0.1" sources."signal-exit-3.0.2" @@ -23048,18 +23346,16 @@ in sources."os-tmpdir-1.0.2" sources."is-promise-2.1.0" sources."is-fullwidth-code-point-2.0.0" - sources."generate-function-2.0.0" - sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.1" - sources."xtend-4.0.1" - sources."is-property-1.0.2" sources."tryit-1.0.3" sources."argparse-1.0.9" - sources."esprima-3.1.3" + sources."esprima-4.0.0" sources."sprintf-js-1.0.3" sources."jsonify-0.0.0" sources."prelude-ls-1.1.2" sources."type-check-0.3.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" + sources."concat-map-0.0.1" sources."minimist-0.0.8" sources."deep-is-0.1.3" sources."wordwrap-1.0.0" @@ -23067,10 +23363,8 @@ in sources."caller-path-0.1.0" sources."resolve-from-1.0.1" sources."callsites-0.2.0" - sources."ajv-4.11.8" sources."ajv-keywords-1.5.1" sources."slice-ansi-0.0.4" - sources."co-4.6.0" ]; buildInputs = globalBuildInputs; meta = { @@ -23083,10 +23377,10 @@ in eslint_d = nodeEnv.buildNodePackage { name = "eslint_d"; packageName = "eslint_d"; - version = "4.2.5"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint_d/-/eslint_d-4.2.5.tgz"; - sha1 = "f0d3a150e2960a7d787841ab83eaef746432c5e1"; + url = "https://registry.npmjs.org/eslint_d/-/eslint_d-5.0.0.tgz"; + sha1 = "88bbceec5d5eead280b63b6351881bc05bfe3987"; }; dependencies = [ (sources."chalk-1.1.3" // { @@ -23094,20 +23388,25 @@ in sources."supports-color-2.0.0" ]; }) - sources."eslint-3.19.0" + sources."eslint-4.2.0" sources."optionator-0.8.2" sources."resolve-1.3.3" - sources."supports-color-3.2.3" + (sources."supports-color-3.2.3" // { + dependencies = [ + sources."has-flag-1.0.0" + ]; + }) sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" sources."strip-ansi-3.0.1" sources."ansi-regex-2.1.1" + sources."ajv-5.2.2" sources."babel-code-frame-6.22.0" sources."concat-stream-1.6.0" sources."debug-2.6.8" sources."doctrine-2.0.0" - sources."escope-3.6.0" + sources."eslint-scope-3.7.1" sources."espree-3.4.3" sources."esquery-1.0.0" sources."estraverse-4.2.0" @@ -23117,56 +23416,51 @@ in sources."globals-9.18.0" sources."ignore-3.3.3" sources."imurmurhash-0.1.4" - sources."inquirer-0.12.0" - sources."is-my-json-valid-2.16.0" + (sources."inquirer-3.2.0" // { + dependencies = [ + sources."chalk-2.0.1" + sources."strip-ansi-4.0.0" + sources."ansi-styles-3.1.0" + sources."supports-color-4.2.0" + sources."ansi-regex-3.0.0" + ]; + }) sources."is-resolvable-1.0.0" - sources."js-yaml-3.8.4" + sources."js-yaml-3.9.0" sources."json-stable-stringify-1.0.1" sources."levn-0.3.0" sources."lodash-4.17.4" + sources."minimatch-3.0.4" sources."mkdirp-0.5.1" sources."natural-compare-1.4.0" sources."path-is-inside-1.0.2" - sources."pluralize-1.2.1" - sources."progress-1.1.8" + sources."pluralize-4.0.0" + sources."progress-2.0.0" sources."require-uncached-1.0.3" - sources."shelljs-0.7.8" - sources."strip-bom-3.0.0" sources."strip-json-comments-2.0.1" - (sources."table-3.8.3" // { + (sources."table-4.0.1" // { dependencies = [ - sources."string-width-2.0.0" - sources."is-fullwidth-code-point-2.0.0" + sources."ajv-4.11.8" ]; }) sources."text-table-0.2.0" - sources."user-home-2.0.0" - sources."js-tokens-3.0.1" + sources."co-4.6.0" + sources."fast-deep-equal-1.0.0" + sources."json-schema-traverse-0.3.1" + sources."js-tokens-3.0.2" sources."inherits-2.0.3" sources."typedarray-0.0.6" - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."ms-2.0.0" - sources."es6-map-0.1.5" - sources."es6-weak-map-2.0.2" - (sources."esrecurse-4.1.0" // { - dependencies = [ - sources."estraverse-4.1.1" - ]; - }) - sources."d-1.0.0" - sources."es5-ext-0.10.23" - sources."es6-iterator-2.0.1" - sources."es6-set-0.1.5" - sources."es6-symbol-3.1.1" - sources."event-emitter-0.3.5" + sources."esrecurse-4.2.0" sources."object-assign-4.1.1" - sources."acorn-5.0.3" + sources."acorn-5.1.1" (sources."acorn-jsx-3.0.1" // { dependencies = [ sources."acorn-3.3.0" @@ -23190,57 +23484,58 @@ in sources."pinkie-2.0.4" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" - sources."minimatch-3.0.4" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" - sources."brace-expansion-1.1.8" - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" - sources."ansi-escapes-1.4.0" - sources."cli-cursor-1.0.2" + sources."ansi-escapes-2.0.0" + sources."cli-cursor-2.1.0" sources."cli-width-2.1.0" - sources."figures-1.7.0" - sources."readline2-1.0.1" - sources."run-async-0.1.0" - sources."rx-lite-3.1.2" - sources."string-width-1.0.2" + sources."external-editor-2.0.4" + sources."figures-2.0.0" + sources."mute-stream-0.0.7" + sources."run-async-2.3.0" + sources."rx-lite-4.0.8" + sources."rx-lite-aggregates-4.0.8" + (sources."string-width-2.1.0" // { + dependencies = [ + sources."strip-ansi-4.0.0" + sources."ansi-regex-3.0.0" + ]; + }) sources."through-2.3.8" - sources."restore-cursor-1.0.1" - sources."exit-hook-1.1.1" - sources."onetime-1.1.0" - sources."code-point-at-1.1.0" - sources."is-fullwidth-code-point-1.0.0" - sources."mute-stream-0.0.5" - sources."number-is-nan-1.0.1" - sources."generate-function-2.0.0" - sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.1" - sources."xtend-4.0.1" - sources."is-property-1.0.2" + sources."color-convert-1.9.0" + sources."color-name-1.1.2" + sources."has-flag-2.0.0" + sources."restore-cursor-2.0.0" + sources."onetime-2.0.1" + sources."signal-exit-3.0.2" + sources."mimic-fn-1.1.0" + sources."iconv-lite-0.4.18" + sources."jschardet-1.4.2" + sources."tmp-0.0.31" + sources."os-tmpdir-1.0.2" + sources."is-promise-2.1.0" + sources."is-fullwidth-code-point-2.0.0" sources."tryit-1.0.3" sources."argparse-1.0.9" - sources."esprima-3.1.3" + sources."esprima-4.0.0" sources."sprintf-js-1.0.3" sources."jsonify-0.0.0" sources."prelude-ls-1.1.2" sources."type-check-0.3.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" + sources."concat-map-0.0.1" sources."minimist-0.0.8" sources."caller-path-0.1.0" sources."resolve-from-1.0.1" sources."callsites-0.2.0" - sources."interpret-1.0.3" - sources."rechoir-0.6.2" - sources."ajv-4.11.8" sources."ajv-keywords-1.5.1" sources."slice-ansi-0.0.4" - sources."co-4.6.0" - sources."os-homedir-1.0.2" sources."deep-is-0.1.3" sources."wordwrap-1.0.0" sources."fast-levenshtein-2.0.6" sources."path-parse-1.0.5" - sources."has-flag-1.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -23253,10 +23548,10 @@ in emojione = nodeEnv.buildNodePackage { name = "emojione"; packageName = "emojione"; - version = "3.0.3"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/emojione/-/emojione-3.0.3.tgz"; - sha1 = "7b4c61210bf6949f0ac16803889ea1abf2b285ea"; + url = "https://registry.npmjs.org/emojione/-/emojione-3.1.1.tgz"; + sha1 = "f5680fbee2cb2a56e99042b14d935e3eb861b300"; }; buildInputs = globalBuildInputs; meta = { @@ -23265,6 +23560,199 @@ in }; production = true; }; + fast-cli = nodeEnv.buildNodePackage { + name = "fast-cli"; + packageName = "fast-cli"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-cli/-/fast-cli-1.0.0.tgz"; + sha1 = "81f5f98043cc2517053f96ba5d61ef5db430c010"; + }; + dependencies = [ + sources."chalk-1.1.3" + sources."log-update-1.0.2" + sources."meow-3.7.0" + (sources."ora-1.3.0" // { + dependencies = [ + sources."cli-cursor-2.1.0" + sources."restore-cursor-2.0.0" + sources."onetime-2.0.1" + ]; + }) + sources."phantomjs-prebuilt-2.1.14" + sources."promise-phantom-3.1.6" + sources."zen-observable-0.5.2" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."ansi-regex-2.1.1" + sources."ansi-escapes-1.4.0" + sources."cli-cursor-1.0.2" + sources."restore-cursor-1.0.1" + sources."exit-hook-1.1.1" + sources."onetime-1.1.0" + sources."camelcase-keys-2.1.0" + sources."decamelize-1.2.0" + sources."loud-rejection-1.6.0" + sources."map-obj-1.0.1" + sources."minimist-1.2.0" + sources."normalize-package-data-2.4.0" + sources."object-assign-4.1.1" + sources."read-pkg-up-1.0.1" + sources."redent-1.0.0" + sources."trim-newlines-1.0.0" + sources."camelcase-2.1.1" + sources."currently-unhandled-0.4.1" + sources."signal-exit-3.0.2" + sources."array-find-index-1.0.2" + sources."hosted-git-info-2.5.0" + sources."is-builtin-module-1.0.0" + sources."semver-5.3.0" + sources."validate-npm-package-license-3.0.1" + sources."builtin-modules-1.1.1" + sources."spdx-correct-1.0.2" + sources."spdx-expression-parse-1.0.4" + sources."spdx-license-ids-1.2.2" + sources."find-up-1.1.2" + sources."read-pkg-1.1.0" + sources."path-exists-2.1.0" + sources."pinkie-promise-2.0.1" + sources."pinkie-2.0.4" + sources."load-json-file-1.1.0" + sources."path-type-1.1.0" + sources."graceful-fs-4.1.11" + sources."parse-json-2.2.0" + sources."pify-2.3.0" + sources."strip-bom-2.0.0" + sources."error-ex-1.3.1" + sources."is-arrayish-0.2.1" + sources."is-utf8-0.2.1" + sources."indent-string-2.1.0" + sources."strip-indent-1.0.1" + sources."repeating-2.0.1" + sources."is-finite-1.0.2" + sources."number-is-nan-1.0.1" + sources."get-stdin-4.0.1" + sources."cli-spinners-1.0.0" + sources."log-symbols-1.0.2" + sources."mimic-fn-1.1.0" + sources."es6-promise-4.0.5" + sources."extract-zip-1.5.0" + sources."fs-extra-1.0.0" + sources."hasha-2.2.0" + sources."kew-0.7.0" + sources."progress-1.1.8" + sources."request-2.79.0" + sources."request-progress-2.0.1" + sources."which-1.2.14" + sources."concat-stream-1.5.0" + sources."debug-0.7.4" + (sources."mkdirp-0.5.0" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."yauzl-2.4.1" + sources."inherits-2.0.3" + sources."typedarray-0.0.6" + sources."readable-stream-2.0.6" + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + sources."fd-slicer-1.0.1" + sources."pend-1.2.0" + sources."jsonfile-2.4.0" + sources."klaw-1.3.1" + sources."is-stream-1.1.0" + sources."aws-sign2-0.6.0" + sources."aws4-1.6.0" + sources."caseless-0.11.0" + sources."combined-stream-1.0.5" + sources."extend-3.0.1" + sources."forever-agent-0.6.1" + sources."form-data-2.1.4" + sources."har-validator-2.0.6" + sources."hawk-3.1.3" + sources."http-signature-1.1.1" + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + sources."mime-types-2.1.15" + sources."oauth-sign-0.8.2" + sources."qs-6.3.2" + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.2" + sources."tunnel-agent-0.4.3" + sources."uuid-3.1.0" + sources."delayed-stream-1.0.0" + sources."asynckit-0.4.0" + sources."commander-2.11.0" + sources."is-my-json-valid-2.16.0" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."jsonpointer-4.0.1" + sources."xtend-4.0.1" + sources."is-property-1.0.2" + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + sources."assert-plus-0.2.0" + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.13.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."extsprintf-1.0.2" + sources."json-schema-0.2.3" + sources."verror-1.3.6" + sources."asn1-0.2.3" + (sources."dashdash-1.14.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."getpass-0.1.7" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."jsbn-0.1.1" + sources."tweetnacl-0.14.5" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.1" + sources."mime-db-1.27.0" + sources."punycode-1.4.1" + sources."throttleit-1.0.0" + sources."isexe-2.0.0" + sources."co-4.6.0" + sources."mkpath-1.0.0" + (sources."node-phantom-simple-2.2.4" // { + dependencies = [ + sources."debug-2.6.8" + ]; + }) + sources."tmp-0.0.31" + sources."ms-2.0.0" + sources."os-tmpdir-1.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Test your download speed using fast.com"; + homepage = "https://github.com/sindresorhus/fast-cli#readme"; + license = "MIT"; + }; + production = true; + }; fetch-bower = nodeEnv.buildNodePackage { name = "fetch-bower"; packageName = "fetch-bower"; @@ -23380,7 +23868,7 @@ in sources."object.omit-2.0.1" sources."parse-glob-3.0.4" sources."regex-cache-0.4.3" - sources."arr-flatten-1.0.3" + sources."arr-flatten-1.1.0" sources."expand-range-1.8.2" sources."preserve-0.2.0" sources."repeat-element-1.1.2" @@ -23411,12 +23899,12 @@ in sources."is-primitive-2.0.0" sources."binary-extensions-1.8.0" sources."graceful-fs-4.1.11" - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."set-immediate-shim-1.0.1" sources."core-util-is-1.0.2" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."nan-2.6.2" sources."node-pre-gyp-0.6.36" @@ -23426,7 +23914,7 @@ in ]; }) sources."nopt-4.0.1" - sources."npmlog-4.1.0" + sources."npmlog-4.1.2" (sources."rc-1.2.1" // { dependencies = [ sources."minimist-1.2.0" @@ -23572,7 +24060,7 @@ in sha1 = "466a7253a54f526ca2f57ca78780895b95efaee4"; }; dependencies = [ - sources."async-2.4.1" + sources."async-2.5.0" sources."lodash.groupby-4.6.0" sources."minilog-2.0.8" sources."simple-git-1.73.0" @@ -23653,13 +24141,13 @@ in sources."jade-1.11.0" (sources."q-2.0.3" // { dependencies = [ - sources."asap-2.0.5" + sources."asap-2.0.6" ]; }) sources."xml2js-0.4.17" sources."msgpack-1.0.2" sources."character-parser-1.2.1" - (sources."clean-css-3.4.27" // { + (sources."clean-css-3.4.28" // { dependencies = [ sources."commander-2.8.1" ]; @@ -23721,7 +24209,7 @@ in sources."acorn-globals-1.0.9" sources."pop-iterate-1.0.1" sources."weak-map-1.0.5" - sources."sax-1.2.2" + sources."sax-1.2.4" sources."xmlbuilder-4.2.1" sources."lodash-4.17.4" sources."nan-2.6.2" @@ -23784,9 +24272,9 @@ in sources."replace-ext-0.0.1" (sources."through2-2.0.3" // { dependencies = [ - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."isarray-1.0.0" - sources."string_decoder-1.0.2" + sources."string_decoder-1.0.3" ]; }) sources."vinyl-0.5.3" @@ -23813,13 +24301,17 @@ in sources."inherits-2.0.3" sources."xtend-4.0.1" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.0.1" + sources."safe-buffer-5.1.1" sources."util-deprecate-1.0.2" sources."clone-1.0.2" sources."clone-stats-0.0.1" sources."extend-3.0.1" sources."findup-sync-0.4.3" - sources."fined-1.0.2" + (sources."fined-1.1.0" // { + dependencies = [ + sources."expand-tilde-2.0.2" + ]; + }) sources."flagged-respawn-0.3.2" sources."lodash.isplainobject-4.0.6" sources."lodash.isstring-4.0.1" @@ -23843,7 +24335,7 @@ in sources."object.omit-2.0.1" sources."parse-glob-3.0.4" sources."regex-cache-0.4.3" - sources."arr-flatten-1.0.3" + sources."arr-flatten-1.1.0" sources."expand-range-1.8.2" sources."preserve-0.2.0" sources."repeat-element-1.1.2" @@ -23886,10 +24378,21 @@ in sources."which-1.2.14" sources."parse-passwd-1.0.0" sources."isexe-2.0.0" - sources."lodash.assignwith-4.2.0" - sources."lodash.isempty-4.4.0" - sources."lodash.pick-4.4.0" + (sources."is-plain-object-2.0.4" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + (sources."object.defaults-1.1.0" // { + dependencies = [ + sources."for-own-1.0.0" + sources."isobject-3.0.1" + ]; + }) + sources."object.pick-1.2.0" sources."parse-filepath-1.0.1" + sources."array-each-1.0.1" + sources."array-slice-1.0.0" sources."is-absolute-0.2.6" sources."map-cache-0.2.2" sources."path-root-0.1.1" @@ -24085,9 +24588,9 @@ in sources."source-map-0.4.4" ]; }) - (sources."js-yaml-3.8.4" // { + (sources."js-yaml-3.9.0" // { dependencies = [ - sources."esprima-3.1.3" + sources."esprima-4.0.0" ]; }) (sources."mkdirp-0.5.1" // { @@ -24164,18 +24667,18 @@ in javascript-typescript-langserver = nodeEnv.buildNodePackage { name = "javascript-typescript-langserver"; packageName = "javascript-typescript-langserver"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.0.0.tgz"; - sha1 = "aad1582560c53dc91c13be6c2abb76cebbc9c971"; + url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.0.1.tgz"; + sha1 = "37abd20a6fe7569c55bc823848e6e40e9148c1a6"; }; dependencies = [ - sources."@reactivex/rxjs-5.4.1" - sources."chai-4.0.2" - sources."chai-as-promised-7.0.0" - sources."chalk-1.1.3" - sources."commander-2.9.0" - sources."fast-json-patch-1.2.2" + sources."@reactivex/rxjs-5.4.2" + sources."chai-4.1.0" + sources."chai-as-promised-7.1.1" + sources."chalk-2.0.1" + sources."commander-2.11.0" + sources."fast-json-patch-2.0.3" sources."glob-7.1.2" sources."iterare-0.0.8" sources."lodash-4.17.4" @@ -24185,7 +24688,7 @@ in sources."semaphore-async-await-1.5.1" sources."string-similarity-1.2.0" sources."typescript-2.3.4" - sources."vscode-jsonrpc-3.3.0" + sources."vscode-jsonrpc-3.3.1" sources."vscode-languageserver-3.3.0" sources."vscode-languageserver-types-3.3.0" sources."symbol-observable-1.0.4" @@ -24199,152 +24702,25 @@ in sources."get-func-name-2.0.0" sources."pathval-1.1.0" sources."type-detect-4.0.3" - sources."eslint-3.19.0" - sources."babel-code-frame-6.22.0" - sources."concat-stream-1.6.0" - sources."debug-2.6.8" - sources."doctrine-2.0.0" - sources."escope-3.6.0" - sources."espree-3.4.3" - sources."esquery-1.0.0" - sources."estraverse-4.2.0" - sources."esutils-2.0.2" - sources."file-entry-cache-2.0.0" - sources."globals-9.18.0" - sources."ignore-3.3.3" - sources."imurmurhash-0.1.4" - sources."inquirer-0.12.0" - sources."is-my-json-valid-2.16.0" - sources."is-resolvable-1.0.0" - sources."js-yaml-3.8.4" - sources."json-stable-stringify-1.0.1" - sources."levn-0.3.0" - sources."mkdirp-0.5.1" - sources."natural-compare-1.4.0" - sources."optionator-0.8.2" - sources."path-is-inside-1.0.2" - sources."pluralize-1.2.1" - sources."progress-1.1.8" - sources."require-uncached-1.0.3" - sources."shelljs-0.7.8" - sources."strip-bom-3.0.0" - sources."strip-json-comments-2.0.1" - (sources."table-3.8.3" // { - dependencies = [ - sources."string-width-2.0.0" - sources."is-fullwidth-code-point-2.0.0" - ]; - }) - sources."text-table-0.2.0" - sources."user-home-2.0.0" - sources."js-tokens-3.0.1" - sources."inherits-2.0.3" - sources."typedarray-0.0.6" - sources."readable-stream-2.2.11" - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" - sources."util-deprecate-1.0.2" - sources."ms-2.0.0" - sources."es6-map-0.1.5" - sources."es6-weak-map-2.0.2" - (sources."esrecurse-4.1.0" // { - dependencies = [ - sources."estraverse-4.1.1" - ]; - }) - sources."d-1.0.0" - sources."es5-ext-0.10.23" - sources."es6-iterator-2.0.1" - sources."es6-set-0.1.5" - sources."es6-symbol-3.1.1" - sources."event-emitter-0.3.5" - sources."object-assign-4.1.1" - sources."acorn-5.0.3" - (sources."acorn-jsx-3.0.1" // { - dependencies = [ - sources."acorn-3.3.0" - ]; - }) - sources."flat-cache-1.2.2" - sources."circular-json-0.3.1" - sources."del-2.2.2" - sources."graceful-fs-4.1.11" - sources."write-0.2.1" - sources."globby-5.0.0" - sources."is-path-cwd-1.0.0" - sources."is-path-in-cwd-1.0.0" - sources."pify-2.3.0" - sources."pinkie-promise-2.0.1" - sources."rimraf-2.6.1" - sources."array-union-1.0.2" - sources."arrify-1.0.1" - sources."array-uniq-1.0.3" - sources."is-path-inside-1.0.0" - sources."pinkie-2.0.4" - sources."ansi-escapes-1.4.0" - sources."ansi-regex-2.1.1" - sources."cli-cursor-1.0.2" - sources."cli-width-2.1.0" - sources."figures-1.7.0" - sources."readline2-1.0.1" - sources."run-async-0.1.0" - sources."rx-lite-3.1.2" - sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" - sources."through-2.3.8" - sources."restore-cursor-1.0.1" - sources."exit-hook-1.1.1" - sources."onetime-1.1.0" + sources."ansi-styles-3.1.0" sources."escape-string-regexp-1.0.5" - sources."code-point-at-1.1.0" - sources."is-fullwidth-code-point-1.0.0" - sources."mute-stream-0.0.5" - sources."number-is-nan-1.0.1" - sources."once-1.4.0" - sources."wrappy-1.0.2" - sources."generate-function-2.0.0" - sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.1" - sources."xtend-4.0.1" - sources."is-property-1.0.2" - sources."tryit-1.0.3" - sources."argparse-1.0.9" - sources."esprima-3.1.3" - sources."sprintf-js-1.0.3" - sources."jsonify-0.0.0" - sources."prelude-ls-1.1.2" - sources."type-check-0.3.2" - sources."minimist-0.0.8" - sources."deep-is-0.1.3" - sources."wordwrap-1.0.0" - sources."fast-levenshtein-2.0.6" - sources."caller-path-0.1.0" - sources."resolve-from-1.0.1" - sources."callsites-0.2.0" - sources."interpret-1.0.3" - sources."rechoir-0.6.2" - sources."resolve-1.3.3" - sources."path-parse-1.0.5" - sources."ajv-4.11.8" - sources."ajv-keywords-1.5.1" - sources."slice-ansi-0.0.4" - sources."co-4.6.0" - sources."os-homedir-1.0.2" - sources."ansi-styles-2.2.1" - sources."has-ansi-2.0.0" - sources."supports-color-2.0.0" - sources."graceful-readlink-1.0.1" + sources."supports-color-4.2.0" + sources."color-convert-1.9.0" + sources."color-name-1.1.2" + sources."has-flag-2.0.0" + sources."deep-equal-1.0.1" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" + sources."inherits-2.0.3" sources."minimatch-3.0.4" + sources."once-1.4.0" sources."path-is-absolute-1.0.1" + sources."wrappy-1.0.2" sources."brace-expansion-1.1.8" sources."balanced-match-1.0.0" sources."concat-map-0.0.1" sources."any-promise-1.3.0" + sources."object-assign-4.1.1" sources."thenify-all-1.6.0" sources."thenify-3.3.0" ]; @@ -24378,10 +24754,10 @@ in jshint = nodeEnv.buildNodePackage { name = "jshint"; packageName = "jshint"; - version = "2.9.4"; + version = "2.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/jshint/-/jshint-2.9.4.tgz"; - sha1 = "5e3ba97848d5290273db514aee47fe24cf592934"; + url = "https://registry.npmjs.org/jshint/-/jshint-2.9.5.tgz"; + sha1 = "1e7252915ce681b40827ee14248c46d34e9aa62c"; }; dependencies = [ sources."cli-1.0.1" @@ -24441,6 +24817,37 @@ in }; production = true; }; + js-beautify = nodeEnv.buildNodePackage { + name = "js-beautify"; + packageName = "js-beautify"; + version = "1.6.14"; + src = fetchurl { + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.6.14.tgz"; + sha1 = "d3b8f7322d02b9277d58bd238264c327e58044cd"; + }; + dependencies = [ + sources."config-chain-1.1.11" + sources."editorconfig-0.13.2" + sources."mkdirp-0.5.1" + sources."nopt-3.0.6" + sources."proto-list-1.2.4" + sources."ini-1.3.4" + sources."bluebird-3.5.0" + sources."commander-2.11.0" + sources."lru-cache-3.2.0" + sources."sigmund-1.0.1" + sources."pseudomap-1.0.2" + sources."minimist-0.0.8" + sources."abbrev-1.1.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "jsbeautifier.org for node"; + homepage = http://jsbeautifier.org/; + license = "MIT"; + }; + production = true; + }; jsontool = nodeEnv.buildNodePackage { name = "jsontool"; packageName = "jsontool"; @@ -24459,25 +24866,29 @@ in json-server = nodeEnv.buildNodePackage { name = "json-server"; packageName = "json-server"; - version = "0.10.1"; + version = "0.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/json-server/-/json-server-0.10.1.tgz"; - sha1 = "1edd299681d3960959cf3b1859d192dc19898a40"; + url = "https://registry.npmjs.org/json-server/-/json-server-0.11.2.tgz"; + sha1 = "f31b366bd3c540ecebf0cf3e0f4d04c427b21781"; }; dependencies = [ sources."body-parser-1.17.2" sources."chalk-1.1.3" - (sources."compression-1.6.2" // { + (sources."compression-1.7.0" // { dependencies = [ - sources."bytes-2.3.0" - sources."debug-2.2.0" - sources."ms-0.7.1" + sources."bytes-2.5.0" + sources."debug-2.6.8" ]; }) sources."connect-pause-0.1.1" - sources."cors-2.8.3" + sources."cors-2.8.4" sources."errorhandler-1.5.0" sources."express-4.15.3" + (sources."express-urlrewrite-1.2.0" // { + dependencies = [ + sources."path-to-regexp-1.7.0" + ]; + }) sources."json-parse-helpfulerror-1.0.3" sources."lodash-4.17.4" sources."lodash-id-0.13.0" @@ -24493,6 +24904,7 @@ in ]; }) sources."object-assign-4.1.1" + sources."please-upgrade-node-1.0.1" sources."pluralize-3.1.0" sources."request-2.81.0" sources."server-destroy-1.0.1" @@ -24531,6 +24943,7 @@ in sources."accepts-1.3.3" sources."compressible-2.0.10" sources."on-headers-1.0.1" + sources."safe-buffer-5.1.1" sources."vary-1.1.1" sources."negotiator-0.6.1" sources."escape-html-1.0.3" @@ -24555,6 +24968,7 @@ in sources."ipaddr.js-1.3.0" sources."destroy-1.0.4" sources."mime-1.3.4" + sources."isarray-0.0.1" sources."jju-1.3.0" sources."graceful-fs-4.1.11" sources."is-promise-2.1.0" @@ -24575,7 +24989,6 @@ in sources."json-stringify-safe-5.0.1" sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" - sources."safe-buffer-5.1.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.6.0" @@ -24668,9 +25081,9 @@ in sources."parse-json-2.2.0" sources."pinkie-promise-2.0.1" sources."read-all-stream-3.1.0" - (sources."readable-stream-2.2.11" // { + (sources."readable-stream-2.3.3" // { dependencies = [ - sources."safe-buffer-5.0.1" + sources."isarray-1.0.0" ]; }) sources."timed-out-3.1.3" @@ -24681,13 +25094,8 @@ in sources."is-arrayish-0.2.1" sources."pinkie-2.0.4" sources."core-util-is-1.0.2" - sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - (sources."string_decoder-1.0.2" // { - dependencies = [ - sources."safe-buffer-5.0.1" - ]; - }) + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."prepend-http-1.0.4" (sources."rc-1.2.1" // { @@ -24720,12 +25128,12 @@ in sources."read-pkg-1.1.0" sources."path-exists-2.1.0" sources."load-json-file-1.1.0" - sources."normalize-package-data-2.3.8" + sources."normalize-package-data-2.4.0" sources."path-type-1.1.0" sources."pify-2.3.0" sources."strip-bom-2.0.0" sources."is-utf8-0.2.1" - sources."hosted-git-info-2.4.2" + sources."hosted-git-info-2.5.0" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" @@ -24744,14 +25152,14 @@ in js-yaml = nodeEnv.buildNodePackage { name = "js-yaml"; packageName = "js-yaml"; - version = "3.8.4"; + version = "3.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.4.tgz"; - sha1 = "520b4564f86573ba96662af85a8cafa7b4b5a6f6"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.0.tgz"; + sha1 = "4ffbbf25c2ac963b8299dc74da7e3740de1c18ce"; }; dependencies = [ sources."argparse-1.0.9" - sources."esprima-3.1.3" + sources."esprima-4.0.0" sources."sprintf-js-1.0.3" ]; buildInputs = globalBuildInputs; @@ -24811,7 +25219,7 @@ in sources."qjobs-1.1.5" sources."range-parser-1.2.0" sources."rimraf-2.6.1" - sources."safe-buffer-5.1.0" + sources."safe-buffer-5.1.1" (sources."socket.io-1.7.3" // { dependencies = [ sources."debug-2.3.3" @@ -24821,7 +25229,7 @@ in }) sources."source-map-0.5.6" sources."tmp-0.0.31" - sources."useragent-2.1.13" + sources."useragent-2.2.1" sources."bytes-2.4.0" sources."content-type-1.0.2" sources."debug-2.6.7" @@ -24863,7 +25271,7 @@ in sources."object.omit-2.0.1" sources."parse-glob-3.0.4" sources."regex-cache-0.4.3" - sources."arr-flatten-1.0.3" + sources."arr-flatten-1.1.0" sources."expand-range-1.8.2" sources."preserve-0.2.0" sources."repeat-element-1.1.2" @@ -24893,25 +25301,17 @@ in sources."is-equal-shallow-0.1.3" sources."is-primitive-2.0.0" sources."binary-extensions-1.8.0" - (sources."readable-stream-2.2.11" // { - dependencies = [ - sources."safe-buffer-5.0.1" - ]; - }) + sources."readable-stream-2.3.3" sources."set-immediate-shim-1.0.1" sources."core-util-is-1.0.2" sources."process-nextick-args-1.0.7" - (sources."string_decoder-1.0.2" // { - dependencies = [ - sources."safe-buffer-5.0.1" - ]; - }) + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."nan-2.6.2" sources."node-pre-gyp-0.6.36" sources."mkdirp-0.5.1" sources."nopt-4.0.1" - sources."npmlog-4.1.0" + sources."npmlog-4.1.2" (sources."rc-1.2.1" // { dependencies = [ sources."minimist-1.2.0" @@ -25251,7 +25651,7 @@ in sources."oauth-0.9.15" sources."passport-oauth2-1.4.0" sources."uid2-0.0.3" - sources."sax-1.2.2" + sources."sax-1.2.4" sources."xmlbuilder-4.2.1" sources."lodash-4.17.4" ]; @@ -25274,14 +25674,14 @@ in sources."through2-2.0.3" sources."vinyl-1.2.0" sources."vinyl-fs-2.4.4" - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."xtend-4.0.1" sources."core-util-is-1.0.2" sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."clone-1.0.2" sources."clone-stats-0.0.1" @@ -25352,7 +25752,7 @@ in ]; }) sources."regex-cache-0.4.3" - sources."arr-flatten-1.0.3" + sources."arr-flatten-1.1.0" sources."expand-range-1.8.2" sources."preserve-0.2.0" sources."repeat-element-1.1.2" @@ -25545,7 +25945,7 @@ in sources."concat-stream-1.6.0" sources."graceful-fs-4.1.11" sources."mkdirp-0.5.1" - sources."normalize-package-data-2.3.8" + sources."normalize-package-data-2.4.0" sources."npm-package-arg-4.2.1" sources."once-1.4.0" sources."request-2.81.0" @@ -25555,15 +25955,15 @@ in sources."npmlog-3.1.2" sources."inherits-2.0.3" sources."typedarray-0.0.6" - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."minimist-0.0.8" - sources."hosted-git-info-2.4.2" + sources."hosted-git-info-2.5.0" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" @@ -25705,7 +26105,7 @@ in sources."minimatch-3.0.4" sources."mkdirp-0.5.1" sources."nopt-3.0.6" - sources."npmlog-4.1.0" + sources."npmlog-4.1.2" sources."osenv-0.1.4" sources."request-2.81.0" sources."rimraf-2.6.1" @@ -25728,12 +26128,12 @@ in sources."gauge-2.7.4" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."aproba-1.1.2" sources."has-unicode-2.0.1" @@ -25890,7 +26290,7 @@ in sources."decamelize-1.2.0" sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" - sources."normalize-package-data-2.3.8" + sources."normalize-package-data-2.4.0" sources."object-assign-4.1.1" sources."read-pkg-up-1.0.1" sources."redent-1.0.0" @@ -25899,7 +26299,7 @@ in sources."currently-unhandled-0.4.1" sources."signal-exit-3.0.2" sources."array-find-index-1.0.2" - sources."hosted-git-info-2.4.2" + sources."hosted-git-info-2.5.0" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" @@ -25995,7 +26395,7 @@ in ]; }) sources."nopt-4.0.1" - sources."npmlog-4.1.0" + sources."npmlog-4.1.2" sources."request-2.81.0" sources."tar-2.2.1" (sources."tar-pack-3.4.0" // { @@ -26010,11 +26410,19 @@ in sources."gauge-2.7.4" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."readable-stream-2.2.11" + (sources."readable-stream-2.3.3" // { + dependencies = [ + sources."safe-buffer-5.1.1" + ]; + }) sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."string_decoder-1.0.2" + (sources."string_decoder-1.0.3" // { + dependencies = [ + sources."safe-buffer-5.1.1" + ]; + }) sources."aproba-1.1.2" sources."has-unicode-2.0.1" sources."string-width-1.0.2" @@ -26117,7 +26525,7 @@ in dependencies = [ sources."mkdirp-0.5.1" sources."nopt-4.0.1" - sources."npmlog-4.1.0" + sources."npmlog-4.1.2" (sources."rc-1.2.1" // { dependencies = [ sources."minimist-1.2.0" @@ -26138,13 +26546,13 @@ in sources."gauge-2.7.4" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."core-util-is-1.0.2" sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."aproba-1.1.2" sources."has-unicode-2.0.1" @@ -26295,7 +26703,7 @@ in sources."object.omit-2.0.1" sources."parse-glob-3.0.4" sources."regex-cache-0.4.3" - sources."arr-flatten-1.0.3" + sources."arr-flatten-1.1.0" sources."expand-range-1.8.2" sources."preserve-0.2.0" sources."repeat-element-1.1.2" @@ -26326,18 +26734,18 @@ in sources."is-primitive-2.0.0" sources."binary-extensions-1.8.0" sources."graceful-fs-4.1.11" - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."set-immediate-shim-1.0.1" sources."core-util-is-1.0.2" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."nan-2.6.2" sources."node-pre-gyp-0.6.36" sources."mkdirp-0.5.1" sources."nopt-4.0.1" - sources."npmlog-4.1.0" + sources."npmlog-4.1.2" (sources."rc-1.2.1" // { dependencies = [ sources."minimist-1.2.0" @@ -26523,61 +26931,55 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "0.16.2"; + version = "0.17.4"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-0.16.2.tgz"; - sha1 = "3f77d608f1b0e89907af3f31e2c3eb8844a2b17b"; + url = "https://registry.npmjs.org/node-red/-/node-red-0.17.4.tgz"; + sha1 = "087a2819f6b59700166be29b04946ad40ac513d2"; }; dependencies = [ sources."basic-auth-1.1.0" - sources."bcryptjs-2.4.0" - (sources."body-parser-1.15.2" // { - dependencies = [ - sources."raw-body-2.1.7" - ]; - }) + sources."bcryptjs-2.4.3" + sources."body-parser-1.17.2" sources."cheerio-0.22.0" - sources."clone-2.1.0" + sources."clone-2.1.1" + sources."cookie-0.3.1" sources."cookie-parser-1.4.3" - sources."cors-2.8.1" + sources."cors-2.8.3" sources."cron-1.2.1" - sources."express-4.14.0" - (sources."follow-redirects-1.2.1" // { - dependencies = [ - sources."debug-2.6.8" - sources."ms-2.0.0" - ]; - }) + sources."express-4.15.3" + sources."follow-redirects-1.2.4" sources."fs-extra-1.0.0" sources."fs.notify-0.0.4" + sources."hash-sum-1.0.2" sources."i18next-1.10.6" sources."is-utf8-0.2.1" - sources."js-yaml-3.7.0" + sources."js-yaml-3.8.4" sources."json-stringify-safe-5.0.1" - sources."jsonata-1.0.10" + sources."jsonata-1.2.6" sources."media-typer-0.3.0" - sources."mqtt-2.2.1" + sources."mqtt-2.9.0" + (sources."multer-1.3.0" // { + dependencies = [ + sources."object-assign-3.0.0" + ]; + }) sources."mustache-2.3.0" sources."nopt-3.0.6" - sources."oauth2orize-1.7.0" + sources."oauth2orize-1.8.0" sources."on-headers-1.0.1" sources."passport-0.3.2" sources."passport-http-bearer-1.0.1" sources."passport-oauth2-client-password-0.1.2" - (sources."raw-body-2.2.0" // { - dependencies = [ - sources."iconv-lite-0.4.15" - ]; - }) + sources."raw-body-2.2.0" sources."semver-5.3.0" sources."sentiment-2.1.0" - (sources."uglify-js-2.7.5" // { + sources."uglify-js-3.0.20" + sources."when-3.7.8" + (sources."ws-1.1.1" // { dependencies = [ - sources."async-0.2.10" + sources."ultron-1.0.2" ]; }) - sources."when-3.7.7" - sources."ws-1.1.1" sources."xml2js-0.4.17" sources."node-red-node-feedparser-0.1.8" sources."node-red-node-email-0.1.23" @@ -26587,7 +26989,6 @@ in sources."caseless-0.12.0" sources."form-data-2.1.4" sources."har-validator-4.2.1" - sources."qs-6.4.0" sources."tunnel-agent-0.6.0" ]; }) @@ -26595,19 +26996,18 @@ in sources."bcrypt-1.0.2" sources."bytes-2.4.0" sources."content-type-1.0.2" - sources."debug-2.2.0" + sources."debug-2.6.7" sources."depd-1.1.0" - sources."http-errors-1.5.1" - sources."iconv-lite-0.4.13" + sources."http-errors-1.6.1" + sources."iconv-lite-0.4.15" sources."on-finished-2.3.0" - sources."qs-6.2.0" + sources."qs-6.4.0" sources."type-is-1.6.15" - sources."ms-0.7.1" + sources."ms-2.0.0" sources."inherits-2.0.3" - sources."setprototypeof-1.0.2" + sources."setprototypeof-1.0.3" sources."statuses-1.3.1" sources."ee-first-1.1.1" - sources."unpipe-1.0.0" sources."mime-types-2.1.15" sources."mime-db-1.27.0" sources."css-select-1.2.0" @@ -26636,41 +27036,37 @@ in sources."nth-check-1.0.1" sources."domelementtype-1.3.0" sources."domhandler-2.4.1" - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" - sources."cookie-0.3.1" sources."cookie-signature-1.0.6" + sources."object-assign-4.1.1" sources."vary-1.1.1" sources."moment-timezone-0.5.13" sources."moment-2.18.1" sources."accepts-1.3.3" sources."array-flatten-1.1.1" - sources."content-disposition-0.5.1" + sources."content-disposition-0.5.2" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" - sources."etag-1.7.0" - sources."finalhandler-0.5.0" - sources."fresh-0.3.0" + sources."etag-1.8.0" + sources."finalhandler-1.0.3" + sources."fresh-0.5.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."parseurl-1.3.1" sources."path-to-regexp-0.1.7" sources."proxy-addr-1.1.4" sources."range-parser-1.2.0" - sources."send-0.14.1" - (sources."serve-static-1.11.2" // { - dependencies = [ - sources."send-0.14.2" - sources."ms-0.7.2" - ]; - }) + sources."send-0.15.3" + sources."serve-static-1.12.3" sources."utils-merge-1.0.0" sources."negotiator-0.6.1" + sources."unpipe-1.0.0" sources."forwarded-0.1.0" sources."ipaddr.js-1.3.0" sources."destroy-1.0.4" @@ -26685,18 +27081,26 @@ in sources."json5-0.2.0" sources."keygrip-1.0.1" sources."argparse-1.0.9" - sources."esprima-2.7.3" + sources."esprima-3.1.3" sources."sprintf-js-1.0.3" sources."commist-1.0.0" sources."concat-stream-1.6.0" sources."end-of-stream-1.4.0" sources."help-me-1.1.0" sources."minimist-1.2.0" - sources."mqtt-packet-5.3.0" + sources."mqtt-packet-5.4.0" sources."pump-1.0.2" sources."reinterval-1.1.0" sources."split2-2.1.1" - sources."websocket-stream-3.3.3" + (sources."websocket-stream-5.0.0" // { + dependencies = [ + (sources."ws-3.0.0" // { + dependencies = [ + sources."safe-buffer-5.0.1" + ]; + }) + ]; + }) sources."xtend-4.0.1" sources."leven-1.0.2" sources."typedarray-0.0.6" @@ -26742,29 +27146,37 @@ in sources."through2-filter-2.0.0" sources."jsonify-0.0.0" sources."bl-1.2.1" + sources."ultron-1.1.0" + sources."append-field-0.1.0" + (sources."busboy-0.2.14" // { + dependencies = [ + sources."readable-stream-1.1.14" + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" + ]; + }) + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + (sources."dicer-0.2.5" // { + dependencies = [ + sources."readable-stream-1.1.14" + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" + ]; + }) + sources."streamsearch-0.1.2" sources."abbrev-1.1.0" sources."uid2-0.0.3" sources."passport-strategy-1.0.0" sources."pause-0.0.1" + sources."commander-2.9.0" sources."source-map-0.5.6" - sources."uglify-to-browserify-1.0.2" - sources."yargs-3.10.0" - sources."camelcase-1.2.1" - sources."cliui-2.1.0" - sources."decamelize-1.2.0" - sources."window-size-0.1.0" - sources."center-align-0.1.3" - sources."right-align-0.1.3" - sources."wordwrap-0.0.2" - sources."align-text-0.1.4" - sources."lazy-cache-1.0.4" - sources."kind-of-3.2.2" - sources."longest-1.0.1" - sources."repeat-string-1.6.1" - sources."is-buffer-1.1.5" + sources."graceful-readlink-1.0.1" sources."options-0.0.6" - sources."ultron-1.0.2" - sources."sax-1.2.2" + sources."sax-1.2.4" sources."xmlbuilder-4.2.1" sources."lodash-4.17.4" (sources."feedparser-1.1.3" // { @@ -26778,6 +27190,7 @@ in (sources."request-2.74.0" // { dependencies = [ sources."bl-1.1.2" + sources."qs-6.2.3" sources."readable-stream-2.0.6" sources."string_decoder-0.10.31" ]; @@ -26791,7 +27204,7 @@ in sources."forever-agent-0.6.1" (sources."form-data-1.0.1" // { dependencies = [ - sources."async-2.4.1" + sources."async-2.5.0" ]; }) sources."har-validator-2.0.6" @@ -26806,7 +27219,6 @@ in sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" sources."chalk-1.1.3" - sources."commander-2.9.0" sources."is-my-json-valid-2.16.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" @@ -26815,7 +27227,6 @@ in sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" sources."ansi-regex-2.1.1" - sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" sources."jsonpointer-4.0.1" @@ -26889,6 +27300,7 @@ in sources."minimist-0.0.10" ]; }) + sources."wordwrap-0.0.3" (sources."mimelib-0.3.1" // { dependencies = [ sources."addressparser-1.0.1" @@ -26913,23 +27325,19 @@ in sources."caseless-0.12.0" sources."form-data-2.1.4" sources."har-validator-4.2.1" - sources."qs-6.4.0" sources."tunnel-agent-0.6.0" ]; }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - sources."npmlog-4.1.0" + sources."npmlog-4.1.2" sources."rc-1.1.7" sources."rimraf-2.5.4" sources."tar-2.2.1" (sources."tar-pack-3.3.0" // { dependencies = [ + sources."debug-2.2.0" sources."once-1.3.3" sources."readable-stream-2.1.5" + sources."ms-0.7.1" sources."string_decoder-0.10.31" ]; }) @@ -26940,7 +27348,6 @@ in sources."delegates-1.0.0" sources."aproba-1.1.2" sources."has-unicode-2.0.1" - sources."object-assign-4.1.1" sources."signal-exit-3.0.2" sources."string-width-1.0.2" sources."wide-align-1.1.2" @@ -27093,25 +27500,30 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "5.0.3"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-5.0.3.tgz"; - sha1 = "abd1c397ede6edd8f93453e7ad2b7a1887861856"; + url = "https://registry.npmjs.org/npm/-/npm-5.3.0.tgz"; + sha1 = "e2ae85ef09d53f7f570a05578692899bf7879f17"; }; dependencies = [ sources."JSONStream-1.3.1" sources."abbrev-1.1.0" - sources."ansi-regex-2.1.1" + sources."ansi-regex-3.0.0" sources."ansicolors-0.3.2" sources."ansistyles-0.1.3" sources."aproba-1.1.2" sources."archy-1.0.0" sources."bluebird-3.5.0" - sources."cacache-9.2.8" + sources."cacache-9.2.9" sources."call-limit-1.1.0" sources."chownr-1.0.1" sources."cmd-shim-2.0.2" - sources."columnify-1.5.4" + (sources."columnify-1.5.4" // { + dependencies = [ + sources."strip-ansi-3.0.1" + sources."ansi-regex-2.1.1" + ]; + }) sources."config-chain-1.1.11" sources."detect-indent-5.0.0" sources."dezalgo-1.0.3" @@ -27123,20 +27535,21 @@ in sources."glob-7.1.2" sources."graceful-fs-4.1.11" sources."has-unicode-2.0.1" - sources."hosted-git-info-2.4.2" + sources."hosted-git-info-2.5.0" sources."iferr-0.1.5" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.4" sources."init-package-json-1.10.1" sources."lazy-property-1.0.0" + sources."libnpx-9.2.0" sources."lockfile-1.0.3" sources."lodash._baseuniq-4.6.0" sources."lodash.clonedeep-4.5.0" sources."lodash.union-4.6.0" sources."lodash.uniq-4.5.0" sources."lodash.without-4.4.0" - sources."lru-cache-4.0.2" + sources."lru-cache-4.1.1" sources."mississippi-1.3.0" sources."mkdirp-0.5.1" sources."move-concurrently-1.0.1" @@ -27146,33 +27559,29 @@ in ]; }) sources."nopt-4.0.1" - sources."normalize-package-data-2.3.8" + sources."normalize-package-data-2.4.0" sources."npm-cache-filename-1.0.2" sources."npm-install-checks-3.0.0" sources."npm-package-arg-5.1.2" - sources."npm-registry-client-8.3.0" + sources."npm-registry-client-8.4.0" sources."npm-user-validate-1.0.0" - sources."npmlog-4.1.0" + sources."npmlog-4.1.2" sources."once-1.4.0" sources."opener-1.4.3" sources."osenv-0.1.4" - sources."pacote-2.7.36" + sources."pacote-2.7.38" sources."path-is-inside-1.0.2" sources."promise-inflight-1.0.1" sources."read-1.0.7" sources."read-cmd-shim-1.0.1" sources."read-installed-4.0.3" - sources."read-package-json-2.0.5" + sources."read-package-json-2.0.10" sources."read-package-tree-5.1.6" - (sources."readable-stream-2.2.11" // { - dependencies = [ - sources."safe-buffer-5.0.1" - ]; - }) + sources."readable-stream-2.3.3" sources."request-2.81.0" sources."retry-0.10.1" sources."rimraf-2.6.1" - sources."safe-buffer-5.1.0" + sources."safe-buffer-5.1.1" sources."semver-5.3.0" sources."sha-2.0.1" sources."slide-1.1.6" @@ -27186,17 +27595,18 @@ in ]; }) sources."ssri-4.1.6" - sources."strip-ansi-3.0.1" + sources."strip-ansi-4.0.0" sources."tar-2.2.1" sources."text-table-0.2.0" sources."uid-number-0.0.6" sources."umask-1.1.0" sources."unique-filename-1.1.0" sources."unpipe-1.0.0" - sources."update-notifier-2.1.0" - sources."uuid-3.0.1" + sources."update-notifier-2.2.0" + sources."uuid-3.1.0" sources."validate-npm-package-name-3.0.0" sources."which-1.2.14" + sources."worker-farm-1.4.1" sources."wrappy-1.0.2" sources."write-file-atomic-2.1.0" sources."debuglog-1.0.1" @@ -27216,7 +27626,7 @@ in sources."defaults-1.0.3" sources."clone-1.0.2" sources."proto-list-1.2.4" - sources."asap-2.0.5" + sources."asap-2.0.6" sources."fstream-ignore-1.0.5" sources."minimatch-3.0.4" sources."brace-expansion-1.1.8" @@ -27225,6 +27635,69 @@ in sources."fs.realpath-1.0.0" sources."path-is-absolute-1.0.1" sources."promzard-0.3.0" + sources."dotenv-4.0.0" + sources."yargs-8.0.2" + sources."camelcase-4.1.0" + (sources."cliui-3.2.0" // { + dependencies = [ + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + sources."ansi-regex-2.1.1" + ]; + }) + sources."decamelize-1.2.0" + sources."get-caller-file-1.0.2" + sources."os-locale-2.0.0" + sources."read-pkg-up-2.0.0" + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."set-blocking-2.0.0" + (sources."string-width-2.1.0" // { + dependencies = [ + sources."is-fullwidth-code-point-2.0.0" + ]; + }) + sources."which-module-2.0.0" + sources."yargs-parser-7.0.0" + (sources."wrap-ansi-2.1.0" // { + dependencies = [ + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + sources."ansi-regex-2.1.1" + ]; + }) + sources."code-point-at-1.1.0" + sources."is-fullwidth-code-point-1.0.0" + sources."number-is-nan-1.0.1" + sources."execa-0.5.1" + sources."lcid-1.0.0" + sources."mem-1.1.0" + sources."cross-spawn-4.0.2" + sources."get-stream-2.3.1" + sources."is-stream-1.1.0" + sources."npm-run-path-2.0.2" + sources."p-finally-1.0.0" + sources."signal-exit-3.0.2" + sources."strip-eof-1.0.0" + sources."object-assign-4.1.1" + sources."pinkie-promise-2.0.1" + sources."pinkie-2.0.4" + sources."path-key-2.0.1" + sources."invert-kv-1.0.0" + sources."mimic-fn-1.1.0" + sources."find-up-2.1.0" + sources."read-pkg-2.0.0" + sources."locate-path-2.0.0" + sources."p-locate-2.0.0" + sources."path-exists-3.0.0" + sources."p-limit-1.1.0" + sources."load-json-file-2.0.0" + sources."path-type-2.0.0" + sources."parse-json-2.2.0" + sources."pify-2.3.0" + sources."strip-bom-3.0.0" + sources."error-ex-1.3.1" + sources."is-arrayish-0.2.1" sources."lodash._createset-4.0.3" sources."lodash._root-3.0.1" sources."pseudomap-1.0.2" @@ -27255,39 +27728,41 @@ in sources."builtin-modules-1.1.1" sources."are-we-there-yet-1.1.4" sources."console-control-strings-1.1.0" - sources."gauge-2.7.4" - sources."set-blocking-2.0.0" + (sources."gauge-2.7.4" // { + dependencies = [ + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + sources."ansi-regex-2.1.1" + ]; + }) sources."delegates-1.0.0" - sources."object-assign-4.1.1" - sources."signal-exit-3.0.2" - sources."string-width-1.0.2" - sources."wide-align-1.1.2" - sources."code-point-at-1.1.0" - sources."is-fullwidth-code-point-1.0.0" - sources."number-is-nan-1.0.1" + (sources."wide-align-1.1.2" // { + dependencies = [ + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + sources."ansi-regex-2.1.1" + ]; + }) sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" - sources."make-fetch-happen-2.4.12" - sources."npm-pick-manifest-1.0.3" + sources."make-fetch-happen-2.4.13" + sources."npm-pick-manifest-1.0.4" sources."promise-retry-1.1.1" sources."protoduck-4.0.0" sources."tar-fs-1.15.3" sources."tar-stream-1.5.4" - sources."agentkeepalive-3.2.0" + sources."agentkeepalive-3.3.0" sources."http-cache-semantics-3.7.3" - sources."http-proxy-agent-1.0.0" - sources."https-proxy-agent-1.0.0" + sources."http-proxy-agent-2.0.0" + sources."https-proxy-agent-2.0.0" sources."node-fetch-npm-2.0.1" - sources."socks-proxy-agent-2.1.1" + sources."socks-proxy-agent-3.0.0" sources."humanize-ms-1.2.1" sources."ms-2.0.0" - (sources."agent-base-2.1.1" // { - dependencies = [ - sources."semver-5.0.3" - ]; - }) - sources."extend-3.0.1" + sources."agent-base-4.1.0" sources."debug-2.6.8" + sources."es6-promisify-5.0.0" + sources."es6-promise-4.1.1" sources."encoding-0.1.12" sources."json-parse-helpfulerror-1.0.3" sources."iconv-lite-0.4.18" @@ -27303,16 +27778,13 @@ in sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - (sources."string_decoder-1.0.2" // { - dependencies = [ - sources."safe-buffer-5.0.1" - ]; - }) + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" sources."caseless-0.12.0" sources."combined-stream-1.0.5" + sources."extend-3.0.1" sources."forever-agent-0.6.1" sources."form-data-2.1.4" sources."har-validator-4.2.1" @@ -27373,52 +27845,69 @@ in sources."stream-iterate-1.2.0" sources."block-stream-0.0.9" sources."unique-slug-2.0.0" - (sources."boxen-1.1.0" // { + (sources."boxen-1.2.0" // { dependencies = [ - sources."string-width-2.0.0" - sources."is-fullwidth-code-point-2.0.0" + sources."chalk-2.0.1" + ]; + }) + (sources."chalk-1.1.3" // { + dependencies = [ + sources."ansi-styles-2.2.1" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."ansi-regex-2.1.1" ]; }) - sources."chalk-1.1.3" sources."configstore-3.1.0" + sources."import-lazy-2.1.0" sources."is-npm-1.0.0" sources."latest-version-3.1.0" - sources."lazy-req-2.0.0" sources."semver-diff-2.1.0" sources."xdg-basedir-3.0.0" - (sources."ansi-align-2.0.0" // { + sources."ansi-align-2.0.0" + sources."cli-boxes-1.0.0" + (sources."term-size-1.2.0" // { dependencies = [ - sources."string-width-2.0.0" - sources."is-fullwidth-code-point-2.0.0" + sources."execa-0.7.0" + sources."cross-spawn-5.1.0" + sources."get-stream-3.0.0" ]; }) - sources."camelcase-4.1.0" - sources."cli-boxes-1.0.0" - sources."term-size-0.1.1" - sources."widest-line-1.0.0" - sources."execa-0.4.0" - sources."cross-spawn-async-2.2.5" - sources."is-stream-1.1.0" - sources."npm-run-path-1.0.0" - sources."path-key-1.0.0" - sources."strip-eof-1.0.0" - sources."ansi-styles-2.2.1" + (sources."widest-line-1.0.0" // { + dependencies = [ + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + sources."ansi-regex-2.1.1" + ]; + }) + sources."ansi-styles-3.1.0" sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."supports-color-2.0.0" + sources."supports-color-4.2.0" + sources."color-convert-1.9.0" + sources."color-name-1.1.2" + sources."has-flag-2.0.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + (sources."has-ansi-2.0.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) sources."dot-prop-4.1.1" sources."make-dir-1.0.0" sources."unique-string-1.0.0" sources."is-obj-1.0.1" - sources."pify-2.3.0" sources."crypto-random-string-1.0.0" sources."package-json-4.0.1" - sources."got-6.7.1" + (sources."got-6.7.1" // { + dependencies = [ + sources."get-stream-3.0.0" + ]; + }) sources."registry-auth-token-3.3.1" sources."registry-url-3.1.0" sources."create-error-class-3.0.2" sources."duplexer3-0.1.4" - sources."get-stream-3.0.0" sources."is-redirect-1.0.0" sources."is-retry-allowed-1.1.0" sources."lowercase-keys-1.0.0" @@ -27436,6 +27925,8 @@ in sources."strip-json-comments-2.0.1" sources."builtins-1.0.3" sources."isexe-2.0.0" + sources."errno-0.1.4" + sources."prr-0.0.0" sources."spdx-correct-1.0.2" sources."spdx-expression-parse-1.0.4" sources."spdx-license-ids-1.2.2" @@ -27496,7 +27987,7 @@ in sources."rimraf-2.6.1" sources."retry-0.6.0" sources."couch-login-0.1.20" - sources."npmlog-4.1.0" + sources."npmlog-4.1.2" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" sources."caseless-0.12.0" @@ -27514,7 +28005,7 @@ in sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" sources."qs-6.4.0" - sources."safe-buffer-5.1.0" + sources."safe-buffer-5.1.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.6.0" @@ -27577,19 +28068,11 @@ in sources."gauge-2.7.4" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - (sources."readable-stream-2.2.11" // { - dependencies = [ - sources."safe-buffer-5.0.1" - ]; - }) + sources."readable-stream-2.3.3" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - (sources."string_decoder-1.0.2" // { - dependencies = [ - sources."safe-buffer-5.0.1" - ]; - }) + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."aproba-1.1.2" sources."has-unicode-2.0.1" @@ -27641,17 +28124,17 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "2.11.3"; + version = "2.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.11.3.tgz"; - sha1 = "5e0172857f89004340b1b9afc0e9acb3bc56d440"; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.12.1.tgz"; + sha1 = "9a41006f5186e8a59da7fd2b466fee9e896d865d"; }; dependencies = [ sources."bluebird-3.5.0" sources."chalk-1.1.3" sources."cint-8.2.1" sources."cli-table-0.3.1" - sources."commander-2.9.0" + sources."commander-2.11.0" sources."fast-diff-1.1.1" sources."find-up-1.1.2" sources."get-stdin-5.0.1" @@ -27667,7 +28150,7 @@ in sources."require-dir-0.3.2" sources."semver-5.3.0" sources."semver-utils-1.1.1" - (sources."snyk-1.34.4" // { + (sources."snyk-1.36.2" // { dependencies = [ sources."update-notifier-0.5.0" sources."latest-version-1.0.1" @@ -27678,13 +28161,30 @@ in sources."timed-out-2.0.0" ]; }) - sources."spawn-please-0.2.0" - (sources."update-notifier-1.0.3" // { + sources."spawn-please-0.3.0" + (sources."update-notifier-2.2.0" // { dependencies = [ - sources."boxen-0.6.0" - sources."configstore-2.1.0" - sources."camelcase-2.1.1" - sources."uuid-2.0.3" + (sources."boxen-1.2.0" // { + dependencies = [ + sources."chalk-2.0.1" + ]; + }) + sources."configstore-3.1.0" + sources."latest-version-3.1.0" + sources."xdg-basedir-3.0.0" + sources."camelcase-4.1.0" + sources."string-width-2.1.0" + sources."ansi-styles-3.1.0" + sources."supports-color-4.2.0" + sources."is-fullwidth-code-point-2.0.0" + sources."strip-ansi-4.0.0" + sources."ansi-regex-3.0.0" + sources."dot-prop-4.1.1" + sources."write-file-atomic-2.1.0" + sources."package-json-4.0.1" + sources."got-6.7.1" + sources."timed-out-4.0.1" + sources."unzip-response-2.0.1" ]; }) sources."ansi-styles-2.2.1" @@ -27694,7 +28194,6 @@ in sources."supports-color-2.0.0" sources."ansi-regex-2.1.1" sources."colors-1.0.3" - sources."graceful-readlink-1.0.1" sources."path-exists-2.1.0" sources."pinkie-promise-2.0.1" sources."pinkie-2.0.4" @@ -27704,7 +28203,7 @@ in sources."ansistyles-0.1.3" sources."aproba-1.0.4" sources."archy-1.0.0" - sources."asap-2.0.5" + sources."asap-2.0.6" sources."chownr-1.0.1" sources."cmd-shim-2.0.2" sources."columnify-1.5.4" @@ -27764,7 +28263,7 @@ in sources."read-1.0.7" sources."read-cmd-shim-1.0.1" sources."read-installed-4.0.3" - sources."read-package-json-2.0.5" + sources."read-package-json-2.0.10" sources."read-package-tree-5.1.6" (sources."readable-stream-2.1.5" // { dependencies = [ @@ -27837,21 +28336,21 @@ in sources."es6-symbol-3.1.1" sources."ms-2.0.0" sources."d-1.0.0" - sources."es5-ext-0.10.23" + sources."es5-ext-0.10.24" sources."es6-iterator-2.0.1" sources."is-builtin-module-1.0.0" sources."builtin-modules-1.1.1" (sources."concat-stream-1.6.0" // { dependencies = [ - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" ]; }) sources."typedarray-0.0.6" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" @@ -27949,9 +28448,11 @@ in sources."open-0.0.5" sources."os-name-1.0.3" sources."snyk-config-1.0.1" + sources."snyk-gradle-plugin-1.0.2" sources."snyk-module-1.8.1" + sources."snyk-mvn-plugin-1.0.0" sources."snyk-policy-1.7.1" - sources."snyk-python-plugin-1.0.0" + sources."snyk-python-plugin-1.2.2" (sources."snyk-recursive-readdir-2.0.0" // { dependencies = [ sources."minimatch-3.0.2" @@ -27963,6 +28464,7 @@ in sources."minimist-1.2.0" ]; }) + sources."snyk-sbt-plugin-1.0.2" sources."snyk-tree-1.0.0" sources."snyk-try-require-1.2.0" (sources."tempfile-1.1.1" // { @@ -28015,9 +28517,26 @@ in sources."longest-1.0.1" sources."repeat-string-1.6.1" sources."is-buffer-1.1.5" - sources."js-yaml-3.8.4" + sources."clone-deep-0.3.0" + sources."for-own-1.0.0" + sources."is-plain-object-2.0.4" + (sources."shallow-clone-0.1.2" // { + dependencies = [ + sources."kind-of-2.0.1" + sources."lazy-cache-0.2.7" + ]; + }) + sources."for-in-1.0.2" + sources."isobject-3.0.1" + sources."is-extendable-0.1.1" + (sources."mixin-object-2.0.1" // { + dependencies = [ + sources."for-in-0.1.8" + ]; + }) + sources."js-yaml-3.9.0" sources."argparse-1.0.9" - sources."esprima-3.1.3" + sources."esprima-4.0.0" sources."sprintf-js-1.0.3" (sources."clite-0.3.0" // { dependencies = [ @@ -28094,7 +28613,7 @@ in sources."is-utf8-0.2.1" sources."pseudomap-1.0.2" sources."yallist-2.1.2" - sources."promise-7.3.0" + sources."promise-7.3.1" sources."string-length-1.0.1" sources."duplexify-3.5.0" sources."infinity-agent-2.0.3" @@ -28106,9 +28625,33 @@ in }) sources."stream-shift-1.0.0" sources."querystring-0.2.0" - sources."lazy-req-1.1.0" - sources."ansi-align-1.1.0" + sources."import-lazy-2.1.0" + (sources."ansi-align-2.0.0" // { + dependencies = [ + sources."string-width-2.1.0" + sources."is-fullwidth-code-point-2.0.0" + sources."strip-ansi-4.0.0" + sources."ansi-regex-3.0.0" + ]; + }) sources."cli-boxes-1.0.0" + sources."term-size-1.2.0" + sources."color-convert-1.9.0" + sources."color-name-1.1.2" + sources."has-flag-2.0.0" + sources."execa-0.7.0" + sources."cross-spawn-5.1.0" + sources."get-stream-3.0.0" + sources."npm-run-path-2.0.2" + sources."p-finally-1.0.0" + sources."strip-eof-1.0.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."path-key-2.0.1" + sources."make-dir-1.0.0" + sources."unique-string-1.0.0" + sources."crypto-random-string-1.0.0" + sources."duplexer3-0.1.4" ]; buildInputs = globalBuildInputs; meta = { @@ -28134,11 +28677,10 @@ in sources."content-type-1.0.2" ]; }) - (sources."compression-1.6.2" // { + (sources."compression-1.7.0" // { dependencies = [ - sources."bytes-2.3.0" - sources."debug-2.2.0" - sources."ms-0.7.1" + sources."bytes-2.5.0" + sources."debug-2.6.8" ]; }) sources."connect-busboy-0.0.2" @@ -28160,7 +28702,7 @@ in sources."ms-0.7.1" ]; }) - sources."js-yaml-3.8.4" + sources."js-yaml-3.9.0" sources."mediawiki-title-0.5.6" sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" sources."node-uuid-1.4.8" @@ -28189,7 +28731,7 @@ in sources."camelcase-3.0.0" ]; }) - sources."asap-2.0.5" + sources."asap-2.0.6" sources."is-arguments-1.0.2" sources."bytes-2.4.0" sources."debug-2.6.7" @@ -28212,6 +28754,7 @@ in sources."accepts-1.3.3" sources."compressible-2.0.10" sources."on-headers-1.0.1" + sources."safe-buffer-5.1.1" sources."vary-1.1.1" sources."busboy-0.2.14" sources."dicer-0.2.5" @@ -28249,7 +28792,7 @@ in ]; }) sources."object.assign-4.0.4" - sources."promise-7.3.0" + sources."promise-7.3.1" sources."inflight-1.0.6" sources."minimatch-3.0.4" sources."once-1.4.0" @@ -28291,7 +28834,7 @@ in sources."define-properties-1.1.2" sources."foreach-2.0.5" sources."argparse-1.0.9" - sources."esprima-3.1.3" + sources."esprima-4.0.0" sources."sprintf-js-1.0.3" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" @@ -28308,7 +28851,6 @@ in sources."json-stringify-safe-5.0.1" sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" - sources."safe-buffer-5.1.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.6.0" @@ -28361,10 +28903,9 @@ in sources."hot-shots-4.5.0" (sources."limitation-0.2.0" // { dependencies = [ - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."isarray-1.0.0" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."string_decoder-1.0.3" ]; }) sources."dnscache-1.0.1" @@ -28391,29 +28932,26 @@ in sources."hat-0.0.3" (sources."kad-fs-0.0.4" // { dependencies = [ - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."isarray-1.0.0" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."string_decoder-1.0.3" ]; }) sources."kad-localstorage-0.0.7" (sources."kad-memstore-0.0.1" // { dependencies = [ - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."isarray-1.0.0" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."string_decoder-1.0.3" ]; }) sources."lodash-3.10.1" sources."merge-1.2.0" (sources."msgpack5-3.4.1" // { dependencies = [ - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."isarray-1.0.0" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."string_decoder-1.0.3" ]; }) sources."process-nextick-args-1.0.7" @@ -28421,10 +28959,9 @@ in sources."dom-storage-2.0.2" (sources."bl-1.2.1" // { dependencies = [ - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."isarray-1.0.0" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."string_decoder-1.0.3" ]; }) sources."get-caller-file-1.0.2" @@ -28452,7 +28989,7 @@ in sources."pinkie-promise-2.0.1" sources."pinkie-2.0.4" sources."load-json-file-1.1.0" - sources."normalize-package-data-2.3.8" + sources."normalize-package-data-2.4.0" sources."path-type-1.1.0" sources."parse-json-2.2.0" sources."pify-2.3.0" @@ -28460,7 +28997,7 @@ in sources."error-ex-1.3.1" sources."is-arrayish-0.2.1" sources."is-utf8-0.2.1" - sources."hosted-git-info-2.4.2" + sources."hosted-git-info-2.5.0" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" @@ -28485,10 +29022,10 @@ in peerflix = nodeEnv.buildNodePackage { name = "peerflix"; packageName = "peerflix"; - version = "0.36.3"; + version = "0.37.0"; src = fetchurl { - url = "https://registry.npmjs.org/peerflix/-/peerflix-0.36.3.tgz"; - sha1 = "7100ab8190192a19633c98a2ea124e089a68c19e"; + url = "https://registry.npmjs.org/peerflix/-/peerflix-0.37.0.tgz"; + sha1 = "535019f8dcbae8932bd38b28533bf61c0f979048"; }; dependencies = [ sources."airplayer-2.0.0" @@ -28527,7 +29064,7 @@ in sources."bencode-0.7.0" ]; }) - sources."windows-no-runnable-0.0.6" + sources."winreg-1.2.3" sources."xtend-4.0.1" sources."airplay-protocol-2.0.2" sources."appendable-cli-menu-2.0.0" @@ -28544,12 +29081,12 @@ in sources."big-integer-1.6.23" sources."inherits-2.0.3" sources."typedarray-0.0.6" - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."base64-js-0.0.8" sources."xmlbuilder-4.0.0" @@ -28588,7 +29125,7 @@ in sources."decamelize-1.2.0" sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" - sources."normalize-package-data-2.3.8" + sources."normalize-package-data-2.4.0" sources."object-assign-4.1.1" sources."read-pkg-up-1.0.1" sources."redent-1.0.0" @@ -28597,7 +29134,7 @@ in sources."currently-unhandled-0.4.1" sources."signal-exit-3.0.2" sources."array-find-index-1.0.2" - sources."hosted-git-info-2.4.2" + sources."hosted-git-info-2.5.0" sources."is-builtin-module-1.0.0" sources."semver-5.3.0" sources."validate-npm-package-license-3.0.1" @@ -28645,11 +29182,11 @@ in sources."wordwrap-0.0.3" sources."blob-to-buffer-1.2.6" sources."magnet-uri-5.1.7" - sources."parse-torrent-file-4.0.2" + sources."parse-torrent-file-4.0.3" sources."simple-get-2.6.0" sources."thirty-two-1.0.2" sources."uniq-1.0.1" - sources."bencode-0.11.0" + sources."bencode-1.0.0" sources."simple-sha1-2.1.0" sources."rusha-0.8.6" sources."simple-concat-1.0.0" @@ -28682,11 +29219,7 @@ in sources."minimist-0.0.8" ]; }) - (sources."randombytes-2.0.5" // { - dependencies = [ - sources."safe-buffer-5.1.0" - ]; - }) + sources."randombytes-2.0.5" sources."run-parallel-1.1.6" sources."buffer-alloc-unsafe-1.0.0" sources."debug-2.6.8" @@ -28732,8 +29265,8 @@ in }) sources."lru-2.0.1" sources."buffer-equal-0.0.1" - sources."k-rpc-socket-1.6.2" - sources."bn.js-4.11.6" + sources."k-rpc-socket-1.7.1" + sources."bn.js-4.11.7" sources."compact2string-1.4.0" sources."random-iterate-1.0.1" sources."run-series-1.1.4" @@ -28741,6 +29274,7 @@ in (sources."simple-websocket-4.3.1" // { dependencies = [ sources."ws-2.3.1" + sources."safe-buffer-5.0.1" ]; }) sources."string2compact-1.2.2" @@ -28749,7 +29283,7 @@ in sources."ultron-1.0.2" ]; }) - sources."ipaddr.js-1.3.0" + sources."ipaddr.js-1.4.0" sources."get-browser-rtc-1.0.2" sources."ultron-1.1.0" sources."addr-to-ip-port-1.4.2" @@ -29047,7 +29581,7 @@ in sources."run-parallel-1.1.6" sources."thunky-1.0.2" sources."buffer-alloc-unsafe-1.0.0" - sources."safe-buffer-5.1.0" + sources."safe-buffer-5.1.1" sources."ip-1.1.5" sources."fifo-0.1.4" (sources."peer-wire-protocol-0.7.0" // { @@ -29083,31 +29617,30 @@ in }) sources."lru-2.0.1" sources."buffer-equal-0.0.1" - (sources."k-rpc-socket-1.6.2" // { + (sources."k-rpc-socket-1.7.1" // { dependencies = [ - sources."bencode-0.11.0" + sources."bencode-1.0.0" ]; }) - sources."bn.js-4.11.6" + sources."bn.js-4.11.7" sources."compact2string-1.4.0" sources."random-iterate-1.0.1" sources."run-series-1.1.4" sources."simple-get-2.6.0" (sources."simple-peer-6.4.4" // { dependencies = [ - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."isarray-1.0.0" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."string_decoder-1.0.3" ]; }) (sources."simple-websocket-4.3.1" // { dependencies = [ - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."ws-2.3.1" sources."isarray-1.0.0" + sources."string_decoder-1.0.3" sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" sources."ultron-1.1.0" ]; }) @@ -29199,7 +29732,7 @@ in sources."isstream-0.1.2" sources."is-typedarray-1.0.0" sources."har-validator-2.0.6" - sources."async-2.4.1" + sources."async-2.5.0" sources."lodash-4.17.4" sources."mime-db-1.27.0" sources."assert-plus-0.2.0" @@ -29237,7 +29770,7 @@ in sources."sntp-1.0.9" sources."delayed-stream-1.0.0" sources."chalk-1.1.3" - sources."commander-2.9.0" + sources."commander-2.11.0" sources."is-my-json-valid-2.16.0" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -29245,7 +29778,6 @@ in sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" sources."ansi-regex-2.1.1" - sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" sources."jsonpointer-4.0.1" @@ -29265,10 +29797,10 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "1.4.4"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-1.4.4.tgz"; - sha1 = "a8d1447b14c9bf67e6d420dcadd10fb9a4fad65a"; + url = "https://registry.npmjs.org/prettier/-/prettier-1.5.2.tgz"; + sha1 = "7ea0751da27b93bfb6cecfcec509994f52d83bb3"; }; buildInputs = globalBuildInputs; meta = { @@ -29293,7 +29825,7 @@ in sources."source-map-0.1.31" ]; }) - sources."commander-2.9.0" + sources."commander-2.11.0" sources."detective-4.5.0" sources."glob-5.0.15" sources."graceful-fs-4.1.11" @@ -29302,7 +29834,6 @@ in sources."private-0.1.7" sources."q-1.5.0" sources."recast-0.11.23" - sources."graceful-readlink-1.0.1" sources."acorn-4.0.13" sources."defined-1.0.0" sources."inflight-1.0.6" @@ -29364,7 +29895,7 @@ in sources."crypto-0.0.3" sources."xml2js-0.2.4" sources."xmlbuilder-0.4.2" - sources."sax-1.2.2" + sources."sax-1.2.4" sources."coffee-script-1.6.3" sources."node-uuid-1.4.1" (sources."connect-2.11.0" // { @@ -29425,7 +29956,7 @@ in sources."mime-types-2.1.15" sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" - sources."safe-buffer-5.1.0" + sources."safe-buffer-5.1.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.6.0" @@ -29515,15 +30046,15 @@ in sources."ms-2.0.0" ]; }) - (sources."compression-1.6.2" // { + (sources."compression-1.7.0" // { dependencies = [ - sources."bytes-2.3.0" - sources."debug-2.2.0" - sources."ms-0.7.1" + sources."bytes-2.5.0" + sources."debug-2.6.8" + sources."ms-2.0.0" ]; }) - sources."commander-2.9.0" - sources."js-yaml-3.8.4" + sources."commander-2.11.0" + sources."js-yaml-3.9.0" sources."cookies-0.7.0" sources."request-2.81.0" sources."async-0.9.2" @@ -29604,9 +30135,9 @@ in sources."iconv-lite-0.4.8" sources."compressible-2.0.10" sources."on-headers-1.0.1" - sources."graceful-readlink-1.0.1" + sources."safe-buffer-5.1.1" sources."argparse-1.0.9" - sources."esprima-3.1.3" + sources."esprima-4.0.0" sources."sprintf-js-1.0.3" sources."keygrip-1.0.1" sources."aws-sign2-0.6.0" @@ -29624,7 +30155,6 @@ in sources."json-stringify-safe-5.0.1" sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" - sources."safe-buffer-5.1.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.6.0" @@ -29708,8 +30238,7 @@ in sources."uc.micro-1.0.3" (sources."htmlparser2-3.9.2" // { dependencies = [ - sources."readable-stream-2.2.11" - sources."safe-buffer-5.0.1" + sources."readable-stream-2.3.3" ]; }) sources."regexp-quote-0.0.0" @@ -29725,11 +30254,7 @@ in sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - (sources."string_decoder-1.0.2" // { - dependencies = [ - sources."safe-buffer-5.0.1" - ]; - }) + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."jsonparse-1.3.1" sources."through-2.3.8" @@ -29764,7 +30289,7 @@ in sources."graceful-readlink-1.0.1" sources."graceful-fs-4.1.11" sources."minimatch-3.0.4" - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."set-immediate-shim-1.0.1" sources."brace-expansion-1.1.8" sources."balanced-match-1.0.0" @@ -29773,8 +30298,8 @@ in sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" ]; buildInputs = globalBuildInputs; @@ -29908,11 +30433,11 @@ in ]; }) sources."json-schema-0.2.3" - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" @@ -29972,8 +30497,8 @@ in sha1 = "9f5772413952135c6fefbf40afe6a4faa88b4bb5"; }; dependencies = [ - sources."sax-1.2.2" - sources."coa-1.0.3" + sources."sax-1.2.4" + sources."coa-1.0.4" sources."js-yaml-3.7.0" sources."colors-1.1.2" sources."whet.extend-0.9.9" @@ -30021,14 +30546,14 @@ in sources."graceful-fs-4.1.11" sources."object-assign-4.1.1" sources."errno-0.1.4" - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."prr-0.0.0" sources."core-util-is-1.0.2" sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" @@ -30050,10 +30575,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "2.3.4"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.3.4.tgz"; - sha1 = "3d38321828231e434f287514959c37a82b629f42"; + url = "https://registry.npmjs.org/typescript/-/typescript-2.4.1.tgz"; + sha1 = "c3ccb16ddaa0b2314de031e7e6fee89e5ba346bc"; }; buildInputs = globalBuildInputs; meta = { @@ -30066,10 +30591,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.0.17"; + version = "3.0.24"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.17.tgz"; - sha1 = "d228cd55c2df9b3d2f53f147568cb4cc4a72cc06"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.24.tgz"; + sha1 = "ee93400ad9857fb7a1671778db83f6a23f033121"; }; dependencies = [ sources."commander-2.9.0" @@ -30087,10 +30612,10 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.1.19"; + version = "1.1.23"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.1.19.tgz"; - sha1 = "83e0c9d79c808f7acb5f2da5a1ea77e3db571558"; + url = "https://registry.npmjs.org/ungit/-/ungit-1.1.23.tgz"; + sha1 = "8067752f07877ef4311833146d58f7badf2f9f4a"; }; dependencies = [ sources."async-2.4.1" @@ -30108,7 +30633,16 @@ in sources."hasher-1.2.0" sources."ignore-3.2.7" sources."just-detect-adblock-1.0.0" - sources."keen.io-0.1.3" + (sources."keen.io-0.1.3" // { + dependencies = [ + sources."superagent-0.21.0" + sources."qs-1.2.0" + sources."mime-1.2.11" + sources."methods-1.0.1" + sources."form-data-0.1.3" + sources."async-0.9.2" + ]; + }) sources."knockout-3.4.2" sources."lodash-4.17.4" (sources."mkdirp-0.5.1" // { @@ -30122,8 +30656,17 @@ in dependencies = [ sources."nopt-4.0.1" sources."npm-registry-client-8.1.1" + sources."readable-stream-2.2.11" sources."request-2.81.0" + sources."isarray-1.0.0" + sources."safe-buffer-5.0.1" + (sources."string_decoder-1.0.3" // { + dependencies = [ + sources."safe-buffer-5.1.1" + ]; + }) sources."combined-stream-1.0.5" + sources."extend-3.0.1" sources."forever-agent-0.6.1" sources."form-data-2.1.4" sources."hawk-3.1.3" @@ -30141,6 +30684,7 @@ in dependencies = [ sources."request-2.81.0" sources."combined-stream-1.0.5" + sources."extend-3.0.1" sources."forever-agent-0.6.1" sources."form-data-2.1.4" sources."hawk-3.1.3" @@ -30183,18 +30727,18 @@ in sources."ms-0.7.2" ]; }) - (sources."superagent-0.21.0" // { + (sources."superagent-3.5.2" // { dependencies = [ - sources."qs-1.2.0" - sources."mime-1.2.11" - sources."component-emitter-1.1.2" - sources."methods-1.0.1" - sources."extend-1.2.1" - sources."form-data-0.1.3" - sources."readable-stream-1.0.27-1" - sources."async-0.9.2" - sources."isarray-0.0.1" - sources."string_decoder-0.10.31" + sources."component-emitter-1.2.1" + sources."cookiejar-2.1.1" + sources."extend-3.0.1" + sources."form-data-2.2.0" + sources."formidable-1.1.1" + sources."readable-stream-2.3.3" + sources."combined-stream-1.0.5" + sources."delayed-stream-1.0.0" + sources."isarray-1.0.0" + sources."string_decoder-1.0.3" ]; }) (sources."temp-0.8.3" // { @@ -30210,8 +30754,10 @@ in }) (sources."yargs-8.0.2" // { dependencies = [ - sources."string-width-2.0.0" + sources."string-width-2.1.0" sources."is-fullwidth-code-point-2.0.0" + sources."strip-ansi-4.0.0" + sources."ansi-regex-3.0.0" ]; }) sources."bytes-2.4.0" @@ -30240,7 +30786,7 @@ in sources."is-arrayish-0.3.1" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - sources."diff-3.2.0" + sources."diff-3.3.0" (sources."hogan.js-3.0.2" // { dependencies = [ sources."mkdirp-0.3.0" @@ -30353,6 +30899,15 @@ in sources."editions-1.3.3" sources."typechecker-4.4.1" sources."underscore-1.5.2" + sources."formidable-1.0.14" + sources."component-emitter-1.1.2" + sources."cookiejar-2.0.1" + sources."reduce-component-1.0.1" + sources."extend-1.2.1" + sources."readable-stream-1.0.27-1" + sources."core-util-is-1.0.2" + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" sources."clone-2.1.1" sources."JSONStream-1.3.1" sources."ansi-regex-2.1.1" @@ -30360,7 +30915,7 @@ in sources."ansistyles-0.1.3" sources."aproba-1.1.2" sources."archy-1.0.0" - sources."asap-2.0.5" + sources."asap-2.0.6" sources."call-limit-1.1.0" sources."chownr-1.0.1" sources."cmd-shim-2.0.2" @@ -30369,7 +30924,13 @@ in sources."dezalgo-1.0.3" sources."editor-1.0.0" sources."fs-vacuum-1.2.10" - sources."fs-write-stream-atomic-1.0.10" + (sources."fs-write-stream-atomic-1.0.10" // { + dependencies = [ + sources."readable-stream-2.3.3" + sources."isarray-1.0.0" + sources."string_decoder-1.0.3" + ]; + }) sources."fstream-1.0.11" sources."fstream-npm-1.2.1" (sources."glob-7.1.2" // { @@ -30412,20 +30973,23 @@ in sources."read-1.0.7" sources."read-cmd-shim-1.0.1" sources."read-installed-4.0.3" - sources."read-package-json-2.0.5" + sources."read-package-json-2.0.10" sources."read-package-tree-5.1.6" - sources."readable-stream-2.2.11" sources."realize-package-specifier-3.0.3" sources."retry-0.10.1" - sources."sha-2.0.1" + (sources."sha-2.0.1" // { + dependencies = [ + sources."readable-stream-2.3.3" + sources."isarray-1.0.0" + sources."string_decoder-1.0.3" + ]; + }) sources."slide-1.1.6" sources."sorted-object-2.0.1" (sources."sorted-union-stream-2.1.3" // { dependencies = [ sources."from2-1.3.0" sources."readable-stream-1.1.14" - sources."isarray-0.0.1" - sources."string_decoder-0.10.31" ]; }) sources."strip-ansi-3.0.1" @@ -30459,6 +31023,9 @@ in ]; }) sources."proto-list-1.2.4" + sources."process-nextick-args-1.0.7" + sources."safe-buffer-5.1.1" + sources."util-deprecate-1.0.2" (sources."fstream-ignore-1.0.5" // { dependencies = [ sources."minimatch-3.0.4" @@ -30472,21 +31039,54 @@ in sources."promzard-0.3.0" sources."lodash._createset-4.0.3" sources."lodash._root-3.0.1" - sources."concat-stream-1.6.0" + (sources."concat-stream-1.6.0" // { + dependencies = [ + sources."readable-stream-2.3.3" + sources."isarray-1.0.0" + sources."string_decoder-1.0.3" + ]; + }) (sources."duplexify-3.5.0" // { dependencies = [ sources."end-of-stream-1.0.0" + sources."readable-stream-2.3.3" sources."once-1.3.3" + sources."isarray-1.0.0" + sources."string_decoder-1.0.3" ]; }) sources."end-of-stream-1.4.0" - sources."flush-write-stream-1.0.2" - sources."from2-2.3.0" - sources."parallel-transform-1.1.0" + (sources."flush-write-stream-1.0.2" // { + dependencies = [ + sources."readable-stream-2.3.3" + sources."isarray-1.0.0" + sources."string_decoder-1.0.3" + ]; + }) + (sources."from2-2.3.0" // { + dependencies = [ + sources."readable-stream-2.3.3" + sources."isarray-1.0.0" + sources."string_decoder-1.0.3" + ]; + }) + (sources."parallel-transform-1.1.0" // { + dependencies = [ + sources."readable-stream-2.3.3" + sources."isarray-1.0.0" + sources."string_decoder-1.0.3" + ]; + }) sources."pump-1.0.2" sources."pumpify-1.3.5" sources."stream-each-1.2.0" - sources."through2-2.0.3" + (sources."through2-2.0.3" // { + dependencies = [ + sources."readable-stream-2.3.3" + sources."isarray-1.0.0" + sources."string_decoder-1.0.3" + ]; + }) sources."typedarray-0.0.6" sources."stream-shift-1.0.0" sources."cyclist-0.2.2" @@ -30495,7 +31095,13 @@ in sources."run-queue-1.0.3" sources."is-builtin-module-1.0.0" sources."builtin-modules-1.1.1" - sources."are-we-there-yet-1.1.4" + (sources."are-we-there-yet-1.1.4" // { + dependencies = [ + sources."readable-stream-2.3.3" + sources."isarray-1.0.0" + sources."string_decoder-1.0.3" + ]; + }) sources."console-control-strings-1.1.0" sources."gauge-2.7.4" sources."set-blocking-2.0.0" @@ -30512,16 +31118,9 @@ in sources."util-extend-1.0.3" sources."json-parse-helpfulerror-1.0.3" sources."jju-1.3.0" - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" - sources."util-deprecate-1.0.2" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" sources."caseless-0.12.0" - sources."extend-3.0.1" sources."har-validator-4.2.1" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" @@ -30565,16 +31164,30 @@ in sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" sources."punycode-1.4.1" - sources."stream-iterate-1.2.0" - sources."block-stream-0.0.9" - sources."unique-slug-2.0.0" - (sources."boxen-1.1.0" // { + (sources."stream-iterate-1.2.0" // { dependencies = [ - sources."string-width-2.0.0" - sources."is-fullwidth-code-point-2.0.0" + sources."readable-stream-2.3.3" + sources."isarray-1.0.0" + sources."string_decoder-1.0.3" + ]; + }) + sources."block-stream-0.0.9" + sources."unique-slug-2.0.0" + (sources."boxen-1.2.0" // { + dependencies = [ + sources."chalk-2.0.1" + sources."string-width-2.1.0" + sources."is-fullwidth-code-point-2.0.0" + sources."strip-ansi-4.0.0" + sources."ansi-regex-3.0.0" + ]; + }) + (sources."chalk-1.1.3" // { + dependencies = [ + sources."ansi-styles-2.2.1" + sources."supports-color-2.0.0" ]; }) - sources."chalk-1.1.3" (sources."configstore-3.1.0" // { dependencies = [ sources."write-file-atomic-2.1.0" @@ -30587,30 +31200,37 @@ in sources."xdg-basedir-3.0.0" (sources."ansi-align-2.0.0" // { dependencies = [ - sources."string-width-2.0.0" + sources."string-width-2.1.0" sources."is-fullwidth-code-point-2.0.0" + sources."strip-ansi-4.0.0" + sources."ansi-regex-3.0.0" ]; }) sources."camelcase-4.1.0" sources."cli-boxes-1.0.0" - sources."term-size-0.1.1" + sources."term-size-1.2.0" sources."widest-line-1.0.0" - sources."execa-0.4.0" - (sources."cross-spawn-async-2.2.5" // { + sources."ansi-styles-3.1.0" + sources."escape-string-regexp-1.0.5" + sources."supports-color-4.2.0" + sources."has-flag-2.0.0" + sources."execa-0.7.0" + (sources."cross-spawn-5.1.0" // { dependencies = [ sources."lru-cache-4.1.1" ]; }) + sources."get-stream-3.0.0" sources."is-stream-1.1.0" - sources."npm-run-path-1.0.0" - sources."path-key-1.0.0" + sources."npm-run-path-2.0.2" + sources."p-finally-1.0.0" sources."strip-eof-1.0.0" + sources."shebang-command-1.2.0" sources."pseudomap-1.0.2" sources."yallist-2.1.2" - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" + sources."shebang-regex-1.0.0" + sources."path-key-2.0.1" sources."has-ansi-2.0.0" - sources."supports-color-2.0.0" sources."dot-prop-4.1.1" sources."make-dir-1.0.0" sources."unique-string-1.0.0" @@ -30623,7 +31243,6 @@ in sources."registry-url-3.1.0" sources."create-error-class-3.0.2" sources."duplexer3-0.1.4" - sources."get-stream-3.0.0" sources."is-redirect-1.0.0" sources."is-retry-allowed-1.1.0" sources."lowercase-keys-1.0.0" @@ -30637,11 +31256,7 @@ in sources."spdx-correct-1.0.2" sources."spdx-expression-parse-1.0.4" sources."spdx-license-ids-1.2.2" - (sources."ssri-4.1.6" // { - dependencies = [ - sources."safe-buffer-5.1.0" - ]; - }) + sources."ssri-4.1.6" sources."passport-strategy-1.0.0" sources."pause-0.0.1" sources."lsmod-1.0.0" @@ -30654,11 +31269,7 @@ in sources."ms-0.7.2" ]; }) - (sources."has-binary-0.1.7" // { - dependencies = [ - sources."isarray-0.0.1" - ]; - }) + sources."has-binary-0.1.7" (sources."socket.io-adapter-0.5.0" // { dependencies = [ sources."debug-2.3.3" @@ -30667,6 +31278,7 @@ in }) (sources."socket.io-client-1.7.4" // { dependencies = [ + sources."component-emitter-1.2.1" sources."debug-2.3.3" sources."ms-0.7.2" ]; @@ -30674,8 +31286,6 @@ in (sources."socket.io-parser-2.3.1" // { dependencies = [ sources."debug-2.2.0" - sources."component-emitter-1.1.2" - sources."isarray-0.0.1" sources."ms-0.7.1" ]; }) @@ -30691,9 +31301,9 @@ in sources."ultron-1.0.2" sources."backo2-1.0.2" sources."component-bind-1.0.0" - sources."component-emitter-1.2.1" (sources."engine.io-client-1.8.4" // { dependencies = [ + sources."component-emitter-1.2.1" sources."debug-2.3.3" sources."ws-1.1.2" sources."ms-0.7.2" @@ -30712,18 +31322,15 @@ in sources."better-assert-1.0.2" sources."callsite-1.0.0" sources."json3-3.3.2" - sources."formidable-1.0.14" - sources."cookiejar-2.0.1" - sources."reduce-component-1.0.1" sources."cliui-3.2.0" sources."decamelize-1.2.0" sources."get-caller-file-1.0.2" (sources."os-locale-2.0.0" // { dependencies = [ sources."execa-0.5.1" + sources."cross-spawn-4.0.2" sources."get-stream-2.3.1" - sources."npm-run-path-2.0.2" - sources."path-key-2.0.1" + sources."lru-cache-4.1.1" ]; }) sources."read-pkg-up-2.0.0" @@ -30735,12 +31342,6 @@ in sources."wrap-ansi-2.1.0" sources."lcid-1.0.0" sources."mem-1.1.0" - (sources."cross-spawn-4.0.2" // { - dependencies = [ - sources."lru-cache-4.1.1" - ]; - }) - sources."p-finally-1.0.0" sources."pinkie-promise-2.0.1" sources."pinkie-2.0.4" sources."invert-kv-1.0.0" @@ -30862,7 +31463,7 @@ in sources."isstream-0.1.2" sources."is-typedarray-1.0.0" sources."har-validator-2.0.6" - sources."async-2.4.1" + sources."async-2.5.0" sources."lodash-4.17.4" sources."mime-db-1.27.0" sources."assert-plus-0.2.0" @@ -30900,7 +31501,7 @@ in sources."sntp-1.0.9" sources."delayed-stream-1.0.0" sources."chalk-1.1.3" - sources."commander-2.9.0" + sources."commander-2.11.0" sources."is-my-json-valid-2.16.0" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -30908,7 +31509,6 @@ in sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" sources."ansi-regex-2.1.1" - sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" sources."jsonpointer-4.0.1" @@ -30930,27 +31530,28 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "2.6.1"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-2.6.1.tgz"; - sha1 = "2e0457f0abb1ac5df3ab106c69c672f236785f07"; + url = "https://registry.npmjs.org/webpack/-/webpack-3.2.0.tgz"; + sha1 = "8b0cae0e1a9fd76bfbf0eab61a8c2ada848c312f"; }; dependencies = [ - sources."acorn-5.0.3" + sources."acorn-5.1.1" (sources."acorn-dynamic-import-2.0.2" // { dependencies = [ sources."acorn-4.0.13" ]; }) - sources."ajv-4.11.8" - sources."ajv-keywords-1.5.1" - sources."async-2.4.1" - sources."enhanced-resolve-3.1.0" + sources."ajv-5.2.2" + sources."ajv-keywords-2.1.0" + sources."async-2.5.0" + sources."enhanced-resolve-3.3.0" + sources."escope-3.6.0" sources."interpret-1.0.3" sources."json-loader-0.5.4" sources."json5-0.5.1" sources."loader-runner-2.3.0" - sources."loader-utils-0.2.17" + sources."loader-utils-1.1.0" sources."memory-fs-0.4.1" sources."mkdirp-0.5.1" (sources."node-libs-browser-2.0.0" // { @@ -30961,13 +31562,9 @@ in sources."source-map-0.5.6" sources."supports-color-3.2.3" sources."tapable-0.2.6" - (sources."uglify-js-2.8.29" // { - dependencies = [ - sources."yargs-3.10.0" - ]; - }) + sources."uglifyjs-webpack-plugin-0.4.6" sources."watchpack-1.3.1" - sources."webpack-sources-0.2.3" + sources."webpack-sources-1.0.1" (sources."yargs-6.6.0" // { dependencies = [ sources."camelcase-3.0.0" @@ -30975,22 +31572,34 @@ in ]; }) sources."co-4.6.0" + sources."fast-deep-equal-1.0.0" + sources."json-schema-traverse-0.3.1" sources."json-stable-stringify-1.0.1" sources."jsonify-0.0.0" sources."lodash-4.17.4" sources."graceful-fs-4.1.11" sources."object-assign-4.1.1" + sources."es6-map-0.1.5" + sources."es6-weak-map-2.0.2" + sources."esrecurse-4.2.0" + sources."estraverse-4.2.0" + sources."d-1.0.0" + sources."es5-ext-0.10.24" + sources."es6-iterator-2.0.1" + sources."es6-set-0.1.5" + sources."es6-symbol-3.1.1" + sources."event-emitter-0.3.5" sources."big.js-3.1.3" sources."emojis-list-2.1.0" sources."errno-0.1.4" - sources."readable-stream-2.2.11" + sources."readable-stream-2.3.3" sources."prr-0.0.0" sources."core-util-is-1.0.2" sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."minimist-0.0.8" sources."assert-1.4.1" @@ -30998,7 +31607,7 @@ in sources."buffer-4.9.1" sources."console-browserify-1.1.0" sources."constants-browserify-1.0.0" - sources."crypto-browserify-3.11.0" + sources."crypto-browserify-3.11.1" sources."domain-browser-1.1.7" sources."events-1.1.1" sources."https-browserify-0.0.1" @@ -31023,7 +31632,7 @@ in }) sources."vm-browserify-0.0.4" sources."pako-0.2.9" - sources."base64-js-1.2.0" + sources."base64-js-1.2.1" sources."ieee754-1.1.8" sources."date-now-0.1.4" sources."browserify-cipher-1.0.0" @@ -31034,24 +31643,20 @@ in sources."diffie-hellman-5.0.2" sources."pbkdf2-3.0.12" sources."public-encrypt-4.0.0" - (sources."randombytes-2.0.5" // { - dependencies = [ - sources."safe-buffer-5.1.0" - ]; - }) + sources."randombytes-2.0.5" sources."browserify-aes-1.0.6" sources."browserify-des-1.0.0" sources."evp_bytestokey-1.0.0" sources."buffer-xor-1.0.3" - sources."cipher-base-1.0.3" + sources."cipher-base-1.0.4" sources."des.js-1.0.0" sources."minimalistic-assert-1.0.0" - sources."bn.js-4.11.6" + sources."bn.js-4.11.7" sources."browserify-rsa-4.0.1" sources."elliptic-6.4.0" sources."parse-asn1-5.1.0" sources."brorand-1.1.0" - sources."hash.js-1.0.3" + sources."hash.js-1.1.3" sources."hmac-drbg-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."asn1.js-4.9.1" @@ -31066,6 +31671,11 @@ in sources."querystring-0.2.0" sources."indexof-0.0.1" sources."has-flag-1.0.0" + (sources."uglify-js-2.8.29" // { + dependencies = [ + sources."yargs-3.10.0" + ]; + }) sources."uglify-to-browserify-1.0.2" sources."camelcase-1.2.1" sources."cliui-2.1.0" @@ -31102,7 +31712,7 @@ in sources."object.omit-2.0.1" sources."parse-glob-3.0.4" sources."regex-cache-0.4.3" - sources."arr-flatten-1.0.3" + sources."arr-flatten-1.1.0" sources."expand-range-1.8.2" sources."preserve-0.2.0" sources."repeat-element-1.1.2" @@ -31137,7 +31747,7 @@ in sources."nan-2.6.2" sources."node-pre-gyp-0.6.36" sources."nopt-4.0.1" - sources."npmlog-4.1.0" + sources."npmlog-4.1.2" (sources."rc-1.2.1" // { dependencies = [ sources."minimist-1.2.0" @@ -31177,7 +31787,11 @@ in sources."extend-3.0.1" sources."forever-agent-0.6.1" sources."form-data-2.1.4" - sources."har-validator-4.2.1" + (sources."har-validator-4.2.1" // { + dependencies = [ + sources."ajv-4.11.8" + ]; + }) sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" @@ -31239,7 +31853,7 @@ in sources."fstream-ignore-1.0.5" sources."uid-number-0.0.6" sources."ms-2.0.0" - sources."source-list-map-1.1.2" + sources."source-list-map-2.0.0" sources."get-caller-file-1.0.2" sources."os-locale-1.4.0" sources."read-pkg-up-1.0.1" @@ -31261,7 +31875,7 @@ in sources."pinkie-promise-2.0.1" sources."pinkie-2.0.4" sources."load-json-file-1.1.0" - sources."normalize-package-data-2.3.8" + sources."normalize-package-data-2.4.0" sources."path-type-1.1.0" sources."parse-json-2.2.0" sources."pify-2.3.0" @@ -31269,7 +31883,7 @@ in sources."error-ex-1.3.1" sources."is-arrayish-0.2.1" sources."is-utf8-0.2.1" - sources."hosted-git-info-2.4.2" + sources."hosted-git-info-2.5.0" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" @@ -31304,10 +31918,10 @@ in yarn = nodeEnv.buildNodePackage { name = "yarn"; packageName = "yarn"; - version = "0.24.5"; + version = "0.27.5"; src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-0.24.5.tgz"; - sha1 = "92c72adf4de8dacccaf6b4259eb4990f6c4f8e3b"; + url = "https://registry.npmjs.org/yarn/-/yarn-0.27.5.tgz"; + sha1 = "06fe67d8040802993f9f1e1923d671cbf9ead5d1"; }; dependencies = [ sources."babel-runtime-6.23.0" @@ -31315,21 +31929,30 @@ in sources."camelcase-4.1.0" sources."chalk-1.1.3" sources."cmd-shim-2.0.2" - sources."commander-2.9.0" + sources."commander-2.11.0" sources."death-1.1.0" sources."debug-2.6.8" sources."detect-indent-5.0.0" - sources."gunzip-maybe-1.4.0" + sources."glob-7.1.2" + sources."gunzip-maybe-1.4.1" sources."ini-1.3.4" - sources."inquirer-3.1.0" + (sources."inquirer-3.2.0" // { + dependencies = [ + sources."chalk-2.0.1" + sources."strip-ansi-4.0.0" + sources."ansi-styles-3.1.0" + sources."supports-color-4.2.0" + sources."ansi-regex-3.0.0" + ]; + }) sources."invariant-2.2.2" sources."is-builtin-module-1.0.0" sources."is-ci-1.0.10" sources."leven-2.1.0" sources."loud-rejection-1.6.0" - sources."minimatch-3.0.4" + sources."micromatch-2.3.11" sources."mkdirp-0.5.1" - sources."node-emoji-1.5.1" + sources."node-emoji-1.7.0" sources."object-path-0.11.4" sources."proper-lockfile-2.0.1" sources."read-1.0.7" @@ -31352,8 +31975,17 @@ in sources."supports-color-2.0.0" sources."ansi-regex-2.1.1" sources."graceful-fs-4.1.11" - sources."graceful-readlink-1.0.1" sources."ms-2.0.0" + sources."fs.realpath-1.0.0" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."minimatch-3.0.4" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."wrappy-1.0.2" + sources."brace-expansion-1.1.8" + sources."balanced-match-1.0.0" + sources."concat-map-0.0.1" sources."browserify-zlib-0.1.4" sources."is-deflate-1.0.0" sources."is-gzip-1.0.0" @@ -31362,25 +31994,22 @@ in sources."through2-2.0.3" sources."pako-0.2.9" sources."duplexify-3.5.0" - sources."end-of-stream-1.0.0" - sources."inherits-2.0.3" - sources."readable-stream-2.2.11" + (sources."end-of-stream-1.0.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) + sources."readable-stream-2.3.3" sources."stream-shift-1.0.0" - sources."once-1.3.3" - sources."wrappy-1.0.2" sources."core-util-is-1.0.2" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - sources."safe-buffer-5.0.1" - sources."string_decoder-1.0.2" + sources."safe-buffer-5.1.1" + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" (sources."pump-1.0.2" // { dependencies = [ - (sources."end-of-stream-1.4.0" // { - dependencies = [ - sources."once-1.4.0" - ]; - }) + sources."end-of-stream-1.4.0" ]; }) sources."xtend-4.0.1" @@ -31394,8 +32023,16 @@ in sources."run-async-2.3.0" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" - sources."string-width-2.0.0" + (sources."string-width-2.1.0" // { + dependencies = [ + sources."strip-ansi-4.0.0" + sources."ansi-regex-3.0.0" + ]; + }) sources."through-2.3.8" + sources."color-convert-1.9.0" + sources."color-name-1.1.2" + sources."has-flag-2.0.0" sources."restore-cursor-2.0.0" sources."onetime-2.0.1" sources."signal-exit-3.0.2" @@ -31407,15 +32044,55 @@ in sources."is-promise-2.1.0" sources."is-fullwidth-code-point-2.0.0" sources."loose-envify-1.3.1" - sources."js-tokens-3.0.1" + sources."js-tokens-3.0.2" sources."builtin-modules-1.1.1" sources."ci-info-1.0.0" sources."currently-unhandled-0.4.1" sources."array-find-index-1.0.2" - sources."brace-expansion-1.1.8" - sources."balanced-match-1.0.0" - sources."concat-map-0.0.1" + sources."arr-diff-2.0.0" + sources."array-unique-0.2.1" + sources."braces-1.8.5" + sources."expand-brackets-0.1.5" + sources."extglob-0.3.2" + sources."filename-regex-2.0.1" + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" + sources."kind-of-3.2.2" + sources."normalize-path-2.1.1" + sources."object.omit-2.0.1" + sources."parse-glob-3.0.4" + sources."regex-cache-0.4.3" + sources."arr-flatten-1.1.0" + sources."expand-range-1.8.2" + sources."preserve-0.2.0" + sources."repeat-element-1.1.2" + sources."fill-range-2.2.3" + sources."is-number-2.1.0" + sources."isobject-2.1.0" + (sources."randomatic-1.1.7" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) + sources."repeat-string-1.6.1" + sources."is-buffer-1.1.5" + sources."is-posix-bracket-0.1.1" + sources."remove-trailing-separator-1.0.2" + sources."for-own-0.1.5" + sources."is-extendable-0.1.1" + sources."for-in-1.0.2" + sources."glob-base-0.3.0" + sources."is-dotfile-1.0.3" + sources."glob-parent-2.0.0" + sources."is-equal-shallow-0.1.3" + sources."is-primitive-2.0.0" sources."minimist-0.0.8" + sources."lodash.toarray-4.4.0" sources."string.prototype.codepointat-0.2.0" sources."retry-0.10.1" sources."aws-sign2-0.6.0" @@ -31480,10 +32157,6 @@ in sources."bcrypt-pbkdf-1.0.1" sources."mime-db-1.27.0" sources."punycode-1.4.1" - sources."glob-7.1.2" - sources."fs.realpath-1.0.0" - sources."inflight-1.0.6" - sources."path-is-absolute-1.0.1" sources."chownr-1.0.1" sources."bl-1.2.1" sources."spdx-correct-1.0.2" @@ -31507,7 +32180,7 @@ in sha1 = "0cd75211379ed87105f99510885759062147b517"; }; dependencies = [ - sources."async-2.4.1" + sources."async-2.5.0" sources."chalk-1.1.3" sources."cli-list-0.2.0" sources."configstore-3.1.0" @@ -31516,7 +32189,15 @@ in sources."fullname-3.3.0" sources."got-6.7.1" sources."humanize-string-1.0.1" - sources."inquirer-3.1.0" + (sources."inquirer-3.2.0" // { + dependencies = [ + sources."chalk-2.0.1" + sources."strip-ansi-4.0.0" + sources."ansi-styles-3.1.0" + sources."supports-color-4.2.0" + sources."ansi-regex-3.0.0" + ]; + }) (sources."insight-0.8.4" // { dependencies = [ sources."async-1.5.2" @@ -31594,6 +32275,7 @@ in (sources."yeoman-character-1.1.0" // { dependencies = [ sources."supports-color-3.2.3" + sources."has-flag-1.0.0" ]; }) sources."yeoman-doctor-2.1.0" @@ -31663,7 +32345,7 @@ in sources."is-redirect-1.0.0" sources."is-retry-allowed-1.1.0" sources."lowercase-keys-1.0.0" - sources."safe-buffer-5.1.0" + sources."safe-buffer-5.1.1" sources."timed-out-4.0.1" sources."unzip-response-2.0.1" sources."url-parse-lax-1.0.0" @@ -31678,8 +32360,16 @@ in sources."run-async-2.3.0" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" - sources."string-width-2.0.0" + (sources."string-width-2.1.0" // { + dependencies = [ + sources."strip-ansi-4.0.0" + sources."ansi-regex-3.0.0" + ]; + }) sources."through-2.3.8" + sources."color-convert-1.9.0" + sources."color-name-1.1.2" + sources."has-flag-2.0.0" sources."restore-cursor-2.0.0" sources."onetime-2.0.1" sources."iconv-lite-0.4.18" @@ -31779,7 +32469,7 @@ in sources."camelcase-keys-2.1.0" sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" - sources."normalize-package-data-2.3.8" + sources."normalize-package-data-2.4.0" (sources."redent-1.0.0" // { dependencies = [ sources."indent-string-2.1.0" @@ -31789,7 +32479,7 @@ in sources."camelcase-2.1.1" sources."currently-unhandled-0.4.1" sources."array-find-index-1.0.2" - sources."hosted-git-info-2.4.2" + sources."hosted-git-info-2.5.0" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" @@ -31816,20 +32506,12 @@ in sources."duplexer2-0.1.4" sources."node-status-codes-1.0.0" sources."read-all-stream-3.1.0" - (sources."readable-stream-2.2.11" // { - dependencies = [ - sources."safe-buffer-5.0.1" - ]; - }) + sources."readable-stream-2.3.3" sources."core-util-is-1.0.2" sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" - (sources."string_decoder-1.0.2" // { - dependencies = [ - sources."safe-buffer-5.0.1" - ]; - }) + sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" sources."registry-auth-token-3.3.1" sources."execall-1.0.0" @@ -31865,9 +32547,12 @@ in sources."lodash.pad-4.5.1" sources."lodash.padend-4.6.1" sources."lodash.padstart-4.6.1" - (sources."boxen-1.1.0" // { + (sources."boxen-1.2.0" // { dependencies = [ sources."camelcase-4.1.0" + sources."chalk-2.0.1" + sources."ansi-styles-3.1.0" + sources."supports-color-4.2.0" ]; }) sources."import-lazy-2.1.0" @@ -31880,11 +32565,9 @@ in sources."semver-diff-2.1.0" sources."ansi-align-2.0.0" sources."cli-boxes-1.0.0" - (sources."term-size-0.1.1" // { + (sources."term-size-1.2.0" // { dependencies = [ - sources."execa-0.4.0" - sources."npm-run-path-1.0.0" - sources."path-key-1.0.0" + sources."execa-0.7.0" ]; }) (sources."widest-line-1.0.0" // { @@ -31893,7 +32576,6 @@ in sources."is-fullwidth-code-point-1.0.0" ]; }) - sources."has-flag-1.0.0" (sources."bin-version-check-2.1.0" // { dependencies = [ sources."semver-4.3.6" @@ -31919,7 +32601,7 @@ in sources."brace-expansion-1.1.8" sources."balanced-match-1.0.0" sources."concat-map-0.0.1" - sources."diff-3.2.0" + sources."diff-3.3.0" sources."globby-6.1.0" sources."grouped-queue-0.3.3" sources."is-scoped-1.0.0" @@ -31949,8 +32631,6 @@ in sources."is-fullwidth-code-point-1.0.0" ]; }) - sources."color-convert-1.9.0" - sources."color-name-1.1.2" ]; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/development/ocaml-modules/angstrom/default.nix b/pkgs/development/ocaml-modules/angstrom/default.nix index fadb55907bf..4f968ce6c09 100644 --- a/pkgs/development/ocaml-modules/angstrom/default.nix +++ b/pkgs/development/ocaml-modules/angstrom/default.nix @@ -1,14 +1,25 @@ { stdenv, fetchFromGitHub, ocaml, ocamlbuild, cstruct, result, findlib, ocaml_oasis }: +let param = + if stdenv.lib.versionAtLeast ocaml.version "4.03" + then { + version = "0.5.1"; + sha256 = "0rm79xyszy9aqvflcc13y9xiya82z31fzmr3b3hx91pmqviymhgc"; + } else { + version = "0.4.0"; + sha256 = "019s3jwhnswa914bgj1fa6q67k0bl2ahqdaqfnavcbyii8763kh2"; + }; +in + stdenv.mkDerivation rec { - version = "0.4.0"; + inherit (param) version; name = "ocaml-angstrom-${version}"; src = fetchFromGitHub { owner = "inhabitedtype"; repo = "angstrom"; rev = "${version}"; - sha256 = "019s3jwhnswa914bgj1fa6q67k0bl2ahqdaqfnavcbyii8763kh2"; + inherit (param) sha256; }; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/atd/default.nix b/pkgs/development/ocaml-modules/atd/default.nix index c7f8bc3d10f..af52bd9aaaf 100644 --- a/pkgs/development/ocaml-modules/atd/default.nix +++ b/pkgs/development/ocaml-modules/atd/default.nix @@ -1,21 +1,36 @@ -{stdenv, menhir, easy-format, buildOcaml, fetchurl, which}: +{ stdenv, menhir, easy-format, ocaml, findlib, fetchurl, jbuilder, which }: -buildOcaml rec { - name = "atd"; - version = "1.1.2"; +let param = + if stdenv.lib.versionAtLeast ocaml.version "4.02" + then { + version = "1.12.0"; + sha256 = "1pcd4fqbilv8zm2mc1nj2s26vc5y8vnisg1q1y6bjx23wxidb09y"; + buildPhase = "jbuilder build -p atd"; + inherit (jbuilder) installPhase; + } else { + version = "1.1.2"; + sha256 = "0ef10c63192aed75e9a4274e89c5f9ca27efb1ef230d9949eda53ad4a9a37291"; + buildPhase = ""; + installPhase = '' + mkdir -p $out/bin + make PREFIX=$out install + ''; + }; +in + +stdenv.mkDerivation rec { + inherit (param) version buildPhase installPhase; + name = "ocaml${ocaml.version}-atd-${version}"; src = fetchurl { url = "https://github.com/mjambon/atd/archive/v${version}.tar.gz"; - sha256 = "0ef10c63192aed75e9a4274e89c5f9ca27efb1ef230d9949eda53ad4a9a37291"; + inherit (param) sha256; }; - installPhase = '' - mkdir -p $out/bin - make PREFIX=$out install - ''; + createFindlibDestdir = true; - buildInputs = [ which ]; - propagatedBuildInputs = [ menhir easy-format ]; + buildInputs = [ which jbuilder ocaml findlib menhir ]; + propagatedBuildInputs = [ easy-format ]; meta = with stdenv.lib; { homepage = https://github.com/mjambon/atd; diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix index 25564a0a300..ea151d1e0e5 100644 --- a/pkgs/development/ocaml-modules/bap/default.nix +++ b/pkgs/development/ocaml-modules/bap/default.nix @@ -58,5 +58,6 @@ buildOcaml rec { homepage = https://github.com/BinaryAnalysisPlatform/bap/; maintainers = [ maintainers.maurer ]; license = licenses.mit; + broken = versionAtLeast ocaml.version "4.03"; }; } diff --git a/pkgs/development/ocaml-modules/benchmark/default.nix b/pkgs/development/ocaml-modules/benchmark/default.nix new file mode 100644 index 00000000000..de2010275ef --- /dev/null +++ b/pkgs/development/ocaml-modules/benchmark/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, ocaml_pcre }: + +let version = "1.4"; in + +stdenv.mkDerivation { + name = "ocaml${ocaml.version}-benchmark-${version}"; + + src = fetchzip { + url = "https://github.com/Chris00/ocaml-benchmark/releases/download/${version}/benchmark-${version}.tar.gz"; + sha256 = "16wi8ld7c3mq77ylpgbnj8qqqqimyzwxs47v06vyrwpma5pab5xa"; + }; + + buildInputs = [ ocaml findlib ocamlbuild ocaml_pcre ]; + + createFindlibDestdir = true; + + meta = { + homepage = http://ocaml-benchmark.forge.ocamlcore.org/; + platforms = ocaml.meta.platforms or []; + description = "Benchmark running times of code"; + license = stdenv.lib.licenses.lgpl21; + maintainers = with stdenv.lib.maintainers; [ volth ]; + }; +} diff --git a/pkgs/development/ocaml-modules/bolt/default.nix b/pkgs/development/ocaml-modules/bolt/default.nix index 5d1fe8aa0d1..fa9b353f4d6 100644 --- a/pkgs/development/ocaml-modules/bolt/default.nix +++ b/pkgs/development/ocaml-modules/bolt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, which, camlp4 }: +{ stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, which, camlp4 }: let inherit (stdenv.lib) getVersion versionAtLeast; in @@ -16,7 +16,13 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib ocamlbuild which camlp4 ]; - patchPhase = '' + patches = [ (fetchpatch { + url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/bolt/bolt.1.4/files/opam.patch; + sha256 = "08cl39r98w312sw23cskd5wian6zg20isn9ki41hnbcgkazhi7pb"; + }) + ]; + + postPatch = '' patch myocamlbuild.ml <title'" + ''; + + LC_ALL="en_US.UTF-8"; + + propagatedBuildInputs = [ pip ]; + + buildInputs = [ pandoc texlive.combined.scheme-small haskellPackages.pandoc-citeproc glibcLocales ]; + + meta = with stdenv.lib; { + description = "Thin wrapper for pandoc"; + homepage = "https://github.com/bebraw/pypandoc"; + license = licenses.mit; + maintainers = with maintainers; [ bennofs kristoff3r ]; + }; +} diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix new file mode 100644 index 00000000000..2acdef1b372 --- /dev/null +++ b/pkgs/development/python-modules/pyslurm/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, buildPythonPackage, cython, slurm }: + +buildPythonPackage rec { + name = "pyslurm"; + + src = fetchFromGitHub { + repo = "pyslurm"; + owner = "PySlurm"; + rev = "69e4f4fd66003b98ddb7da25613fe641d4ae160d"; + sha256 = "051kafkndbniklxyf0drb360aiblnqcf9rqjbvmqh66zrfya1m28"; + }; + + patches = [ ./pyslurm-dlfcn.patch ]; + + buildInputs = [ cython slurm ]; + setupPyBuildFlags = [ "--slurm-lib=${slurm}/lib" "--slurm-inc=${slurm.dev}/include" ]; + + meta = with lib; { + homepage = "https://github.com/PySlurm/pyslurm"; + description = "Python bindings to Slurm"; + license = licenses.gpl2; + maintainers = [ maintainers.veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/pyslurm/pyslurm-dlfcn.patch b/pkgs/development/python-modules/pyslurm/pyslurm-dlfcn.patch new file mode 100644 index 00000000000..2b3798a3070 --- /dev/null +++ b/pkgs/development/python-modules/pyslurm/pyslurm-dlfcn.patch @@ -0,0 +1,18 @@ +diff --git a/pyslurm/__init__.py b/pyslurm/__init__.py +index 81643e1..e8b6836 100644 +--- a/pyslurm/__init__.py ++++ b/pyslurm/__init__.py +@@ -11,8 +11,11 @@ import sys + old_dlopen_flags = '' + if hasattr(sys, "setdlopenflags"): + old_dlopen_flags = sys.getdlopenflags() +- import DLFCN +- sys.setdlopenflags(old_dlopen_flags | DLFCN.RTLD_GLOBAL) ++ if sys.version_info >= (3,6): ++ from os import RTLD_GLOBAL ++ else: ++ from DLFCN import RTLD_GLOBAL ++ sys.setdlopenflags(old_dlopen_flags | RTLD_GLOBAL) + + from .pyslurm import * + diff --git a/pkgs/development/python-modules/python-editor/default.nix b/pkgs/development/python-modules/python-editor/default.nix new file mode 100644 index 00000000000..98ed980588e --- /dev/null +++ b/pkgs/development/python-modules/python-editor/default.nix @@ -0,0 +1,17 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + version = "0.4"; + pname = "python-editor"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1gykxn16anmsbcrwhx3rrhwjif95mmwvq9gjcrr9bbzkdc8sf8a4"; + }; + + meta = with stdenv.lib; { + description = "A library that provides the `editor` module for programmatically"; + homepage = "https://github.com/fmoo/python-editor"; + }; +} diff --git a/pkgs/development/python-modules/python-gnupg/default.nix b/pkgs/development/python-modules/python-gnupg/default.nix new file mode 100644 index 00000000000..28870d3db85 --- /dev/null +++ b/pkgs/development/python-modules/python-gnupg/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage, fetchPypi, gnupg1 }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "python-gnupg"; + version = "0.4.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "06hfw9cmiw5306fyisp3kzg1hww260qzip829g7y7pj1mwpb0izg"; + }; + + propagatedBuildInputs = [ gnupg1 ]; + + # Let's make the library default to our gpg binary + patchPhase = '' + substituteInPlace gnupg.py \ + --replace "gpgbinary='gpg'" "gpgbinary='${gnupg1}/bin/gpg'" + substituteInPlace test_gnupg.py \ + --replace "gpgbinary=GPGBINARY" "gpgbinary='${gnupg1}/bin/gpg'" + ''; + + meta = with stdenv.lib; { + description = "A wrapper for the Gnu Privacy Guard"; + homepage = https://pypi.python.org/pypi/python-gnupg; + license = licenses.bsd3; + maintainers = with maintainers; [ copumpkin ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/python-uinput/default.nix b/pkgs/development/python-modules/python-uinput/default.nix new file mode 100644 index 00000000000..93b67fe4782 --- /dev/null +++ b/pkgs/development/python-modules/python-uinput/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi +, udev }: + +buildPythonPackage rec { + pname = "python-uinput"; + version = "0.11.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "033zqiypjz0nigav6vz0s57pbzikvds55mxphrdpkdbpdikjnfcr"; + }; + + buildInputs = [ udev ]; + + NIX_CFLAGS_LINK = [ "-ludev" ]; + + meta = with stdenv.lib; { + description = "Pythonic API to Linux uinput kernel module"; + homepage = "http://tjjr.fi/sw/python-uinput/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/pytoml/default.nix b/pkgs/development/python-modules/pytoml/default.nix new file mode 100644 index 00000000000..55479e76daf --- /dev/null +++ b/pkgs/development/python-modules/pytoml/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchgit +, python }: + +buildPythonPackage rec { + pname = "pytoml"; + version = "0.1.11"; + name = "${pname}-${version}"; + + checkPhase = "${python.interpreter} test/test.py"; + + # fetchgit used to ensure test submodule is available + src = fetchgit { + url = "${meta.homepage}.git"; + rev = "refs/tags/v${version}"; + sha256 = "1jiw04zk9ccynr8kb1vqh9r1p2kh0al7g7b1f94911iazg7dgs9j"; + }; + + meta = with stdenv.lib; { + description = "A TOML parser/writer for Python"; + homepage = https://github.com/avakar/pytoml; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix new file mode 100644 index 00000000000..2088b2e0b10 --- /dev/null +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -0,0 +1,43 @@ +{ buildPythonPackage, fetchFromGitHub, lib, numpy, pyyaml, cffi, cmake, + git, stdenv }: + +buildPythonPackage rec { + version = "0.1.12"; + pname = "pytorch"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "pytorch"; + repo = "pytorch"; + rev = "v${version}"; + sha256 = "0r8mf4xya76gz83y5z3hfxh0rydkydafhipl8g7d0bfrgw961jy9"; + }; + + checkPhase = '' + ${stdenv.shell} test/run_test.sh + ''; + + buildInputs = [ + cmake + git + numpy.blas + ]; + + propagatedBuildInputs = [ + cffi + numpy + pyyaml + ]; + + preConfigure = '' + export NO_CUDA=1 + ''; + + meta = { + description = "Tensors and Dynamic neural networks in Python with strong GPU acceleration."; + homepage = http://pytorch.org/; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ teh ]; + }; +} diff --git a/pkgs/development/python-modules/rcssmin/default.nix b/pkgs/development/python-modules/rcssmin/default.nix new file mode 100644 index 00000000000..9347cd55cf3 --- /dev/null +++ b/pkgs/development/python-modules/rcssmin/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi }: +buildPythonPackage rec { + pname = "rcssmin"; + version = "1.0.6"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0w42l4dhxghcz7pj3q7hkxp015mvb8z2cq9sfxbl31npsfavd1ya"; + }; + + # The package does not ship tests, and the setup machinary confuses + # tests auto-discovery + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://opensource.perlig.de/rcssmin/; + license = licenses.asl20; + description = "CSS minifier written in pure python"; + }; +} diff --git a/pkgs/development/python-modules/rjsmin/default.nix b/pkgs/development/python-modules/rjsmin/default.nix new file mode 100644 index 00000000000..24adf830699 --- /dev/null +++ b/pkgs/development/python-modules/rjsmin/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi }: +buildPythonPackage rec { + pname = "rjsmin"; + version = "1.0.12"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1wc62d0f80kw1kjv8nlxychh0iy66a6pydi4vfvhh2shffm935fx"; + }; + + # The package does not ship tests, and the setup machinary confuses + # tests auto-discovery + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://opensource.perlig.de/rjsmin/; + license = licenses.asl20; + description = "Javascript minifier written in python"; + }; +} diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix index 37369b8f0bd..c8958f9dd1f 100644 --- a/pkgs/development/python-modules/ropper/default.nix +++ b/pkgs/development/python-modules/ropper/default.nix @@ -14,6 +14,8 @@ buildPythonApplication rec { inherit pname version; sha256 = "1676e07947a19df9d17002307a7555c2647a4224d6f2869949e8fc4bd18f2e87"; }; + # XXX tests rely on user-writeable /dev/shm to obtain process locks and return PermissionError otherwise + # workaround: sudo chmod 777 /dev/shm checkPhase = '' py.test testcases ''; diff --git a/pkgs/development/python-modules/spotipy/default.nix b/pkgs/development/python-modules/spotipy/default.nix new file mode 100644 index 00000000000..326975e7155 --- /dev/null +++ b/pkgs/development/python-modules/spotipy/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, requests }: + +buildPythonPackage rec { + pname = "spotipy"; + name = "spotipy-${version}"; + version = "2.4.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1l8ya0cln936x0mx2j5ngl1xwpc0r89hs3wcvb8x8paw3d4dl1ab"; + }; + + propagatedBuildInputs = [ requests ]; + + meta = with stdenv.lib; { + homepage = "http://spotipy.readthedocs.org/"; + description = "A light weight Python library for the Spotify Web API"; + license = licenses.mit; + maintainers = [ maintainers.rvolosatovs ]; + }; +} diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 3fdb7cf9a6e..4cd522fe195 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "SQLAlchemy"; name = "${pname}-${version}"; - version = "1.1.10"; + version = "1.1.11"; src = fetchPypi { inherit pname version; - sha256 = "dbd92b8af2306d600efa98ed36262d73aad227440a758c8dc3a067ca30096bd3"; + sha256 = "76f76965e9a968ba3aecd2a8bc0d991cea04fd9a182e6c95c81f1551487b0211"; }; checkInputs = [ pytest mock pytest_xdist ] diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix new file mode 100644 index 00000000000..5a1e114fb25 --- /dev/null +++ b/pkgs/development/python-modules/stripe/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchPypi +, unittest2, mock, requests }: + +buildPythonPackage rec { + pname = "stripe"; + version = "1.41.1"; + name = "${pname}-${version}"; + + # Tests require network connectivity and there's no easy way to disable + # them. ~ C. + doCheck = false; + + src = fetchPypi { + inherit pname version; + sha256 = "0zvffvq933ia5w5ll6xhx2zgvppgc6zc2mxhc6f0kypw5g2fxvz5"; + }; + + buildInputs = [ unittest2 mock ]; + + propagatedBuildInputs = [ requests ]; + + meta = with stdenv.lib; { + description = "Stripe Python bindings"; + homepage = "https://github.com/stripe/stripe-python"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/tarsnapper-path.patch b/pkgs/development/python-modules/tarsnapper-path.patch deleted file mode 100644 index 337ad49f971..00000000000 --- a/pkgs/development/python-modules/tarsnapper-path.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/tarsnapper/script.py b/src/tarsnapper/script.py -index 737ac8d..52cc775 100644 ---- a/src/tarsnapper/script.py -+++ b/src/tarsnapper/script.py -@@ -48,7 +48,7 @@ class TarsnapBackend(object): - """ - ``arguments`` is a single list of strings. - """ -- call_with = ['tarsnap'] -+ call_with = ['@NIXTARSNAPPATH@'] - for option in self.options: - key = option[0] - pre = "-" if len(key) == 1 else "--" -@@ -499,4 +499,4 @@ def run(): - - - if __name__ == '__main__': -- run() -\ No newline at end of file -+ run() diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index 29e6a7d1743..6a3f9c63890 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -1,4 +1,6 @@ -{ lib, fetchPypi, buildPythonPackage, protobuf3_0, hidapi, ecdsa, mnemonic }: +{ lib, fetchPypi, buildPythonPackage, protobuf3_2, hidapi, ecdsa, mnemonic +, requests +}: buildPythonPackage rec { name = "${pname}-${version}"; @@ -10,7 +12,7 @@ buildPythonPackage rec { sha256 = "f7e4f509263ca172532b4c0a440d164add7cdc021b4370a253d51eba5806b618"; }; - propagatedBuildInputs = [ protobuf3_0 hidapi ]; + propagatedBuildInputs = [ protobuf3_2 hidapi requests ]; buildInputs = [ ecdsa mnemonic ]; diff --git a/pkgs/development/python-modules/unifi/default.nix b/pkgs/development/python-modules/unifi/default.nix new file mode 100644 index 00000000000..89496e00e56 --- /dev/null +++ b/pkgs/development/python-modules/unifi/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage +, fetchPypi, urllib3 }: + +buildPythonPackage rec { + pname = "unifi"; + version = "1.2.5"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0prgx01hzs49prrazgxrinm7ivqzy57ch06qm2h7s1p957sazds8"; + }; + + propagatedBuildInputs = [ urllib3 ]; + + # upstream has no tests + doCheck = false; + + meta = with stdenv.lib; { + description = "An API towards the Ubiquity Networks UniFi controller"; + homepage = https://pypi.python.org/pypi/unifi/; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/development/python-modules/uritools/default.nix b/pkgs/development/python-modules/uritools/default.nix new file mode 100644 index 00000000000..d680c29e224 --- /dev/null +++ b/pkgs/development/python-modules/uritools/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, ipaddress }: + +buildPythonPackage rec { + pname = "uritools"; + name = "uritools-${version}"; + version = "2.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "20d7881a947cd3c3bb452e2b541f44acc52febe9c4e3f6d05c55d559fb208c50"; + }; + + propagatedBuildInputs = [ ipaddress ]; + + meta = with stdenv.lib; { + description = "RFC 3986 compliant, Unicode-aware, scheme-agnostic replacement for urlparse"; + license = licenses.mit; + maintainers = [ maintainers.rvolosatovs ]; + }; +} diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix new file mode 100644 index 00000000000..efdce1e6dba --- /dev/null +++ b/pkgs/development/python-modules/vega/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildPythonPackage , fetchPypi +, pytest, jupyter_core, pandas }: + +buildPythonPackage rec { + pname = "vega"; + version = "0.4.4"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "08k92afnk0bivm07h1l5nh26xl2rfp7qn03aq17q1hr3fs5r6cdm"; + }; + + buildInputs = [ pytest ]; + propagatedBuildInputs = [ jupyter_core pandas ]; + + meta = with stdenv.lib; { + description = "An IPython/Jupyter widget for Vega and Vega-Lite"; + longDescription = '' + To use this you have to enter a nix-shell with vega. Then run: + + jupyter nbextension install --user --py vega + jupyter nbextension enable --user vega + ''; + homepage = https://github.com/vega/ipyvega; + license = licenses.bsd3; + maintainers = with maintainers; [ teh ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/vine/default.nix b/pkgs/development/python-modules/vine/default.nix new file mode 100644 index 00000000000..85b17f5119c --- /dev/null +++ b/pkgs/development/python-modules/vine/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi +, case, pytest, pythonOlder }: + +buildPythonPackage rec { + pname = "vine"; + version = "1.1.3"; + name = "${pname}-${version}"; + + disable = pythonOlder "2.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "0h94x9mc9bspg23lb1f73h7smdzc39ps7z7sm0q38ds9jahmvfc7"; + }; + + buildInputs = [ case pytest ]; + + meta = with stdenv.lib; { + description = "Python promises"; + homepage = https://github.com/celery/vine; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix new file mode 100644 index 00000000000..f6d3a747ee4 --- /dev/null +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -0,0 +1,31 @@ +{ buildPythonPackage +, fetchPypi +, lib +, recursivePthLoader +}: + +buildPythonPackage rec { + pname = "virtualenv"; + version = "15.0.3"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "6d9c760d3fc5fa0894b0f99b9de82a4647e1164f0b700a7f99055034bf548b1d"; + }; + + # Doubt this is needed - FRidh 2017-07-07 + pythonPath = [ recursivePthLoader ]; + + patches = [ ./virtualenv-change-prefix.patch ]; + + # Tarball doesn't contain tests + doCheck = false; + + meta = { + description = "A tool to create isolated Python environments"; + homepage = http://www.virtualenv.org; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ goibhniu ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/virtualenv-change-prefix.patch b/pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch similarity index 100% rename from pkgs/development/python-modules/virtualenv-change-prefix.patch rename to pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix new file mode 100644 index 00000000000..6fbd6886b1a --- /dev/null +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi +, nose, pyyaml }: + +buildPythonPackage rec { + pname = "yamllint"; + version = "0.5.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0brdy1crhfng10hlw0420bv10c2xnjk8ndnhssybkzym47yrzg84"; + }; + + buildInputs = [ nose ]; + + propagatedBuildInputs = [ pyyaml ]; + + meta = with stdenv.lib; { + description = "A linter for YAML files"; + homepage = "https://github.com/adrienverge/yamllint"; + license = licenses.gpl3; + maintainers = with maintainers; [ mikefaille ]; + }; +} diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix new file mode 100644 index 00000000000..b7f9d713927 --- /dev/null +++ b/pkgs/development/python-modules/yapf/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "yapf"; + version = "0.11.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "14kb9gxw39zhvrijhp066b4bm6bgv35iw56c394y4dyczpha0dij"; + }; + + meta = with stdenv.lib; { + description = "A formatter for Python code."; + homepage = "https://github.com/google/yapf"; + license = licenses.asl20; + maintainers = with maintainers; [ siddharthist ]; + }; + +} diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix new file mode 100644 index 00000000000..aa90bf0ce1a --- /dev/null +++ b/pkgs/development/python-modules/zconfig/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, fetchPypi +, buildPythonPackage +, zope_testrunner +}: + +buildPythonPackage rec { + pname = "ZConfig"; + version = "3.2.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "de0a802e5dfea3c0b3497ccdbe33a5023c4265f950f33e35dd4cf078d2a81b19"; + }; + + patches = [ ./skip-broken-test.patch ]; + + propagatedBuildInputs = [ zope_testrunner ]; + + meta = with stdenv.lib; { + description = "Structured Configuration Library"; + homepage = http://pypi.python.org/pypi/ZConfig; + license = licenses.zpt20; + maintainers = [ maintainers.goibhniu ]; + }; +} diff --git a/pkgs/development/python-modules/zconfig/skip-broken-test.patch b/pkgs/development/python-modules/zconfig/skip-broken-test.patch new file mode 100644 index 00000000000..ee3fcff4903 --- /dev/null +++ b/pkgs/development/python-modules/zconfig/skip-broken-test.patch @@ -0,0 +1,12 @@ +diff --git a/ZConfig/tests/test_schema2html.py b/ZConfig/tests/test_schema2html.py +index 838cf7c..52daf4e 100644 +--- a/ZConfig/tests/test_schema2html.py ++++ b/ZConfig/tests/test_schema2html.py +@@ -74,6 +74,7 @@ else: + + class TestSchema2HTML(unittest.TestCase): + ++ @unittest.skip('broken test (https://github.com/zopefoundation/ZConfig/issues/34)') + def test_no_schema(self): + self.assertRaises(SystemExit, + run_transform) diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix new file mode 100644 index 00000000000..487f657680c --- /dev/null +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildPythonPackage, fetchPypi +, netifaces, six, enum-compat }: + +buildPythonPackage rec { + pname = "zeroconf"; + version = "0.18.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0s1840v2h4h19ad8lfadbm3dhzs8bw9c5c3slkxql1zsaiycvjy2"; + }; + + propagatedBuildInputs = [ netifaces six enum-compat ]; + + meta = with stdenv.lib; { + description = "A pure python implementation of multicast DNS service discovery"; + homepage = "https://github.com/jstasiak/python-zeroconf"; + license = licenses.lgpl21; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/zope_interface/default.nix b/pkgs/development/python-modules/zope_interface/default.nix new file mode 100644 index 00000000000..bfde1f0a215 --- /dev/null +++ b/pkgs/development/python-modules/zope_interface/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, zope_event +}: + +buildPythonPackage rec { + pname = "zope.interface"; + version = "4.4.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "4e59e427200201f69ef82956ddf9e527891becf5b7cde8ec3ce39e1d0e262eb0"; + }; + + propagatedBuildInputs = [ zope_event ]; + + meta = with stdenv.lib; { + description = "Zope.Interface"; + homepage = http://zope.org/Products/ZopeInterface; + license = licenses.zpt20; + maintainers = [ maintainers.goibhniu ]; + }; +} diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix new file mode 100644 index 00000000000..fc1a3c4c902 --- /dev/null +++ b/pkgs/development/python-modules/zope_testrunner/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPy3k +, zope_interface +, zope_exceptions +, zope_testing +, six +, subunit +}: + + +buildPythonPackage rec { + pname = "zope.testrunner"; + version = "4.7.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "8ffcb4989829544a83d27e42b2eeb28f8fc134bd847d71ce8dca54f710526ef0"; + extension = "zip"; + }; + + propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ] ++ stdenv.lib.optional (!isPy3k) subunit; + + meta = with stdenv.lib; { + description = "A flexible test runner with layer support"; + homepage = http://pypi.python.org/pypi/zope.testrunner; + license = licenses.zpt20; + maintainers = [ maintainers.goibhniu ]; + }; +} diff --git a/pkgs/development/python-modules/zxcvbn-python/default.nix b/pkgs/development/python-modules/zxcvbn-python/default.nix index 65d343cbec9..66a0f8d77aa 100644 --- a/pkgs/development/python-modules/zxcvbn-python/default.nix +++ b/pkgs/development/python-modules/zxcvbn-python/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "zxcvbn-python"; - version = "4.4.14"; + version = "4.4.15"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "fd3a46536035851571e3f4142b64d6e7bcf0ade3cd40d8fecae7a1243945e327"; + sha256 = "ef982a382518d217d353a42093aa8bb8608a50bc2df559c08885bba166782cd0"; }; # No tests in archive diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix index ff4341c6783..f3d8e746c22 100644 --- a/pkgs/development/qtcreator/default.nix +++ b/pkgs/development/qtcreator/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; let baseVersion = "4.3"; - revision = "0"; + revision = "1"; in stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.xz"; - sha256 = "1n3ihky72p6q69n6c8s5hacq8rxdqmmr6msg89w5amwd17sam7p9"; + sha256 = "1bd4wxvp8b5imsmrbnn8rkiln38g74g2545x07pmihc8z51qh2h6"; }; buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ]; diff --git a/pkgs/development/r-modules/bioc-annotation-packages.nix b/pkgs/development/r-modules/bioc-annotation-packages.nix index 25a89d94eba..75ae872d77c 100644 --- a/pkgs/development/r-modules/bioc-annotation-packages.nix +++ b/pkgs/development/r-modules/bioc-annotation-packages.nix @@ -4,7 +4,7 @@ # Rscript generate-r-packages.R bioc-annotation >new && mv new bioc-annotation-packages.nix { self, derive }: -let derive2 = derive { rVersion = "3.3"; }; +let derive2 = derive { rVersion = "3.4"; }; in with self; { BSgenome_Alyrata_JGI_v1 = derive2 { name="BSgenome.Alyrata.JGI.v1"; version="1.0.0"; sha256="06549kkzy36n378zb61lrf9zardncp7i20r73rmmiq1pnfjp3gww"; depends=[BSgenome]; }; BSgenome_Amellifera_BeeBase_assembly4 = derive2 { name="BSgenome.Amellifera.BeeBase.assembly4"; version="1.4.0"; sha256="02zs16q441zcbfp7xvv1gny5nn02ivfr8md1wh5s5rpnj6sdl6kj"; depends=[BSgenome]; }; @@ -46,6 +46,7 @@ in with self; { BSgenome_Ggallus_UCSC_galGal3_masked = derive2 { name="BSgenome.Ggallus.UCSC.galGal3.masked"; version="1.3.99"; sha256="0igi02g46h1j87hv9bk45nbqahyjd0k75jkg0s6m9a62jsssg63l"; depends=[BSgenome BSgenome_Ggallus_UCSC_galGal3]; }; BSgenome_Ggallus_UCSC_galGal4 = derive2 { name="BSgenome.Ggallus.UCSC.galGal4"; version="1.4.0"; sha256="1qfl046akdf43azigprc13sssgbmxdz9dmlrvy13ag8fgfkjxign"; depends=[BSgenome]; }; BSgenome_Ggallus_UCSC_galGal4_masked = derive2 { name="BSgenome.Ggallus.UCSC.galGal4.masked"; version="1.3.99"; sha256="0fvqimjf1xvgka4nw66nd0rbyb7r93v8cyw33776lhfv68ny058v"; depends=[BSgenome BSgenome_Ggallus_UCSC_galGal4]; }; + BSgenome_Ggallus_UCSC_galGal5 = derive2 { name="BSgenome.Ggallus.UCSC.galGal5"; version="1.4.2"; sha256="0gi82xr2b3fn3wi608nmqp3cgjx63rm82wy24p9l0s1qqh2z3jdb"; depends=[BSgenome]; }; BSgenome_Hsapiens_1000genomes_hs37d5 = derive2 { name="BSgenome.Hsapiens.1000genomes.hs37d5"; version="0.99.1"; sha256="1cg0g5fqmsvwyw2p9hp2yy4ilk21jkbbrnpgqvb5c36ihjwvc7sr"; depends=[BSgenome]; }; BSgenome_Hsapiens_NCBI_GRCh38 = derive2 { name="BSgenome.Hsapiens.NCBI.GRCh38"; version="1.3.1000"; sha256="0y75qdq578fh6420vbvsbwmdw8jvr3g06qli2h3vj3pxmjykh9c1"; depends=[BSgenome]; }; BSgenome_Hsapiens_UCSC_hg17 = derive2 { name="BSgenome.Hsapiens.UCSC.hg17"; version="1.3.1000"; sha256="1q8p0zp5xpp22znwnygl3jhc159db4q3kkpj5wfij5a6z19zs1w3"; depends=[BSgenome]; }; @@ -74,6 +75,7 @@ in with self; { BSgenome_Ptroglodytes_UCSC_panTro2_masked = derive2 { name="BSgenome.Ptroglodytes.UCSC.panTro2.masked"; version="1.3.99"; sha256="1dy1bf6rsmzv6qj9d2a1sz56w33pk63g3qxm8znfdw11hmdbq9m1"; depends=[BSgenome BSgenome_Ptroglodytes_UCSC_panTro2]; }; BSgenome_Ptroglodytes_UCSC_panTro3 = derive2 { name="BSgenome.Ptroglodytes.UCSC.panTro3"; version="1.4.0"; sha256="1vbfx0zrj4rcwcsm1q09xdiv0mmrycj8223lnxqb8nr5r017f7gm"; depends=[BSgenome]; }; BSgenome_Ptroglodytes_UCSC_panTro3_masked = derive2 { name="BSgenome.Ptroglodytes.UCSC.panTro3.masked"; version="1.3.99"; sha256="18ga0whdcp5zpigrmh68wjmn99lzvfyvgxjm58y0jx66rmg94mir"; depends=[BSgenome BSgenome_Ptroglodytes_UCSC_panTro3]; }; + BSgenome_Ptroglodytes_UCSC_panTro5 = derive2 { name="BSgenome.Ptroglodytes.UCSC.panTro5"; version="1.4.2"; sha256="0wxciajcyf0hr6g6zcji125jm18nnspwvnv5x3jibjvxzx55gcds"; depends=[BSgenome]; }; BSgenome_Rnorvegicus_UCSC_rn4 = derive2 { name="BSgenome.Rnorvegicus.UCSC.rn4"; version="1.4.0"; sha256="1aww2bxyqbb81iln3vgrb0659r82v9yv1z41k9r3zws8b7k7df6x"; depends=[BSgenome]; }; BSgenome_Rnorvegicus_UCSC_rn4_masked = derive2 { name="BSgenome.Rnorvegicus.UCSC.rn4.masked"; version="1.3.99"; sha256="0jfv1873ab1nwwdr18vrjqcdl4rhv3xgqbf4jfnjk7sjx154pfi6"; depends=[BSgenome BSgenome_Rnorvegicus_UCSC_rn4]; }; BSgenome_Rnorvegicus_UCSC_rn5 = derive2 { name="BSgenome.Rnorvegicus.UCSC.rn5"; version="1.4.0"; sha256="1s92983m73bi08ihvyd8c17yx29hz5xxrnrs2if8fda4asw1f3f0"; depends=[BSgenome]; }; @@ -93,21 +95,21 @@ in with self; { BSgenome_Vvinifera_URGI_IGGP8X = derive2 { name="BSgenome.Vvinifera.URGI.IGGP8X"; version="0.1"; sha256="0v0hi2pbbi5ynd92bvbv4bzr7bgv48kvyz62hdv7k9gh7s5pg0id"; depends=[BSgenome]; }; ChemmineDrugs = derive2 { name="ChemmineDrugs"; version="1.0.0"; sha256="0h4jxcb6vkf9ijljas7yvcx6vmrd5rpjgj202cf2jb9hx8h9497i"; depends=[BiocGenerics ChemmineR RSQLite]; }; DO_db = derive2 { name="DO.db"; version="2.9"; sha256="10bqqa124l61ivzy4mdd3z3ar9a6537qbxw23pc4y9w8a6dwnavn"; depends=[AnnotationDbi]; }; - EnsDb_Hsapiens_v75 = derive2 { name="EnsDb.Hsapiens.v75"; version="0.99.12"; sha256="1yc912m6qvrqbmc9y4bxyr1l3vfq4pv751jagsqpvjlhgkdasn2p"; depends=[ensembldb GenomicFeatures]; }; - EnsDb_Hsapiens_v79 = derive2 { name="EnsDb.Hsapiens.v79"; version="0.99.12"; sha256="1r09wksknhsa42aq2xdwnyd0agsw46fnxijb5nkx1avhp82zlpp2"; depends=[ensembldb GenomicFeatures]; }; - EnsDb_Mmusculus_v75 = derive2 { name="EnsDb.Mmusculus.v75"; version="0.99.12"; sha256="1w3hby778gm1xcin2jyjn6f9l4h2na7lz99mqy28pl6g2b2fc74g"; depends=[ensembldb GenomicFeatures]; }; - EnsDb_Mmusculus_v79 = derive2 { name="EnsDb.Mmusculus.v79"; version="0.99.12"; sha256="0zhjh0l26rsimg2qz9a7qgxcb7h4mrgp28wawh7993mym6apwbvq"; depends=[ensembldb GenomicFeatures]; }; - EnsDb_Rnorvegicus_v75 = derive2 { name="EnsDb.Rnorvegicus.v75"; version="0.99.12"; sha256="11g24pbal3frfkfndcs80kmbp9igkf7l8hqfbz1ggdxyshgaf6z0"; depends=[ensembldb GenomicFeatures]; }; - EnsDb_Rnorvegicus_v79 = derive2 { name="EnsDb.Rnorvegicus.v79"; version="0.99.12"; sha256="1s0mbrd3v104rxvnjrm7rq21ypy5vcjgbhnadwkj679spz84jnib"; depends=[ensembldb GenomicFeatures]; }; + EnsDb_Hsapiens_v75 = derive2 { name="EnsDb.Hsapiens.v75"; version="2.1.0"; sha256="020vrkfjs7bwnz897l3x4fmc1bnzn3n1zpmv5mmnn8fm35qcrai8"; depends=[ensembldb]; }; + EnsDb_Hsapiens_v79 = derive2 { name="EnsDb.Hsapiens.v79"; version="2.1.0"; sha256="1684sl2smmp2bdkfzv9v5f04100p4hqkfhn1m73pyppygkpak2hp"; depends=[ensembldb]; }; + EnsDb_Hsapiens_v86 = derive2 { name="EnsDb.Hsapiens.v86"; version="2.1.0"; sha256="1xbvzl8abgcafzd3f8kaypq5b6lpa8j92m2skgsagn0mfpqwqk4s"; depends=[ensembldb]; }; + EnsDb_Mmusculus_v75 = derive2 { name="EnsDb.Mmusculus.v75"; version="2.1.0"; sha256="0r6j0andx2mbrjk7wfhr4k8cwpll63i08m0073fik0cy08hy0f6l"; depends=[ensembldb]; }; + EnsDb_Mmusculus_v79 = derive2 { name="EnsDb.Mmusculus.v79"; version="2.1.0"; sha256="12shvxcj8jjzn5mil6vfil4a9jnrfs41jlll4wypgs4iyb0m8f7g"; depends=[ensembldb]; }; + EnsDb_Rnorvegicus_v75 = derive2 { name="EnsDb.Rnorvegicus.v75"; version="2.1.0"; sha256="1bdr417m0dk2qdkz4ydfzhl3q728c9vl8k5w84x4g8cqv0bv58lv"; depends=[ensembldb]; }; + EnsDb_Rnorvegicus_v79 = derive2 { name="EnsDb.Rnorvegicus.v79"; version="2.1.0"; sha256="1nri32xkz764nnpxfh8hbp6c8f8xd565jl5hwhvn6ml2awjqxd83"; depends=[ensembldb]; }; FDb_FANTOM4_promoters_hg19 = derive2 { name="FDb.FANTOM4.promoters.hg19"; version="1.0.0"; sha256="04sn5x1r5fcbghzw6n1bvy0z8zyhrbk86wsqz1p5gk665vicz8rw"; depends=[AnnotationDbi Biostrings GenomicFeatures]; }; FDb_InfiniumMethylation_hg18 = derive2 { name="FDb.InfiniumMethylation.hg18"; version="2.2.0"; sha256="0vwzqzj49imjdsn8ssiwqi7qic7rqw5pbsiinyxgy7y10fn2i42a"; depends=[AnnotationDbi Biostrings GenomicFeatures org_Hs_eg_db TxDb_Hsapiens_UCSC_hg18_knownGene]; }; FDb_InfiniumMethylation_hg19 = derive2 { name="FDb.InfiniumMethylation.hg19"; version="2.2.0"; sha256="0gq90fvph6kgrpjb89nvzq6hl1k24swn19rgjh5g98l86mja6nk0"; depends=[AnnotationDbi Biostrings GenomicFeatures org_Hs_eg_db TxDb_Hsapiens_UCSC_hg19_knownGene]; }; FDb_UCSC_snp135common_hg19 = derive2 { name="FDb.UCSC.snp135common.hg19"; version="1.0.0"; sha256="1ykyixrbw86ajx65w1jwr068ma5cvzl4kypaw77kpggmf1qqgkxp"; depends=[AnnotationDbi GenomicFeatures]; }; FDb_UCSC_snp137common_hg19 = derive2 { name="FDb.UCSC.snp137common.hg19"; version="1.0.0"; sha256="1q1r7rk29q0zlzxz6fvfy1kjfli6wxzvhvhhfnf3z4ksy5332q63"; depends=[AnnotationDbi GenomicFeatures]; }; FDb_UCSC_tRNAs = derive2 { name="FDb.UCSC.tRNAs"; version="1.0.1"; sha256="1dymdalx9fzrplxyc0fd9faa4r5jimi7zyry9k65lyz1pabpkwqz"; depends=[AnnotationDbi GenomicFeatures]; }; - FlowSorted_CordBloodNorway_450k = derive2 { name="FlowSorted.CordBloodNorway.450k"; version="0.99.1"; sha256="0sfnrcg5f99d65grlc7ds9i03yrgn8c0p87sp7cqnmr6f2h3y7i4"; depends=[minfi]; }; GGHumanMethCancerPanelv1_db = derive2 { name="GGHumanMethCancerPanelv1.db"; version="1.4.1"; sha256="0ag1pkbh4mx4aplfrrz1q4f4cl05mczq9pcsfkd1071qk51dcwvx"; depends=[AnnotationDbi AnnotationForge org_Hs_eg_db]; }; - GO_db = derive2 { name="GO.db"; version="3.3.0"; sha256="0x2hkbhg9d8waw32hdn05887vv3zbs5aqff3mf5vfyzvl7xhgxy0"; depends=[AnnotationDbi]; }; + GO_db = derive2 { name="GO.db"; version="3.4.0"; sha256="02cj8kqi5w39jwcs8gp1dgj08sah262ppxnkz4h3qd0w191y8yyl"; depends=[AnnotationDbi]; }; Homo_sapiens = derive2 { name="Homo.sapiens"; version="1.3.1"; sha256="151vj7h5p1c8yd5swrchk46z469p135wk50hvkl0nhgndvy0jj01"; depends=[AnnotationDbi GenomicFeatures GO_db org_Hs_eg_db OrganismDbi TxDb_Hsapiens_UCSC_hg19_knownGene]; }; Hs6UG171_db = derive2 { name="Hs6UG171.db"; version="3.2.3"; sha256="034aady3hy8j9bm7pbl8l8h0gcfnzmpyxg9l9s1ky0pj7ryzr93a"; depends=[AnnotationDbi org_Hs_eg_db]; }; HsAgilentDesign026652_db = derive2 { name="HsAgilentDesign026652.db"; version="3.2.3"; sha256="0x6nxvzmc8k4qp382ca32y58awkxpg0b3kc7m1mz9iag6sq7c5vx"; depends=[AnnotationDbi org_Hs_eg_db]; }; @@ -117,113 +119,112 @@ in with self; { HuExExonProbesetLocationHg19 = derive2 { name="HuExExonProbesetLocationHg19"; version="0.0.3"; sha256="0h240v2wc2c935bxws6xpha4c0hw89bm821w1c1digwhd04kbyxh"; depends=[AnnotationDbi]; }; HuO22_db = derive2 { name="HuO22.db"; version="3.2.3"; sha256="159ml83s9r8kcb0phh2zalcmzacn6d5z7vq6bg5ygy9l85vkcqsf"; depends=[AnnotationDbi org_Hs_eg_db]; }; IlluminaHumanMethylation27k_db = derive2 { name="IlluminaHumanMethylation27k.db"; version="1.4.8"; sha256="0zw0n4a9v42ifmvw2hfzzvl8jz1d7f00ia59ljhcvvw9aj12q4zs"; depends=[AnnotationDbi org_Hs_eg_db]; }; + IlluminaHumanMethylation27kanno_ilmn12_hg19 = derive2 { name="IlluminaHumanMethylation27kanno.ilmn12.hg19"; version="0.6.0"; sha256="0idy6xn3x5c640d47q52na03s29pj4l38dpxy8q9mh6hy8g29vp3"; depends=[minfi]; }; IlluminaHumanMethylation27kmanifest = derive2 { name="IlluminaHumanMethylation27kmanifest"; version="0.4.0"; sha256="1kvz6z7g61zdrc1i93wsk1zv5mwcswfkxkl114644q09djwbz1fx"; depends=[minfi]; }; IlluminaHumanMethylation450k_db = derive2 { name="IlluminaHumanMethylation450k.db"; version="2.0.9"; sha256="1zmm65qnm95w9c8z30c9vncca451npbhhnlkpkpp894svsakxziz"; depends=[AnnotationDbi org_Hs_eg_db]; }; - IlluminaHumanMethylation450kanno_ilmn12_hg19 = derive2 { name="IlluminaHumanMethylation450kanno.ilmn12.hg19"; version="0.2.1"; sha256="1agvivsji3ppd9qwmf99kzyg5jrz1wnz3f0w07715xywc6pavvxl"; depends=[minfi]; }; + IlluminaHumanMethylation450kanno_ilmn12_hg19 = derive2 { name="IlluminaHumanMethylation450kanno.ilmn12.hg19"; version="0.6.0"; sha256="059vlxsx3p3fcnywwirahsc6mlk813zpqnbv0jsrag6x5bb8z6r4"; depends=[minfi]; }; IlluminaHumanMethylation450kmanifest = derive2 { name="IlluminaHumanMethylation450kmanifest"; version="0.4.0"; sha256="0qx75xwifrbkqmbkd8dhf44c34ibmbivqh7y8rvgrsizmi5ybcj1"; depends=[minfi]; }; IlluminaHumanMethylation450kprobe = derive2 { name="IlluminaHumanMethylation450kprobe"; version="2.0.6"; sha256="1iah0rw7d8qvgwvn6n2l4cln39ky010gqpd9shml45m48m6whiia"; depends=[AnnotationDbi]; }; - IlluminaHumanMethylationEPICanno_ilm10b2_hg19 = derive2 { name="IlluminaHumanMethylationEPICanno.ilm10b2.hg19"; version="0.3.0"; sha256="1nz15bva44pag3c4l1z7d01r0jfgb9cirn3zard5i258v1ahg4q6"; depends=[minfi]; }; + IlluminaHumanMethylationEPICanno_ilm10b2_hg19 = derive2 { name="IlluminaHumanMethylationEPICanno.ilm10b2.hg19"; version="0.6.0"; sha256="0sfdx0lpiw3l4passx93pjfswd0iv3hxdc7ciazh53baib3xpv2d"; depends=[minfi]; }; IlluminaHumanMethylationEPICmanifest = derive2 { name="IlluminaHumanMethylationEPICmanifest"; version="0.3.0"; sha256="0alhjda5g186z8b1nsmnpfswrlj7prdz8mkwx60wkkl6hkcnk6p3"; depends=[minfi]; }; JazaeriMetaData_db = derive2 { name="JazaeriMetaData.db"; version="3.2.3"; sha256="04lvcmm4ybxkfwgbiwcnpyj6kpbd0gd7jz6ijlbbvv6zdgdmvykb"; depends=[AnnotationDbi org_Hs_eg_db]; }; KEGG_db = derive2 { name="KEGG.db"; version="3.2.3"; sha256="0qv9in1nmnqcbjxh0y45x33xyw9zdp4jf5hmlvcsh1pclcq4dsh2"; depends=[AnnotationDbi]; }; LAPOINTE_db = derive2 { name="LAPOINTE.db"; version="3.2.3"; sha256="0960gy5p4ybs5zs6251cgc3nk5a9gsh1nh23gkbkr3gc8jddinfm"; depends=[AnnotationDbi org_Hs_eg_db]; }; LowMACAAnnotation = derive2 { name="LowMACAAnnotation"; version="0.99.3"; sha256="0ri301ci54s8wwkah1jccy5h44xg8yjk08j5b15qmdsm25hli4wm"; depends=[]; }; LymphoSeqDB = derive2 { name="LymphoSeqDB"; version="0.99.2"; sha256="1cdyn2imjh4zr23szndc4vwyiacxs1jsp14gil2dyq9aifa25qr7"; depends=[]; }; - MafDb_1Kgenomes_phase1_hs37d5 = derive2 { name="MafDb.1Kgenomes.phase1.hs37d5"; version="3.3.0"; sha256="0axbmmcqsy8hbxxn0q3q14whdjy8zvmd0xbqdlcb08nhs8j1jji0"; depends=[AnnotationDbi Biobase Biostrings GenomicRanges IRanges Rsamtools RSQLite VariantAnnotation VariantFiltering]; }; - MafDb_1Kgenomes_phase3_hs37d5 = derive2 { name="MafDb.1Kgenomes.phase3.hs37d5"; version="3.3.0"; sha256="1g1hi6fvz87im8xafk2jmkms463i2jakjjq8xdmb4zhk1ij6ck2f"; depends=[AnnotationDbi Biobase Biostrings GenomicRanges IRanges Rsamtools RSQLite VariantAnnotation VariantFiltering]; }; - MafDb_ALL_wgs_phase1_release_v3_20101123 = derive2 { name="MafDb.ALL.wgs.phase1.release.v3.20101123"; version="3.3.0"; sha256="1aj9w8kaymm9jmjani1nyw75akxprvm77rjddmrlkfdpfj4mnadn"; depends=[AnnotationDbi Biobase Biostrings GenomicRanges IRanges Rsamtools RSQLite VariantAnnotation VariantFiltering]; }; - MafDb_ALL_wgs_phase3_release_v5b_20130502 = derive2 { name="MafDb.ALL.wgs.phase3.release.v5b.20130502"; version="3.3.0"; sha256="0rjsj5423nksnk3dn8zyxa7j62ihni1ni9m7hr0fqcm4jixqbjmp"; depends=[AnnotationDbi Biobase Biostrings GenomicRanges IRanges Rsamtools RSQLite VariantAnnotation VariantFiltering]; }; - MafDb_ESP6500SI_V2_SSA137 = derive2 { name="MafDb.ESP6500SI.V2.SSA137"; version="3.3.0"; sha256="1yicrqh40pjgg4g7dm7xf26dz3hwp01n25k3m46ds7dyg20g6vln"; depends=[AnnotationDbi Biobase Biostrings GenomicRanges IRanges Rsamtools RSQLite VariantAnnotation VariantFiltering]; }; - MafDb_ExAC_r0_3_1_nonTCGA_snvs_hs37d5 = derive2 { name="MafDb.ExAC.r0.3.1.nonTCGA.snvs.hs37d5"; version="3.3.0"; sha256="01l4ixcgpwi8prj91xag2r93dayprg6zi2w2pp0bhsw3cs8v9cfi"; depends=[BSgenome GenomicRanges IRanges VariantFiltering]; }; - MafDb_ExAC_r0_3_1_snvs_hs37d5 = derive2 { name="MafDb.ExAC.r0.3.1.snvs.hs37d5"; version="3.3.0"; sha256="0csnsa6s08yc1mgi32h7pbmdn4h9wja96l2zdfvfwapmh3wmzm1a"; depends=[BSgenome GenomicRanges IRanges VariantFiltering]; }; - MafDb_ExAC_r0_3_sites = derive2 { name="MafDb.ExAC.r0.3.sites"; version="3.3.0"; sha256="07a859ipwbk1il6fvb7mlpvc05r7gkglchx2qlc3xlpl8i9fb9qr"; depends=[AnnotationDbi Biobase Biostrings GenomicRanges IRanges Rsamtools RSQLite SummarizedExperiment VariantAnnotation VariantFiltering]; }; - MeSH_AOR_db = derive2 { name="MeSH.AOR.db"; version="1.6.0"; sha256="0zia94rqj9kjf9cibppkhdb7qx086hkx6hd3dcn85x27di4ic12g"; depends=[MeSHDbi]; }; - MeSH_Aca_eg_db = derive2 { name="MeSH.Aca.eg.db"; version="1.6.0"; sha256="1lq2a7l855xb482x97p4mwvgzbizjb6m0avswhm9snvipbkfb42q"; depends=[MeSHDbi]; }; - MeSH_Aga_PEST_eg_db = derive2 { name="MeSH.Aga.PEST.eg.db"; version="1.6.0"; sha256="19nv4mpx15qgiixcvwlbq8v5plzpkzkikgpc5mp9mzf286nnh7vz"; depends=[MeSHDbi]; }; - MeSH_Ame_eg_db = derive2 { name="MeSH.Ame.eg.db"; version="1.6.0"; sha256="05xfrgyvyljh9jh38f8fj4x2l0i7h55yn08gd0r4riiibsgrfwvz"; depends=[MeSHDbi]; }; - MeSH_Aml_eg_db = derive2 { name="MeSH.Aml.eg.db"; version="1.6.0"; sha256="1fnz04qz5f8v20sr0zp9wd2dbqapww0lfb1c8lv099m5sanmwz35"; depends=[MeSHDbi]; }; - MeSH_Ana_eg_db = derive2 { name="MeSH.Ana.eg.db"; version="1.6.0"; sha256="0jbsz97wrbj70pypj9xgvhwy4cgjapirnhsdiix6b1l0lpqahvzq"; depends=[MeSHDbi]; }; - MeSH_Ani_FGSC_eg_db = derive2 { name="MeSH.Ani.FGSC.eg.db"; version="1.6.0"; sha256="13gdrcn4xmndly7ag15b7qnwl86aclqgi63fn682y12hdbd0r4d9"; depends=[MeSHDbi]; }; - MeSH_Ath_eg_db = derive2 { name="MeSH.Ath.eg.db"; version="1.6.0"; sha256="1k7faw7vspx5fg5qqnlq29r7i5b01fv2zhin2b3r497g25pg2yqf"; depends=[MeSHDbi]; }; - MeSH_Bfl_eg_db = derive2 { name="MeSH.Bfl.eg.db"; version="1.6.0"; sha256="1fs858m8hsipawrjm75nqsrcmkka5ynqxk0cw2vr8g7q9a3ash9s"; depends=[MeSHDbi]; }; - MeSH_Bsu_168_eg_db = derive2 { name="MeSH.Bsu.168.eg.db"; version="1.6.0"; sha256="1pwg5p82jsqmjl0rf3vv6nk9f4k2l5smn2ksx4d1q8dbnrl6dxdi"; depends=[MeSHDbi]; }; - MeSH_Bsu_TUB10_eg_db = derive2 { name="MeSH.Bsu.TUB10.eg.db"; version="1.6.0"; sha256="1s3i1g5smbcal6sfdraqaybi6cmw3aagjr90dbgbw0dzf1i3vjf5"; depends=[MeSHDbi]; }; - MeSH_Bta_eg_db = derive2 { name="MeSH.Bta.eg.db"; version="1.6.0"; sha256="198l8ksvfnzz8cdzx0k6297zvms7m4a6v54c1j96p1brqyx3asc7"; depends=[MeSHDbi]; }; - MeSH_Cal_SC5314_eg_db = derive2 { name="MeSH.Cal.SC5314.eg.db"; version="1.6.0"; sha256="1lcsfax1w6jpyj6k33l4l4iw7n87gm88pljamn584622i7xgz65q"; depends=[MeSHDbi]; }; - MeSH_Cbr_eg_db = derive2 { name="MeSH.Cbr.eg.db"; version="1.6.0"; sha256="1m1wf195nipvy4ha3amdl1l8shya7308s087ixy8sgklzdfnrka7"; depends=[MeSHDbi]; }; - MeSH_Cel_eg_db = derive2 { name="MeSH.Cel.eg.db"; version="1.6.0"; sha256="1192anip5ib95cai84q0lxcj4q9j05m7p91zxnyqgwy8hda13fc4"; depends=[MeSHDbi]; }; - MeSH_Cfa_eg_db = derive2 { name="MeSH.Cfa.eg.db"; version="1.6.0"; sha256="1qis2wxmilv2yy6gi5318md57ybcl1jwd1ap2y6qpa8aa92jdmpn"; depends=[MeSHDbi]; }; - MeSH_Cin_eg_db = derive2 { name="MeSH.Cin.eg.db"; version="1.6.0"; sha256="1gs2dvrpdkis46m72sw7rxj5x3wsbyvxyn81npw6af4zvsp1150n"; depends=[MeSHDbi]; }; - MeSH_Cja_eg_db = derive2 { name="MeSH.Cja.eg.db"; version="1.6.0"; sha256="13zsdh0x572p06drb6jhmmr2flcsmdwndhpb844rwc9ycw5fxka5"; depends=[MeSHDbi]; }; - MeSH_Cpo_eg_db = derive2 { name="MeSH.Cpo.eg.db"; version="1.6.0"; sha256="0321fb35vmajhpp5fj8g0ha28psbbbk81076zvpx84kf4pbmy4z7"; depends=[MeSHDbi]; }; - MeSH_Cre_eg_db = derive2 { name="MeSH.Cre.eg.db"; version="1.6.0"; sha256="1k225nkxnlkrcjg44xb7f7f9h52hjy6b54zfmphkp8r06hqmmynz"; depends=[MeSHDbi]; }; - MeSH_Dan_eg_db = derive2 { name="MeSH.Dan.eg.db"; version="1.6.0"; sha256="0z67vcgk9mbjfab5hwd8n2dga02v01b62h51wbajanf5zv8yclb3"; depends=[MeSHDbi]; }; - MeSH_Dda_3937_eg_db = derive2 { name="MeSH.Dda.3937.eg.db"; version="1.6.0"; sha256="1xncfml5h36g5ldgvmrvdq1w3mb9b2d3zsw4935ybydw0239pm8f"; depends=[MeSHDbi]; }; - MeSH_Ddi_AX4_eg_db = derive2 { name="MeSH.Ddi.AX4.eg.db"; version="1.6.0"; sha256="0alw1az6iwk7xlbji5ibd22kp2hkj4s7cgssvkp7m880bbimfw49"; depends=[MeSHDbi]; }; - MeSH_Der_eg_db = derive2 { name="MeSH.Der.eg.db"; version="1.6.0"; sha256="02dhsprjfg1lb5kiwmflxsd6sdapkp5j9d42c59mgq5i8wp5fgxb"; depends=[MeSHDbi]; }; - MeSH_Dgr_eg_db = derive2 { name="MeSH.Dgr.eg.db"; version="1.6.0"; sha256="036n8rkn51fg1a5n4drx9gxqc6px895f7iqblbkjfyxxg4ljgxvq"; depends=[MeSHDbi]; }; - MeSH_Dme_eg_db = derive2 { name="MeSH.Dme.eg.db"; version="1.6.0"; sha256="14v6nm8ky41aq9vih24nyb2yvzx4g14zazc6f2g7ik8g027nvwdl"; depends=[MeSHDbi]; }; - MeSH_Dmo_eg_db = derive2 { name="MeSH.Dmo.eg.db"; version="1.6.0"; sha256="0zr4i89rk4jz20yrh8ag8mb5kdhcf4psb1pplr62idj1h38yn645"; depends=[MeSHDbi]; }; - MeSH_Dpe_eg_db = derive2 { name="MeSH.Dpe.eg.db"; version="1.6.0"; sha256="0yigpsc3j8d0fp390qyxlfm0lgqbbz0q0661nkpchqajfdd1hy7k"; depends=[MeSHDbi]; }; - MeSH_Dre_eg_db = derive2 { name="MeSH.Dre.eg.db"; version="1.6.0"; sha256="1rgc176cgd1ciwkiwma6q8vj53fa1an2k7ivqsxiwx8dpiznwp3z"; depends=[MeSHDbi]; }; - MeSH_Dse_eg_db = derive2 { name="MeSH.Dse.eg.db"; version="1.6.0"; sha256="12hznsnlpbgmwabli009vr57cqnk5w35r31zsvjfcs0qkmk87dq7"; depends=[MeSHDbi]; }; - MeSH_Dsi_eg_db = derive2 { name="MeSH.Dsi.eg.db"; version="1.6.0"; sha256="0khbqcxj2hvmiknb1ycryv91i2iw028lhhzfwma18spwmqybn8s0"; depends=[MeSHDbi]; }; - MeSH_Dvi_eg_db = derive2 { name="MeSH.Dvi.eg.db"; version="1.6.0"; sha256="0v5pkbzjyrvx8say1nx0aqak8hqpwl4g9hr57nnvbmj6akjqfg5f"; depends=[MeSHDbi]; }; - MeSH_Dya_eg_db = derive2 { name="MeSH.Dya.eg.db"; version="1.6.0"; sha256="0dfm8cdl5s83iia8jn4830vxc7lh9l8yf25pd4851zwdz4m34gj7"; depends=[MeSHDbi]; }; - MeSH_Eco_55989_eg_db = derive2 { name="MeSH.Eco.55989.eg.db"; version="1.4.0"; sha256="1r9q1vk8p9ah28k6gc2dlglwyi1i0y5zaxmzcrkxyw04pfzn41f7"; depends=[MeSHDbi]; }; + MafDb_1Kgenomes_phase1_hs37d5 = derive2 { name="MafDb.1Kgenomes.phase1.hs37d5"; version="3.4.0"; sha256="180z52y03gdkf36ycr76vcs1mz9qdbwywzxrbcj6yb5vcj8i5hdx"; depends=[BSgenome GenomicRanges IRanges VariantFiltering]; }; + MafDb_ESP6500SI_V2_SSA137 = derive2 { name="MafDb.ESP6500SI.V2.SSA137"; version="3.4.0"; sha256="1s5vqp3fnkswiv2slsh0wkd286psdhqcwvchcjq3gm4hq86h4pwh"; depends=[AnnotationDbi Biobase Biostrings GenomicRanges IRanges Rsamtools RSQLite VariantAnnotation VariantFiltering]; }; + MafDb_ESP6500SI_V2_SSA137_GRCh38 = derive2 { name="MafDb.ESP6500SI.V2.SSA137.GRCh38"; version="3.4.0"; sha256="1qaqqkshvrf7y6lwnnh8n47zvb35vn23l8vmvm29przz8y2xz22v"; depends=[BSgenome GenomicRanges IRanges VariantFiltering]; }; + MafDb_ESP6500SI_V2_SSA137_hs37d5 = derive2 { name="MafDb.ESP6500SI.V2.SSA137.hs37d5"; version="3.4.0"; sha256="0gxj4nghd99r6ivgzvs86gl8j1frr8laira4gld0vmfp0a4iv5fy"; depends=[BSgenome GenomicRanges IRanges VariantFiltering]; }; + MafDb_ExAC_r0_3_1_nonTCGA_snvs_hs37d5 = derive2 { name="MafDb.ExAC.r0.3.1.nonTCGA.snvs.hs37d5"; version="3.4.0"; sha256="060750f8zz3gasgnq6smzq7f68nd9jh12wb8gpivc3xklx7gcrk9"; depends=[BSgenome GenomicRanges IRanges VariantFiltering]; }; + MafDb_ExAC_r0_3_1_snvs_hs37d5 = derive2 { name="MafDb.ExAC.r0.3.1.snvs.hs37d5"; version="3.4.0"; sha256="0kq7c2zqzm0g4mbdzqgxq5bklsr2n0cm8x97gn3cfbf61y96ngqw"; depends=[BSgenome GenomicRanges IRanges VariantFiltering]; }; + MeSH_AOR_db = derive2 { name="MeSH.AOR.db"; version="1.7.0"; sha256="16h0yvjmrp8x5a0gqzpd9zc2f7q89pr1jsqqwxa44i8hqrgan0zp"; depends=[MeSHDbi]; }; + MeSH_Aca_eg_db = derive2 { name="MeSH.Aca.eg.db"; version="1.7.0"; sha256="04wqdv5z7r2lv49711k0z6vs408yyp96vnsmvyjh15m2bx3bbp3s"; depends=[MeSHDbi]; }; + MeSH_Aga_PEST_eg_db = derive2 { name="MeSH.Aga.PEST.eg.db"; version="1.7.0"; sha256="1k7kx59k9q6hd2svxi233bgq06h3wd6ahcm5lyy2i0br5crysbir"; depends=[MeSHDbi]; }; + MeSH_Ame_eg_db = derive2 { name="MeSH.Ame.eg.db"; version="1.7.0"; sha256="08wi41vxxb5ssbgz019dq5n4li0vfnv737iaavmy07hymh6js9v8"; depends=[MeSHDbi]; }; + MeSH_Aml_eg_db = derive2 { name="MeSH.Aml.eg.db"; version="1.7.0"; sha256="0l0a60mv7s08aflgra3ynkpr455953fr6lxv67xwkjag8k14gsi1"; depends=[MeSHDbi]; }; + MeSH_Ana_eg_db = derive2 { name="MeSH.Ana.eg.db"; version="1.7.0"; sha256="0ix24hj6g3n44g5g4f22dv84q3w6k588san83048x7w946774jf5"; depends=[MeSHDbi]; }; + MeSH_Ani_FGSC_eg_db = derive2 { name="MeSH.Ani.FGSC.eg.db"; version="1.7.0"; sha256="1dagpmrwmsgb8hylc69wic3qfl0cfs0qp9ib32w6qv9y71zg4i1c"; depends=[MeSHDbi]; }; + MeSH_Ath_eg_db = derive2 { name="MeSH.Ath.eg.db"; version="1.7.0"; sha256="02dhvpzacq6v785q4r5r5d6sm0wzqrgm1k7ajn7h3y8v3gjyymap"; depends=[MeSHDbi]; }; + MeSH_Bfl_eg_db = derive2 { name="MeSH.Bfl.eg.db"; version="1.7.0"; sha256="1sv8g45lay1fijlnryza8nz3hf1r2lvcclf3kd1x6iw6fi0yn4q2"; depends=[MeSHDbi]; }; + MeSH_Bsu_168_eg_db = derive2 { name="MeSH.Bsu.168.eg.db"; version="1.7.0"; sha256="16xkz7cbg64rcgv82baxvxnyy5gg16l9cl97xdlk4wvzkyp944hy"; depends=[MeSHDbi]; }; + MeSH_Bsu_TUB10_eg_db = derive2 { name="MeSH.Bsu.TUB10.eg.db"; version="1.7.0"; sha256="1d7i7q78fdnr73a0qdpcwb28jk5gj77af4vyz708gw1803l35gb1"; depends=[MeSHDbi]; }; + MeSH_Bta_eg_db = derive2 { name="MeSH.Bta.eg.db"; version="1.7.0"; sha256="0lbq02vslnv1gj01ill14hf15mncqbwx7p872c8whvdkziwrvki8"; depends=[MeSHDbi]; }; + MeSH_Cal_SC5314_eg_db = derive2 { name="MeSH.Cal.SC5314.eg.db"; version="1.7.0"; sha256="12nfjk5qndfrg4p11nfy392nzsrgd196qrxiqx36vffbindpmykd"; depends=[MeSHDbi]; }; + MeSH_Cbr_eg_db = derive2 { name="MeSH.Cbr.eg.db"; version="1.7.0"; sha256="128hslq3vs4psp64vi6vj84za2kbh0jwlc20j2ivnjkrr30fsb2h"; depends=[MeSHDbi]; }; + MeSH_Cel_eg_db = derive2 { name="MeSH.Cel.eg.db"; version="1.7.0"; sha256="1x5l0p0iiwqg7ci7nirwcsarg33b43clrbvr2cf20rxhc1valmpz"; depends=[MeSHDbi]; }; + MeSH_Cfa_eg_db = derive2 { name="MeSH.Cfa.eg.db"; version="1.7.0"; sha256="1y87i8x6ismji8y6i6yibz5zacf4486dkzmmxggy6ly80lisklb2"; depends=[MeSHDbi]; }; + MeSH_Cin_eg_db = derive2 { name="MeSH.Cin.eg.db"; version="1.7.0"; sha256="05mn2a7fb3zcfzqwl60zp946xyp0kdr5ld7nxh79yxwglhb2r6v0"; depends=[MeSHDbi]; }; + MeSH_Cja_eg_db = derive2 { name="MeSH.Cja.eg.db"; version="1.7.0"; sha256="0hii578hva5aa388zkiarm07w437ccci3qpskd8nl0qyj1xmpb72"; depends=[MeSHDbi]; }; + MeSH_Cpo_eg_db = derive2 { name="MeSH.Cpo.eg.db"; version="1.7.0"; sha256="1nm83ydgfzb43agra99sp10a513fn69yzxg430f0qdwaw564c85y"; depends=[MeSHDbi]; }; + MeSH_Cre_eg_db = derive2 { name="MeSH.Cre.eg.db"; version="1.7.0"; sha256="1gnvf3qm17xa1q0szb4gqnslws6g026x79hmjg7fnkcyn6faxgy9"; depends=[MeSHDbi]; }; + MeSH_Dan_eg_db = derive2 { name="MeSH.Dan.eg.db"; version="1.7.0"; sha256="0qnj09hpnmpxwj448wl4vdpzzmdm1w9m4gq3r2pak30fp5l2mv9i"; depends=[MeSHDbi]; }; + MeSH_Dda_3937_eg_db = derive2 { name="MeSH.Dda.3937.eg.db"; version="1.7.0"; sha256="14z8gbnj6jjh2v76qqpikylaz781gfag6r199hkq20pfph10hld7"; depends=[MeSHDbi]; }; + MeSH_Ddi_AX4_eg_db = derive2 { name="MeSH.Ddi.AX4.eg.db"; version="1.7.0"; sha256="0114vi0k57nv6pxq74c4h38b4yavs74vzidm8gg0pws2pxk8grah"; depends=[MeSHDbi]; }; + MeSH_Der_eg_db = derive2 { name="MeSH.Der.eg.db"; version="1.7.0"; sha256="0ia2xp2bl6bb497gscqbxyd9kd33bynhyg5avvyfddkhpnljv5dx"; depends=[MeSHDbi]; }; + MeSH_Dgr_eg_db = derive2 { name="MeSH.Dgr.eg.db"; version="1.7.0"; sha256="0rgjng9g69kwhh01kww5mahwbikiyc8qgzh363j2m7piqmsc5siy"; depends=[MeSHDbi]; }; + MeSH_Dme_eg_db = derive2 { name="MeSH.Dme.eg.db"; version="1.7.0"; sha256="0m4n7wfxxgw5i9zpcss25x1n47bpshvca03cigfmxaqvh3lagf2n"; depends=[MeSHDbi]; }; + MeSH_Dmo_eg_db = derive2 { name="MeSH.Dmo.eg.db"; version="1.7.0"; sha256="1hchnrhgvk18cs8hzg7dvf2fqrpk7fqgarkp23h325clrrh243l0"; depends=[MeSHDbi]; }; + MeSH_Dpe_eg_db = derive2 { name="MeSH.Dpe.eg.db"; version="1.7.0"; sha256="19bpjyxja7clnyvhcwfv939z1xplxj5naz4vpchs555arzx0c2m4"; depends=[MeSHDbi]; }; + MeSH_Dre_eg_db = derive2 { name="MeSH.Dre.eg.db"; version="1.7.0"; sha256="1njf3r6dfcvs2734mdsb3zlpkqgip9nnmmaxfz7wy3fqhn2ddyqa"; depends=[MeSHDbi]; }; + MeSH_Dse_eg_db = derive2 { name="MeSH.Dse.eg.db"; version="1.7.0"; sha256="0i66f7g4zfz44gnrqgl7mw0k7kadj6pmsqkk62ik2af783y9cv0r"; depends=[MeSHDbi]; }; + MeSH_Dsi_eg_db = derive2 { name="MeSH.Dsi.eg.db"; version="1.7.0"; sha256="10ndr1g76d955gii8m91l5nfvxxim3k7b5fk9r7d8fnzwagjnpij"; depends=[MeSHDbi]; }; + MeSH_Dvi_eg_db = derive2 { name="MeSH.Dvi.eg.db"; version="1.7.0"; sha256="1nwig8czz65cfrq1mw62h85wh9wch69b5i12iry85x1567q7sfbv"; depends=[MeSHDbi]; }; + MeSH_Dya_eg_db = derive2 { name="MeSH.Dya.eg.db"; version="1.7.0"; sha256="1f93fnclsp6zmza6blwkfj5ncmxs8ihjqxr9dh8xjqciyb7wfmw5"; depends=[MeSHDbi]; }; + MeSH_Eco_55989_eg_db = derive2 { name="MeSH.Eco.55989.eg.db"; version="1.7.0"; sha256="0328rxhmhhmspylzx7sdmk3mlbx9hndmpfc3fkrdr2n9a8zirlwp"; depends=[MeSHDbi]; }; MeSH_Eco_CFT073_eg_db = derive2 { name="MeSH.Eco.CFT073.eg.db"; version="1.4.0"; sha256="0r7hlxd5k9n9shq3wj5ldqj00apvx4bv8h38v2i4adv29s5x7973"; depends=[MeSHDbi]; }; - MeSH_Eco_ED1a_eg_db = derive2 { name="MeSH.Eco.ED1a.eg.db"; version="1.6.0"; sha256="0wgc2c0ihn3qg2sbh3xs2x54igsf4w1pl71c9vcpx65n71xnzwwg"; depends=[MeSHDbi]; }; + MeSH_Eco_ED1a_eg_db = derive2 { name="MeSH.Eco.ED1a.eg.db"; version="1.7.0"; sha256="0x6sn0zhqm5gcd9is5ka5hg24kvlyk3qc4pnyjmc88cgfz90cqqq"; depends=[MeSHDbi]; }; MeSH_Eco_HS_eg_db = derive2 { name="MeSH.Eco.HS.eg.db"; version="1.4.0"; sha256="0gyrfjyp3k5jbcg92qzz4fjpmk9m4i0v7q2yvja73sni6976g9ca"; depends=[MeSHDbi]; }; MeSH_Eco_IAI1_eg_db = derive2 { name="MeSH.Eco.IAI1.eg.db"; version="1.4.0"; sha256="16mxh182ij25qgfk14dzzpvaac7fqcnzx58j5m6hfrz3wvgh9jrq"; depends=[MeSHDbi]; }; - MeSH_Eco_IAI39_eg_db = derive2 { name="MeSH.Eco.IAI39.eg.db"; version="1.6.0"; sha256="18m2grrbjp73ymb25iv3krb495b7y0rqy7bgq3ramig119hxcmqp"; depends=[MeSHDbi]; }; + MeSH_Eco_IAI39_eg_db = derive2 { name="MeSH.Eco.IAI39.eg.db"; version="1.7.0"; sha256="1ahln8fad45mvrg6scdaz1ilvj9wnb5mxww9jvzm33d1ik04j5sj"; depends=[MeSHDbi]; }; MeSH_Eco_K12_DH10B_eg_db = derive2 { name="MeSH.Eco.K12.DH10B.eg.db"; version="1.4.0"; sha256="00y5qlqrsjl941iaqln4m5jvskc2a6kildys881ml92f14cmgs07"; depends=[MeSHDbi]; }; - MeSH_Eco_K12_MG1655_eg_db = derive2 { name="MeSH.Eco.K12.MG1655.eg.db"; version="1.6.0"; sha256="1778f3bcll6zd4jing0nm8iydsyhbx68d78wh1dj68x9gky1rwd2"; depends=[MeSHDbi]; }; + MeSH_Eco_K12_MG1655_eg_db = derive2 { name="MeSH.Eco.K12.MG1655.eg.db"; version="1.7.0"; sha256="0vdb038i7pj7bcnnn3rf22bj3knnx4vj1dpwijivh6w9gxfkqd4p"; depends=[MeSHDbi]; }; MeSH_Eco_O127_H6_E2348_69_eg_db = derive2 { name="MeSH.Eco.O127.H6.E2348.69.eg.db"; version="1.4.0"; sha256="1as23bz0yylgf24sy84xm46bblvkacp84kjr2g8c9if1vll2x2dg"; depends=[MeSHDbi]; }; MeSH_Eco_O157_H7_EDL933_eg_db = derive2 { name="MeSH.Eco.O157.H7.EDL933.eg.db"; version="1.4.0"; sha256="0qnnp2a2v3nv1br1lg2km0p96q1knwa1fx95cg4wp38nc5g0jcc9"; depends=[MeSHDbi]; }; - MeSH_Eco_O157_H7_Sakai_eg_db = derive2 { name="MeSH.Eco.O157.H7.Sakai.eg.db"; version="1.6.0"; sha256="01lbrqjdyf8awzhypqmm5wja1ql08i4f8a6c9w5h9g4sziq24ck5"; depends=[MeSHDbi]; }; + MeSH_Eco_O157_H7_Sakai_eg_db = derive2 { name="MeSH.Eco.O157.H7.Sakai.eg.db"; version="1.7.0"; sha256="02j5gi0199z9g6ghc4rsq7h9b5sigrq1a06hhl7rdm4bpa2sy8p1"; depends=[MeSHDbi]; }; MeSH_Eco_S88_eg_db = derive2 { name="MeSH.Eco.S88.eg.db"; version="1.4.0"; sha256="15k44ricv7vi7sbw5s2nckm6jwbfzrrjp8ck06ydjp9q70hfzmhy"; depends=[MeSHDbi]; }; - MeSH_Eco_UMN026_eg_db = derive2 { name="MeSH.Eco.UMN026.eg.db"; version="1.6.0"; sha256="0j9jrfi1fin7siaqn3q06s1aqh84f2x15sr5vkd28wzxxiv12c58"; depends=[MeSHDbi]; }; - MeSH_Eqc_eg_db = derive2 { name="MeSH.Eqc.eg.db"; version="1.6.0"; sha256="1ka55k5g7h8rzy6qab4q06k5h1mn5ryhhp28hvbb393yhslavgya"; depends=[MeSHDbi]; }; - MeSH_Gga_eg_db = derive2 { name="MeSH.Gga.eg.db"; version="1.6.0"; sha256="12fwr628gn4mmp876j9lli637p1452hwqm8sa383jyf3hvj5a0c2"; depends=[MeSHDbi]; }; - MeSH_Gma_eg_db = derive2 { name="MeSH.Gma.eg.db"; version="1.6.0"; sha256="1yznkpsdl9y560sh66q36ks5h1k0qzkc6crgrwfalpq6g4ik353w"; depends=[MeSHDbi]; }; - MeSH_Hsa_eg_db = derive2 { name="MeSH.Hsa.eg.db"; version="1.6.0"; sha256="0nxk5s2gqa2gswhzmg8isxsraf06plcwhwj8k6s1hvr2lhiq4dmd"; depends=[MeSHDbi]; }; - MeSH_Laf_eg_db = derive2 { name="MeSH.Laf.eg.db"; version="1.6.0"; sha256="1dqn7arsrrmwxznkal10cpzz2409i28b0n2jivkxnyfbkhvfpxrn"; depends=[MeSHDbi]; }; - MeSH_Lma_eg_db = derive2 { name="MeSH.Lma.eg.db"; version="1.6.0"; sha256="1xn14fwbs2g60b5v6jagq0yjlywziv9ds7djz9pjaagsxpk9clip"; depends=[MeSHDbi]; }; - MeSH_Mdo_eg_db = derive2 { name="MeSH.Mdo.eg.db"; version="1.6.0"; sha256="033q5j9q6nrkb8fingqhccg1qmka1j518pppz7lhgbjzskvlqkmj"; depends=[MeSHDbi]; }; - MeSH_Mes_eg_db = derive2 { name="MeSH.Mes.eg.db"; version="1.6.0"; sha256="18qypw8l98gk71lxkffvip00qqn1kdhr4k3bgmv9r9j3k00imdf2"; depends=[MeSHDbi]; }; - MeSH_Mga_eg_db = derive2 { name="MeSH.Mga.eg.db"; version="1.6.0"; sha256="02wx25mh7967ymqkapj4k4qh0f0xfxqkklmz8xyn1pkvk0mr1zr5"; depends=[MeSHDbi]; }; - MeSH_Miy_eg_db = derive2 { name="MeSH.Miy.eg.db"; version="1.6.0"; sha256="0w9m7pbayp967pcx34f7a1snk72ww093w445gf5maagifzlffwak"; depends=[MeSHDbi]; }; - MeSH_Mml_eg_db = derive2 { name="MeSH.Mml.eg.db"; version="1.6.0"; sha256="1s8vmdqnydla1psnbz0n1rrm9w987jy8j04a4av2cr4q5lciv551"; depends=[MeSHDbi]; }; - MeSH_Mmu_eg_db = derive2 { name="MeSH.Mmu.eg.db"; version="1.6.0"; sha256="1wn365f0j5x19mwzycgkr3r5c73vmm509622p5jrmx83ndx2gk94"; depends=[MeSHDbi]; }; - MeSH_Mtr_eg_db = derive2 { name="MeSH.Mtr.eg.db"; version="1.6.0"; sha256="1yinkkinzn9jhxmr1ri0cgcvlb08pvdrgz2fqnafxk55rihh5kg5"; depends=[MeSHDbi]; }; - MeSH_Nle_eg_db = derive2 { name="MeSH.Nle.eg.db"; version="1.6.0"; sha256="1jni4l7ha3asjpg9nvwh17kmbfgkg2gvmp79wjdd7b3mpw1lrm1z"; depends=[MeSHDbi]; }; - MeSH_Oan_eg_db = derive2 { name="MeSH.Oan.eg.db"; version="1.6.0"; sha256="1q46w0v4vni4b1qfx291xs0v5p7rgjsj5pwpfkrvkviy780c5nb9"; depends=[MeSHDbi]; }; - MeSH_Ocu_eg_db = derive2 { name="MeSH.Ocu.eg.db"; version="1.6.0"; sha256="1d8j6sbx4n98yg3fygznrcczwimga96w7ibm1rw4jwg4nxsscizn"; depends=[MeSHDbi]; }; - MeSH_Oni_eg_db = derive2 { name="MeSH.Oni.eg.db"; version="1.6.0"; sha256="1ycg7mh4pa7rb734x1swrfv8r0mxx6gxrlf5dnbwh0imdcxy1b5y"; depends=[MeSHDbi]; }; - MeSH_Osa_eg_db = derive2 { name="MeSH.Osa.eg.db"; version="1.6.0"; sha256="0qvqs3vwbwc0bah348bmmhglvqmj9q7y7kk6zkrwc4337nfrbd2i"; depends=[MeSHDbi]; }; - MeSH_PCR_db = derive2 { name="MeSH.PCR.db"; version="1.6.0"; sha256="0v84n2i71vdf71wj9yk7h89h1hvb5s0ixcdrzyhsi6a041bwq17m"; depends=[MeSHDbi]; }; - MeSH_Pab_eg_db = derive2 { name="MeSH.Pab.eg.db"; version="1.6.0"; sha256="0wrngzyncgsrnl1ai98vaqzs2rmx3sk6ic9xdxkfkf8xb8hgdzjy"; depends=[MeSHDbi]; }; - MeSH_Pae_PAO1_eg_db = derive2 { name="MeSH.Pae.PAO1.eg.db"; version="1.6.0"; sha256="0gvm30z9k7xnb98m3s3wk2f47kvb6h8318cjjhmbpniilfz0cl7g"; depends=[MeSHDbi]; }; - MeSH_Pfa_3D7_eg_db = derive2 { name="MeSH.Pfa.3D7.eg.db"; version="1.6.0"; sha256="137267ibpcr159br33mqrvbnbr98rxc54l2wfl0hhfrgv1k25ccp"; depends=[MeSHDbi]; }; - MeSH_Pto_eg_db = derive2 { name="MeSH.Pto.eg.db"; version="1.6.0"; sha256="01ghjn7fjhiy5pg27wl10kqcdlx5qnggzflrhs4kiyz5k8wa997h"; depends=[MeSHDbi]; }; - MeSH_Ptr_eg_db = derive2 { name="MeSH.Ptr.eg.db"; version="1.6.0"; sha256="08hi6csc8lnfryg6jsjv8z1qz9md6ss6vd0f2szhanrq3j198f0z"; depends=[MeSHDbi]; }; - MeSH_Rno_eg_db = derive2 { name="MeSH.Rno.eg.db"; version="1.6.0"; sha256="0wyrzfj5v1fgr7c61pdg0s3bpna24x50dzzvxv3bls0qzpn096hl"; depends=[MeSHDbi]; }; + MeSH_Eco_UMN026_eg_db = derive2 { name="MeSH.Eco.UMN026.eg.db"; version="1.7.0"; sha256="0nv4w38w9s53jqv3zin3m61skl2gr27iizhqvrp961wy5kqyqwmj"; depends=[MeSHDbi]; }; + MeSH_Eqc_eg_db = derive2 { name="MeSH.Eqc.eg.db"; version="1.7.0"; sha256="1kdv46yjw9dw1ksw1f59gn51gl1vkp8xgk1bwl7fjk9ap7pgc924"; depends=[MeSHDbi]; }; + MeSH_Gga_eg_db = derive2 { name="MeSH.Gga.eg.db"; version="1.7.0"; sha256="07ng6pri1666sv9hznxx8whk8wkj8mm969w3dlgi633fp9qsg507"; depends=[MeSHDbi]; }; + MeSH_Gma_eg_db = derive2 { name="MeSH.Gma.eg.db"; version="1.7.0"; sha256="0sb4nab0fibbhms8h8izwxzdwdg450klnlnczksjka5rccl8na7l"; depends=[MeSHDbi]; }; + MeSH_Hsa_eg_db = derive2 { name="MeSH.Hsa.eg.db"; version="1.7.0"; sha256="02mchzw2jc615g7xd9gb42vsjjyfpz8i6p36mrd0y4nr7mskxmr0"; depends=[MeSHDbi]; }; + MeSH_Laf_eg_db = derive2 { name="MeSH.Laf.eg.db"; version="1.7.0"; sha256="10sl8qisbf8m49j2fvwbwhhp2w964gfnm8j273sy6ma1rdcj1df0"; depends=[MeSHDbi]; }; + MeSH_Lma_eg_db = derive2 { name="MeSH.Lma.eg.db"; version="1.7.0"; sha256="195g835jsswc9v1c0ycp4s1rgcfnwbramgk9vfrlwwiqis7yw358"; depends=[MeSHDbi]; }; + MeSH_Mdo_eg_db = derive2 { name="MeSH.Mdo.eg.db"; version="1.7.0"; sha256="162rg0y1x1nr61vdzdv51ps4ilvybw6z2899xcchbvvpdgd2cxbz"; depends=[MeSHDbi]; }; + MeSH_Mes_eg_db = derive2 { name="MeSH.Mes.eg.db"; version="1.7.0"; sha256="1mj2p780nf8wnid2c2gkjrsbhrm8jyng03wa0wy83hs0gi38zp8k"; depends=[MeSHDbi]; }; + MeSH_Mga_eg_db = derive2 { name="MeSH.Mga.eg.db"; version="1.7.0"; sha256="076wrm9g3ppijpsq7ggcl3ld9nrm0vh87g5wspc760fjd0xy2pgn"; depends=[MeSHDbi]; }; + MeSH_Miy_eg_db = derive2 { name="MeSH.Miy.eg.db"; version="1.7.0"; sha256="0nzm1rl1qf2impsjns3cbp45kl4ld1a8icb3ip85r2hg2js85ifa"; depends=[MeSHDbi]; }; + MeSH_Mml_eg_db = derive2 { name="MeSH.Mml.eg.db"; version="1.7.0"; sha256="0v30ia3wdicx38a4qaqafz5xblvdhpwzlxxdxka941v364dqvjvi"; depends=[MeSHDbi]; }; + MeSH_Mmu_eg_db = derive2 { name="MeSH.Mmu.eg.db"; version="1.7.0"; sha256="0j7l3w697jbf8wx2shnvs5hirpck0cwa7ik298gsjm9d5hwmjkwa"; depends=[MeSHDbi]; }; + MeSH_Mtr_eg_db = derive2 { name="MeSH.Mtr.eg.db"; version="1.7.0"; sha256="0nssphb6qs81i0hay1lmyvvvsj055rxwr21p46x4zlrqy01m9qxq"; depends=[MeSHDbi]; }; + MeSH_Nle_eg_db = derive2 { name="MeSH.Nle.eg.db"; version="1.7.0"; sha256="0pn9hhs4h9i49kw64xc4rb25gfvrn72swncvhw33pbw5kdav3mmi"; depends=[MeSHDbi]; }; + MeSH_Oan_eg_db = derive2 { name="MeSH.Oan.eg.db"; version="1.7.0"; sha256="1mw04y6vdma7q8i456qbjga4ikswsrbg4r7l9k9dyq37rh53fqhj"; depends=[MeSHDbi]; }; + MeSH_Ocu_eg_db = derive2 { name="MeSH.Ocu.eg.db"; version="1.7.0"; sha256="16b5wgr5wfhrv64za39k9kkqg1drscvnf1s98jw7inrlk3hc7cx3"; depends=[MeSHDbi]; }; + MeSH_Oni_eg_db = derive2 { name="MeSH.Oni.eg.db"; version="1.7.0"; sha256="0g2czpb0d47yrq161fzvkmra5gmv7vqjllrhxd6v8vc65kmjkcjb"; depends=[MeSHDbi]; }; + MeSH_Osa_eg_db = derive2 { name="MeSH.Osa.eg.db"; version="1.7.0"; sha256="15k2ymcn65hwjmp47azf7wn7b8d1mb8g6b9wxrpv2jw7cazr14j2"; depends=[MeSHDbi]; }; + MeSH_PCR_db = derive2 { name="MeSH.PCR.db"; version="1.7.0"; sha256="04yw89mswnpi52hz1fa4y0ds5lykhwbwlgf52fyjhcbjw43ldais"; depends=[MeSHDbi]; }; + MeSH_Pab_eg_db = derive2 { name="MeSH.Pab.eg.db"; version="1.7.0"; sha256="09g0cgcbgyj59irvifqzbym9pyij3g4sqk95njd6xnlq57rw1awi"; depends=[MeSHDbi]; }; + MeSH_Pae_PAO1_eg_db = derive2 { name="MeSH.Pae.PAO1.eg.db"; version="1.7.0"; sha256="09yrm1skqvbs6jfn5a6s2ky7ij2b5nvs0p3vbjcv3pfh60n0zxdl"; depends=[MeSHDbi]; }; + MeSH_Pfa_3D7_eg_db = derive2 { name="MeSH.Pfa.3D7.eg.db"; version="1.7.0"; sha256="0h4g20ndpbrasaxml6in3wff6ckl5dy3h7wli9zamvrljzh0qdza"; depends=[MeSHDbi]; }; + MeSH_Pto_eg_db = derive2 { name="MeSH.Pto.eg.db"; version="1.7.0"; sha256="1ny0pqj05rz005fhi3nawixk0rj0jdnyd737359vbph79s82h4n5"; depends=[MeSHDbi]; }; + MeSH_Ptr_eg_db = derive2 { name="MeSH.Ptr.eg.db"; version="1.7.0"; sha256="0p62h8i0fx5vxac0xk54laibgsgmnpavpi5d6brjrddvxa4yqvx7"; depends=[MeSHDbi]; }; + MeSH_Rno_eg_db = derive2 { name="MeSH.Rno.eg.db"; version="1.7.0"; sha256="10f6kxzdgpidig3jc8wfgkan5yx1c8brxnf6w2y62ba3nq5nhj1j"; depends=[MeSHDbi]; }; MeSH_Sau_USA300TCH1516_eg_db = derive2 { name="MeSH.Sau.USA300TCH1516.eg.db"; version="1.4.0"; sha256="109kvsdqvra8x392l82djbd46l8z4hv4z92785ivgdcnchsdjq7p"; depends=[MeSHDbi]; }; - MeSH_Sce_S288c_eg_db = derive2 { name="MeSH.Sce.S288c.eg.db"; version="1.6.0"; sha256="1yxhywyzzak1h13vb7dqnqn016l8zjafq2y5dg7gyja1njwln4sr"; depends=[MeSHDbi]; }; - MeSH_Sco_A32_eg_db = derive2 { name="MeSH.Sco.A32.eg.db"; version="1.6.0"; sha256="137zvl1628jxrrn5n2pv4p9j00nrrqp3bxibxspx760hwrf72qah"; depends=[MeSHDbi]; }; - MeSH_Sil_eg_db = derive2 { name="MeSH.Sil.eg.db"; version="1.6.0"; sha256="0w5r34mkmfllrgqcvnv51yi9d9qpy88w2xnff388qf101n3pr8zd"; depends=[MeSHDbi]; }; - MeSH_Spo_972h_eg_db = derive2 { name="MeSH.Spo.972h.eg.db"; version="1.6.0"; sha256="1kqnms8zq7mspk1bp0in7c6rns0zp08jaji5a0dlryng6awirm2m"; depends=[MeSHDbi]; }; - MeSH_Spu_eg_db = derive2 { name="MeSH.Spu.eg.db"; version="1.6.0"; sha256="0s4dw4hkgw9qkbcwp1pd7kvkjpbsiwnzmbp3x9448ljphi5x3fya"; depends=[MeSHDbi]; }; - MeSH_Ssc_eg_db = derive2 { name="MeSH.Ssc.eg.db"; version="1.6.0"; sha256="1bb8cpb28amrxjdlq24vszg7nzp64crhsvckl9dgsw48mf4ijvlr"; depends=[MeSHDbi]; }; - MeSH_Syn_eg_db = derive2 { name="MeSH.Syn.eg.db"; version="1.6.0"; sha256="0g09xgh4kzrqbaq1aif93bbbazkxggf36jsr4w2m5l7pdmbr9307"; depends=[MeSHDbi]; }; - MeSH_Tbr_9274_eg_db = derive2 { name="MeSH.Tbr.9274.eg.db"; version="1.6.0"; sha256="11zcyybrwappblsbwylzmjvavmvr4p80q9308mgdc5wix9zzj1fy"; depends=[MeSHDbi]; }; - MeSH_Tgo_ME49_eg_db = derive2 { name="MeSH.Tgo.ME49.eg.db"; version="1.6.0"; sha256="022c14njscb5d5146z3y85m2x5jxhq2lanj0nvba5jl0apzjxbb3"; depends=[MeSHDbi]; }; - MeSH_Tgu_eg_db = derive2 { name="MeSH.Tgu.eg.db"; version="1.6.0"; sha256="123zq61pnb1fgm5w81ahdymb3fmyb3bassxqh3bzf592q5457sm0"; depends=[MeSHDbi]; }; - MeSH_Vvi_eg_db = derive2 { name="MeSH.Vvi.eg.db"; version="1.6.0"; sha256="068qigbld4s7jj8001d21vi2k0ddqw74csn8xqhm245h31w8sr1v"; depends=[MeSHDbi]; }; - MeSH_Xla_eg_db = derive2 { name="MeSH.Xla.eg.db"; version="1.6.0"; sha256="0is3w4snymmc8207lbwi8b1qi6kwm2v50k9aqd4x51acs292kyim"; depends=[MeSHDbi]; }; - MeSH_Xtr_eg_db = derive2 { name="MeSH.Xtr.eg.db"; version="1.6.0"; sha256="0qdpw4s0brlmp6dvxdngzmflhvvz85x56mr1z72v3wf4991l41r8"; depends=[MeSHDbi]; }; - MeSH_Zma_eg_db = derive2 { name="MeSH.Zma.eg.db"; version="1.6.0"; sha256="1al8lr6p7g0wpcjjkwl3sxwkgykc06mgmgm54y5bvrgdbqxydz1q"; depends=[MeSHDbi]; }; - MeSH_db = derive2 { name="MeSH.db"; version="1.6.0"; sha256="0k366gpxn6kv9b8by516dqib3d5aclzf8475ci8vqrryaxh3ibsm"; depends=[MeSHDbi]; }; + MeSH_Sce_S288c_eg_db = derive2 { name="MeSH.Sce.S288c.eg.db"; version="1.7.0"; sha256="09df9issnh9adhwb5z6rxzll8d8gqpvg812p0xny7zx598hvjbyh"; depends=[MeSHDbi]; }; + MeSH_Sco_A32_eg_db = derive2 { name="MeSH.Sco.A32.eg.db"; version="1.7.0"; sha256="047v0h1jrxacw33hd2iclrwzi441s60aq107ynzh549066r44l26"; depends=[MeSHDbi]; }; + MeSH_Sil_eg_db = derive2 { name="MeSH.Sil.eg.db"; version="1.7.0"; sha256="19a6sq9yzc7q7515x7wxjdr74r3xxagfinzwgxvb13j2pcxl72qr"; depends=[MeSHDbi]; }; + MeSH_Spo_972h_eg_db = derive2 { name="MeSH.Spo.972h.eg.db"; version="1.7.0"; sha256="01m12jm4wwkdh9zkajl1fh9193pkys23m33q0zxahvqaknainv3b"; depends=[MeSHDbi]; }; + MeSH_Spu_eg_db = derive2 { name="MeSH.Spu.eg.db"; version="1.7.0"; sha256="08991vxjyqxybi91msicrxdxi60js6gynnhkxdybhcdn0rq3q03b"; depends=[MeSHDbi]; }; + MeSH_Ssc_eg_db = derive2 { name="MeSH.Ssc.eg.db"; version="1.7.0"; sha256="188jk2yx2xkyd9nr55jx0w2ki6fk5a10hc39zzs8c7ilb6azj973"; depends=[MeSHDbi]; }; + MeSH_Syn_eg_db = derive2 { name="MeSH.Syn.eg.db"; version="1.7.0"; sha256="0csch7hs1hvabrhpvm8hwv35iqhllisf3xr9j5b3lhysdxm9awha"; depends=[MeSHDbi]; }; + MeSH_Tbr_9274_eg_db = derive2 { name="MeSH.Tbr.9274.eg.db"; version="1.7.0"; sha256="1qr5d4zf6778bqrmxynjzl0hjvfgfbk42wldw6c40cqa51caav5x"; depends=[MeSHDbi]; }; + MeSH_Tgo_ME49_eg_db = derive2 { name="MeSH.Tgo.ME49.eg.db"; version="1.7.0"; sha256="1cwb68y7sn8gnhwcm05dry9aaq2jjphvwfnl5yh0fddw7x31nsc6"; depends=[MeSHDbi]; }; + MeSH_Tgu_eg_db = derive2 { name="MeSH.Tgu.eg.db"; version="1.7.0"; sha256="0dbpxc3syrw5s59cwl36skzi9d5j557aacq0j5kcwahy8abb1pk9"; depends=[MeSHDbi]; }; + MeSH_Vvi_eg_db = derive2 { name="MeSH.Vvi.eg.db"; version="1.7.0"; sha256="06fckdyfrwdh3ijz6bcikr4fsd69adlcjb54brwqqaak14lf06w4"; depends=[MeSHDbi]; }; + MeSH_Xla_eg_db = derive2 { name="MeSH.Xla.eg.db"; version="1.7.0"; sha256="1wxh3lhbc8cy040dhkwjckxc2q6laxb8wrvzd1lg72vijzsnyvlg"; depends=[MeSHDbi]; }; + MeSH_Xtr_eg_db = derive2 { name="MeSH.Xtr.eg.db"; version="1.7.0"; sha256="1fz9l962w0mi8a6ch54xa4qn5v7kkva21n7q68yd4d4irm51dcac"; depends=[MeSHDbi]; }; + MeSH_Zma_eg_db = derive2 { name="MeSH.Zma.eg.db"; version="1.7.0"; sha256="0pfx33qs6m5m5i85ib8agbdg58w8g0af188rl0jdyxrfkbfaj9v9"; depends=[MeSHDbi]; }; + MeSH_db = derive2 { name="MeSH.db"; version="1.7.0"; sha256="0zinr1wbbw3q05zcaq5xaqn0gqx9z9rdhdc89g1pj6f13mhs7zz3"; depends=[MeSHDbi]; }; MmAgilentDesign026655_db = derive2 { name="MmAgilentDesign026655.db"; version="3.2.3"; sha256="00d0yjcb5id7zacx4bzdwy4q6f4qvnnx8ph4d4xz1fmcbspz2qiz"; depends=[AnnotationDbi org_Mm_eg_db]; }; MoExExonProbesetLocation = derive2 { name="MoExExonProbesetLocation"; version="1.15.0"; sha256="0bvj3bji4bwwmxjz4b57n1aqypdibdmry30rfwmlxss1hav96sl7"; depends=[AnnotationDbi]; }; Mu15v1_db = derive2 { name="Mu15v1.db"; version="3.2.3"; sha256="0qchqkbx6ybijab8qhflxj33kwksfll1d3d3917vydjac9fzw1lz"; depends=[AnnotationDbi org_Mm_eg_db]; }; @@ -232,7 +233,7 @@ in with self; { Norway981_db = derive2 { name="Norway981.db"; version="3.2.3"; sha256="04ngc2hilqi9m7933mnm7jcvkxlz68vqqh5b628db575vcxql9b9"; depends=[AnnotationDbi org_Hs_eg_db]; }; OperonHumanV3_db = derive2 { name="OperonHumanV3.db"; version="3.2.3"; sha256="082gff88cwk2p50q8g9bixggacaclgqcvk6w5dc11h9fkgvd160i"; depends=[AnnotationDbi org_Hs_eg_db]; }; PANTHER_db = derive2 { name="PANTHER.db"; version="1.0.3"; sha256="1vsfhradfhk087vzi0jzkd7qab72g0v0x9s1rr7wblw7wjz48299"; depends=[AnnotationDbi RSQLite]; }; - PFAM_db = derive2 { name="PFAM.db"; version="3.3.0"; sha256="11qd5mjqksvlsqsgljgaffrbzzbsnf8d1xx38a135fk3cgmk9vb4"; depends=[AnnotationDbi]; }; + PFAM_db = derive2 { name="PFAM.db"; version="3.4.0"; sha256="1s50z6g6azm9jbxbfq2qlciapm31pv5rsylgpy4p0wsc9dbxh723"; depends=[AnnotationDbi]; }; POCRCannotation_db = derive2 { name="POCRCannotation.db"; version="3.2.3"; sha256="0ybvs4hrxpivdkhm0fxpib11vlxqqdk8prlyj78vj5qzyb3iy89d"; depends=[AnnotationDbi org_Hs_eg_db]; }; PartheenMetaData_db = derive2 { name="PartheenMetaData.db"; version="3.2.3"; sha256="0d37c5b7s3fgkkvg7sj7gl9ksrjk5pyyv54vkys8w3qwgsm8yrdz"; depends=[AnnotationDbi org_Hs_eg_db]; }; PolyPhen_Hsapiens_dbSNP131 = derive2 { name="PolyPhen.Hsapiens.dbSNP131"; version="1.0.2"; sha256="1kikygkli41sn3rqihz0924prmqg2264ifj29vmg1a7qccm0kf7c"; depends=[AnnotationDbi RSQLite VariantAnnotation]; }; @@ -258,31 +259,32 @@ in with self; { TxDb_Athaliana_BioMart_plantsmart22 = derive2 { name="TxDb.Athaliana.BioMart.plantsmart22"; version="3.0.1"; sha256="0j2zr4cddad7z1lxx9m9kfgyy7jajjnblpk9j8igd39ia3ixrpzc"; depends=[AnnotationDbi GenomicFeatures]; }; TxDb_Athaliana_BioMart_plantsmart25 = derive2 { name="TxDb.Athaliana.BioMart.plantsmart25"; version="3.1.3"; sha256="0a6v0l6p13zmiysi3k8dxzdlxng552qqj9rnlbdavdiidla0pvm3"; depends=[AnnotationDbi GenomicFeatures]; }; TxDb_Athaliana_BioMart_plantsmart28 = derive2 { name="TxDb.Athaliana.BioMart.plantsmart28"; version="3.2.2"; sha256="1yjyvrbx55y024lqg3b2rlf8pngqw5xi3p83j5ipan05wf0aq6ir"; depends=[AnnotationDbi GenomicFeatures]; }; - TxDb_Btaurus_UCSC_bosTau8_refGene = derive2 { name="TxDb.Btaurus.UCSC.bosTau8.refGene"; version="3.3.0"; sha256="023n916nxmb1l42sbzlknfmg6y1ad2s27bfhhxpvwl2c8mbbi2ci"; depends=[AnnotationDbi GenomicFeatures]; }; - TxDb_Celegans_UCSC_ce11_refGene = derive2 { name="TxDb.Celegans.UCSC.ce11.refGene"; version="3.3.0"; sha256="06ax8wnqzi0jk0c4asxczvfcfg03b46vksfr3lfcnfij96ksb9mh"; depends=[AnnotationDbi GenomicFeatures]; }; + TxDb_Btaurus_UCSC_bosTau8_refGene = derive2 { name="TxDb.Btaurus.UCSC.bosTau8.refGene"; version="3.4.0"; sha256="1grg9vjsvlrcfdnn25q5rnr2d92ff73xfpv9fh215r23b552a5f5"; depends=[AnnotationDbi GenomicFeatures]; }; + TxDb_Celegans_UCSC_ce11_refGene = derive2 { name="TxDb.Celegans.UCSC.ce11.refGene"; version="3.4.0"; sha256="0sz0jd08kh604kq830h4k5g7f3dpqq0dypz0jyc1hp7mf367h16b"; depends=[AnnotationDbi GenomicFeatures]; }; TxDb_Celegans_UCSC_ce6_ensGene = derive2 { name="TxDb.Celegans.UCSC.ce6.ensGene"; version="3.2.2"; sha256="1sgppva33cdy4isj2is8mfalj5gmmkpbkq9w1d83a4agcq31mi90"; depends=[AnnotationDbi GenomicFeatures]; }; TxDb_Cfamiliaris_UCSC_canFam3_refGene = derive2 { name="TxDb.Cfamiliaris.UCSC.canFam3.refGene"; version="3.3.0"; sha256="0h0n3yqdzqip1ikqq396pziyn0l5651yg87bb0cgc3gy2ldsrl74"; depends=[AnnotationDbi GenomicFeatures]; }; TxDb_Dmelanogaster_UCSC_dm3_ensGene = derive2 { name="TxDb.Dmelanogaster.UCSC.dm3.ensGene"; version="3.2.2"; sha256="1337x23rdmiiza83ms225kri37h16q5hw1lw0m577abcgip3d7c7"; depends=[AnnotationDbi GenomicFeatures]; }; TxDb_Dmelanogaster_UCSC_dm6_ensGene = derive2 { name="TxDb.Dmelanogaster.UCSC.dm6.ensGene"; version="3.3.0"; sha256="1kgwb63z37zq5mspqzf2rb09vl8b71kn8aa3fsmyn8phmhay98zw"; depends=[AnnotationDbi GenomicFeatures]; }; - TxDb_Drerio_UCSC_danRer10_refGene = derive2 { name="TxDb.Drerio.UCSC.danRer10.refGene"; version="3.3.0"; sha256="1wjzhbc6kqxdwbl1g1nc3ljvphqd7d9qx9dgfr31x100ddjgpkc6"; depends=[AnnotationDbi GenomicFeatures]; }; - TxDb_Ggallus_UCSC_galGal4_refGene = derive2 { name="TxDb.Ggallus.UCSC.galGal4.refGene"; version="3.3.0"; sha256="0bmc3hi953dildf89in9njwpy32mddxynami04z903ijsm26nkvi"; depends=[AnnotationDbi GenomicFeatures]; }; + TxDb_Drerio_UCSC_danRer10_refGene = derive2 { name="TxDb.Drerio.UCSC.danRer10.refGene"; version="3.4.0"; sha256="0vgvjb6jqzqgmnnqjx9qdn2by01p1pfrqd1ks91q2db6wqcm5jjv"; depends=[AnnotationDbi GenomicFeatures]; }; + TxDb_Ggallus_UCSC_galGal4_refGene = derive2 { name="TxDb.Ggallus.UCSC.galGal4.refGene"; version="3.4.0"; sha256="07d21x4sw4gwszi32wjli9hczgr1g579pq0zyzndwvkibqawvdwh"; depends=[AnnotationDbi GenomicFeatures]; }; TxDb_Hsapiens_BioMart_igis = derive2 { name="TxDb.Hsapiens.BioMart.igis"; version="2.3.2"; sha256="0590a2hkrpm33hmjg5g0gm6sig3xvc09m0q6lwmafgaajf90h6ky"; depends=[AnnotationDbi GenomicFeatures]; }; TxDb_Hsapiens_UCSC_hg18_knownGene = derive2 { name="TxDb.Hsapiens.UCSC.hg18.knownGene"; version="3.2.2"; sha256="1yk9ggclkqqfzrdp8gcqyplvif824pa7df54ck5gb1xb9q5s975w"; depends=[AnnotationDbi GenomicFeatures]; }; TxDb_Hsapiens_UCSC_hg19_knownGene = derive2 { name="TxDb.Hsapiens.UCSC.hg19.knownGene"; version="3.2.2"; sha256="1sajhcqqwazgz2lqbik7rd935i7kpnh08zxbp2ra10j72yqy4g86"; depends=[AnnotationDbi GenomicFeatures]; }; TxDb_Hsapiens_UCSC_hg19_lincRNAsTranscripts = derive2 { name="TxDb.Hsapiens.UCSC.hg19.lincRNAsTranscripts"; version="3.2.2"; sha256="0bmbp7kydvviczw8axgxq2wdlwq6fdas90jk9bg56avjq5syws2g"; depends=[AnnotationDbi GenomicFeatures]; }; - TxDb_Hsapiens_UCSC_hg38_knownGene = derive2 { name="TxDb.Hsapiens.UCSC.hg38.knownGene"; version="3.1.3"; sha256="10250vgk5b9k7852n0ah47c4n535603mdm4swwlwbsh44438n544"; depends=[AnnotationDbi GenomicFeatures]; }; - TxDb_Mmulatta_UCSC_rheMac3_refGene = derive2 { name="TxDb.Mmulatta.UCSC.rheMac3.refGene"; version="3.3.0"; sha256="1gdmfi5v6cy22f7np2sn51l1vnq0v689iyg59sm7fhfggvlykndf"; depends=[AnnotationDbi GenomicFeatures]; }; - TxDb_Mmusculus_UCSC_mm10_ensGene = derive2 { name="TxDb.Mmusculus.UCSC.mm10.ensGene"; version="3.2.2"; sha256="15p0n8snfsc3lml2zsmrsn5w4nq3h0pgvw82z0y6i43g0wg8fzl6"; depends=[AnnotationDbi GenomicFeatures]; }; - TxDb_Mmusculus_UCSC_mm10_knownGene = derive2 { name="TxDb.Mmusculus.UCSC.mm10.knownGene"; version="3.2.2"; sha256="0cvqp1pv632br5bd84g2ymb67hm4ijwqk43pycvwb2fvhzgx089c"; depends=[AnnotationDbi GenomicFeatures]; }; + TxDb_Hsapiens_UCSC_hg38_knownGene = derive2 { name="TxDb.Hsapiens.UCSC.hg38.knownGene"; version="3.4.0"; sha256="0i0xw0mcn403r911ijqdnrwg9k5bspdnjibfjvnhxq4h8vcfprn5"; depends=[AnnotationDbi GenomicFeatures]; }; + TxDb_Mmulatta_UCSC_rheMac3_refGene = derive2 { name="TxDb.Mmulatta.UCSC.rheMac3.refGene"; version="3.4.0"; sha256="0ap8qn2bza0j9ismnpv2l64wdbzc9i0q6sb1w195134hwq9cr51y"; depends=[AnnotationDbi GenomicFeatures]; }; + TxDb_Mmulatta_UCSC_rheMac8_refGene = derive2 { name="TxDb.Mmulatta.UCSC.rheMac8.refGene"; version="3.4.0"; sha256="1d61p9aj2wv4gdx2q5g33j7hipzfj1a4zi6apn058cffy1clyrn9"; depends=[AnnotationDbi GenomicFeatures]; }; + TxDb_Mmusculus_UCSC_mm10_ensGene = derive2 { name="TxDb.Mmusculus.UCSC.mm10.ensGene"; version="3.4.0"; sha256="0saxi1fdiwd38sfvy1rynd3v44rbp158jv6sjqcivvaqnd84zg9s"; depends=[AnnotationDbi GenomicFeatures]; }; + TxDb_Mmusculus_UCSC_mm10_knownGene = derive2 { name="TxDb.Mmusculus.UCSC.mm10.knownGene"; version="3.4.0"; sha256="08gava9wsvpcqz51k2sni3pj03n5155v32d9riqbf305nbirqbkb"; depends=[AnnotationDbi GenomicFeatures]; }; TxDb_Mmusculus_UCSC_mm9_knownGene = derive2 { name="TxDb.Mmusculus.UCSC.mm9.knownGene"; version="3.2.2"; sha256="16bjxy00363hf91ik2mqlqls86i07gia72qh92xc3l1ncch61mx2"; depends=[AnnotationDbi GenomicFeatures]; }; - TxDb_Ptroglodytes_UCSC_panTro4_refGene = derive2 { name="TxDb.Ptroglodytes.UCSC.panTro4.refGene"; version="3.3.0"; sha256="08qf0n15hm0wacvp70gr5pcwn1y64zk0z0ya3cx5h1w6ci7cpdlf"; depends=[AnnotationDbi GenomicFeatures]; }; + TxDb_Ptroglodytes_UCSC_panTro4_refGene = derive2 { name="TxDb.Ptroglodytes.UCSC.panTro4.refGene"; version="3.4.0"; sha256="08kihk3sl1hw32rf8122y03grbg1xdbc84z1b2ldnf752xr4zn9x"; depends=[AnnotationDbi GenomicFeatures]; }; TxDb_Rnorvegicus_BioMart_igis = derive2 { name="TxDb.Rnorvegicus.BioMart.igis"; version="2.3.2"; sha256="1099vkk8g3lxbgjxsm1p1m3mjj08nsw282mqxgzpnrxf7m6jll76"; depends=[AnnotationDbi GenomicFeatures]; }; TxDb_Rnorvegicus_UCSC_rn4_ensGene = derive2 { name="TxDb.Rnorvegicus.UCSC.rn4.ensGene"; version="3.2.2"; sha256="0gv8bynfxxa471ap069mjvfrb1d7a0c4w5k8hxkr4hnsm44mschm"; depends=[AnnotationDbi GenomicFeatures]; }; - TxDb_Rnorvegicus_UCSC_rn5_refGene = derive2 { name="TxDb.Rnorvegicus.UCSC.rn5.refGene"; version="3.3.0"; sha256="13qhwb5x4813binp8grl41rd07j1h9agld8zmnkiqw7c1sdz3q7b"; depends=[AnnotationDbi GenomicFeatures]; }; - TxDb_Rnorvegicus_UCSC_rn6_refGene = derive2 { name="TxDb.Rnorvegicus.UCSC.rn6.refGene"; version="3.3.0"; sha256="0jpvrn8wq4wl4d2kh4n133nla43f94ym2rjh5f45d4kikqk6xl2i"; depends=[AnnotationDbi GenomicFeatures]; }; + TxDb_Rnorvegicus_UCSC_rn5_refGene = derive2 { name="TxDb.Rnorvegicus.UCSC.rn5.refGene"; version="3.4.0"; sha256="1p3m7g24x7pvavwix5r5kyqsklv7hxav23nz36cs7gsqh1ifizaq"; depends=[AnnotationDbi GenomicFeatures]; }; + TxDb_Rnorvegicus_UCSC_rn6_refGene = derive2 { name="TxDb.Rnorvegicus.UCSC.rn6.refGene"; version="3.4.0"; sha256="1f1b16ya35x7x5x2j7a62qlg2ka5wd3521kfbk2xp4dr8h5ah6mx"; depends=[AnnotationDbi GenomicFeatures]; }; TxDb_Scerevisiae_UCSC_sacCer2_sgdGene = derive2 { name="TxDb.Scerevisiae.UCSC.sacCer2.sgdGene"; version="3.2.2"; sha256="0l5gcwhbvzx60p9hjhd31angamb0hkgdg2avga7341j77rd5pwza"; depends=[AnnotationDbi GenomicFeatures]; }; TxDb_Scerevisiae_UCSC_sacCer3_sgdGene = derive2 { name="TxDb.Scerevisiae.UCSC.sacCer3.sgdGene"; version="3.2.2"; sha256="1sjwl7fb3l3zxxbk8gkvzxwdsind0xjj7kmh7dachm6fi17hpb3d"; depends=[AnnotationDbi GenomicFeatures]; }; - TxDb_Sscrofa_UCSC_susScr3_refGene = derive2 { name="TxDb.Sscrofa.UCSC.susScr3.refGene"; version="3.3.0"; sha256="18hbrp5agka35zhqh4d809yx16brri5hi08pcpw41v3q3pk1599c"; depends=[AnnotationDbi GenomicFeatures]; }; + TxDb_Sscrofa_UCSC_susScr3_refGene = derive2 { name="TxDb.Sscrofa.UCSC.susScr3.refGene"; version="3.4.0"; sha256="0jpvb3phw0967my7afk8scsjzpq1x0i2za534ndizzql3cp45yh7"; depends=[AnnotationDbi GenomicFeatures]; }; XtraSNPlocs_Hsapiens_dbSNP141_GRCh38 = derive2 { name="XtraSNPlocs.Hsapiens.dbSNP141.GRCh38"; version="0.99.12"; sha256="0a27y0ngg760y5wwcja4dpd7cjd8h5zg1s2b3a1r54s21k65zny3"; depends=[BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; XtraSNPlocs_Hsapiens_dbSNP144_GRCh37 = derive2 { name="XtraSNPlocs.Hsapiens.dbSNP144.GRCh37"; version="0.99.12"; sha256="0k823fvqjmdkmd47m7wyra6jxmv8lnk2i1xl4pp0mh3zgb87hgfb"; depends=[BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; XtraSNPlocs_Hsapiens_dbSNP144_GRCh38 = derive2 { name="XtraSNPlocs.Hsapiens.dbSNP144.GRCh38"; version="0.99.12"; sha256="0d4q32ij2x4726wvw06sgmivid0n94vfdmszdyh607xlcahqxa5z"; depends=[BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; }; @@ -290,22 +292,23 @@ in with self; { ag_db = derive2 { name="ag.db"; version="3.2.3"; sha256="1h0nb5z742pbh7hc8bwqkk9vh16kac8m3h3bh4v5flqfqw6rn8d0"; depends=[AnnotationDbi org_At_tair_db]; }; agcdf = derive2 { name="agcdf"; version="2.18.0"; sha256="07hq41dwqs7yy2sck8p7zl3v9x4bgl35kkycpazz5ql2g5zy6b7j"; depends=[AnnotationDbi]; }; agprobe = derive2 { name="agprobe"; version="2.18.0"; sha256="1vnawamcpz16na8nmlq2czfxcr325fwdnngxl65mmnbd0f4lmy3k"; depends=[AnnotationDbi]; }; - anopheles_db0 = derive2 { name="anopheles.db0"; version="3.3.0"; sha256="1w8bylv1v1v4v51jwddvvq12j1gxm0p53s640w4h07p00d28szjv"; depends=[AnnotationDbi]; }; - arabidopsis_db0 = derive2 { name="arabidopsis.db0"; version="3.3.0"; sha256="0jnkdy084zl3mpyhnxgfmc15sf6kb5hn47h3380s6w7chxz7c4as"; depends=[AnnotationDbi]; }; + alternativeSplicingEvents_hg19 = derive2 { name="alternativeSplicingEvents.hg19"; version="1.0.0"; sha256="1bcqn20a963l49ah3j59nmd5qd15qad56p7k3880q4cp7qza2xsw"; depends=[AnnotationHub]; }; + anopheles_db0 = derive2 { name="anopheles.db0"; version="3.4.1"; sha256="0pzd8yij4ixdp48sr0ksjdmx3mw9gaizgj1rx33375a7091580yf"; depends=[AnnotationDbi]; }; + arabidopsis_db0 = derive2 { name="arabidopsis.db0"; version="3.4.1"; sha256="0rcpiaf0157c8v433a7khnam6g15siai1xbmf4gviw5vgw8l5a9l"; depends=[AnnotationDbi]; }; ath1121501_db = derive2 { name="ath1121501.db"; version="3.2.3"; sha256="1zrf26cfhlmrb5pyfawwk4v8l1mflx8c43zsxrwkbmxzc1jnc7dv"; depends=[AnnotationDbi org_At_tair_db]; }; ath1121501cdf = derive2 { name="ath1121501cdf"; version="2.18.0"; sha256="1naq8f8dwgbmndx178nm2pw6hjx5ljx0w1wb4dfjifnl4bs5rqcc"; depends=[AnnotationDbi]; }; ath1121501probe = derive2 { name="ath1121501probe"; version="2.18.0"; sha256="0a2nd8zhp3ybis780l3rrmwcxskbl3a111g8w6m8qfwsw5vnlqg1"; depends=[AnnotationDbi]; }; barley1cdf = derive2 { name="barley1cdf"; version="2.18.0"; sha256="0rbij5cqr2sz33y5waybv85nrcgf70iwj5gk13g0xn9p1l1zxyn2"; depends=[AnnotationDbi]; }; barley1probe = derive2 { name="barley1probe"; version="2.18.0"; sha256="1kh5r748b4vkmvlfaclmrh07ypbrzgxn90liqfz1rwkabh6rfk71"; depends=[AnnotationDbi]; }; bovine_db = derive2 { name="bovine.db"; version="3.2.3"; sha256="1i8mgk60hlmvngb4c727wajix9mca9gfg0pzxrnfcjwi87rpw7fy"; depends=[AnnotationDbi org_Bt_eg_db]; }; - bovine_db0 = derive2 { name="bovine.db0"; version="3.3.0"; sha256="18206lazpa4xn82wfz17l2n51rkw3jisqbk04msb8s39fj6zfnkq"; depends=[AnnotationDbi]; }; + bovine_db0 = derive2 { name="bovine.db0"; version="3.4.1"; sha256="113pi0dr4jc0vr2gfm8pkavz72s16bw3l6ml3hmvzjy89yg9r0s0"; depends=[AnnotationDbi]; }; bovinecdf = derive2 { name="bovinecdf"; version="2.18.0"; sha256="13mf0yy0dypkm5n2ghl04xm6ayb9bn9qijqhgynksghi7s2k34mb"; depends=[AnnotationDbi]; }; bovineprobe = derive2 { name="bovineprobe"; version="2.18.0"; sha256="0i4afa5dksnir2nfrfh2cynjm59sm6vfaqa9wyag8cxg7c2nlm1i"; depends=[AnnotationDbi]; }; bsubtiliscdf = derive2 { name="bsubtiliscdf"; version="2.18.0"; sha256="1rihrjim37b49rhqr4nxga8sp67qri9xqlqc141mhbngh6cw3iyl"; depends=[AnnotationDbi]; }; bsubtilisprobe = derive2 { name="bsubtilisprobe"; version="2.18.0"; sha256="0k99hvgaswn96x4yanvr9cy8bdy69sd5q7yp6dj9synxj7s1fcw9"; depends=[AnnotationDbi]; }; cMAP = derive2 { name="cMAP"; version="1.15.1"; sha256="0pzizm27rgcaic7wsh52z30v1jwarmz4cwh1mksbygp63k54mwiv"; depends=[]; }; canine_db = derive2 { name="canine.db"; version="3.2.3"; sha256="0wbyzhk827l49yxzimvznx9z6yag5nd4djm2hddysf5nk1ndapqs"; depends=[AnnotationDbi org_Cf_eg_db]; }; - canine_db0 = derive2 { name="canine.db0"; version="3.3.0"; sha256="0d6vhp39i5f7mmv6n5hq4m9yk0yj3kdpgnbfdhnzi400apf53da1"; depends=[AnnotationDbi]; }; + canine_db0 = derive2 { name="canine.db0"; version="3.4.1"; sha256="11imzg70ffkfnb1q6i9q3mj033ncl9pmzpkv2wp3nc3l5nz8z2sg"; depends=[AnnotationDbi]; }; canine2_db = derive2 { name="canine2.db"; version="3.2.3"; sha256="1gzd2x23dkfiwnwqz9pdn5lp4l8aby525mhscn3xakw633si4dvz"; depends=[AnnotationDbi org_Cf_eg_db]; }; canine2cdf = derive2 { name="canine2cdf"; version="2.18.0"; sha256="077cmmnhjdk0vxjzm1kqf3q5kgx6chwkm59dr4s5dy019rqb6sqr"; depends=[AnnotationDbi]; }; canine2probe = derive2 { name="canine2probe"; version="2.18.0"; sha256="1l849a1dqy4kpcsxs0lvb48ag81i0f0ys0w4757rw4kp8ry59z4b"; depends=[AnnotationDbi]; }; @@ -315,12 +318,20 @@ in with self; { celeganscdf = derive2 { name="celeganscdf"; version="2.18.0"; sha256="0a6w0a48azg0i21j3aqb7fnxck3ff9w3gsi89bnlfh0zx6pknx7p"; depends=[AnnotationDbi]; }; celegansprobe = derive2 { name="celegansprobe"; version="2.18.0"; sha256="05k7si3f8pzkyb8jv0r2vkavbrqxsn4nawl92gcphfsylrwcddqb"; depends=[AnnotationDbi]; }; chicken_db = derive2 { name="chicken.db"; version="3.2.3"; sha256="1rq9afkpcpv8qi75shvnsw8di3ycai4ylv7jq9zwj51zlwlw9cpq"; depends=[AnnotationDbi org_Gg_eg_db]; }; - chicken_db0 = derive2 { name="chicken.db0"; version="3.3.0"; sha256="0zqaps2cf6c8zsra9x6z98dgpyp65hc7p1bx5qjn047v24swpgs5"; depends=[AnnotationDbi]; }; + chicken_db0 = derive2 { name="chicken.db0"; version="3.4.1"; sha256="0gfd9nrkdnjymqdssijp5r9mdj2r6bmnkf6y4xh6ri90b02d1xpf"; depends=[AnnotationDbi]; }; chickencdf = derive2 { name="chickencdf"; version="2.18.0"; sha256="09hhim5s9xj7n2b5rhn1svf5qly2mn0rr2v2ls25hfzyrqcbxlz1"; depends=[AnnotationDbi]; }; chickenprobe = derive2 { name="chickenprobe"; version="2.18.0"; sha256="1fdsiwfyg7fwslrr7xs3gny7sw24bzg5k1fvlyzb1477sgj0pid3"; depends=[AnnotationDbi]; }; - chimp_db0 = derive2 { name="chimp.db0"; version="3.3.0"; sha256="0n655psk47zvdgv4kfjr8ffqz78pimvqbhixlscfiwss01vaspa0"; depends=[AnnotationDbi]; }; + chimp_db0 = derive2 { name="chimp.db0"; version="3.4.1"; sha256="06z4kmpnsj98mi5j0ahz57grlbdqb8ycl8rf592561lvmzzdfs8h"; depends=[AnnotationDbi]; }; citruscdf = derive2 { name="citruscdf"; version="2.18.0"; sha256="1326mj1xf3k4v5iyyn46whx24qfng0x3cv6rvckdr1ycc1v887dn"; depends=[AnnotationDbi]; }; citrusprobe = derive2 { name="citrusprobe"; version="2.18.0"; sha256="0bf1wic136cxwgs4j13wsyqasnyvr0jw1hzg6qizndmy7g8hrb87"; depends=[AnnotationDbi]; }; + clariomdhumanprobeset_db = derive2 { name="clariomdhumanprobeset.db"; version="8.5.0"; sha256="0hb3bsdh79aajgb9vk34kpd61py6rxv4vm8ygzm531nrh44s7a33"; depends=[AnnotationDbi org_Hs_eg_db]; }; + clariomdhumantranscriptcluster_db = derive2 { name="clariomdhumantranscriptcluster.db"; version="8.5.0"; sha256="1kfv4f0jbd4a63mk83jhpbhfhlyka9hwfik7i52kszkb8grgz48d"; depends=[AnnotationDbi org_Hs_eg_db]; }; + clariomshumanhttranscriptcluster_db = derive2 { name="clariomshumanhttranscriptcluster.db"; version="8.5.0"; sha256="07x7gl4p9dyrk41hx6d5ddsj3raz7gqimc79irfia2ismazwvd95"; depends=[AnnotationDbi org_Hs_eg_db]; }; + clariomshumantranscriptcluster_db = derive2 { name="clariomshumantranscriptcluster.db"; version="8.5.0"; sha256="0h4i35pglq6mwxxflg7l09f8a1xvhnrjygns54bnv8cyj97vq2a3"; depends=[AnnotationDbi org_Hs_eg_db]; }; + clariomsmousehttranscriptcluster_db = derive2 { name="clariomsmousehttranscriptcluster.db"; version="8.5.0"; sha256="1qvn0dpakh7g43wrssg2wyy5zi5axs7bqfmc97d8jgk56rwyzh46"; depends=[AnnotationDbi org_Mm_eg_db]; }; + clariomsmousetranscriptcluster_db = derive2 { name="clariomsmousetranscriptcluster.db"; version="8.5.0"; sha256="17y506pcfq8x9g4xl6wm9di545bgbzc54mjlybmz19c56456z5w9"; depends=[AnnotationDbi org_Mm_eg_db]; }; + clariomsrathttranscriptcluster_db = derive2 { name="clariomsrathttranscriptcluster.db"; version="8.5.0"; sha256="18dxnpvck3qfw660mx70d8psa1grzv9h43zf36qa6m958ybmcq19"; depends=[AnnotationDbi org_Rn_eg_db]; }; + clariomsrattranscriptcluster_db = derive2 { name="clariomsrattranscriptcluster.db"; version="8.5.0"; sha256="1ds9vssyg9zpp99zzd6110k1x9v2ji455k7xmk4nd699y1vfc67x"; depends=[AnnotationDbi org_Rn_eg_db]; }; cottoncdf = derive2 { name="cottoncdf"; version="2.18.0"; sha256="0xfwwla941fbxddykgizpar8dh8q459src7kc5wyrsd3swp3zyp5"; depends=[AnnotationDbi]; }; cottonprobe = derive2 { name="cottonprobe"; version="2.18.0"; sha256="04mfjd3a7ikif4pv46s6h9dj2s912w8ihg4yyiii7s3jlmvy62ah"; depends=[AnnotationDbi]; }; cyp450cdf = derive2 { name="cyp450cdf"; version="2.18.0"; sha256="1mbqn9940sxc0ksvykdk3i4jvnkv9q91igwn1rwmv2z18hz18qf0"; depends=[AnnotationDbi]; }; @@ -333,13 +344,14 @@ in with self; { ecoli2_db = derive2 { name="ecoli2.db"; version="3.2.3"; sha256="07vc5fl2zq2f65ndcldyzvwfpl65snp6ygvw658j4036lbb7cpjl"; depends=[AnnotationDbi org_EcK12_eg_db]; }; ecoli2cdf = derive2 { name="ecoli2cdf"; version="2.18.0"; sha256="1rkxrwadq9kg9685z9pg6rgc4bblkx5p3c6snsl4gv2k188dva9r"; depends=[AnnotationDbi]; }; ecoli2probe = derive2 { name="ecoli2probe"; version="2.18.0"; sha256="11q4ka0ncjapahic49xdl9919vm9frrwlqgj101krgkg262lfm8n"; depends=[AnnotationDbi]; }; - ecoliK12_db0 = derive2 { name="ecoliK12.db0"; version="3.3.0"; sha256="00cjwrlkr2y6m4x30n39iykiwb4r36s7pp0qzg4v2xgq178n3jsv"; depends=[AnnotationDbi]; }; - ecoliSakai_db0 = derive2 { name="ecoliSakai.db0"; version="3.3.0"; sha256="1p5br2s8wfrxa20kg800nn90qz29j8459wp90bkhprya2h8f2pf4"; depends=[AnnotationDbi]; }; + ecoliK12_db0 = derive2 { name="ecoliK12.db0"; version="3.4.1"; sha256="1v9qa6pxwwc3ykh8nasi42vld07c9il0j72vfc8lpsxi9v56l5cs"; depends=[AnnotationDbi]; }; + ecoliSakai_db0 = derive2 { name="ecoliSakai.db0"; version="3.4.1"; sha256="18shfvqbv925xi694zv8c1mfxndrnsmkxdncncld11ra17wqs6cp"; depends=[AnnotationDbi]; }; ecoliasv2cdf = derive2 { name="ecoliasv2cdf"; version="2.18.0"; sha256="16i6has9qgmzakcy24racc1h9j331wndv5c87qp5r1zrai61zyav"; depends=[AnnotationDbi]; }; ecoliasv2probe = derive2 { name="ecoliasv2probe"; version="2.18.0"; sha256="1hfrnal170cdigc2fmnynb75jjsiq77p4x6ws9gah558hvx87nk3"; depends=[AnnotationDbi]; }; ecolicdf = derive2 { name="ecolicdf"; version="2.18.0"; sha256="18g5prjykn356k35m131ifn128k5mhij2x26balqav0azigzjqsn"; depends=[AnnotationDbi]; }; ecoliprobe = derive2 { name="ecoliprobe"; version="2.18.0"; sha256="17g5zxfzsak7a0w51irc0w1w2i5ngdkx9db6rhv1fyp8mfjgaphd"; depends=[AnnotationDbi]; }; - fly_db0 = derive2 { name="fly.db0"; version="3.3.0"; sha256="00nk8rwnrl8j2k3pafppzaiipfmclhgdlbk54zj41jakrqd5cmk2"; depends=[AnnotationDbi]; }; + fitCons_UCSC_hg19 = derive2 { name="fitCons.UCSC.hg19"; version="3.4.0"; sha256="1nlbmzngg077p1bz462qsyvhc9k6pn2vzmvmsqs0hwrxsk2myvgq"; depends=[BSgenome GenomicRanges IRanges VariantFiltering]; }; + fly_db0 = derive2 { name="fly.db0"; version="3.4.1"; sha256="10bh5mrl163w433fr8g8n5b190wqcldxvxdamw13gwn79hymbjr4"; depends=[AnnotationDbi]; }; gahgu133a_db = derive2 { name="gahgu133a.db"; version="2.2.0"; sha256="1ikyvj1gi39qbakpn5wl0823ljavng1k33zvpf2k24jdhdw927qb"; depends=[AnnotationDbi]; }; gahgu133acdf = derive2 { name="gahgu133acdf"; version="2.2.1"; sha256="0hvd4iwj2fjiqp1jzbz68i1w6jn77nrsih316jlj85bhb35f7cyv"; depends=[]; }; gahgu133aprobe = derive2 { name="gahgu133aprobe"; version="2.2.1"; sha256="108lki2bg55ysh485shxxsz1imm26g5a3grgcmxbfs4pgna3g4h0"; depends=[AnnotationDbi]; }; @@ -439,8 +451,8 @@ in with self; { hom_Sc_inp_db = derive2 { name="hom.Sc.inp.db"; version="3.1.2"; sha256="0l9nly3k7jnf6g1qnwyw22ga1hdyjdvn3hrlway8pb9rv7279bil"; depends=[AnnotationDbi]; }; hs25kresogen_db = derive2 { name="hs25kresogen.db"; version="2.5.0"; sha256="1yp25ifm3bwzkzm8vimlxw5slini7drhvmh5ggh0z80sfrjyndyf"; depends=[AnnotationDbi org_Hs_eg_db]; }; hspeccdf = derive2 { name="hspeccdf"; version="0.99.1"; sha256="07azl9zpg552ic7li14p6n09ba3jbqqclwffjfpd2vc249x0n4fw"; depends=[AnnotationDbi]; }; - hta20stprobeset_db = derive2 { name="hta20stprobeset.db"; version="8.3.0"; sha256="05blv54srnw7yrs8x32syzk1xdksrl8gswk837m7qjgciq8hazcn"; depends=[AnnotationDbi org_Hs_eg_db]; }; - hta20sttranscriptcluster_db = derive2 { name="hta20sttranscriptcluster.db"; version="8.3.1"; sha256="0ana9fg3ms22m394w8qbfvfy663l0r163w0qfwh5ir59rs4bpalf"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hta20probeset_db = derive2 { name="hta20probeset.db"; version="8.5.0"; sha256="0d1gydcxgcxgchg7imlbkc6acz6py894v6m2i7wl6mpm793az7r6"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hta20transcriptcluster_db = derive2 { name="hta20transcriptcluster.db"; version="8.5.0"; sha256="114l2jh1zg4jiirw2gp5djp7x4yf9l9x4hrxfflzzk2b0gc66fwk"; depends=[AnnotationDbi org_Hs_eg_db]; }; hthgu133a_db = derive2 { name="hthgu133a.db"; version="3.2.3"; sha256="0sgi7pbkndcpl775qn36rdlsm4j6ip2lfk0cmkh8zqryrj3yq6hh"; depends=[AnnotationDbi org_Hs_eg_db]; }; hthgu133acdf = derive2 { name="hthgu133acdf"; version="2.18.0"; sha256="1a5b421lx0nxy3mrrxjxifwjpnv289c5q2a89xhnkwlcfhqlzqrp"; depends=[AnnotationDbi]; }; hthgu133afrmavecs = derive2 { name="hthgu133afrmavecs"; version="1.3.0"; sha256="0466xgi67r5rpp7cs06ib0cr6vvx8d881g5l96b8sh9948pbn4ss"; depends=[]; }; @@ -480,20 +492,20 @@ in with self; { hu6800subccdf = derive2 { name="hu6800subccdf"; version="2.18.0"; sha256="1xir2k62whqf39g7g5rm646nz6hxq83nldrrc3cyzch85723a55p"; depends=[AnnotationDbi]; }; hu6800subdcdf = derive2 { name="hu6800subdcdf"; version="2.18.0"; sha256="1caiyyna5ffnnx85h9f62h2fwd42wwi187g9igspcy8mn2hakpfw"; depends=[AnnotationDbi]; }; huex_1_0_st_v2frmavecs = derive2 { name="huex.1.0.st.v2frmavecs"; version="1.1.0"; sha256="0fnadflyg615v7w071jilg42w8w5fvnac7rm0wg33klvzx9c9knx"; depends=[]; }; - huex10stprobeset_db = derive2 { name="huex10stprobeset.db"; version="8.4.0"; sha256="1kppimky5d2qnl7sv4xnghb477lwizjy5zznrd9dkvxii5msyf2v"; depends=[AnnotationDbi org_Hs_eg_db]; }; - huex10sttranscriptcluster_db = derive2 { name="huex10sttranscriptcluster.db"; version="8.4.0"; sha256="1m3s1bnwvr50jcpwqax4bnlcan9j01l4q01jg3yaf62ww9wlhdw2"; depends=[AnnotationDbi org_Hs_eg_db]; }; + huex10stprobeset_db = derive2 { name="huex10stprobeset.db"; version="8.5.0"; sha256="0yrc5hf2yhxr33xr7mlrljbndbxl1mcv1ylnfak8wnhkzlbz5ir1"; depends=[AnnotationDbi org_Hs_eg_db]; }; + huex10sttranscriptcluster_db = derive2 { name="huex10sttranscriptcluster.db"; version="8.5.0"; sha256="1ybxzqqpxfdjpw7mkyn1ydyghgsv5yfp27byi3yifpjz3ymm0lzi"; depends=[AnnotationDbi org_Hs_eg_db]; }; hugene_1_0_st_v1frmavecs = derive2 { name="hugene.1.0.st.v1frmavecs"; version="1.1.0"; sha256="0jwk5mm37fil3h9h1hrc4bm3sxfdzywbmsqm1blvrvb5q6jgl50a"; depends=[]; }; - hugene10stprobeset_db = derive2 { name="hugene10stprobeset.db"; version="8.4.0"; sha256="1a6jsr65hcj5799iymrzhn2r8cnjp8916hixacjks01z5civzgfb"; depends=[AnnotationDbi org_Hs_eg_db]; }; - hugene10sttranscriptcluster_db = derive2 { name="hugene10sttranscriptcluster.db"; version="8.4.0"; sha256="03bvwawba9r8ayhzjiszn60h5v4qms64xk11q3qfj5d5kxc61374"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hugene10stprobeset_db = derive2 { name="hugene10stprobeset.db"; version="8.5.0"; sha256="1sh6ca1abnd5a09rcpa99gfpcnl0vjk49v8hnkbrzlrm8b6z603a"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hugene10sttranscriptcluster_db = derive2 { name="hugene10sttranscriptcluster.db"; version="8.5.0"; sha256="0ydqq477ms68q8g7k8zj5mz609cdyk5ly5mxvvkzpbfrw7r663jd"; depends=[AnnotationDbi org_Hs_eg_db]; }; hugene10stv1cdf = derive2 { name="hugene10stv1cdf"; version="2.18.0"; sha256="1drsclrcf344z4m61qxd1a1lg2qrd2h7s3y6kk7xcy76s2mqjx2f"; depends=[AnnotationDbi]; }; hugene10stv1probe = derive2 { name="hugene10stv1probe"; version="2.18.0"; sha256="1cn6hdw1mj0i4f0syvx8g1r02bbki994y3s9hrdps3kvcbaw6brd"; depends=[AnnotationDbi]; }; - hugene11stprobeset_db = derive2 { name="hugene11stprobeset.db"; version="8.4.0"; sha256="0sycgmzzmaf1aqi48f4nvh9y514n4f4v3cd3cdcq926grajv6l2v"; depends=[AnnotationDbi org_Hs_eg_db]; }; - hugene11sttranscriptcluster_db = derive2 { name="hugene11sttranscriptcluster.db"; version="8.4.0"; sha256="19v0zkqz81v97np2azbnrxnmw19a5z1fh523d2y28hiyp0z62hlr"; depends=[AnnotationDbi org_Hs_eg_db]; }; - hugene20stprobeset_db = derive2 { name="hugene20stprobeset.db"; version="8.4.0"; sha256="1dh9115c1nd1a744adxcgjk2rxhj5ngvh6v4l1832a659z1q85lz"; depends=[AnnotationDbi org_Hs_eg_db]; }; - hugene20sttranscriptcluster_db = derive2 { name="hugene20sttranscriptcluster.db"; version="8.4.0"; sha256="16ynwlnl5qkf3in7b08lf8k5v1q0sr0zd2hl52pl8yvpqxsm7sdz"; depends=[AnnotationDbi org_Hs_eg_db]; }; - hugene21stprobeset_db = derive2 { name="hugene21stprobeset.db"; version="8.4.0"; sha256="07cza2h7r0ipc4c3z14gw2vca4zqx2l0s41hz5fj0g6ss2a7n2qj"; depends=[AnnotationDbi org_Hs_eg_db]; }; - hugene21sttranscriptcluster_db = derive2 { name="hugene21sttranscriptcluster.db"; version="8.4.0"; sha256="1xqwq17xvmfbhy89di2gwg8c7r52ihp50qckqiqi0qdv5w59vbfj"; depends=[AnnotationDbi org_Hs_eg_db]; }; - human_db0 = derive2 { name="human.db0"; version="3.3.0"; sha256="18kfi5g4v2d15dkkn4nrm14cqaz47ihaj2w4c2bazq0qcyc4iy34"; depends=[AnnotationDbi]; }; + hugene11stprobeset_db = derive2 { name="hugene11stprobeset.db"; version="8.5.0"; sha256="1akfj1z69s5kda10rybbpx0gl1ziwjq8nf0vr0sd24vzn3z0ml34"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hugene11sttranscriptcluster_db = derive2 { name="hugene11sttranscriptcluster.db"; version="8.5.0"; sha256="1shmhzqy5zjaj564j6gfhs5plg3rhiz46qk2mkm7xyysgkjwwq90"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hugene20stprobeset_db = derive2 { name="hugene20stprobeset.db"; version="8.5.0"; sha256="1bxhlz983ar0m72rlv3vyqkl9gyqkndyv896yyim09ah8hpln24k"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hugene20sttranscriptcluster_db = derive2 { name="hugene20sttranscriptcluster.db"; version="8.5.0"; sha256="1cz6080w523j1dvbrgslkw1qs9bspci7086azz0xn4pmqjrkr78i"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hugene21stprobeset_db = derive2 { name="hugene21stprobeset.db"; version="8.5.0"; sha256="0wcjldj9vxf73c2j9wmkra4kfd3n34yhicj53svgkcb2s9ldj8mq"; depends=[AnnotationDbi org_Hs_eg_db]; }; + hugene21sttranscriptcluster_db = derive2 { name="hugene21sttranscriptcluster.db"; version="8.5.0"; sha256="0ndcpkkqa5bq8g70bf1119vs1pj0hzkqlmm1bxy3zw86by06gass"; depends=[AnnotationDbi org_Hs_eg_db]; }; + human_db0 = derive2 { name="human.db0"; version="3.4.1"; sha256="0dpxa3ifmqsg63rzcz333iqkhg8hjipfyvl18899d11cxxcm9wh7"; depends=[AnnotationDbi]; }; human1mduov3bCrlmm = derive2 { name="human1mduov3bCrlmm"; version="1.0.4"; sha256="1p7qpzk6svafgdafljhh4k0z7pcs78qmwwfd80r0a1yhkssmp0v9"; depends=[]; }; human1mv1cCrlmm = derive2 { name="human1mv1cCrlmm"; version="1.0.3"; sha256="1qlph3qrjv52ddzlj8pwa93zzh70x4mbdrdr7q9pan427lpck9gx"; depends=[]; }; human370quadv3cCrlmm = derive2 { name="human370quadv3cCrlmm"; version="1.0.3"; sha256="1chjx9vsmqz2whslw1l7jn7nfn7zx6pcjfmqqm9mh81i74rzrdik"; depends=[]; }; @@ -531,7 +543,7 @@ in with self; { m20kcod_db = derive2 { name="m20kcod.db"; version="3.4.0"; sha256="1p2sm5j4b50iqzwcb984qrh74c3hf6yml7b8mvxlhhhvxz4iy1np"; depends=[AnnotationDbi org_Mm_eg_db]; }; maizecdf = derive2 { name="maizecdf"; version="2.18.0"; sha256="0yfz5gjhsq4wz6j63s1b1hxjz03gsmrlfs2cdc8smq6azp3zdid4"; depends=[AnnotationDbi]; }; maizeprobe = derive2 { name="maizeprobe"; version="2.18.0"; sha256="01h5dv5i0zaqlphkii9ipxy9wswv1srgprrpr5vmi01c9d98qsk0"; depends=[AnnotationDbi]; }; - malaria_db0 = derive2 { name="malaria.db0"; version="3.3.0"; sha256="17s27vzxlpzrz8hy9z91fl2azbg82519fy5j2mzrk3h6429v7289"; depends=[AnnotationDbi]; }; + malaria_db0 = derive2 { name="malaria.db0"; version="3.4.1"; sha256="041qsj8dkpavjs444v5fyhfzl7p6s2fx6ny16m36ak3g0w528bnf"; depends=[AnnotationDbi]; }; medicagocdf = derive2 { name="medicagocdf"; version="2.18.0"; sha256="1clz679cc887x98c6jk93cphijkbg5r2nd9idrj5901yvh6p9n5q"; depends=[AnnotationDbi]; }; medicagoprobe = derive2 { name="medicagoprobe"; version="2.18.0"; sha256="0w6j1pfkvb3npc8srpjifq2ywnqxhc9q090jqzmkx22x36cw9cl5"; depends=[AnnotationDbi]; }; mgu74a_db = derive2 { name="mgu74a.db"; version="3.2.3"; sha256="0xd2gbvry061409kiwq99i13641g8x6m9kbgg4yr0x6m9dh7hxa8"; depends=[AnnotationDbi org_Mm_eg_db]; }; @@ -559,7 +571,7 @@ in with self; { mgug4122a_db = derive2 { name="mgug4122a.db"; version="3.2.3"; sha256="0x4mrjqd9wnppkp757f3azllbjiilxfds3cpbcrfsi07l8lf4mxx"; depends=[AnnotationDbi org_Mm_eg_db]; }; mi16cod_db = derive2 { name="mi16cod.db"; version="3.4.0"; sha256="1v64plvn173hdvjyy491qh2wd4mgbpwr27iq7lab9b3w1g3b1a82"; depends=[AnnotationDbi org_Mm_eg_db]; }; miRBaseVersions_db = derive2 { name="miRBaseVersions.db"; version="0.99.5"; sha256="0cxkxy42ybnls6396m4svm4iiw0x29fgg98dfwpgwfv5np85m0vh"; depends=[AnnotationDbi DBI gtools RSQLite]; }; - miRNAtap_db = derive2 { name="miRNAtap.db"; version="0.99.7"; sha256="0h7s83cqr8xwypizdhkgx4nl4pxbr3lhnjwgnwcdibrpq3mbq5cj"; depends=[AnnotationDbi DBI miRNAtap RSQLite]; }; + miRNAtap_db = derive2 { name="miRNAtap.db"; version="0.99.10"; sha256="1j4igmyb9f4fa0a72hkmq3f7xgvyv38wai3mds5sd6mfgfc3brs3"; depends=[AnnotationDbi DBI miRNAtap RSQLite]; }; mirbase_db = derive2 { name="mirbase.db"; version="1.2.0"; sha256="0l7ah1ia7q1h16av2v1qa9nqpr0604z5dlrq37kd0aiz8dcxyddk"; depends=[AnnotationDbi]; }; mirna102xgaincdf = derive2 { name="mirna102xgaincdf"; version="2.18.0"; sha256="03q71dq6b0plivj5bgpgx0pnqdwfgplakyk5ggj4w7kqwmr5k17i"; depends=[AnnotationDbi]; }; mirna10cdf = derive2 { name="mirna10cdf"; version="2.18.0"; sha256="146gc1dx071vawn29k2m31zpi3wdwykss4qh8znpmbp5qcja4hyb"; depends=[AnnotationDbi]; }; @@ -572,20 +584,20 @@ in with self; { moe430b_db = derive2 { name="moe430b.db"; version="3.2.3"; sha256="0hb6pa07j5hdirpprcm9vdszbh5bkgf38gyp3g0gqvlc32nklv58"; depends=[AnnotationDbi org_Mm_eg_db]; }; moe430bcdf = derive2 { name="moe430bcdf"; version="2.18.0"; sha256="0yl5pkqj37188k2yvvsqhnhm2vx523r11sry976bwzcadlicfhvb"; depends=[AnnotationDbi]; }; moe430bprobe = derive2 { name="moe430bprobe"; version="2.18.0"; sha256="1nziw3pj4picz0aazblpqkbw82wq3vdajh9i78yfvlz1bwb2vpfi"; depends=[AnnotationDbi]; }; - moex10stprobeset_db = derive2 { name="moex10stprobeset.db"; version="8.4.0"; sha256="0f7xxq0n5c5cp9axaxjmi9dhqfznjiifj98yxz1cgzkihgw7fwry"; depends=[AnnotationDbi org_Mm_eg_db]; }; - moex10sttranscriptcluster_db = derive2 { name="moex10sttranscriptcluster.db"; version="8.4.0"; sha256="0cg16g8i58a2dzkrpa39gjw4cz60ii9d8x4amgwk01j77lbmxwmh"; depends=[AnnotationDbi org_Mm_eg_db]; }; + moex10stprobeset_db = derive2 { name="moex10stprobeset.db"; version="8.5.0"; sha256="15i8fqp6r5q39pyhnpfqcwpqw4iar1yf9id391js0fbpz01n0hq1"; depends=[AnnotationDbi org_Mm_eg_db]; }; + moex10sttranscriptcluster_db = derive2 { name="moex10sttranscriptcluster.db"; version="8.5.0"; sha256="0idxw02vyyspkbcd80al8h3l991v9n93d5cfag9f54hriz6ra5q8"; depends=[AnnotationDbi org_Mm_eg_db]; }; mogene_1_0_st_v1frmavecs = derive2 { name="mogene.1.0.st.v1frmavecs"; version="1.1.0"; sha256="00lyakg7dhsm3jkh011mfq1vy439mds64zpm6fgyq592x3k9w2ah"; depends=[]; }; - mogene10stprobeset_db = derive2 { name="mogene10stprobeset.db"; version="8.4.0"; sha256="0z4szr7gxrfqdajzlz38z1l4i87lfwjsidhxa2kp4a5sm0kcpp2y"; depends=[AnnotationDbi org_Mm_eg_db]; }; - mogene10sttranscriptcluster_db = derive2 { name="mogene10sttranscriptcluster.db"; version="8.4.0"; sha256="1hv7ninsn834if8qwywa033ycf6sifvq3p38h6bkr83gdjzk1pfh"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mogene10stprobeset_db = derive2 { name="mogene10stprobeset.db"; version="8.5.0"; sha256="08nc0qn8kn4nfsxv0nxyrs9d3rw4schgl1k9sfhav1a0zp9gak5a"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mogene10sttranscriptcluster_db = derive2 { name="mogene10sttranscriptcluster.db"; version="8.5.0"; sha256="005ahfhnhdxfivhwk1qifph9civ4411clq9h7km9m4ldn0bsg23r"; depends=[AnnotationDbi org_Mm_eg_db]; }; mogene10stv1cdf = derive2 { name="mogene10stv1cdf"; version="2.18.0"; sha256="1zhq08zsghck39ly7ymcjanzgw3xy1hqw435hwcrrlipv6i4lbmj"; depends=[AnnotationDbi]; }; mogene10stv1probe = derive2 { name="mogene10stv1probe"; version="2.18.0"; sha256="1qjnsf6cv23gnqdpcy1xqxy807y91fnaiyh95hg99v932pvika6a"; depends=[AnnotationDbi]; }; - mogene11stprobeset_db = derive2 { name="mogene11stprobeset.db"; version="8.4.0"; sha256="1gvn50r1slchfczhf00ylflpgka11l98rfvi25w6jgm433l2dknq"; depends=[AnnotationDbi org_Mm_eg_db]; }; - mogene11sttranscriptcluster_db = derive2 { name="mogene11sttranscriptcluster.db"; version="8.4.0"; sha256="0nw9k3wfgssfwrxhw9nnqwjz6vzgrljd1g5gs2bw4f2isa4dzfvn"; depends=[AnnotationDbi org_Mm_eg_db]; }; - mogene20stprobeset_db = derive2 { name="mogene20stprobeset.db"; version="8.4.0"; sha256="1pqf0dqd3apb64cfsmd1rs3vhx76ixf3hx01y4np2khl33spng3v"; depends=[AnnotationDbi org_Mm_eg_db]; }; - mogene20sttranscriptcluster_db = derive2 { name="mogene20sttranscriptcluster.db"; version="8.4.0"; sha256="0sbms5rld5x53cjk5yaxl9j37kni37j9drar4a1b94s6cxsh0ydf"; depends=[AnnotationDbi org_Mm_eg_db]; }; - mogene21stprobeset_db = derive2 { name="mogene21stprobeset.db"; version="8.4.0"; sha256="1nbvq5v114ziqjiijxjji703c30h8fv7f1qvzj1bgr5cssv60bbl"; depends=[AnnotationDbi org_Mm_eg_db]; }; - mogene21sttranscriptcluster_db = derive2 { name="mogene21sttranscriptcluster.db"; version="8.4.0"; sha256="111b5pvq4l25wghys2ba9f1g8n5d4y8dqvzi7iivdx17jy61jqm7"; depends=[AnnotationDbi org_Mm_eg_db]; }; - mouse_db0 = derive2 { name="mouse.db0"; version="3.3.0"; sha256="13vm1zi33glpkc0sl166gni542825f1pnbj2qqh5yqlp6i00whxf"; depends=[AnnotationDbi]; }; + mogene11stprobeset_db = derive2 { name="mogene11stprobeset.db"; version="8.5.0"; sha256="1zkhix305yn3s3a9bvngi62gcnmr516cr48i9mcfc4wm32vlvqwx"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mogene11sttranscriptcluster_db = derive2 { name="mogene11sttranscriptcluster.db"; version="8.5.0"; sha256="0ginnqn5p5gqha2w888i3v62qr1as4vfa3ffid3g6ylc7wr8q57c"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mogene20stprobeset_db = derive2 { name="mogene20stprobeset.db"; version="8.5.0"; sha256="1wlnbz5lycwpcj152yf683gvidymr9clyrq3sknkskdqkk6m0k11"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mogene20sttranscriptcluster_db = derive2 { name="mogene20sttranscriptcluster.db"; version="8.5.0"; sha256="1pk5z46pgj1fknknsl0cxpfmrnkss69c9apw5nxvg3kjm4m3zsyv"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mogene21stprobeset_db = derive2 { name="mogene21stprobeset.db"; version="8.5.0"; sha256="04j1ga7jfgp72pwa99p5yd7g4vk0k5964srdrpr7p9xi5664ac4r"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mogene21sttranscriptcluster_db = derive2 { name="mogene21sttranscriptcluster.db"; version="8.5.0"; sha256="175h9jaqjqhabxi3ydrmr8ykwyzw078frqj93p55b8gdwccbngzb"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mouse_db0 = derive2 { name="mouse.db0"; version="3.4.1"; sha256="1b03kqwpnwhnmv6x0cgn24qsl75hvcqmqpc1mlw8ms7hlbvaiijg"; depends=[AnnotationDbi]; }; mouse4302_db = derive2 { name="mouse4302.db"; version="3.2.3"; sha256="1wdgqawqzkr39xwl32cap4ksr59p7r7i83g82h1ss4q3lm58gxpm"; depends=[AnnotationDbi org_Mm_eg_db]; }; mouse4302cdf = derive2 { name="mouse4302cdf"; version="2.18.0"; sha256="1mpyma4x8zfs2fmmx57xw4cfs2cf9lhw71nc3icl72d7vmwidswc"; depends=[AnnotationDbi]; }; mouse4302frmavecs = derive2 { name="mouse4302frmavecs"; version="1.5.0"; sha256="04clwkfz1gqqwrnqbavkka3hv480w6vi6c4q947qqnhw8j5jjp7s"; depends=[]; }; @@ -596,8 +608,8 @@ in with self; { mouse430a2probe = derive2 { name="mouse430a2probe"; version="2.18.0"; sha256="1f7a6mvcpv57h7kfj1qzkcwh7mdl2w9z6ysmrgan9037rd0652sz"; depends=[AnnotationDbi]; }; mouseCHRLOC = derive2 { name="mouseCHRLOC"; version="2.1.6"; sha256="0xylgnz43xmjnqdwv7pn034wfs61va21lvcpn9igdik2s42ykpp2"; depends=[]; }; mpedbarray_db = derive2 { name="mpedbarray.db"; version="3.2.3"; sha256="04pwchivzb19awnnqr9an0nl49rgdva58ip1fkgbavp3vlirxv4i"; depends=[AnnotationDbi org_Mm_eg_db]; }; - mta10stprobeset_db = derive2 { name="mta10stprobeset.db"; version="8.4.0"; sha256="1chc4ld5g8dmy33vrvprx08yp2vasmr4x6m8bswhfyigzf6n3d6w"; depends=[AnnotationDbi org_Mm_eg_db]; }; - mta10sttranscriptcluster_db = derive2 { name="mta10sttranscriptcluster.db"; version="8.4.0"; sha256="0f890nbnc27hnfazdyyypb3k6sla1ipijb8fvfqfld40nm1is978"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mta10probeset_db = derive2 { name="mta10probeset.db"; version="8.5.0"; sha256="0k7mpqbd02hyc77kiacxzrq661bc27hdfj04lsdg2szm9ij14c11"; depends=[AnnotationDbi org_Mm_eg_db]; }; + mta10transcriptcluster_db = derive2 { name="mta10transcriptcluster.db"; version="8.5.0"; sha256="1qbj0ac3xfbl0xw0xj4xix2spswgdp91qqqck8arlafpyacjc71b"; depends=[AnnotationDbi org_Mm_eg_db]; }; mu11ksuba_db = derive2 { name="mu11ksuba.db"; version="3.2.3"; sha256="188ld7awcgrbqxkwqyr98739x4ihmcawv3lv2ybrc0khqifylzj3"; depends=[AnnotationDbi org_Mm_eg_db]; }; mu11ksubacdf = derive2 { name="mu11ksubacdf"; version="2.18.0"; sha256="09xm3ah3zlssclblx663rlwrnmx3niabd5nf7zf7krhbpgcwhyim"; depends=[AnnotationDbi]; }; mu11ksubaprobe = derive2 { name="mu11ksubaprobe"; version="2.18.0"; sha256="1p3kc06h83ivh06a8qqcbpgbsbdfp9nnwvqfxr6d1gdn15qcp96k"; depends=[AnnotationDbi]; }; @@ -622,28 +634,28 @@ in with self; { nugomm1a520177cdf = derive2 { name="nugomm1a520177cdf"; version="3.4.0"; sha256="0skd5b76si0vydzk5qhg4f1a1j655alxflm9sqci8fi8safwj96a"; depends=[AnnotationDbi]; }; nugomm1a520177probe = derive2 { name="nugomm1a520177probe"; version="3.4.0"; sha256="1n70k0mhv146983myjgk1cgkr9rmmcpqdv8wpkcr320qcvgf9bn7"; depends=[AnnotationDbi]; }; oligoData = derive2 { name="oligoData"; version="1.8.0"; sha256="1d1yfms3jv2c4s255xnh8yxwijrj35skw3nxds7l46y88lg3qn8y"; depends=[oligo]; }; - org_Ag_eg_db = derive2 { name="org.Ag.eg.db"; version="3.3.0"; sha256="0fsjivcmwdfhvq45dikfgpni7725snncrv33pbird09hwy6n10vc"; depends=[AnnotationDbi]; }; - org_At_tair_db = derive2 { name="org.At.tair.db"; version="3.3.0"; sha256="1fhv5kvwwjfgnrrynala7bnjv0sxzr9isp32vhgx0gazl5krzyh7"; depends=[AnnotationDbi]; }; - org_Bt_eg_db = derive2 { name="org.Bt.eg.db"; version="3.3.0"; sha256="0sl6kxkdisss5y0c50n9f3ccbbk4kdwj1afkkqr3aay75fzm78hs"; depends=[AnnotationDbi]; }; - org_Ce_eg_db = derive2 { name="org.Ce.eg.db"; version="3.3.0"; sha256="17mvb2ci2jgac3zi420cbf70n4zswqinzxlk1v2fjnp8vvydl2fw"; depends=[AnnotationDbi]; }; - org_Cf_eg_db = derive2 { name="org.Cf.eg.db"; version="3.3.0"; sha256="1d5ip9d0236kp6i7z2wy6xgfb1nf0sjc8qyggjfan6pb2lsx2m2y"; depends=[AnnotationDbi]; }; - org_Dm_eg_db = derive2 { name="org.Dm.eg.db"; version="3.3.0"; sha256="15kzvw78xwa54yk1d69l6pmgny4726ydpdkk8lic26vr0yiwicla"; depends=[AnnotationDbi]; }; - org_Dr_eg_db = derive2 { name="org.Dr.eg.db"; version="3.3.0"; sha256="1823101yjvyc8x4gbmz7bijm2s5bd0fz4nv62glmaczlfc4lcwp9"; depends=[AnnotationDbi]; }; - org_EcK12_eg_db = derive2 { name="org.EcK12.eg.db"; version="3.3.0"; sha256="0hjffgii1pxmri7razxpilsk7scbdm8ingfwbgn6g51lyd5ygbj3"; depends=[AnnotationDbi]; }; - org_EcSakai_eg_db = derive2 { name="org.EcSakai.eg.db"; version="3.3.0"; sha256="15pn6kdbx2pf07dfq4knxbx3s7hf8zyip1c8hfmnvs5ixajivgxz"; depends=[AnnotationDbi]; }; - org_Gg_eg_db = derive2 { name="org.Gg.eg.db"; version="3.3.0"; sha256="0my3kjhfvzv6zwdaina7qcl7riqy2rj2z2v6x477plwbscixb9p7"; depends=[AnnotationDbi]; }; - org_Hs_eg_db = derive2 { name="org.Hs.eg.db"; version="3.3.0"; sha256="09zb43yjd82ny210n5a0wsrji4w56l2r6ana6d9lx0nn9mzd7rzp"; depends=[AnnotationDbi]; }; + org_Ag_eg_db = derive2 { name="org.Ag.eg.db"; version="3.4.0"; sha256="1rp0pipdfwwacfnznj65di2xny8ccjdfll882jp73yrpk8x6g9w5"; depends=[AnnotationDbi]; }; + org_At_tair_db = derive2 { name="org.At.tair.db"; version="3.4.0"; sha256="0176yrpjxdn83nvqlp24ad65fwqdfwk010lmygl0anjgnskxb3y2"; depends=[AnnotationDbi]; }; + org_Bt_eg_db = derive2 { name="org.Bt.eg.db"; version="3.4.0"; sha256="1cazky0p9rj8islivfhrmqal4q39h9hiq48mpmycpkh8qrrl7nyy"; depends=[AnnotationDbi]; }; + org_Ce_eg_db = derive2 { name="org.Ce.eg.db"; version="3.4.0"; sha256="12llfzrrc09kj2wzbisdspv38qzkzgpsbn8kv7qkwg746k3pq436"; depends=[AnnotationDbi]; }; + org_Cf_eg_db = derive2 { name="org.Cf.eg.db"; version="3.4.0"; sha256="07h339h4vh9dwb6jdr7hczcc1bka5gibi5g7b97jlpykn5qzqjrx"; depends=[AnnotationDbi]; }; + org_Dm_eg_db = derive2 { name="org.Dm.eg.db"; version="3.4.0"; sha256="1vzbphbrh1cf7xi5cksia9xy9a9l42js2z2qsajvjxvddiphrb7j"; depends=[AnnotationDbi]; }; + org_Dr_eg_db = derive2 { name="org.Dr.eg.db"; version="3.4.0"; sha256="0c1q78gbqgv915daalsgmm58xxqw4zsd3xf99m9kzfv7qd11c0nk"; depends=[AnnotationDbi]; }; + org_EcK12_eg_db = derive2 { name="org.EcK12.eg.db"; version="3.4.0"; sha256="14bv6gbznmdf3yhz2r4pqfbxc5ql7h2wv6n5alyir1fyy1gdyf0m"; depends=[AnnotationDbi]; }; + org_EcSakai_eg_db = derive2 { name="org.EcSakai.eg.db"; version="3.4.0"; sha256="1cgb7fg0c7z3f7x17b0ir8zzgvi4k1d64ryqy9mmfk9bg5n1f9y1"; depends=[AnnotationDbi]; }; + org_Gg_eg_db = derive2 { name="org.Gg.eg.db"; version="3.4.0"; sha256="0swfc1krsfgjhxgkhdnhq4x5ikviixk0pyacvl7f20gbyqlgxpsf"; depends=[AnnotationDbi]; }; + org_Hs_eg_db = derive2 { name="org.Hs.eg.db"; version="3.4.0"; sha256="19mg64pw8zcvb9yxzzyf7caz1kvdrkfsj1hd84bzq7crrh8kc4y6"; depends=[AnnotationDbi]; }; org_Hs_ipi_db = derive2 { name="org.Hs.ipi.db"; version="1.3.0"; sha256="06nkcjcavzwgnxzmbj05i4dapszf2wq7m5s0g8d6hm7kxz5wxddy"; depends=[AnnotationDbi PAnnBuilder]; }; - org_Mm_eg_db = derive2 { name="org.Mm.eg.db"; version="3.3.0"; sha256="0r939vfmsqqdwfimix1nv0bkhnixawy9c6avbclrncfanw3kgjax"; depends=[AnnotationDbi]; }; - org_Mmu_eg_db = derive2 { name="org.Mmu.eg.db"; version="3.3.0"; sha256="0awqg374j99j5g8z2am3cy0p92y68rsxss5b9by7mblxra4sy7gm"; depends=[AnnotationDbi]; }; - org_Pf_plasmo_db = derive2 { name="org.Pf.plasmo.db"; version="3.3.0"; sha256="0xydp19vacycxwkfc1r5z1sbhhmmg5kzv25jqrnm47lbvdsbzbnq"; depends=[AnnotationDbi]; }; - org_Pt_eg_db = derive2 { name="org.Pt.eg.db"; version="3.3.0"; sha256="1d0rrcpq3md5lavl3c9ypcbrg19l69p8abcxlzbqyn4rims6hsbp"; depends=[AnnotationDbi]; }; - org_Rn_eg_db = derive2 { name="org.Rn.eg.db"; version="3.3.0"; sha256="1d89gafdk0hra7c0rmkkbydvp23ayam186ydjcwydvpms4lpjssb"; depends=[AnnotationDbi]; }; - org_Sc_sgd_db = derive2 { name="org.Sc.sgd.db"; version="3.3.0"; sha256="1n251ds1gikv9ksgzy9a0j1z21kf18zj8q5b19zc0lh2pvgghhfh"; depends=[AnnotationDbi]; }; + org_Mm_eg_db = derive2 { name="org.Mm.eg.db"; version="3.4.0"; sha256="1lykjqjaf01fmgg3cvfcvwd5xjq6zc5vbxnm5r4l32fzvl89q50c"; depends=[AnnotationDbi]; }; + org_Mmu_eg_db = derive2 { name="org.Mmu.eg.db"; version="3.4.0"; sha256="0ba5z4fvv69bsw62wcx4smsz9fdlk01sql7scgi799ij9qzzd13v"; depends=[AnnotationDbi]; }; + org_Pf_plasmo_db = derive2 { name="org.Pf.plasmo.db"; version="3.4.0"; sha256="0miw8n5lqijfxw2q7lyxkp2srdf1rdfxyx8k87r279x23wxqgz12"; depends=[AnnotationDbi]; }; + org_Pt_eg_db = derive2 { name="org.Pt.eg.db"; version="3.4.0"; sha256="1dqj2japcbdqkisdla6aca4cjf4hbigf4gb2gn8abx5n1di0h2pi"; depends=[AnnotationDbi]; }; + org_Rn_eg_db = derive2 { name="org.Rn.eg.db"; version="3.4.0"; sha256="04az0yf3ngrz7nlbmmy9k97i9i8gf4dxbmgvd03vrv59y0x47m11"; depends=[AnnotationDbi]; }; + org_Sc_sgd_db = derive2 { name="org.Sc.sgd.db"; version="3.4.0"; sha256="01zc0kx0jrmcwly4bb3cy69x3zm7mkrffzx720mwphn61gzngz3z"; depends=[AnnotationDbi]; }; org_Sco_eg_db = derive2 { name="org.Sco.eg.db"; version="2.4.2"; sha256="1ppjl55059gk9jbh8c8xbsn2jlqz1hm650vm9gxnbd8hpnk63vgz"; depends=[AnnotationDbi]; }; - org_Ss_eg_db = derive2 { name="org.Ss.eg.db"; version="3.3.0"; sha256="1fcskfrq0r4iq4nv2rnpl6sb5xi53qqihnm1cjnfi00mgc767xw1"; depends=[AnnotationDbi]; }; + org_Ss_eg_db = derive2 { name="org.Ss.eg.db"; version="3.4.0"; sha256="17j0lvwp212zaxw5dx8488884v6b7l4hhzn2d14wisf8s3w1djig"; depends=[AnnotationDbi]; }; org_Tgondii_eg_db = derive2 { name="org.Tgondii.eg.db"; version="1.0"; sha256="1vq3qbk6jswfffj5lfwsic71h8ga7a6gqf6wfa7qcda3gvfhnwlc"; depends=[AnnotationDbi]; }; - org_Xl_eg_db = derive2 { name="org.Xl.eg.db"; version="3.3.0"; sha256="16k3c5ym289hsrg7qvsdz8l7saisyrf096d5nrxd92jw1ilzj31q"; depends=[AnnotationDbi]; }; + org_Xl_eg_db = derive2 { name="org.Xl.eg.db"; version="3.4.0"; sha256="1sbzmnxi9gvq3x86w6jw49qgzd7g58ilh1xmnvr840pz50b3n8j6"; depends=[AnnotationDbi]; }; paeg1acdf = derive2 { name="paeg1acdf"; version="2.18.0"; sha256="127pgxxp5wp3hgmafbzdzsk4gqnllq1m1gcsfyzkvpkvmbn4aa9n"; depends=[AnnotationDbi]; }; paeg1aprobe = derive2 { name="paeg1aprobe"; version="2.18.0"; sha256="0hbyd402wf9nzy2g93nhnf2zsi9jvhgfk0llxlyfk0kqxs0y4byy"; depends=[AnnotationDbi]; }; pd_081229_hg18_promoter_medip_hx1 = derive2 { name="pd.081229.hg18.promoter.medip.hx1"; version="0.99.4"; sha256="1h4925dmw0vfsnhllg55gswq3sxfmx9rcjzifdvgs9y27399psrr"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite]; }; @@ -671,6 +683,13 @@ in with self; { pd_chogene_2_0_st = derive2 { name="pd.chogene.2.0.st"; version="3.12.0"; sha256="0pljjz466y2aav9045qgr5hbrv7alyl3gw3br4a8knbijk6fbw15"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; pd_chogene_2_1_st = derive2 { name="pd.chogene.2.1.st"; version="3.12.0"; sha256="0d9pslimh0w37yvvfgqljbr2z5arjn6kx0wnjhp19gcch44jvkr2"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; pd_citrus = derive2 { name="pd.citrus"; version="3.12.0"; sha256="1792gsxdr24264n121zvspdq39ac3khaghv5j66rn2nzqds75qch"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_clariom_d_human = derive2 { name="pd.clariom.d.human"; version="3.14.1"; sha256="11q4s4q07fpkl5wpmhhjfkrp4l8i8gy1i8wc80aar84lp1261vvx"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_clariom_s_human = derive2 { name="pd.clariom.s.human"; version="3.14.1"; sha256="0a68mnwv735mi9k9qxs2vv4hnh76yg1n7jjyaw34g8m7405yjxxp"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_clariom_s_human_ht = derive2 { name="pd.clariom.s.human.ht"; version="3.14.1"; sha256="08fzm8xp6wa4x03vqb28dvlz3hiwv2q5n5h9m2np0g4g40hbhg89"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_clariom_s_mouse = derive2 { name="pd.clariom.s.mouse"; version="3.14.1"; sha256="15fc25840lnhv0rlxc98akda1gis1s4xn61ycvymjii3lgx8hwpk"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_clariom_s_mouse_ht = derive2 { name="pd.clariom.s.mouse.ht"; version="3.14.1"; sha256="1ka9mganvymml306yh196rqan333ykrmqp9dfl4xs9mz57p405kk"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_clariom_s_rat = derive2 { name="pd.clariom.s.rat"; version="3.14.1"; sha256="1bx0vipcw3vjpz59h5820yanwy7b8mxb8bkgwp3n58vm24x7l304"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_clariom_s_rat_ht = derive2 { name="pd.clariom.s.rat.ht"; version="3.14.1"; sha256="17fk4qiznh2ks7r4mzbv1gnpjca39n6rzshb5dw5n73rbnd24160"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; pd_cotton = derive2 { name="pd.cotton"; version="3.12.0"; sha256="1h71klvndi32j7hb7cy2w6asf7lb1xhs5glxajnd30y7ksigba7l"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; pd_cyngene_1_0_st = derive2 { name="pd.cyngene.1.0.st"; version="3.12.0"; sha256="1xkv8m346x1zrnp4bhbjk2xwfq5jkbprbh417bya8swqvcyv3zbj"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; pd_cyngene_1_1_st = derive2 { name="pd.cyngene.1.1.st"; version="3.12.0"; sha256="1kicrk0n2lik32q9nkpfy8ydh8klsy6i5cy6m2grddv80g5hc6n4"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; @@ -716,7 +735,7 @@ in with self; { pd_ht_hg_u133_plus_pm = derive2 { name="pd.ht.hg.u133.plus.pm"; version="3.12.0"; sha256="1000f1d28yzc0kcdf380fkx3xlgla3kn4n9f2ddawzjb7igash92"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; pd_ht_hg_u133a = derive2 { name="pd.ht.hg.u133a"; version="3.12.0"; sha256="14bnnxsn02mpyynn8bvl8c47id9l2wfakngbvpq4h5yjy689jm1c"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; pd_ht_mg_430a = derive2 { name="pd.ht.mg.430a"; version="3.12.0"; sha256="10shsap47217p6zmb9fn86na7if965h45l2r787cisgyyn9n45mq"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; - pd_hta_2_0 = derive2 { name="pd.hta.2.0"; version="3.12.1"; sha256="0564lbkyxs2lvj6pcz5p9p19p5jxlywk7iiva0qfmb7pbmairk7k"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_hta_2_0 = derive2 { name="pd.hta.2.0"; version="3.12.2"; sha256="004mm93wag59arzirws3cfqjv4whl8sbv558xxg7pj1ar026g4m3"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; pd_hu6800 = derive2 { name="pd.hu6800"; version="3.12.0"; sha256="07dj0avpx53kwaab9s126pn844nal9kn3h288n1m0kihir2mrjmv"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; pd_huex_1_0_st_v2 = derive2 { name="pd.huex.1.0.st.v2"; version="3.14.1"; sha256="1chlvjy1gvw5r8hfmkb34m3h7w2z4s5x9gsc50qbj84988k4gzga"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; pd_hugene_1_0_st_v1 = derive2 { name="pd.hugene.1.0.st.v1"; version="3.14.1"; sha256="1ikd6h7wnyxm11j0had2wcsxfbfrwdfw9605bvvdgd63dlvdv5dk"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; @@ -788,7 +807,7 @@ in with self; { pd_rjpgene_1_0_st = derive2 { name="pd.rjpgene.1.0.st"; version="3.12.0"; sha256="18qj6sdjw17553lwcb3swdx0aiv54izdzzblgl88g90ijny8rbpa"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; pd_rjpgene_1_1_st = derive2 { name="pd.rjpgene.1.1.st"; version="3.12.0"; sha256="0i99fyf6ya13z4hfjf3f5ssvys8wjhmwk894zy0p59p7nmphigyc"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; pd_rn_u34 = derive2 { name="pd.rn.u34"; version="3.12.0"; sha256="0ayp6r7z7p61b1lfq9dkq4ips4apgjg6igrcnvsivlfhcfcfs0wf"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; - pd_rta_1_0 = derive2 { name="pd.rta.1.0"; version="3.12.0"; sha256="0kchpv8j55k07gm42sbpsw5mpg47cfj4m0jw8i70wbrhj866bilp"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pd_rta_1_0 = derive2 { name="pd.rta.1.0"; version="3.12.2"; sha256="0x3j1a47lxhlqnhfvh1cii11rd433x16i6xmydwq2dkvm4xgd63h"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; pd_rusgene_1_0_st = derive2 { name="pd.rusgene.1.0.st"; version="3.12.0"; sha256="1ik28yykkpdclr5hrv8lzafzfivakwvzgz49q7bpb1g6ihwylshw"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; pd_rusgene_1_1_st = derive2 { name="pd.rusgene.1.1.st"; version="3.12.0"; sha256="090lxwxzj39d6qzlr7c3x50zf98g8x987rv1gdn0gcas15imya6n"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; pd_s_aureus = derive2 { name="pd.s.aureus"; version="3.12.0"; sha256="0kszw94ymxgwd3midzkpl307ch3pyr4g5qjcf4s2jsq6mrvxw666"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; @@ -810,10 +829,10 @@ in with self; { pd_zebrafish = derive2 { name="pd.zebrafish"; version="3.12.0"; sha256="0gg7y7w51pv0vf39qzyaf09wl3vxy222nr69zgxg7cylwxmaky7v"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; pedbarrayv10_db = derive2 { name="pedbarrayv10.db"; version="3.2.3"; sha256="01sn7qh5r2c2ph7gqirlzlplxscsmczf7ajffd9rsx59932f71kx"; depends=[AnnotationDbi org_Hs_eg_db]; }; pedbarrayv9_db = derive2 { name="pedbarrayv9.db"; version="3.2.3"; sha256="0x9m9m4nmdhc0j5244avmlfwljcpw0sh44l1b00cx05swi3vmjlp"; depends=[AnnotationDbi org_Hs_eg_db]; }; - phastCons100way_UCSC_hg19 = derive2 { name="phastCons100way.UCSC.hg19"; version="3.3.0"; sha256="1mdwkd75ljmshyprg5ns9880ck9hrq7015s413sp64d2fxj206z5"; depends=[BSgenome GenomicRanges IRanges VariantFiltering]; }; - phastCons100way_UCSC_hg38 = derive2 { name="phastCons100way.UCSC.hg38"; version="3.3.0"; sha256="1f5nq7chb5k5ahgwbjl0d67c382hvn50g0yz56l4ny1gwbgyamk7"; depends=[BSgenome GenomicRanges IRanges VariantFiltering]; }; - phastCons7way_UCSC_hg38 = derive2 { name="phastCons7way.UCSC.hg38"; version="3.3.0"; sha256="035zap0igcfvrncq7pc1y6f9whnik0izchqjidf6z0cdyhv3h088"; depends=[BSgenome GenomicRanges IRanges VariantFiltering]; }; - pig_db0 = derive2 { name="pig.db0"; version="3.3.0"; sha256="00lk4i3cvq3z14fxkyj393aa8sq70c9icd2srwkpgxhw51w8l3wz"; depends=[AnnotationDbi]; }; + phastCons100way_UCSC_hg19 = derive2 { name="phastCons100way.UCSC.hg19"; version="3.4.0"; sha256="1xkrm9s3x301g8kf0p60dcgx3irmsl8jfaayxbw3zgfyyr0nb1mw"; depends=[BSgenome GenomicRanges IRanges VariantFiltering]; }; + phastCons100way_UCSC_hg38 = derive2 { name="phastCons100way.UCSC.hg38"; version="3.4.0"; sha256="0d99mmih14s7mw0qsp2izdhi6fc59aamz160p0p9jpfbd8v4fz0g"; depends=[BSgenome GenomicRanges IRanges VariantFiltering]; }; + phastCons7way_UCSC_hg38 = derive2 { name="phastCons7way.UCSC.hg38"; version="3.4.0"; sha256="0r0wb1yj0ahkhql45n4jcqc2jgac5nshrjk3vn0w8sn80mxzialj"; depends=[BSgenome GenomicRanges IRanges VariantFiltering]; }; + pig_db0 = derive2 { name="pig.db0"; version="3.4.1"; sha256="1rkkbxk33nj8n2cijsh109xa49dw3b8hj05h396z0g6k2rflkxhx"; depends=[AnnotationDbi]; }; plasmodiumanophelescdf = derive2 { name="plasmodiumanophelescdf"; version="2.18.0"; sha256="1vs36091djinn3g6rjhmy9xfdyi58365zbcjc9mf50adnp2i5fq9"; depends=[AnnotationDbi]; }; plasmodiumanophelesprobe = derive2 { name="plasmodiumanophelesprobe"; version="2.18.0"; sha256="03hfq51nrpmx8ihc48jiih6bk99irrgal9x7i7mgcv8xd508gcsy"; depends=[AnnotationDbi]; }; poplarcdf = derive2 { name="poplarcdf"; version="2.18.0"; sha256="0j28czs936j2wgwp63qbwl1mjcflcrx7ir88jzxkkw7411ch1gl1"; depends=[AnnotationDbi]; }; @@ -830,26 +849,26 @@ in with self; { rae230b_db = derive2 { name="rae230b.db"; version="3.2.3"; sha256="0rjs9lijabhxfrs6m9qri7a1c10zm1mxqx7bbip366cw069f5dx4"; depends=[AnnotationDbi org_Rn_eg_db]; }; rae230bcdf = derive2 { name="rae230bcdf"; version="2.18.0"; sha256="1j2i49cp042nk3rkf8q6gxcnwd5cihz1nyg8r6yndkja51r41pi8"; depends=[AnnotationDbi]; }; rae230bprobe = derive2 { name="rae230bprobe"; version="2.18.0"; sha256="1smqs93fks4rd5g9kk7cacnpsnj4rjr0d6fl2i01mdiihfi3csny"; depends=[AnnotationDbi]; }; - raex10stprobeset_db = derive2 { name="raex10stprobeset.db"; version="8.4.0"; sha256="004h4z10x84w9bk71y1a22r51hh52xhpvdr1flr6crgxvhh0icis"; depends=[AnnotationDbi org_Rn_eg_db]; }; - raex10sttranscriptcluster_db = derive2 { name="raex10sttranscriptcluster.db"; version="8.4.0"; sha256="1ndjr34s6bbaa6bl6922asw90hnyzllm5w2bd7n0vxasgjl434fq"; depends=[AnnotationDbi org_Rn_eg_db]; }; - ragene10stprobeset_db = derive2 { name="ragene10stprobeset.db"; version="8.4.0"; sha256="1gqvgcgvnqhgibava8rp1izz2fgncpdyw2qm5hkxqkkw3gy7kf8p"; depends=[AnnotationDbi org_Rn_eg_db]; }; - ragene10sttranscriptcluster_db = derive2 { name="ragene10sttranscriptcluster.db"; version="8.4.0"; sha256="1sbda37zh5p7dx2rsgfa2mjc3yrrskzp2cpgdk5vi1m94lqs651w"; depends=[AnnotationDbi org_Rn_eg_db]; }; + raex10stprobeset_db = derive2 { name="raex10stprobeset.db"; version="8.5.0"; sha256="15i8inp73n8acjrs6z0hk88lgzjrcqd9vr5cv4vnsdzmzbnhrxdd"; depends=[AnnotationDbi org_Rn_eg_db]; }; + raex10sttranscriptcluster_db = derive2 { name="raex10sttranscriptcluster.db"; version="8.5.0"; sha256="1r0rg2ifiswbf5a2zahm9823vnahii9s2vrhprbj87rbl7wm19xl"; depends=[AnnotationDbi org_Rn_eg_db]; }; + ragene10stprobeset_db = derive2 { name="ragene10stprobeset.db"; version="8.5.0"; sha256="0zywhbxajqcmfl90r95r2ghas4zrla92rjc5qa7vf57cas40pk1s"; depends=[AnnotationDbi org_Rn_eg_db]; }; + ragene10sttranscriptcluster_db = derive2 { name="ragene10sttranscriptcluster.db"; version="8.5.0"; sha256="1wiichdhfi20lav0vqi80jw0k8i6pbsrdlark8x397sn1acynn3q"; depends=[AnnotationDbi org_Rn_eg_db]; }; ragene10stv1cdf = derive2 { name="ragene10stv1cdf"; version="2.18.0"; sha256="0fm2yj6nn3v1wiscjb53hm4ylh5cgxvs7qgc9sbsbpv7agr0bzng"; depends=[AnnotationDbi]; }; ragene10stv1probe = derive2 { name="ragene10stv1probe"; version="2.18.0"; sha256="0cb3a908hixcakl41ay4yyfm9r97ln8gjidn4rs1hr7qaplfj1mh"; depends=[AnnotationDbi]; }; - ragene11stprobeset_db = derive2 { name="ragene11stprobeset.db"; version="8.4.0"; sha256="023md8y6wmfxa6cmj6ld1j22g48xc9clbibixm4zx73av9qjjm47"; depends=[AnnotationDbi org_Rn_eg_db]; }; - ragene11sttranscriptcluster_db = derive2 { name="ragene11sttranscriptcluster.db"; version="8.4.0"; sha256="1lqypb7s4jifgga2fzk0q6662m28yn4qkw0axcbal2hqn37rsm30"; depends=[AnnotationDbi org_Rn_eg_db]; }; - ragene20stprobeset_db = derive2 { name="ragene20stprobeset.db"; version="8.4.0"; sha256="1hi6zq13l9vjimppmp3y6bznbwh08l0g1wcfva0ihgyw0mj5klwc"; depends=[AnnotationDbi org_Rn_eg_db]; }; - ragene20sttranscriptcluster_db = derive2 { name="ragene20sttranscriptcluster.db"; version="8.4.0"; sha256="18v7f7i6r9byq5sjr9pxshqmbr6p2iym3gv95lqqfg4qlgiri991"; depends=[AnnotationDbi org_Rn_eg_db]; }; - ragene21stprobeset_db = derive2 { name="ragene21stprobeset.db"; version="8.4.0"; sha256="0qfhb9fpydfh9n0d41pky46zsjabg7cpmyg6m59v529s22xw1mhw"; depends=[AnnotationDbi org_Rn_eg_db]; }; - ragene21sttranscriptcluster_db = derive2 { name="ragene21sttranscriptcluster.db"; version="8.4.0"; sha256="04cm1248iphl4n7avjr29ac44kgvhj8fkwxvb5wsyrjdfs15swmm"; depends=[AnnotationDbi org_Rn_eg_db]; }; - rat_db0 = derive2 { name="rat.db0"; version="3.3.0"; sha256="1dsb56lldvq8a75ryx7b1wvzaw9w8x0b1kjsnhd8jh2qj2rai2d5"; depends=[AnnotationDbi]; }; + ragene11stprobeset_db = derive2 { name="ragene11stprobeset.db"; version="8.5.0"; sha256="1qsrj2r0j4819rx2m6ahxz8fhpwz5cv6srysl585igipjy1caq43"; depends=[AnnotationDbi org_Rn_eg_db]; }; + ragene11sttranscriptcluster_db = derive2 { name="ragene11sttranscriptcluster.db"; version="8.5.0"; sha256="17np61fr5n545ilr4xlwsc559ni7rc38ns67x41lj6gnaz8cpmiy"; depends=[AnnotationDbi org_Rn_eg_db]; }; + ragene20stprobeset_db = derive2 { name="ragene20stprobeset.db"; version="8.5.0"; sha256="08g7wnfmxai9klscb7yywj6p8yfnid8px3qqwkn2s2r1iwi46azg"; depends=[AnnotationDbi org_Rn_eg_db]; }; + ragene20sttranscriptcluster_db = derive2 { name="ragene20sttranscriptcluster.db"; version="8.5.0"; sha256="09qcsbhl81j4wiz90fw6ldy97x821w72wywqik6rrsw1qhyaizkg"; depends=[AnnotationDbi org_Rn_eg_db]; }; + ragene21stprobeset_db = derive2 { name="ragene21stprobeset.db"; version="8.5.0"; sha256="15920i2wdyn5j0gn8nxdv1dvwhkmh1swzkazj5zqrg304xhrv1ki"; depends=[AnnotationDbi org_Rn_eg_db]; }; + ragene21sttranscriptcluster_db = derive2 { name="ragene21sttranscriptcluster.db"; version="8.5.0"; sha256="08gzlnbng7vhc3kw72lvrzp8f6799vr8b4c4vkdzwsrhd4hs60hf"; depends=[AnnotationDbi org_Rn_eg_db]; }; + rat_db0 = derive2 { name="rat.db0"; version="3.4.1"; sha256="0zzf91wbincgp75mwjx6q13xayb46giqv8vrz1wx8pmw2halqiy4"; depends=[AnnotationDbi]; }; rat2302_db = derive2 { name="rat2302.db"; version="3.2.3"; sha256="0vj4vkx091m34xqjh6gv6m2iqszvn5rq3kvnpyq3fin5v42wrsr1"; depends=[AnnotationDbi org_Rn_eg_db]; }; rat2302cdf = derive2 { name="rat2302cdf"; version="2.18.0"; sha256="1748rc6yypd7y8wgr1qg632pcsxx0fkxjz6b3z4fhblgdllhy9wk"; depends=[AnnotationDbi]; }; rat2302probe = derive2 { name="rat2302probe"; version="2.18.0"; sha256="1zwjgbcb9d4ib6z1iyjz8x11lq0b5gqs08y6j3idb5wf3i2p521v"; depends=[AnnotationDbi]; }; ratCHRLOC = derive2 { name="ratCHRLOC"; version="2.1.6"; sha256="0mgk6lwvvdwjzjh4r1q1q6nfnx4vqx9iy6gmbrb9f31jf30hqnsb"; depends=[]; }; rattoxfxcdf = derive2 { name="rattoxfxcdf"; version="2.18.0"; sha256="0q84lfaxnnj2zbm5q8xswa1md15fjj4i0djnqr835ixzn7px4yqn"; depends=[AnnotationDbi]; }; rattoxfxprobe = derive2 { name="rattoxfxprobe"; version="2.18.0"; sha256="1kp159553rkcn9yh6x3yph3yjz2ja21wi9j5ax03qnhwlsl1x8ik"; depends=[AnnotationDbi]; }; - reactome_db = derive2 { name="reactome.db"; version="1.55.0"; sha256="1q3cikzvbywzcrihnw5hizb8fylf1mfbwyrlyxcnw5hb522f5x8n"; depends=[AnnotationDbi]; }; + reactome_db = derive2 { name="reactome.db"; version="1.58.0"; sha256="191bz92rr446g8w4m4wr9c51ykfqaj65vp7adb56wch7r8llawrl"; depends=[AnnotationDbi]; }; rgu34a_db = derive2 { name="rgu34a.db"; version="3.2.3"; sha256="1s2sd5bqlj4qhamhrnb9byxn8nc7z265mqy7zzkgxcd6a2k472vp"; depends=[AnnotationDbi org_Rn_eg_db]; }; rgu34acdf = derive2 { name="rgu34acdf"; version="2.18.0"; sha256="08z9f16xp1m2mwl9vlmbffxl4zyyl8cgzf6wp66rrm32lvl0nbwq"; depends=[AnnotationDbi]; }; rgu34aprobe = derive2 { name="rgu34aprobe"; version="2.18.0"; sha256="1gjxyq9128jgv3ic386f84rajgf3wz7yi2dja80y0ff4m0a48dlh"; depends=[AnnotationDbi]; }; @@ -863,7 +882,7 @@ in with self; { rgug4105a_db = derive2 { name="rgug4105a.db"; version="3.2.3"; sha256="0lq8k95qm0q7j65nf16p3f09dn9zs87n3k561wxrgi2lb0pf6j40"; depends=[AnnotationDbi org_Rn_eg_db]; }; rgug4130a_db = derive2 { name="rgug4130a.db"; version="3.2.3"; sha256="0zlcn9spw23bj3px9z1l2f5afn09zbr6rv0nbd2h6dd12wrvy1zk"; depends=[AnnotationDbi org_Rn_eg_db]; }; rgug4131a_db = derive2 { name="rgug4131a.db"; version="3.2.3"; sha256="1r272jf9cflf1yf4bznp4d59h7bd7adh1i3rf890h5ffc0xzf5cq"; depends=[AnnotationDbi org_Rn_eg_db]; }; - rhesus_db0 = derive2 { name="rhesus.db0"; version="3.3.0"; sha256="0xq7bvargvwv06xzalshw7iz75incm6cz58w7h7hg66avyvrxyc9"; depends=[AnnotationDbi]; }; + rhesus_db0 = derive2 { name="rhesus.db0"; version="3.4.1"; sha256="16p3zsx6sr466xzf0yd667an21br21n13agacsysf9g1vw4gc7cx"; depends=[AnnotationDbi]; }; rhesuscdf = derive2 { name="rhesuscdf"; version="2.18.0"; sha256="0q2alkxm80wkzaf0q80df27q30qkswybavz05x6ywsihbs9h0nb8"; depends=[AnnotationDbi]; }; rhesusprobe = derive2 { name="rhesusprobe"; version="2.18.0"; sha256="0fd8pvwvpcmx41k80nbccjxllh39fvjf7l9dr8facisl1x7gsfil"; depends=[AnnotationDbi]; }; ri16cod_db = derive2 { name="ri16cod.db"; version="3.4.0"; sha256="1xz533vxjdyxx1wkks0kgk6b90sxs44iqcsvyds0xcm573bx8c6q"; depends=[AnnotationDbi org_Rn_eg_db]; }; @@ -872,6 +891,8 @@ in with self; { rnu34_db = derive2 { name="rnu34.db"; version="3.2.3"; sha256="0ahridq75rmjyaivmlhn428wg712zv3003cbzzrajm9w6nibbfgk"; depends=[AnnotationDbi org_Rn_eg_db]; }; rnu34cdf = derive2 { name="rnu34cdf"; version="2.18.0"; sha256="1snb89530zxdbsfs1vgw30b1wdc5sdr1q46bmvz5m9g57gyficr0"; depends=[AnnotationDbi]; }; rnu34probe = derive2 { name="rnu34probe"; version="2.18.0"; sha256="1rzjha1v453fxiwqs2zgwcbrvz6w96biz2jny0hrh5s86d5f6xpb"; depends=[AnnotationDbi]; }; + rta10probeset_db = derive2 { name="rta10probeset.db"; version="8.5.0"; sha256="039klpv3v3npb9i9pw4sjh2jwyv8ffk83360h41lxmmy17fdzlmh"; depends=[AnnotationDbi org_Rn_eg_db]; }; + rta10transcriptcluster_db = derive2 { name="rta10transcriptcluster.db"; version="8.5.0"; sha256="0q0szasa6c1klhhzdp08sv598m7njf1xql9h710xajbyksq0accy"; depends=[AnnotationDbi org_Rn_eg_db]; }; rtu34_db = derive2 { name="rtu34.db"; version="3.2.3"; sha256="119l36gbzdi52na2lkjbpb5r2d9pp5rz2zpzfj7isw07an6h8wmh"; depends=[AnnotationDbi org_Rn_eg_db]; }; rtu34cdf = derive2 { name="rtu34cdf"; version="2.18.0"; sha256="10f5wnvk820c8brl2qqs7mv6jcn1v6pmz680kvlpyz9s2sz16936"; depends=[AnnotationDbi]; }; rtu34probe = derive2 { name="rtu34probe"; version="2.18.0"; sha256="0mcp9lmc65j3ds73gyak72pkshnx6km0d2cm324yaxlp9bqzfchw"; depends=[AnnotationDbi]; }; @@ -898,8 +919,8 @@ in with self; { vitisviniferaprobe = derive2 { name="vitisviniferaprobe"; version="2.18.0"; sha256="1ggz1s37dwvrkhj4vx2civyhap7bgqsshy33lk14z4fjsayfi39a"; depends=[AnnotationDbi]; }; wheatcdf = derive2 { name="wheatcdf"; version="2.18.0"; sha256="1gmbrdilqvm54h6nkb1cm01ki8aipiywd4qj8gpwlm2hqrimr8kr"; depends=[AnnotationDbi]; }; wheatprobe = derive2 { name="wheatprobe"; version="2.18.0"; sha256="1fifi3pvzdrg356idwz0kx7qlf5mssdxlyvwpn3cjgw0z7n7cnw8"; depends=[AnnotationDbi]; }; - worm_db0 = derive2 { name="worm.db0"; version="3.3.0"; sha256="00g3cq605zgzq11lrc8fyp5qyqds1rwq3qzbpg82ja29ggbnkr6f"; depends=[AnnotationDbi]; }; - xenopus_db0 = derive2 { name="xenopus.db0"; version="3.3.0"; sha256="1bxz80rg1kf9hawmbrawiswz8r8yb29ck7l8wwivi4n5cg3mfbkw"; depends=[AnnotationDbi]; }; + worm_db0 = derive2 { name="worm.db0"; version="3.4.1"; sha256="0r76ck6b2zkf38z59n9m3frc2d6v27frrbryvyk6lv4bnnwa1p2n"; depends=[AnnotationDbi]; }; + xenopus_db0 = derive2 { name="xenopus.db0"; version="3.4.1"; sha256="0953cf597hxd2h28p7bqrv5xxs96y3bxr4x1hp8bm1v0l8l37d13"; depends=[AnnotationDbi]; }; xenopuslaeviscdf = derive2 { name="xenopuslaeviscdf"; version="2.18.0"; sha256="1bcz1hr7gxw6ac4qvw0giph6hfcf5i9b11s274ypq512qc1d32iq"; depends=[AnnotationDbi]; }; xenopuslaevisprobe = derive2 { name="xenopuslaevisprobe"; version="2.18.0"; sha256="0prb14zn2gvgxq8w0y21x1ng51cn3bgjhkppf7zkmnq1xkzvq0pw"; depends=[AnnotationDbi]; }; xlaevis_db = derive2 { name="xlaevis.db"; version="3.2.3"; sha256="0cdi71c8pflb8n4yfxc0wmfi51w6z0dlz7nw5hv0hkx547v79d53"; depends=[AnnotationDbi org_Xl_eg_db]; }; @@ -911,7 +932,7 @@ in with self; { ye6100subbcdf = derive2 { name="ye6100subbcdf"; version="2.18.0"; sha256="1169hv56981b915rlr5w5sn6ppyjd8as7f4k1hbjzadrdrl3glwp"; depends=[AnnotationDbi]; }; ye6100subccdf = derive2 { name="ye6100subccdf"; version="2.18.0"; sha256="0mhr4zd33gfvvivc17k7fb6nvmhq6h3q0xbx2zl09zd6qk09kizm"; depends=[AnnotationDbi]; }; ye6100subdcdf = derive2 { name="ye6100subdcdf"; version="2.18.0"; sha256="11b1fflgc34lrj4yf1p7way5n83cm9c7znsbxpzlwddwyy8qib30"; depends=[AnnotationDbi]; }; - yeast_db0 = derive2 { name="yeast.db0"; version="3.3.0"; sha256="0dpdqn22m5l78ck5shwpiw4qza63sddckzdq85fx4xskmnr0qhr2"; depends=[AnnotationDbi]; }; + yeast_db0 = derive2 { name="yeast.db0"; version="3.4.1"; sha256="0d9p474891jshxynmwa63xg7kb01s6vb1dll3hns9ps0bpm6d8r3"; depends=[AnnotationDbi]; }; yeast2_db = derive2 { name="yeast2.db"; version="3.2.3"; sha256="1xns0129ifklipbardybkjyxfwnlklavq0k6s15wk2iwk7vxa33s"; depends=[AnnotationDbi org_Sc_sgd_db]; }; yeast2cdf = derive2 { name="yeast2cdf"; version="2.18.0"; sha256="0c68val9x8bfnv4xx0vag9dxwsx5q8dzbj0dpha3nshh12jw48w9"; depends=[AnnotationDbi]; }; yeast2probe = derive2 { name="yeast2probe"; version="2.18.0"; sha256="125nif693qcmxc0nnnz917f9avggcdr8g9rfvx2qdc54a2l7vdb7"; depends=[AnnotationDbi]; }; @@ -920,7 +941,7 @@ in with self; { ygs98frmavecs = derive2 { name="ygs98frmavecs"; version="1.3.0"; sha256="1xrm1209xnknwvad7nvg1a0mbxz15z12yd4x5bia3cq03zcmzf9m"; depends=[]; }; ygs98probe = derive2 { name="ygs98probe"; version="2.18.0"; sha256="0awf6z4j2vb2jk9a9j2r512yd3m31660y68pasa9mp488m270a3q"; depends=[AnnotationDbi]; }; zebrafish_db = derive2 { name="zebrafish.db"; version="3.2.3"; sha256="1n6p04hlm5c32fnficx294s7n7izy5460avagw8hx1g5xryhdzqk"; depends=[AnnotationDbi org_Dr_eg_db]; }; - zebrafish_db0 = derive2 { name="zebrafish.db0"; version="3.3.0"; sha256="1x0pzppwlm2ad8b2amg3i4jcpkadr2x26nqdhjqyjag0kq5w72zl"; depends=[AnnotationDbi]; }; + zebrafish_db0 = derive2 { name="zebrafish.db0"; version="3.4.1"; sha256="12a1qk7wjjsclrj2nbf02hwk9pakzkgzgy4l2893bnwyf0c30ffb"; depends=[AnnotationDbi]; }; zebrafishcdf = derive2 { name="zebrafishcdf"; version="2.18.0"; sha256="0sq1xqhblbilvaiabhqyl9gxdj3jg576vgq8v0cls1zvvx0isrx0"; depends=[AnnotationDbi]; }; zebrafishprobe = derive2 { name="zebrafishprobe"; version="2.18.0"; sha256="1pb8z2rdhq11hq391xyi236scyafbp56kbhhwsnha36yygz5drw0"; depends=[AnnotationDbi]; }; } diff --git a/pkgs/development/r-modules/bioc-experiment-packages.nix b/pkgs/development/r-modules/bioc-experiment-packages.nix index 93fc5a95482..e87c0160ff3 100644 --- a/pkgs/development/r-modules/bioc-experiment-packages.nix +++ b/pkgs/development/r-modules/bioc-experiment-packages.nix @@ -4,299 +4,306 @@ # Rscript generate-r-packages.R bioc-experiment >new && mv new bioc-experiment-packages.nix { self, derive }: -let derive2 = derive { rVersion = "3.3"; }; +let derive2 = derive { rVersion = "3.4"; }; in with self; { - ABAData = derive2 { name="ABAData"; version="1.2.2"; sha256="0wp44a5i8qdg2jnxg1fvc9i79m6zdcr0027cp4fha11l1syj6dh7"; depends=[]; }; - ALL = derive2 { name="ALL"; version="1.14.0"; sha256="07prs6q7qahv763ldwf9msyglbs0yrxpr0l95aykvflyyzlkdj04"; depends=[Biobase]; }; - ALLMLL = derive2 { name="ALLMLL"; version="1.12.0"; sha256="1h4747m67sc7d6hif42dv62y7ffzv92rili95ajp208i7j4451jp"; depends=[affy]; }; - ARRmData = derive2 { name="ARRmData"; version="1.8.0"; sha256="0jkzvn9kg2laxng4gkgpx7x30zx542y1z0ywvidy8w7xa99d1c6q"; depends=[]; }; - Affyhgu133A2Expr = derive2 { name="Affyhgu133A2Expr"; version="1.8.0"; sha256="08r8cr8gddbsl0xgbvm9vrdazzg874vkglvy3ji5y88nph9gli5x"; depends=[]; }; - Affyhgu133Plus2Expr = derive2 { name="Affyhgu133Plus2Expr"; version="1.6.0"; sha256="0wn61kslpxp50fih4hrciig5hf0ydafabf6lzn8nlpamkr54gcw8"; depends=[]; }; - Affyhgu133aExpr = derive2 { name="Affyhgu133aExpr"; version="1.10.0"; sha256="1qp649gli32h6xffw1sfjsfpxmm3wfn870sx6sgfnyxkyhr4fa4y"; depends=[]; }; - AffymetrixDataTestFiles = derive2 { name="AffymetrixDataTestFiles"; version="0.10.0"; sha256="1id05rc0q2nlazc4ndjmd8blwzd1xhk06rwc2sv755v0amprn4iy"; depends=[]; }; - Affymoe4302Expr = derive2 { name="Affymoe4302Expr"; version="1.10.0"; sha256="0pqm0v6frq0xjkdjbxgyrcipjkyp47r652gn20wc0y5kpkqs0pqq"; depends=[]; }; - AmpAffyExample = derive2 { name="AmpAffyExample"; version="1.12.0"; sha256="04ih81msr17zwl00n36xx2l180d6q6q4cbrr2mdwr6ppfxq60g3w"; depends=[affy]; }; - AneuFinderData = derive2 { name="AneuFinderData"; version="1.0.2"; sha256="0n28m8x6kdkgqrzx468zrssy3a5qla294xs6mqxi5ghsppdasxwh"; depends=[]; }; - AshkenazimSonChr21 = derive2 { name="AshkenazimSonChr21"; version="1.2.2"; sha256="032f48jq7qm94g45lv1kabjc6362xfhr63dr0spsh17vhipbj06n"; depends=[]; }; - BeadArrayUseCases = derive2 { name="BeadArrayUseCases"; version="1.10.0"; sha256="026fgqgb5b7s09zjb93qpvn9lashvcmw4dabqi80vmcslw1qynrm"; depends=[beadarray GEOquery limma]; }; - CCl4 = derive2 { name="CCl4"; version="1.9.0"; sha256="1byiayjf1jbqj1xfarblga5523gqnivr0m14pd1flrmx4d0z22kb"; depends=[Biobase limma]; }; - CLL = derive2 { name="CLL"; version="1.12.0"; sha256="1ni36n8cadlwybg9crnw1kq6xp7l0l8y6mwnjqlqzykxn5x16w08"; depends=[affy Biobase]; }; - COHCAPanno = derive2 { name="COHCAPanno"; version="1.8.0"; sha256="1wi4mg9q3kg0rglkz2i630y2w8p2hk35k013iav6r7k02n9pb4xz"; depends=[]; }; - CONFESSdata = derive2 { name="CONFESSdata"; version="1.0.0"; sha256="12q519wik54dyw2svviib04w0z5c884iiskk0v7qyhx9kydkmkfc"; depends=[]; }; - COPDSexualDimorphism_data = derive2 { name="COPDSexualDimorphism.data"; version="1.8.0"; sha256="00zhw6iyak3z38s1xgh3mdd1kb166r0vm0s5np4xkp93pg6bcj7i"; depends=[]; }; - COSMIC_67 = derive2 { name="COSMIC.67"; version="1.8.2"; sha256="0x09csirjgsww38r339cpcg446xx4c5nfsifvfyvzdxxdfjq42xa"; depends=[GenomicRanges SummarizedExperiment VariantAnnotation]; }; - CRCL18 = derive2 { name="CRCL18"; version="0.106.0"; sha256="1lfhb82hkv4ylgwdzpmlsk4rk66ingp3p2zd7c43w6rawald3s2y"; depends=[Biobase]; }; - CardinalWorkflows = derive2 { name="CardinalWorkflows"; version="1.4.0"; sha256="042456sy3bikv66i2j6zidk9s9bjgd2hl481jy2jzcjg9jqzkrvr"; depends=[Cardinal]; }; - ChAMPdata = derive2 { name="ChAMPdata"; version="1.10.0"; sha256="1i4ifwiim97ap0n7ccyy3w0yh8bf22bm1laif0vb1y8cibj5nwnc"; depends=[BiocGenerics GenomicRanges]; }; - ChIPXpressData = derive2 { name="ChIPXpressData"; version="1.10.0"; sha256="1v0h5k7z3hvwkf56xx42s8y1dx4bmwxcnl16q0pmfnakimvbm1bc"; depends=[bigmemory]; }; - ChimpHumanBrainData = derive2 { name="ChimpHumanBrainData"; version="1.10.0"; sha256="0vyvzdr6iznp82njz72vw7c5amw7pgiswv7a3yv4iiz6ilcp1lb2"; depends=[affy hexbin limma qvalue statmod]; }; - ConnectivityMap = derive2 { name="ConnectivityMap"; version="1.8.0"; sha256="1b8x7g8vzd6dmfpg5rih41bpz1srp0ykwkiz6fvwqxcic3wwjhyr"; depends=[]; }; - CopyNumber450kData = derive2 { name="CopyNumber450kData"; version="1.8.0"; sha256="1f7g07iks077b5wis4p960kf1smwwcqv8hbwqqkix5gan5hwy09g"; depends=[IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest minfi]; }; - CopyhelpeR = derive2 { name="CopyhelpeR"; version="1.4.0"; sha256="1z4bcakmi84jgiz1c46g2v6yqmxdzy9n02adhfzbh8jgzh2apq5h"; depends=[]; }; - DAPARdata = derive2 { name="DAPARdata"; version="1.0.1"; sha256="078dcj8cjj7iqjc5i6q1d7bi1frvix8f8hhmb4x20670fynda3pr"; depends=[knitr MSnbase]; }; - DLBCL = derive2 { name="DLBCL"; version="1.12.0"; sha256="04rg3c1mh5kl0dkm3wyxv5izm6910j6zin8lw21dbgnvnf7v4fg3"; depends=[Biobase]; }; - DMRcatedata = derive2 { name="DMRcatedata"; version="1.8.2"; sha256="0pl3wj2nvjhp84cvvh2yqdqqsa4b61wyqmihw8xg4qkh78dnizqk"; depends=[GenomicRanges]; }; - DREAM4 = derive2 { name="DREAM4"; version="1.8.0"; sha256="1qnq24lrpwrlcn3x1f54mb6j3qpa6rjcxn1r326dabryphg2j27d"; depends=[SummarizedExperiment]; }; - DeSousa2013 = derive2 { name="DeSousa2013"; version="1.8.0"; sha256="0x8is94i2svw9hlrhypkc0b9fa5jdpnr8vbk0iywdg8fp3a2yis0"; depends=[affy AnnotationDbi Biobase cluster ConsensusClusterPlus frma frmaTools gplots hgu133plus2_db hgu133plus2frmavecs pamr rgl ROCR siggenes survival sva]; }; - DmelSGI = derive2 { name="DmelSGI"; version="1.4.2"; sha256="11v1f4nh2r1p29dszwgq451l5cfhppylggg578xfn0i20dmwfrry"; depends=[abind gplots igraph knitr limma rhdf5 TSP]; }; - DonaPLLP2013 = derive2 { name="DonaPLLP2013"; version="1.10.0"; sha256="0j22cb94h0sz17jdvfcc6ifig738qkx8rhlhyps42vjinslzh317"; depends=[EBImage]; }; - DrugVsDiseasedata = derive2 { name="DrugVsDiseasedata"; version="1.8.0"; sha256="0qzm3zlsxhh3bq98wbwar1lmrdkjigxbw249l4l6fs6rkr89fjh7"; depends=[]; }; - DvDdata = derive2 { name="DvDdata"; version="1.8.0"; sha256="0mfgcwjqmpbi0bqy0xav8bd6w5pasx10xmz3sk5qx17iw873n6j7"; depends=[]; }; - EGSEAdata = derive2 { name="EGSEAdata"; version="1.0.1"; sha256="12294jrirm23sch7b84ylvsxg7njw9gj5h9spjh0s3mzp0iak3ac"; depends=[]; }; - ELMER_data = derive2 { name="ELMER.data"; version="1.2.2"; sha256="1invnncdcqxv8iz0asj9nkgxrvjannqfhgmv23w2p7hpvnhfc18h"; depends=[GenomicRanges]; }; - EatonEtAlChIPseq = derive2 { name="EatonEtAlChIPseq"; version="0.10.0"; sha256="1i9cm0way8g856h90rcgq6xh0w3qkv4cq8ac0k7b2gpnsa342m6w"; depends=[GenomicRanges rtracklayer ShortRead]; }; - FANTOM3and4CAGE = derive2 { name="FANTOM3and4CAGE"; version="1.8.0"; sha256="1yvk3px2dcnld9maizb9l5xd82pr7y9j652gknn20kl6d70rqz90"; depends=[]; }; - FIs = derive2 { name="FIs"; version="1.0.0"; sha256="0fd7yfzdyr7lrixaxji14012z2kqlyx5g9236r9hi5v1fcrxgi1v"; depends=[]; }; - Fletcher2013a = derive2 { name="Fletcher2013a"; version="1.8.0"; sha256="0yk4aqi5j94m1n2d0ablmcc5czk44nyimi5wfagyb51187hvad8s"; depends=[Biobase gplots limma VennDiagram]; }; - Fletcher2013b = derive2 { name="Fletcher2013b"; version="1.8.0"; sha256="11lfcbbmz5yk12j5yvn4y8ylf62i98h6y3b0mkd63lyswfkzknq9"; depends=[Fletcher2013a igraph RColorBrewer RedeR RTN]; }; - FlowSorted_Blood_450k = derive2 { name="FlowSorted.Blood.450k"; version="1.10.0"; sha256="1i3f459rd7fnkqqpdshzxkilcm3m2mivw8hva3y7gb6734gpllyy"; depends=[minfi]; }; - FlowSorted_CordBlood_450k = derive2 { name="FlowSorted.CordBlood.450k"; version="1.0.0"; sha256="0rq9b4xdvq6v1brjvn7qhin3s8jaakc4s5va87qnnr6hh41zlj2a"; depends=[minfi]; }; - FlowSorted_DLPFC_450k = derive2 { name="FlowSorted.DLPFC.450k"; version="1.8.0"; sha256="13qr6a95vwbx3ilkbh2pbim6yb9hmz0f3gn2bkj3a3hgm1skbh5c"; depends=[minfi]; }; - FunciSNP_data = derive2 { name="FunciSNP.data"; version="1.8.0"; sha256="07pdy0fpprs8ri1vrg3z97zdrifrgh9js25g2imb7f84fnzcl1gj"; depends=[IRanges rtracklayer]; }; - GGdata = derive2 { name="GGdata"; version="1.10.0"; sha256="14y0vmzhf3afz1q3ydrl2pwdn42x2j58rmyj2rbidcj1l2dqg4gd"; depends=[AnnotationDbi Biobase GGBase illuminaHumanv1_db snpStats]; }; - GSBenchMark = derive2 { name="GSBenchMark"; version="0.106.0"; sha256="028f0xfnmq5rn8z1q12rmd4wmcg4r7vncxkjbb589d5v7d7p73b0"; depends=[]; }; - GSE62944 = derive2 { name="GSE62944"; version="1.0.0"; sha256="1j9gh4glqw3ip442m4rp2i174l9ql9kbxd0slm7d9qgfkpggzyki"; depends=[Biobase GEOquery]; }; - GSVAdata = derive2 { name="GSVAdata"; version="1.8.0"; sha256="17azis177nwq34pn55mvz4clq32w2qn9m9rfbd2j99y7m0gcc63h"; depends=[Biobase GSEABase hgu95a_db]; }; - GWASdata = derive2 { name="GWASdata"; version="1.10.0"; sha256="0xl7idhril2jfas34g7nr7b6qvnglkg6q7q9xh1damk166dpb49g"; depends=[GWASTools]; }; - GeuvadisTranscriptExpr = derive2 { name="GeuvadisTranscriptExpr"; version="1.0.2"; sha256="1rxkg8wxpkv0rlldyfa01f8fvph35gy7awpsnw58qfj92bcsmkgg"; depends=[]; }; - HD2013SGI = derive2 { name="HD2013SGI"; version="1.12.0"; sha256="0701nvh83q3r1mkzl6ywb91zhnmwshmsnl22zb2dhikbn1j4rzbc"; depends=[EBImage geneplotter gplots limma LSD RColorBrewer splots vcd]; }; - HEEBOdata = derive2 { name="HEEBOdata"; version="1.10.0"; sha256="1rpvpgirbwmyc3ybh2z7h6z6a0bw4jfcm60c1kamnvj44nk9f32j"; depends=[]; }; - HIVcDNAvantWout03 = derive2 { name="HIVcDNAvantWout03"; version="1.12.0"; sha256="073sb84gy804ipsdcrljxvizxp637zi9lxzc8zimxk91l35mcrnc"; depends=[]; }; - HSMMSingleCell = derive2 { name="HSMMSingleCell"; version="0.106.2"; sha256="1lc0q6q2601z53fyxzfjzl4yg14pl0rz8j8jqzjjvb3c29an7wbb"; depends=[]; }; - HarmanData = derive2 { name="HarmanData"; version="1.0.2"; sha256="1yd9np9diir65cndk2n8cdfilnxycl0fhd9kzdz8fh37inrfvli2"; depends=[]; }; - HiCDataHumanIMR90 = derive2 { name="HiCDataHumanIMR90"; version="0.106.0"; sha256="1bh9ncz49gp25nj5cy4yr577lnzh6byrcps5aic71052xqw00a3a"; depends=[]; }; - HiCDataLymphoblast = derive2 { name="HiCDataLymphoblast"; version="1.8.0"; sha256="0mmvxi6ippljm2c1h7grhlr0qacyvq63w0mnm9n2g6bjkmwzmn0w"; depends=[]; }; - Hiiragi2013 = derive2 { name="Hiiragi2013"; version="1.8.0"; sha256="0s0ynp1mc60ikhn20phw37happbdxi1gfgkikj51z0aryrf489wd"; depends=[affy Biobase boot clue cluster genefilter geneplotter gplots gtools KEGGREST lattice latticeExtra MASS mouse4302_db RColorBrewer xtable]; }; - IHW = derive2 { name="IHW"; version="0.99.14"; sha256="1qh81nhvqg5pfxvd6ap7rlksbqk6wb041w1ba1s36gfrjr1ff1j0"; depends=[BiocGenerics fdrtool lpsymphony slam]; }; - IHWpaper = derive2 { name="IHWpaper"; version="1.0.2"; sha256="0whaa0gdqx5c5l8ra6yjl9dx9nkg32fs16w095djk7jn9f140211"; depends=[Biobase BiocGenerics BiocParallel cowplot DESeq2 dplyr fdrtool genefilter ggplot2 IHW qvalue Rcpp SummarizedExperiment]; }; - ITALICSData = derive2 { name="ITALICSData"; version="2.10.0"; sha256="1l31w7fgaizdglp8khnlzzpz1gwxmhzmpgfbkpnvl7wsdkfa20pn"; depends=[]; }; - Illumina450ProbeVariants_db = derive2 { name="Illumina450ProbeVariants.db"; version="1.8.0"; sha256="1x8c897bj5bq9ifw4pyvq36rk6sqyqinr66hhxm0gcj0grhi8kpv"; depends=[]; }; - IlluminaDataTestFiles = derive2 { name="IlluminaDataTestFiles"; version="1.10.0"; sha256="191a6vyd35ia7dcx7x9vcgizapnpzdyhcqygw4yhsf0z3pr5iv9b"; depends=[]; }; - Iyer517 = derive2 { name="Iyer517"; version="1.14.0"; sha256="13p736wxx77qc4dg2bxl2crf193yj5jxx9p6m5mblqbrgvnr4g5g"; depends=[Biobase]; }; - JASPAR2014 = derive2 { name="JASPAR2014"; version="1.8.0"; sha256="1wspjfij2h0x5i2lff0j24rx9v3ivp6s9plv61zrj34sbwibwwws"; depends=[Biostrings]; }; - JASPAR2016 = derive2 { name="JASPAR2016"; version="1.0.0"; sha256="0i29a9qa68zxgvgmfx0wyhnbangvbqr2mbdgqh65a56mnjk2ay2q"; depends=[]; }; - JctSeqData = derive2 { name="JctSeqData"; version="1.2.2"; sha256="17ld0vwk9dqyy6a6n386mzklx05azcwcfwbxrbm07z0d7f2fc73n"; depends=[]; }; - KEGGandMetacoreDzPathwaysGEO = derive2 { name="KEGGandMetacoreDzPathwaysGEO"; version="0.106.0"; sha256="07pffi3ajklina1w35dn1dgj522djymp07dyillxyhm21g64qcn5"; depends=[Biobase BiocGenerics]; }; - KEGGdzPathwaysGEO = derive2 { name="KEGGdzPathwaysGEO"; version="1.10.0"; sha256="0c7gdlxnwxlcfvydq93p9zklggk3cgrspshhjzzsmavm1dk917kk"; depends=[Biobase BiocGenerics]; }; - LiebermanAidenHiC2009 = derive2 { name="LiebermanAidenHiC2009"; version="0.10.0"; sha256="1fqhs3kmxf3hjld6hmi1grn8j0a4z3s4wxy8nhmwc36c7asmcyhk"; depends=[IRanges KernSmooth]; }; - ListerEtAlBSseq = derive2 { name="ListerEtAlBSseq"; version="1.4.2"; sha256="0kcwicjx327lpnxq1lcmxy061r6cxfz8q2csrxp74dddkyvljmr2"; depends=[methylPipe]; }; - LungCancerACvsSCCGEO = derive2 { name="LungCancerACvsSCCGEO"; version="1.8.0"; sha256="0fwkqyh0zhihpp2wn98b0fk23cmh9q2xvxidskia618p69vkyvn3"; depends=[]; }; - LungCancerLines = derive2 { name="LungCancerLines"; version="0.10.0"; sha256="0svawwn2xzgsd8a9k5ml5g8yll70nwpryfsqd98azrmy5jmnpmb4"; depends=[Rsamtools]; }; - MAQCsubset = derive2 { name="MAQCsubset"; version="1.10.0"; sha256="1spiav4m5zfzkbbig0qf6clvzi6gin690gicl6pvfvnwxw9hvc3s"; depends=[affy Biobase lumi]; }; - MAQCsubsetAFX = derive2 { name="MAQCsubsetAFX"; version="1.10.0"; sha256="07c6by6j3cc2pvj59vsaphnaccks6asgdy7rap05b18v3cv0d85x"; depends=[affy Biobase]; }; - MAQCsubsetILM = derive2 { name="MAQCsubsetILM"; version="1.10.0"; sha256="0z7n1pjrx2wglxpwv8h03knff5ddhcka9jxi7y14jpmjh7k9qsdc"; depends=[Biobase lumi]; }; - MEALData = derive2 { name="MEALData"; version="1.2.0"; sha256="075b5pm1xz7xm35lcbqghlhrb1srfkbdkm3f5h24cbq3qjdlnyyf"; depends=[]; }; - MEDIPSData = derive2 { name="MEDIPSData"; version="1.8.0"; sha256="0yvrr3h57vfxiv2g1n6hiib15i6rl5zw73lic9aaihhz8vzq3hiq"; depends=[]; }; - MEEBOdata = derive2 { name="MEEBOdata"; version="1.10.0"; sha256="1r7cr1fn2x372d2vx9rxz5dd53zc6256ii2laq53i9g558c4368q"; depends=[]; }; - MMDiffBamSubset = derive2 { name="MMDiffBamSubset"; version="1.8.0"; sha256="04065hwj0ncczk4gv7zq9szp79xd90mp15a60rw8vayrh07cg563"; depends=[]; }; - MSBdata = derive2 { name="MSBdata"; version="0.10.2"; sha256="1g4ai2vrbl3dvk53acwsdqy47lh2i6d9fmghclfb8jxnh20ab34j"; depends=[]; }; - MUGAExampleData = derive2 { name="MUGAExampleData"; version="0.106.0"; sha256="1hsky35vancvwlsqky0d5liz5kfq6fhyqkvw243gjz4rakw090mh"; depends=[]; }; - MethylAidData = derive2 { name="MethylAidData"; version="1.4.2"; sha256="1x42fhaaazcwzbx7s47ffzcpga0dg39wyy64956fm42ygbvykzm6"; depends=[MethylAid]; }; - Mulder2012 = derive2 { name="Mulder2012"; version="0.12.0"; sha256="141ibn42qnv0dzzhbqgarzcvcbsqz4ckf0k4fpcgms23ky1js5s1"; depends=[HTSanalyzeR igraph KEGG_db MASS org_Hs_eg_db PANR pvclust RedeR]; }; - NCIgraphData = derive2 { name="NCIgraphData"; version="1.8.0"; sha256="0v4v0z09rh31si29sm8bwjmc3lcjpqnpsx07wyir6kqv5kils7mb"; depends=[]; }; - NGScopyData = derive2 { name="NGScopyData"; version="0.106.0"; sha256="0a9kx8d0aqv526kk26060afl5mydj8xdkh3vv1r1v820niqgyd32"; depends=[]; }; - Neve2006 = derive2 { name="Neve2006"; version="0.10.0"; sha256="1z3hg18my8sv8q9x0k4kpcq75fm73id1ak30zq1rqrscdvysk2wn"; depends=[annotate Biobase hgu133a_db]; }; - PCHiCdata = derive2 { name="PCHiCdata"; version="1.0.2"; sha256="15pdm6y6gaia5yv4xg1yjmyqwhak49fzl5v9y0mb2gsn6nb2ajs0"; depends=[Chicago]; }; - PGPC = derive2 { name="PGPC"; version="1.0.2"; sha256="0q6s3km9d8sjzhbz1yxyadcnfq3gc8aav9hgp886ri7jcm5ddh14"; depends=[ChemmineR EBImage geneplotter ggplot2 gplots imageHTS limma plyr RColorBrewer reshape2 SearchTrees splots]; }; - PREDAsampledata = derive2 { name="PREDAsampledata"; version="0.12.0"; sha256="0q4857a0i0a77ff139j57m6i5p71hg9gz24ln97hc4zrxcp3qbh6"; depends=[affy annotate Biobase gahgu133plus2_db gahgu133plus2cdf PREDA]; }; - PWMEnrich_Dmelanogaster_background = derive2 { name="PWMEnrich.Dmelanogaster.background"; version="4.6.0"; sha256="0has8xd86qh5042c5kx63py8b2bqsxy1xmn12gr7wv0r1wlkzylh"; depends=[PWMEnrich]; }; - PWMEnrich_Hsapiens_background = derive2 { name="PWMEnrich.Hsapiens.background"; version="4.6.0"; sha256="1l0806ihhba3rl6ck1xrb2jqx77jsl4c2ksph5a0dc8zccsdln94"; depends=[PWMEnrich]; }; - PWMEnrich_Mmusculus_background = derive2 { name="PWMEnrich.Mmusculus.background"; version="4.6.0"; sha256="1j55797xdw1bwy0z0md4swyn87lki5y1qcnp7mcxfdvvq4371vm4"; depends=[PWMEnrich]; }; - PasillaTranscriptExpr = derive2 { name="PasillaTranscriptExpr"; version="1.0.2"; sha256="0h867v5vrcwaibybqf8przk4d2l286bwbc0rg1863kdq63qhxpls"; depends=[]; }; - PathNetData = derive2 { name="PathNetData"; version="1.8.0"; sha256="0wxixfjdskcqpy6nr2bfjggjd40jlzq31y50k5x0ccbhkkf60lrv"; depends=[]; }; - ProData = derive2 { name="ProData"; version="1.10.0"; sha256="1fkh3arikrwzllqn83x5v71b5x0nm31fy1xr2sldln1qif583mcn"; depends=[Biobase]; }; - QDNAseq_hg19 = derive2 { name="QDNAseq.hg19"; version="1.2.0"; sha256="13d8zwgwv22nhi96yypk87m35yhf256aslxhx682awi40lacljr1"; depends=[QDNAseq]; }; - QDNAseq_mm10 = derive2 { name="QDNAseq.mm10"; version="1.2.0"; sha256="0v5j0nfy0k0jkgd2mxc7ya0bfagcrl7ck72crz3959bh70vglvdg"; depends=[QDNAseq]; }; - QUBICdata = derive2 { name="QUBICdata"; version="1.0.2"; sha256="1q99mhlk08x9y68pyjv9wjrdvg58qzvfsxg1alrilyh243zr2nsn"; depends=[]; }; - RIPSeekerData = derive2 { name="RIPSeekerData"; version="1.8.0"; sha256="1i5mwj837ppmildrbsq38iqbmhgphbz18vin7qj03axxg29lkwxm"; depends=[RIPSeeker]; }; - RMassBankData = derive2 { name="RMassBankData"; version="1.10.0"; sha256="113x5dq02krdv3i1vlziqiwvvpnwg7mmmarsysjnjad539gklfvy"; depends=[]; }; - RNAinteractMAPK = derive2 { name="RNAinteractMAPK"; version="1.10.0"; sha256="0b3gfhm5b4s044j78lq81jj3pq7w7ycxh466xnlxilaqyw7g0ydl"; depends=[fields gdata genefilter MASS RNAinteract sparseLDA]; }; - RNAseqData_HNRNPC_bam_chr14 = derive2 { name="RNAseqData.HNRNPC.bam.chr14"; version="0.10.0"; sha256="016wrjr539an4hygb53schaypbsivnk6asrwywhjlxb0cjwszwvy"; depends=[]; }; - RRBSdata = derive2 { name="RRBSdata"; version="0.106.0"; sha256="08knas04hnhm54ya6nqhzv86q12gfjfynjqpy3d63s13r25pn4xk"; depends=[BiSeq]; }; - RTCGA_CNV = derive2 { name="RTCGA.CNV"; version="1.0.2"; sha256="0yq6yig0xx0lzcqz1adb78swmy1jwb18hqp1x1xvnqf7c9jffv2a"; depends=[RTCGA]; }; - RTCGA_PANCAN12 = derive2 { name="RTCGA.PANCAN12"; version="1.0.2"; sha256="0mkwa1w6qzp1kzjg8y0vs09vq5yy0alf5v56cg64qg83yjb2153l"; depends=[RTCGA]; }; - RTCGA_RPPA = derive2 { name="RTCGA.RPPA"; version="1.0.2"; sha256="0h95prind9ydyc2yj9m5ay6m7jx8fi3ay42j37px3gb0l4zmb1ph"; depends=[RTCGA]; }; - RTCGA_clinical = derive2 { name="RTCGA.clinical"; version="20151101.2.2"; sha256="0dyr95s50cgw5xczczlaiba1hbc6x4gn03bq3zffcss3kwwzrhqy"; depends=[RTCGA]; }; - RTCGA_mRNA = derive2 { name="RTCGA.mRNA"; version="1.0.2"; sha256="031g8pllcyyn7ayd2qy3yyq3ny39snnk86r6dy44n53a7wixvaap"; depends=[RTCGA]; }; - RTCGA_methylation = derive2 { name="RTCGA.methylation"; version="1.0.2"; sha256="1nzyl6ny4vvgpxy891icy6smwi24li67k4nwzm7vwkbxq25lkgvy"; depends=[RTCGA]; }; - RTCGA_miRNASeq = derive2 { name="RTCGA.miRNASeq"; version="1.0.2"; sha256="16yqlr2ml4hg6kz5740nxl10jkgs4d3mvm4gj2lb8qg3mji0xw77"; depends=[RTCGA]; }; - RTCGA_mutations = derive2 { name="RTCGA.mutations"; version="20151101.2.2"; sha256="0mdj5aqxrhpwcxp2i6m9xxp808v73b3gr59ymnfsvh8pyf6929p8"; depends=[RTCGA]; }; - RTCGA_rnaseq = derive2 { name="RTCGA.rnaseq"; version="20151101.2.2"; sha256="1wsvyrs738qz55x41byhsqrnxp3w18qibxwmmsymkgx065rlnn7p"; depends=[RTCGA]; }; - RUVnormalizeData = derive2 { name="RUVnormalizeData"; version="0.106.0"; sha256="065vc1dhka15zzlpl84j4y619wifn7gh31i3yjqds0bgkzj5ppz8"; depends=[Biobase]; }; - RforProteomics = derive2 { name="RforProteomics"; version="1.10.2"; sha256="07snpj844hbr1g9ciq06s75w6pcjr4j70ssg85wr3igas1zmkz85"; depends=[Biobase BiocInstaller biocViews interactiveDisplay MSnbase R_utils rpx shiny]; }; - RnBeads_hg19 = derive2 { name="RnBeads.hg19"; version="1.4.0"; sha256="0k3k116ncw3l8fjkilbgydpp3wwj9341f7zmm67wv3mr06s43hdl"; depends=[GenomicRanges]; }; - RnBeads_hg38 = derive2 { name="RnBeads.hg38"; version="1.4.0"; sha256="0jmyxbdw7jj16d9p2p5kf5bc1jgdcq4w7nfca2bdsmn7q3lyq0yp"; depends=[GenomicRanges]; }; - RnBeads_mm10 = derive2 { name="RnBeads.mm10"; version="1.4.0"; sha256="00rj7kab8n32hxbw5682xxzrwrc91hdq1068z9bcvb52z0bsiyb2"; depends=[GenomicRanges]; }; - RnBeads_mm9 = derive2 { name="RnBeads.mm9"; version="1.4.0"; sha256="1513z6xka9gx3gmykc40p0xh33i4jbpw8j4l6h0bs6h25fsarqhc"; depends=[GenomicRanges]; }; - RnBeads_rn5 = derive2 { name="RnBeads.rn5"; version="1.4.0"; sha256="1f16sb6mazcs184wrpwkgbz6zkbk6k79pawn7ip1rsjma9p1sgqp"; depends=[GenomicRanges]; }; - RnaSeqSampleSizeData = derive2 { name="RnaSeqSampleSizeData"; version="1.4.2"; sha256="127hc0wkpjssmnwqj4zzlbv7glznsc5g3qfsmx4slzf983i3hdbi"; depends=[edgeR]; }; - RnaSeqTutorial = derive2 { name="RnaSeqTutorial"; version="0.10.0"; sha256="0ci771xdjyjxidkra0lcbpnnqghbk9ycvllpxla3lw5h608wgb4m"; depends=[easyRNASeq]; }; - SCLCBam = derive2 { name="SCLCBam"; version="1.4.0"; sha256="0jpx7m38gl38r54b0652rxvbma61gzmki28j373g3ns4f4xxf7ph"; depends=[]; }; - SNAData = derive2 { name="SNAData"; version="1.18.0"; sha256="11bvbzxcvg5s3f9cl44cpwnb2php8qkfmlvzpw829wb6k2pk5ha9"; depends=[graph]; }; - SNAGEEdata = derive2 { name="SNAGEEdata"; version="1.8.0"; sha256="0qy6rwsggd4cyvci9ng1l8kjpcv79hhqndvv6zpwnvh7ng9f0x5d"; depends=[]; }; - SNPhoodData = derive2 { name="SNPhoodData"; version="1.2.2"; sha256="0r4kanaq96xppyhjy2hnss42ckn8mac9gwpyak64ywwvq30wl12m"; depends=[]; }; - SVM2CRMdata = derive2 { name="SVM2CRMdata"; version="1.4.0"; sha256="0lwdr0zpq3m0fqwijfgnm4jky8wg5pakrlpfgdhff01i9x4dh8bb"; depends=[]; }; - Single_mTEC_Transcriptomes = derive2 { name="Single.mTEC.Transcriptomes"; version="1.0.2"; sha256="0vpa4a43h39hl8jx465kbypird4bh2ry5dyz3pyrf483j2wlmwjd"; depends=[]; }; - SomatiCAData = derive2 { name="SomatiCAData"; version="1.10.0"; sha256="1f2m9rdfczlsn4nvyj5m5qhy1zg08y5ajblqc4r2r6gh8y8vpqyi"; depends=[]; }; - SomaticCancerAlterations = derive2 { name="SomaticCancerAlterations"; version="1.8.2"; sha256="0kdngwd3b9vb698rpfmbirbi6wa70p3sp41z2q92fjlvv9lmv7b4"; depends=[exomeCopy GenomicRanges IRanges S4Vectors stringr]; }; - SpikeIn = derive2 { name="SpikeIn"; version="1.14.0"; sha256="1wrfz7sl1gdqpps54k8dy2r5444jajbkg66br6pjf78s4qh555sg"; depends=[affy]; }; - SpikeInSubset = derive2 { name="SpikeInSubset"; version="1.12.0"; sha256="0r9cknnazvp8rl7a0aynh5lpb1lq69d3s8jz84wafj2mdddr3m46"; depends=[affy Biobase]; }; - TBX20BamSubset = derive2 { name="TBX20BamSubset"; version="1.8.0"; sha256="1950l0fwf23p62v0sgh0mjyisa9cnf0wjplx4x368l30jxgx8ag8"; depends=[Rsamtools xtable]; }; - TCGAMethylation450k = derive2 { name="TCGAMethylation450k"; version="1.8.0"; sha256="18hzf0sz089dpay1c4abp1wwi680gbp1cnz32rm40fgadaxv60ga"; depends=[]; }; - TCGAcrcmRNA = derive2 { name="TCGAcrcmRNA"; version="0.106.0"; sha256="0j87h53l2by6rx0r452s3vyf1987p23zgdybgyblwhdjgiddizc0"; depends=[Biobase]; }; - TCGAcrcmiRNA = derive2 { name="TCGAcrcmiRNA"; version="0.106.0"; sha256="1207h52ccs7rv4dpp87xmsdgyl841zxrnzg4wh55v8kcqnk08ly9"; depends=[Biobase]; }; - TargetScoreData = derive2 { name="TargetScoreData"; version="1.8.0"; sha256="1mb3b14qa4b0cbzxlkn4c5rihp1niz98qdd3kmmj9w3q0fllymxa"; depends=[]; }; - TargetSearchData = derive2 { name="TargetSearchData"; version="1.10.0"; sha256="1vyphhfz6lnyh19qid7m5d1j8lmwzda89bq58r5anz2dk2m7rg2s"; depends=[TargetSearch]; }; - TimerQuant = derive2 { name="TimerQuant"; version="1.2.2"; sha256="08i0qnp7fhpg1y5xdckrwxh2mzyxrv2s44z5vs1ldr2wlx4y244p"; depends=[deSolve dplyr ggplot2 gridExtra locfit shiny]; }; - WES_1KG_WUGSC = derive2 { name="WES.1KG.WUGSC"; version="1.4.0"; sha256="07kh15dyqhb867y93g3ymcr346l69p30sikfm30dvhq16ckrg9jm"; depends=[]; }; - XhybCasneuf = derive2 { name="XhybCasneuf"; version="1.10.0"; sha256="08zhxkg5h1g13l3p17idzcyz34qbpr6yvvl8qzkfgnm0ipcd35dv"; depends=[affy ath1121501cdf RColorBrewer tinesath1cdf]; }; - affycompData = derive2 { name="affycompData"; version="1.10.0"; sha256="12dmv99m7iy0wrzsk9h2j8ibby0shfxlyk02kk9312rlnyf7qb6g"; depends=[affycomp Biobase]; }; - affydata = derive2 { name="affydata"; version="1.20.0"; sha256="1wg3kxvlzqwf40wrkz69szrcyv4fr0fml42qqfcw7qy1m3skp1hi"; depends=[affy]; }; - airway = derive2 { name="airway"; version="0.106.2"; sha256="1yidngcxv2sma29l5k9zpjhfbawk2wb62w7ik0gbjxw9sdacpk0v"; depends=[SummarizedExperiment]; }; - antiProfilesData = derive2 { name="antiProfilesData"; version="1.8.0"; sha256="07kccp1qhhmskpymvllz9l5a4r1ml8wzww0ik82653pibsjr5zy7"; depends=[Biobase]; }; - bcellViper = derive2 { name="bcellViper"; version="1.8.0"; sha256="05bvnx7ji27r115ih4k00pqb2zvfg9cj6hsr03yszp7cmhdjw752"; depends=[Biobase]; }; - beadarrayExampleData = derive2 { name="beadarrayExampleData"; version="1.10.0"; sha256="1gvq1f95yy9x8nx5hj20c884xcl6zqhsmc39pdzhmdgclfr07p6i"; depends=[beadarray Biobase]; }; - beta7 = derive2 { name="beta7"; version="1.10.0"; sha256="1vry0dbwjvzynb9bgxr8vnpaqby6kb8am2fc230hswqmwm6yjgkq"; depends=[marray]; }; - bladderbatch = derive2 { name="bladderbatch"; version="1.10.0"; sha256="06f8gx1gmkn520ca17z5a03j9f5f4bz00ggy51ygl9zlb7ib56si"; depends=[Biobase]; }; - blimaTestingData = derive2 { name="blimaTestingData"; version="0.106.0"; sha256="1d9x37wdnhcx6q5qipf4y74pr8585wwlz7xdq7dmfcrghsgd23qi"; depends=[]; }; - breastCancerMAINZ = derive2 { name="breastCancerMAINZ"; version="1.10.0"; sha256="1ry4issbkfk761sc1mjhg46hk7j5yb4kidvpgh9nnid807zyqrfp"; depends=[]; }; - breastCancerNKI = derive2 { name="breastCancerNKI"; version="1.10.0"; sha256="1wml4q5m83ak1zagpjlbwy7fzap7dli0rnpjanyk3dqrl79pp77c"; depends=[]; }; - breastCancerTRANSBIG = derive2 { name="breastCancerTRANSBIG"; version="1.10.0"; sha256="0iyb8dvz4l7rvaam2xnyvgmg4n5zak5w6jhzqyc1dy29hhy55rjv"; depends=[]; }; - breastCancerUNT = derive2 { name="breastCancerUNT"; version="1.10.0"; sha256="04av31c737ggq268rc84z89hhfv3pqrxkjlbbwhrl2qmcc0hh9fl"; depends=[]; }; - breastCancerUPP = derive2 { name="breastCancerUPP"; version="1.10.0"; sha256="1cdx855ai6qrzq49l57x9nl58jpixnpp97cmfzys8n7kb2dn963h"; depends=[]; }; - breastCancerVDX = derive2 { name="breastCancerVDX"; version="1.10.0"; sha256="0q1ann7mhgxlyikb4nprzhy2mm6g8fgfbb2kyczi7sshrh6h4qba"; depends=[]; }; - bronchialIL13 = derive2 { name="bronchialIL13"; version="1.10.0"; sha256="1r6p4ysr6ahwlwi0hhla6fb8cmnmgbssbqhrizqsid1f7di77n6b"; depends=[affy]; }; - bsseqData = derive2 { name="bsseqData"; version="0.10.0"; sha256="196bbxl1p31g9kpm448642a0gx8dyng8r98gn53pxmdpp2hq5yxl"; depends=[bsseq]; }; - cMap2data = derive2 { name="cMap2data"; version="1.8.0"; sha256="0pnym9c0pipag2kr7j6b7c3dhhhav7z508avv4aj6f4wcagb4yrp"; depends=[]; }; - cancerdata = derive2 { name="cancerdata"; version="1.10.0"; sha256="0388634p3j33vz8dw5i2j2y3n9w9h2diw3qsnqcar4w7d97grd9v"; depends=[Biobase]; }; - ccTutorial = derive2 { name="ccTutorial"; version="1.10.0"; sha256="04h212d5j963xm5l1hpdb901njfrfkp1qdy12ndlrph010kpk6mv"; depends=[affy Biobase Ringo topGO]; }; - ceu1kg = derive2 { name="ceu1kg"; version="0.10.0"; sha256="05dvfjpf93cl8g1caypzk84k73z6vmam91x3rh16r1fw4i3sj2i7"; depends=[Biobase GGBase GGtools]; }; - ceu1kgv = derive2 { name="ceu1kgv"; version="0.14.0"; sha256="0ah88kr9rc6g4n7d800dxaarpliy443zpd7innbmrm02xq4yjn6g"; depends=[Biobase GGBase]; }; - ceuhm3 = derive2 { name="ceuhm3"; version="0.10.0"; sha256="07pzhj9b4b4zpcfg8fjlzh53yr6pzwnfv7m7cks55x47l8bpv1d8"; depends=[Biobase GGBase GGtools]; }; - cgdv17 = derive2 { name="cgdv17"; version="0.10.0"; sha256="0rjx8jn1m9h5p982c336bza9liyv5wymgigbr7dar91y89a0pmpg"; depends=[Biobase BiocGenerics GenomicRanges IRanges S4Vectors VariantAnnotation]; }; - charmData = derive2 { name="charmData"; version="1.8.0"; sha256="0b8ka779s0p0byjn8vxbygwbr2w11g5mflgzyi4qh4dvjh84sri7"; depends=[charm pd_charm_hg18_example]; }; - cheung2010 = derive2 { name="cheung2010"; version="0.10.0"; sha256="1ibwajsyggi14vscb27kr3zg8vnqrswsiphv5cdsfnapna9n5r5k"; depends=[AnnotationDbi Biobase GenomicRanges GGtools hgfocus_db]; }; - chipenrich_data = derive2 { name="chipenrich.data"; version="1.8.0"; sha256="1nq7a4kf4nybwm9k2szccn5678agfc4zy38375f44ca8b40481x9"; depends=[BiocGenerics GenomicRanges IRanges]; }; - cnvGSAdata = derive2 { name="cnvGSAdata"; version="1.8.0"; sha256="17kfdidwvj02kcf4pvkypmx7zhyl1dafxw1j32vzvb1rm50m770b"; depends=[cnvGSA]; }; - colonCA = derive2 { name="colonCA"; version="1.14.0"; sha256="1zsk2p0q18l2nfbjgyp7h88ci3rqavnx18vkvgzp1sd4zfc2q7m4"; depends=[Biobase]; }; - curatedBladderData = derive2 { name="curatedBladderData"; version="1.8.0"; sha256="0dvr1qzjknjaq4wicihdzdlk2scj43bx89p5vshvnx5238pc0ya7"; depends=[affy]; }; - curatedBreastData = derive2 { name="curatedBreastData"; version="1.4.0"; sha256="0nm87q0x7jp2xzmw4lc3q4xa77nkjyfjzx7xnj72d9q1ph79rnyd"; depends=[Biobase BiocStyle ggplot2 impute XML]; }; - curatedCRCData = derive2 { name="curatedCRCData"; version="2.4.0"; sha256="0xw2fda03sfh9x8qdqvp0r5g06jawidjvw2139kgn3lkh000mffb"; depends=[BiocGenerics nlme]; }; - curatedOvarianData = derive2 { name="curatedOvarianData"; version="1.10.0"; sha256="1wgf366krp6zv950giw1s5am9wi54zyvh5qkyn5ff85s6nshx7xf"; depends=[affy BiocGenerics]; }; - davidTiling = derive2 { name="davidTiling"; version="1.12.0"; sha256="0hw2im7in8h49w41k528lwzb1jvdj1q1pvdlsf5n3h4dm8j2yccv"; depends=[Biobase GO_db tilingArray]; }; - derfinderData = derive2 { name="derfinderData"; version="0.106.2"; sha256="0drjk0gazg071z794d6hp88rgvl1913cchrbi23gkplrfvpqdka0"; depends=[]; }; - diffloopdata = derive2 { name="diffloopdata"; version="1.0.2"; sha256="06vc1mgyq9bzx0bkadzzmh9qjfjpwi1hz7cjnzh78afkyn6xsm25"; depends=[]; }; - diggitdata = derive2 { name="diggitdata"; version="1.4.0"; sha256="0rjjh8p58wcpvyliixnrjys4s6r6kriinrk3h0vjr1f7ljb2zci5"; depends=[Biobase viper]; }; - dressCheck = derive2 { name="dressCheck"; version="0.10.0"; sha256="05vsyp4xmpi3374xlama9bi720hns0c0lfl2094pn720mwlzm784"; depends=[Biobase]; }; - dsQTL = derive2 { name="dsQTL"; version="0.10.0"; sha256="1jkg3j8gclm7c8dc2620dvy91z0j7p02nswb4v52p377g3v90pw1"; depends=[Biobase GGBase SummarizedExperiment]; }; - dyebiasexamples = derive2 { name="dyebiasexamples"; version="1.12.0"; sha256="1iqhbzx5dggch34h87g189ldppv3axjmi60vi5cmfl0ngwh7gkyv"; depends=[GEOquery marray]; }; - ecoliLeucine = derive2 { name="ecoliLeucine"; version="1.12.0"; sha256="1g0diwj1ihqw10rfgw2rp7vfnjrknkgmqm9l5snxcsszkqn11ipl"; depends=[affy ecolicdf]; }; - encoDnaseI = derive2 { name="encoDnaseI"; version="0.10.0"; sha256="1ka2m4i6f6wccfrkjzcjgygxmpkf9xfyh1cykzh9zrjc3305pyjd"; depends=[Biobase GGBase GGtools lattice]; }; - estrogen = derive2 { name="estrogen"; version="1.18.0"; sha256="0kimcb33jsanysl60dhmyhz4201f33ni8ap3wk4ikplf3s619l8j"; depends=[affy]; }; - etec16s = derive2 { name="etec16s"; version="1.0.0"; sha256="07ngasmbqiipkxy23kdpjbi72n3mjfk4wkad52sli48s3hh2xssa"; depends=[Biobase metagenomeSeq]; }; - faahKO = derive2 { name="faahKO"; version="1.12.0"; sha256="1sx6jdkv8i1d4lpl4kv2d3c0gk2cycs0gzykngyvz8yap911i82y"; depends=[xcms]; }; - fabiaData = derive2 { name="fabiaData"; version="1.10.0"; sha256="0m51rnsgh4wrq69rpc1i4cn69jvab4y0ib4sr6kpdh8mqrb17n0k"; depends=[Biobase]; }; - facopy_annot = derive2 { name="facopy.annot"; version="0.106.0"; sha256="1bfsnqlcb8lq351anaq1bc2hgzpdsavzpsh81sr7pq0kpinkn35i"; depends=[]; }; - facsDorit = derive2 { name="facsDorit"; version="1.14.0"; sha256="0am46a770gvm0qjb0ah2gbm28yjazg2dfrdagywvyiaadj68krrk"; depends=[prada]; }; - ffpeExampleData = derive2 { name="ffpeExampleData"; version="1.10.0"; sha256="14mfsjgqxrmcf8y9n47yix9qgbi437636978nd2gxggahhvx45z8"; depends=[lumi]; }; - fibroEset = derive2 { name="fibroEset"; version="1.14.0"; sha256="0h6dj4ypwvxi9137mzpzsymw0dkgral0d3fvh8via8l0vkzhxq81"; depends=[Biobase]; }; - fission = derive2 { name="fission"; version="0.106.2"; sha256="0x43py9445w5hw4z9s2br7k2lqlr988bchaw7qjll6qhm5xrbip0"; depends=[SummarizedExperiment]; }; - flowFitExampleData = derive2 { name="flowFitExampleData"; version="1.8.0"; sha256="02dlkyl9zxqy4cns9mrgf98zspzc5ks1qajbg8vy4fnrphykbp0v"; depends=[flowCore]; }; - flowWorkspaceData = derive2 { name="flowWorkspaceData"; version="2.8.0"; sha256="063wq1nv9f3z014qhcq8a060q5n1yxc99knh12vd1kl8blbanjvn"; depends=[]; }; - frmaExampleData = derive2 { name="frmaExampleData"; version="1.8.0"; sha256="1mwyx3xyz82xg9ymyqsiy2iqpcfgw471pmbfd489y15rb7jdl2rh"; depends=[]; }; - furrowSeg = derive2 { name="furrowSeg"; version="1.0.2"; sha256="0j1zvdm7g3f0m8y58izbrkmpsjxi0sx4h24qlbmglj2xhhh34b9i"; depends=[abind dplyr EBImage locfit tiff]; }; - gageData = derive2 { name="gageData"; version="2.10.0"; sha256="17nr1kfn2r5zhwd7sj01iv7wv3rw8bj3dpfm9x4bsg2pby93i2wl"; depends=[]; }; - gaschYHS = derive2 { name="gaschYHS"; version="1.10.0"; sha256="1aaxy1iayi10k7pj4s3jfx7dss929ll11zvps1xcbiz1wfhk9163"; depends=[Biobase]; }; - gatingMLData = derive2 { name="gatingMLData"; version="2.12.0"; sha256="14a2kvg95zvq4ij8adqihr7ajckgzg76y3r1c7bbyd4b46h96l1x"; depends=[]; }; - gcspikelite = derive2 { name="gcspikelite"; version="1.10.0"; sha256="139ig58xnds081q8azkkzpp1mb22xx9cz0m38lpw0xl69ny1h8mv"; depends=[]; }; - geneLenDataBase = derive2 { name="geneLenDataBase"; version="1.8.0"; sha256="10ynnx2r8snnffhwnj620z7blfy4af8rm1il6qy4g7dgs0cx7a4l"; depends=[GenomicFeatures rtracklayer]; }; - genomationData = derive2 { name="genomationData"; version="1.4.2"; sha256="1zl7gg144fs7zfycsmq5492sm1bqy7l527xbc2zj04schd9wsan2"; depends=[]; }; - geuvPack = derive2 { name="geuvPack"; version="1.4.0"; sha256="1jplp7fgcjayvxzrzxxgdwdb89k5jw4xflbjb71mrai11p8za546"; depends=[SummarizedExperiment]; }; - geuvStore = derive2 { name="geuvStore"; version="1.4.2"; sha256="0svfj6axbfyyhwx1v8dpmla9a8f31pq3psqd72zkpgqh25q7zyrn"; depends=[BatchJobs BiocGenerics GenomicRanges gQTLBase]; }; - geuvStore2 = derive2 { name="geuvStore2"; version="1.2.2"; sha256="0dhdf2a10la9vm5vcvdxrzh50va4343h57vvc8711wbris0hqfcr"; depends=[BatchJobs GenomicRanges gQTLBase]; }; - golubEsets = derive2 { name="golubEsets"; version="1.14.0"; sha256="1a1ccsx7jfcgpjmhrdpnysrsa3b7r807vkgsrkri11pidf79kbc2"; depends=[Biobase]; }; - grndata = derive2 { name="grndata"; version="1.4.2"; sha256="0ivddlxc2xd6ncwignrxkp2cy81k17wav42g8m0pjb7ck6qaak6l"; depends=[]; }; - gskb = derive2 { name="gskb"; version="1.3.0"; sha256="16yisw86zhvanigcq9zlxk3wsqdln8cwslija5s8mq68srffc3q4"; depends=[]; }; - h5vcData = derive2 { name="h5vcData"; version="1.106.0"; sha256="00m3l1wwvff3w3nxdbk7sn22i7p2ikdr1mrd5x6f7jbihzii5zdq"; depends=[]; }; - hapmap100khind = derive2 { name="hapmap100khind"; version="1.14.0"; sha256="1rpglhfy3q1m5l54wjir1nsyzqxpp1h1112gyvdxkxdv4jsxfmd2"; depends=[]; }; - hapmap100kxba = derive2 { name="hapmap100kxba"; version="1.14.0"; sha256="1lq1na4v1v2pd96nn59kppiaga9w8ib85qndbv5id0q8fh11xmsf"; depends=[]; }; - hapmap500knsp = derive2 { name="hapmap500knsp"; version="1.14.0"; sha256="1b7pyp4nqp7qkjv5zjvn8q3ha7jn8fk410y50j9vhl147jwfir98"; depends=[]; }; - hapmap500ksty = derive2 { name="hapmap500ksty"; version="1.14.0"; sha256="1cnkvc2miv4gw3gqg0avjdi19vhrpa7b24wm9fdz7ynasi164qqa"; depends=[]; }; - hapmapsnp5 = derive2 { name="hapmapsnp5"; version="1.14.0"; sha256="0yylk76s1n9n9yj04726pzs9fx10gng146s4zpbpb2qk14kj0zfr"; depends=[]; }; - hapmapsnp6 = derive2 { name="hapmapsnp6"; version="1.14.0"; sha256="0d06wzcrawssamh48ncvys1v0r1iqfg88vf8nx9hbjlyi8a8lw33"; depends=[]; }; - harbChIP = derive2 { name="harbChIP"; version="1.10.0"; sha256="0rpbv423fp7scgkdws6s467a97mv2g4ami3zx0x8p5786ywiv42y"; depends=[Biobase Biostrings IRanges]; }; - healthyFlowData = derive2 { name="healthyFlowData"; version="1.10.0"; sha256="1hmpvgapf75wiwvc4c68k1wglhg04zka51m3fyzsbqqg23g8a8zv"; depends=[flowCore]; }; - hgu133abarcodevecs = derive2 { name="hgu133abarcodevecs"; version="1.10.0"; sha256="1zckhwi7wjns9plp3r7w5v0lv3syydlf0akzgarl5fz28nbjxy42"; depends=[]; }; - hgu133plus2barcodevecs = derive2 { name="hgu133plus2barcodevecs"; version="1.10.0"; sha256="02kacr0qkvvh6bx69pmkp6n1y1q6jvizf8dqcdp72bxzav9m2pgc"; depends=[]; }; - hgu2beta7 = derive2 { name="hgu2beta7"; version="1.12.0"; sha256="056p5lmqmady3yaif7flvd266i3a6b1z8vycjfq44zxd4dccdm8m"; depends=[]; }; - hmyriB36 = derive2 { name="hmyriB36"; version="1.8.0"; sha256="1v1gbfg9sqpxlkk4qjrdh09yggqcq0xl32f845iiaxfizsj3xlh0"; depends=[Biobase GGBase]; }; - humanStemCell = derive2 { name="humanStemCell"; version="0.12.0"; sha256="1l2q09i3pl49dp2wksmj8dh81lvly09ldm8ixzz89wz5f39d2bff"; depends=[Biobase hgu133plus2_db]; }; - ind1KG = derive2 { name="ind1KG"; version="0.9.0"; sha256="02f25djy7zxh7d88v00jhpr1f5wa2ijskg5w9i90r2llwssjxx97"; depends=[chopsticks]; }; - iontreeData = derive2 { name="iontreeData"; version="1.8.0"; sha256="1xmbs8vicz7p01bk4xh8lvgdflzhybwfblpx8pdsvbkv5vz3rhkb"; depends=[]; }; - kidpack = derive2 { name="kidpack"; version="1.14.0"; sha256="0lxbi4sn4g68s23kcyaxpxdi6dpz7w3cz7i5n6x9ywa12mbnxzgs"; depends=[Biobase]; }; - leeBamViews = derive2 { name="leeBamViews"; version="1.8.0"; sha256="0bkah146rpvw1kh1r9j8rqjwh07bv5vhy3pc8gca4ssvn1l77js4"; depends=[Biobase BSgenome GenomicAlignments GenomicRanges Rsamtools]; }; - leukemiasEset = derive2 { name="leukemiasEset"; version="1.8.0"; sha256="1kvbk2j385c9jajdvgbpaq0rv8p9nid76fvjpkk2a4babbvbk5f0"; depends=[Biobase]; }; - lumiBarnes = derive2 { name="lumiBarnes"; version="1.12.0"; sha256="07vbrzyd3ihc2b3s5rs538pbq3gm1mqm2xywclx2agm4n318dbbi"; depends=[Biobase lumi]; }; - lungExpression = derive2 { name="lungExpression"; version="0.10.0"; sha256="1nhph1ljbj0z22rh9c0dcljrddgnydhhghpah9fp8qv0hbjlzl1x"; depends=[Biobase]; }; - mAPKLData = derive2 { name="mAPKLData"; version="1.4.2"; sha256="0qn6j547i2d3rndpxb0rwvk9q5i0qkc3nm4gmmpipd34hz9g7yh1"; depends=[]; }; - mammaPrintData = derive2 { name="mammaPrintData"; version="1.8.0"; sha256="1ybc3zrylvwlbzyl5nrzgsfrzfqx5yqhair3x5sansdhrsmc383d"; depends=[]; }; - maqcExpression4plex = derive2 { name="maqcExpression4plex"; version="1.16.0"; sha256="12v51x33dmj591yhnrgbpvp1v55gkkwmi1r12niprkkzdy5q3jn6"; depends=[]; }; - metaMSdata = derive2 { name="metaMSdata"; version="1.8.0"; sha256="0d79080kmna8zckadbgjgfc4hyxnqsb6pirhjyf015z3qq3w7h3l"; depends=[]; }; - miRNATarget = derive2 { name="miRNATarget"; version="1.10.0"; sha256="0hycvsh3m96aqr888vq14y38r9dj1gdn3nhmvl77rsn19bn7lryp"; depends=[Biobase]; }; - miRcompData = derive2 { name="miRcompData"; version="1.2.0"; sha256="1zl65i127p04vlbx9wy7jmrvbdh679j8sz7qxlvmcbsmbxx43dm2"; depends=[]; }; - minfiData = derive2 { name="minfiData"; version="0.14.0"; sha256="0w4gwk70ka6kic7dy7qfsb9nd791mf5gwr35x3cw7jqi6gdlh29q"; depends=[IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest minfi]; }; - minionSummaryData = derive2 { name="minionSummaryData"; version="1.2.2"; sha256="0j0jygm9nnw6zjh99l21yncddnqp93pfjsikjv80vlap8bhdndcy"; depends=[]; }; - mitoODEdata = derive2 { name="mitoODEdata"; version="1.8.0"; sha256="1ffjvsw4rj76fa39r51fvhh7xx12zsjxww9p5spg5b8alxd40f6h"; depends=[]; }; - mosaicsExample = derive2 { name="mosaicsExample"; version="1.10.0"; sha256="1r99ig2w8006zzmckcwl9b1831qya1a33z3k1vw88nwakjib5had"; depends=[]; }; - mouse4302barcodevecs = derive2 { name="mouse4302barcodevecs"; version="1.10.0"; sha256="0c8zzbqd4d70fw6xfmnmcs8wfxffy4q5jdibbv58wxyszvvs2215"; depends=[]; }; - msd16s = derive2 { name="msd16s"; version="0.106.0"; sha256="0mii809mrh4h8whas47x32xn5xbslirhf28bi641k7c4yfay4bha"; depends=[Biobase metagenomeSeq]; }; - msdata = derive2 { name="msdata"; version="0.10.0"; sha256="1m8mg19qqv5pmqchjgqk6vbljimg6iw8caz44vj6095pxzjs78cl"; depends=[]; }; - msqc1 = derive2 { name="msqc1"; version="1.0.2"; sha256="1s27aasqy93iscdqla7jdfg12i8fwwq4gb30pnv8g9amrx3ag7a7"; depends=[lattice]; }; - mtbls2 = derive2 { name="mtbls2"; version="1.2.2"; sha256="12l6f7k48ga1kq51svjgz1xw888bpqigm2ry774yv22pi01kq038"; depends=[]; }; - mvoutData = derive2 { name="mvoutData"; version="1.8.0"; sha256="1d6kj8fjh401z0bbqbyy7r509aim63srh0xihhnf8k0v4hnxb2y4"; depends=[affy Biobase lumi]; }; - pRolocdata = derive2 { name="pRolocdata"; version="1.10.0"; sha256="1v0chfpji5pjaq5pfca6d80nqq4rzfm4078i9jmcwzlbsdkpwh63"; depends=[Biobase MSnbase]; }; - parathyroidSE = derive2 { name="parathyroidSE"; version="1.10.0"; sha256="1ynmw06cj2jy61vy6pfjxx2yfmbqh5ks449zg2an02algc7cmhk6"; depends=[SummarizedExperiment]; }; - pasilla = derive2 { name="pasilla"; version="0.12.0"; sha256="128bq3gk8af8c6lyxbzisyqmal0s1vd73rzsf0w1cj46riwb81ya"; depends=[]; }; - pasillaBamSubset = derive2 { name="pasillaBamSubset"; version="0.10.0"; sha256="071zjb0w6fqwaijkkj6g56wbf7xq2d1a7am4lzmfx1s4rrqlpxk3"; depends=[]; }; - pcaGoPromoter_Hs_hg19 = derive2 { name="pcaGoPromoter.Hs.hg19"; version="1.8.1"; sha256="1q1wq5zff2qcqw5i86rrdvlf2y7n87xlcpf6grrahnh3dc8nf42z"; depends=[]; }; - pcaGoPromoter_Mm_mm9 = derive2 { name="pcaGoPromoter.Mm.mm9"; version="1.8.1"; sha256="1ln4nnb92wvg84m3haczc390c7d1xm7qbiklvv1yp5f7saqglix9"; depends=[]; }; - pcaGoPromoter_Rn_rn4 = derive2 { name="pcaGoPromoter.Rn.rn4"; version="1.8.1"; sha256="1d9sv8m4yi15zyjb3j3iva2530nzfwfb180qqm0v9zj3xqxfarnv"; depends=[]; }; - pd_atdschip_tiling = derive2 { name="pd.atdschip.tiling"; version="0.10.0"; sha256="11gj7mxx5k28ymdsf13132xy1bwablhp98wk5rx32833gx2cfafc"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; - pepDat = derive2 { name="pepDat"; version="0.106.2"; sha256="0gipg8j40966wvqyk77xldfqlcs891g1m47vym63s878lzz87ifm"; depends=[GenomicRanges]; }; - ppiData = derive2 { name="ppiData"; version="0.10.0"; sha256="1v6cgbdlp6dhb4vajp8ck7gpz2hbdzs8qc621xmiyslv7v03w5p8"; depends=[AnnotationDbi graph]; }; - prebsdata = derive2 { name="prebsdata"; version="1.8.0"; sha256="1cx3f99z886c7z83w35pvcw98lq2zkw27qrd4mgsi95qh1z8yz5w"; depends=[]; }; - prostateCancerCamcap = derive2 { name="prostateCancerCamcap"; version="1.0.0"; sha256="1d91m8mgq70s26lh3q9jdsa0fgv3p84wvbrvz2vd8r5z5vpph8jv"; depends=[Biobase]; }; - prostateCancerGrasso = derive2 { name="prostateCancerGrasso"; version="1.0.0"; sha256="0kiy78nyk420055m81zdiv5m9iwrw1s7bpn4mwdkjfd45klzv9vh"; depends=[Biobase]; }; - prostateCancerStockholm = derive2 { name="prostateCancerStockholm"; version="1.0.0"; sha256="13vcfyrl3958wkra6mp2w18q1d3yjcgb0ml8xasqnbicwiv3193y"; depends=[Biobase]; }; - prostateCancerTaylor = derive2 { name="prostateCancerTaylor"; version="1.0.0"; sha256="0q0n2blq1d7x20d08621gvcc2s96n0a1h0nwl7lcdb3alk0a3vmd"; depends=[Biobase]; }; - prostateCancerVarambally = derive2 { name="prostateCancerVarambally"; version="1.0.0"; sha256="0a94q06vfwmkq687gc4y3h974psq18f9rrpphldv7sscgx7dfniq"; depends=[Biobase]; }; - pumadata = derive2 { name="pumadata"; version="2.8.0"; sha256="1gkfchlr4s8rlfqi6cc3l1n7ppzihlifc7jqvk15vhz6lsrsv0sx"; depends=[affy Biobase oligo puma]; }; - rRDPData = derive2 { name="rRDPData"; version="0.106.0"; sha256="0pbn1aklw2x8yagj65436601drd81fklsgc7kwg8wrr519nb8mjq"; depends=[rRDP]; }; - rcellminerData = derive2 { name="rcellminerData"; version="1.4.2"; sha256="1bsh3i6cfyvg6drl7jz3k53g3bqcr6iz3gc5wb9kcbnvfxa6rzg5"; depends=[Biobase]; }; - rheumaticConditionWOLLBOLD = derive2 { name="rheumaticConditionWOLLBOLD"; version="1.10.0"; sha256="1c77rz7bir6rfsmry7f6bn4pzaqpwy178v8hkbkf9l6jskf29yy2"; depends=[]; }; - seq2pathway_data = derive2 { name="seq2pathway.data"; version="1.4.0"; sha256="0ysc83rcciq8isb834wfvz3iwvwa7xky28b4nvyhskblgb7d0ahp"; depends=[]; }; - seqCNA_annot = derive2 { name="seqCNA.annot"; version="1.8.0"; sha256="08d9by2grfpyl6xc137hax10nk8mjdpakg49richcr3g0yql719a"; depends=[]; }; - seqc = derive2 { name="seqc"; version="1.6.0"; sha256="1715vwd5y4pbll271ka0vszj7b4sb0z6xpv2vpkqilw71axwsj7n"; depends=[]; }; - serumStimulation = derive2 { name="serumStimulation"; version="1.8.1"; sha256="0h34yqcazpzh9scp0xpyil33fr10zx67slpn3c3m3vvi8g9aw2n1"; depends=[]; }; - seventyGeneData = derive2 { name="seventyGeneData"; version="1.8.0"; sha256="16ymh2r6g0kficrg2dnlf5hlixbzmi83vz2djxn4w7ws0bm67dfa"; depends=[]; }; - shinyMethylData = derive2 { name="shinyMethylData"; version="0.106.0"; sha256="18r8syb5glkaj6xdwqg1yqwg6lmz4w8z72394zkx58zcirpbdvnw"; depends=[]; }; - simpIntLists = derive2 { name="simpIntLists"; version="1.8.0"; sha256="0l52c7ps0yi7wmjbnl5hf5blm5wizgk0j9qfsz5dli7xp88fhjq5"; depends=[]; }; - stemHypoxia = derive2 { name="stemHypoxia"; version="1.8.0"; sha256="0llcpgp325hzjjhk05l9yhmfsksr6i4sxqvik7b80jd1978wklxm"; depends=[]; }; - stjudem = derive2 { name="stjudem"; version="1.12.0"; sha256="1fya1ma1yi5426l6m4hgisyg54y1pa7j86q5kn0dzibhijn7is4d"; depends=[]; }; - synapterdata = derive2 { name="synapterdata"; version="1.10.0"; sha256="0pnvl1bhfxa6s94csgzbnkfgbryd8yk4x8619794cdgvbxkfy11l"; depends=[synapter]; }; - systemPipeRdata = derive2 { name="systemPipeRdata"; version="1.2.4"; sha256="00difbsafgzxw2n7k5d5rf50sjahrxxdqv65a1vl7ij5vkv1fg6f"; depends=[BiocGenerics]; }; - tinesath1cdf = derive2 { name="tinesath1cdf"; version="1.10.0"; sha256="1ang51lcj9vm1jx2hxm1dmgpl9gii9gkjzcvy0kik5ljkzwp5m6b"; depends=[]; }; - tinesath1probe = derive2 { name="tinesath1probe"; version="1.10.0"; sha256="018xp85f8k1m59vf6yymba5nx1cgq2v3jg029gj2i2k63d59iwx1"; depends=[AnnotationDbi]; }; - tofsimsData = derive2 { name="tofsimsData"; version="1.0.2"; sha256="1kkl337qpipxbq99k2s84398pdfi1mmzddvwj5g3ni95ibgppipz"; depends=[]; }; - tweeDEseqCountData = derive2 { name="tweeDEseqCountData"; version="1.10.0"; sha256="0hcg3d55lklfkqbrbir3q9qsbb3r9nqk3g2qmipjfa1s16vdbmvj"; depends=[Biobase]; }; - tximportData = derive2 { name="tximportData"; version="1.0.2"; sha256="1my9afgaazmh8rif298iym9hw0ld9iy18fbz78p5qxxr016j1vqz"; depends=[]; }; - waveTilingData = derive2 { name="waveTilingData"; version="1.8.0"; sha256="0qc512xw3mpmx3dchwlpp8wsapk9jghnfgpq7f6332592r9dsr5k"; depends=[]; }; - yeastCC = derive2 { name="yeastCC"; version="1.12.0"; sha256="0j90r5mhx44x85n42a5ljyhk5xs7mpjjckrqgc5y5rlbas3922jm"; depends=[Biobase]; }; - yeastExpData = derive2 { name="yeastExpData"; version="0.18.0"; sha256="1cpn0jwxlpzyv3fjg72z87wfc6l3l39yzdkyyaqkwk55fqgzgg24"; depends=[graph]; }; - yeastGSData = derive2 { name="yeastGSData"; version="0.10.0"; sha256="1dfdi86qdpcx62hpmdrkhw4qcs9nnsyn3pf8535ky9g9x9004p2m"; depends=[]; }; - yeastNagalakshmi = derive2 { name="yeastNagalakshmi"; version="1.8.0"; sha256="15cmh17lzmbby3z028wrd90aycd64r70i9r15lffvkbp7f443q63"; depends=[]; }; - yeastRNASeq = derive2 { name="yeastRNASeq"; version="0.10.0"; sha256="1xj2bszfyzm440nf0w4gbskh1j0lbzqdhr0c88ilppmmbfmgv9nq"; depends=[]; }; - yri1kgv = derive2 { name="yri1kgv"; version="0.14.0"; sha256="1a0811vzim9cv3p37s6hbd4pqvzf4xnzi53w0kc5wrc8mz1634aa"; depends=[Biobase GGBase]; }; - yriMulti = derive2 { name="yriMulti"; version="0.0.9"; sha256="0v984z7bvqzpsj0d0zw1dqi6zavv3s5mgx7p2sbm433wfk1jjs0a"; depends=[dsQTL GenomicRanges geuvPack gQTLBase Homo_sapiens SummarizedExperiment]; }; - zebrafishRNASeq = derive2 { name="zebrafishRNASeq"; version="0.106.2"; sha256="0v3j968815jwcxpj11hml5z6a06kcgvmh8lz539c2nryixr5dj53"; depends=[]; }; + ABAData = derive2 { name="ABAData"; version="1.4.0"; sha256="1xlr9ps6s6xy95wh4c0m09rl2hkp9rms2gbfgsf0y46j1jak4ick"; depends=[]; }; + ALL = derive2 { name="ALL"; version="1.16.0"; sha256="01b0ksakw06l8q9a1ihb56sm0p8v78d2n4aji8yj1nnfi2kcgr3m"; depends=[Biobase]; }; + ALLMLL = derive2 { name="ALLMLL"; version="1.14.0"; sha256="1hza3ckxlc9k6mrdxc94r8yrsnj51ywcpinslrfyhanibrjvi8yc"; depends=[affy]; }; + ARRmData = derive2 { name="ARRmData"; version="1.10.0"; sha256="0f5my7jbp0x8r7hcj5rvnfa3swxh39apfby7rlqmkznr175jmsa8"; depends=[]; }; + Affyhgu133A2Expr = derive2 { name="Affyhgu133A2Expr"; version="1.10.0"; sha256="038yspp7l837i8lqv99alj1jsb51b27c84m4nvglpy3pzwvbqda7"; depends=[]; }; + Affyhgu133Plus2Expr = derive2 { name="Affyhgu133Plus2Expr"; version="1.8.0"; sha256="070iv3jschvz36fa6q8d4s6prlbmwj4m07f69yhfv4mlb30nz6gk"; depends=[]; }; + Affyhgu133aExpr = derive2 { name="Affyhgu133aExpr"; version="1.12.0"; sha256="1z6bn6sqdqd152gn2bzppy6g57n281mwmp5vvv901mb3w1i3yvgl"; depends=[]; }; + AffymetrixDataTestFiles = derive2 { name="AffymetrixDataTestFiles"; version="0.12.0"; sha256="0dqbf9rvha6cq0ipf9rjwx6akmcapsrh1k2p5kws3i0i2nw2kr3v"; depends=[]; }; + Affymoe4302Expr = derive2 { name="Affymoe4302Expr"; version="1.12.0"; sha256="1yx8pri6zdvv4hr4w43axb10d1y2bmqfp5mhhn9j286wxal7qgh0"; depends=[]; }; + AmpAffyExample = derive2 { name="AmpAffyExample"; version="1.14.0"; sha256="0prmpqyklxl47wna3kdh27bnrw9saa0s48xidmybs1nzgvizs5s4"; depends=[affy]; }; + AneuFinderData = derive2 { name="AneuFinderData"; version="1.2.0"; sha256="1bcr57mpvvxlryrhcpwzagv9gdirhfdmyc4rsv6giixqsj2d2m9v"; depends=[]; }; + AshkenazimSonChr21 = derive2 { name="AshkenazimSonChr21"; version="1.4.0"; sha256="0hc5zqdajra3qy76z65qccllksz268vpnrn35232zp6w3i1zljx6"; depends=[]; }; + BeadArrayUseCases = derive2 { name="BeadArrayUseCases"; version="1.12.0"; sha256="1dvy6bg0949cx12smpzkndh1mq32jy0hfq7aaiixziqbxb32gggm"; depends=[beadarray GEOquery limma]; }; + CCl4 = derive2 { name="CCl4"; version="1.12.0"; sha256="19f1zmicl6i90l11sq6ly9913v2913s37c5jz5341p822shf8knz"; depends=[Biobase limma]; }; + CLL = derive2 { name="CLL"; version="1.14.0"; sha256="078avwbs42nnaqxa1k4769rgxign1xmwv2s1irjgd9dkxqq2ha0n"; depends=[affy Biobase]; }; + COHCAPanno = derive2 { name="COHCAPanno"; version="1.10.0"; sha256="1jf4wrbwbzbn4rwjkn936zg1cddd1s96a8m8r9bx2z2zm49vc5bp"; depends=[]; }; + CONFESSdata = derive2 { name="CONFESSdata"; version="1.2.0"; sha256="0p8v2qxg2hj1q3r8pwpp46zfbwjyiilq85kmzxl8v2flcw9n3brv"; depends=[]; }; + COPDSexualDimorphism_data = derive2 { name="COPDSexualDimorphism.data"; version="1.10.0"; sha256="1yd8k5pacs37yvb1bbpb46h9s3h1r8kb01r1hiwr73m1rbsg3qdl"; depends=[]; }; + COSMIC_67 = derive2 { name="COSMIC.67"; version="1.10.0"; sha256="0mw0q9s2dsqvc5qb5p57624raki7dgs0qc1anr2vaw1pi1gvfgib"; depends=[GenomicRanges SummarizedExperiment VariantAnnotation]; }; + CRCL18 = derive2 { name="CRCL18"; version="0.108.0"; sha256="12m13kv1f1cxynlar59m5s0ihz92ff52j80dqz5m8dzsynbjckbz"; depends=[Biobase]; }; + CardinalWorkflows = derive2 { name="CardinalWorkflows"; version="1.6.0"; sha256="0zjc5h348h94h2vm926z592f1zibv000nvx039662ydhsxn58mp2"; depends=[Cardinal]; }; + CellMapperData = derive2 { name="CellMapperData"; version="1.0.0"; sha256="12nkc500mqzfrg5yksfwf4f4kv2flk4l7lxx6ws0kw2hgrnm9yz1"; depends=[CellMapper ExperimentHub]; }; + ChIPXpressData = derive2 { name="ChIPXpressData"; version="1.12.0"; sha256="1hb4ay5a9z2c5zmjhlbbkcbycvmk27qimrpb6rvxkh3lprap2lv2"; depends=[bigmemory]; }; + ChimpHumanBrainData = derive2 { name="ChimpHumanBrainData"; version="1.12.0"; sha256="0wg9bsb1264wif23rqv2c863rr72crxb4n640q37ayf5zw7p6jgh"; depends=[affy hexbin limma qvalue statmod]; }; + ConnectivityMap = derive2 { name="ConnectivityMap"; version="1.10.0"; sha256="0v34kfkdpw8zmg1hkxbdjvk58m18ldxvsirz7s3i2vaf8k1g4r53"; depends=[]; }; + CopyNumber450kData = derive2 { name="CopyNumber450kData"; version="1.10.0"; sha256="1rblm57ljkq1dmzsbcmwm6p9gp0mgpgm2bbjczy0dppbhhr34m2c"; depends=[IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest minfi]; }; + CopyhelpeR = derive2 { name="CopyhelpeR"; version="1.6.0"; sha256="0x7cyynjmxls9as2gg0iyp9x5fpalxmdjq914ss7i84i9zyk5bhq"; depends=[]; }; + DAPARdata = derive2 { name="DAPARdata"; version="1.2.0"; sha256="1pc26xa2hx6vsl0xpfwhrgvnnrbxgr5cnzpygayrzh3hs4ryi987"; depends=[knitr MSnbase]; }; + DLBCL = derive2 { name="DLBCL"; version="1.14.0"; sha256="0baxgyvy07k502ndf81p2v51wrlb1p9fy0zxlx6faf0g80kghx7l"; depends=[Biobase]; }; + DMRcatedata = derive2 { name="DMRcatedata"; version="1.10.1"; sha256="10z534ffv975x08hxdfv871lm1ngg9qmgakfhamqcdlbc02y1j93"; depends=[GenomicRanges]; }; + DREAM4 = derive2 { name="DREAM4"; version="1.10.0"; sha256="0swyywaja7cfvn370wx6cbh5pda724v3rd5iy4rhvm7i1pg3m4l7"; depends=[SummarizedExperiment]; }; + DeSousa2013 = derive2 { name="DeSousa2013"; version="1.10.0"; sha256="0hx68nzhjb7sqrc2zzn37n0aby388bvbxr6ads7k9rckz50lha19"; depends=[affy AnnotationDbi Biobase cluster ConsensusClusterPlus frma frmaTools gplots hgu133plus2_db hgu133plus2frmavecs pamr rgl ROCR siggenes survival sva]; }; + DmelSGI = derive2 { name="DmelSGI"; version="1.6.0"; sha256="0n3ald8rg5yp5a27bwdfhdrl0rns50bmn7yi3z38qcvk6iiq9v70"; depends=[abind gplots igraph knitr limma rhdf5 TSP]; }; + DonaPLLP2013 = derive2 { name="DonaPLLP2013"; version="1.12.0"; sha256="0944p9gk4vazb2gqn5s2mij0b2vyvgs050h61d1g2iv11156wc6v"; depends=[EBImage]; }; + DrugVsDiseasedata = derive2 { name="DrugVsDiseasedata"; version="1.10.0"; sha256="0vvzvxkvg6l0q143jjh74mx4xam3q4xc9wlxbl693aipz0kpicql"; depends=[]; }; + DvDdata = derive2 { name="DvDdata"; version="1.10.0"; sha256="0rz5yhfcammg17rx15dnkcg43cwqbwi8ipkkqmlfkr3kb4km731v"; depends=[]; }; + EGSEAdata = derive2 { name="EGSEAdata"; version="1.2.0"; sha256="1rm3yjsngjrn86l2rdx0cz1kz9ki8h16znhag854l9yfahh9sr35"; depends=[]; }; + ELMER_data = derive2 { name="ELMER.data"; version="1.4.0"; sha256="0l12m881b5j0i7dw2wz868p0mqlfgfz3y5yyhj6kyzvwaj677p0a"; depends=[GenomicRanges]; }; + EatonEtAlChIPseq = derive2 { name="EatonEtAlChIPseq"; version="0.12.0"; sha256="16q9f1p21xdh00mzb3vc2zpmyry9cfb884y2vp60gpq930vs3fsj"; depends=[GenomicRanges rtracklayer ShortRead]; }; + FANTOM3and4CAGE = derive2 { name="FANTOM3and4CAGE"; version="1.10.0"; sha256="0k0wajjj340wpc3zlcd9kylllfa3ly5cbfg8i38dc5g88hz5nvkr"; depends=[]; }; + FIs = derive2 { name="FIs"; version="1.2.0"; sha256="0hw83rnb5bl4a390h2x413zlss52bkbmfyq0md69zx1rlvxpdprp"; depends=[]; }; + Fletcher2013a = derive2 { name="Fletcher2013a"; version="1.10.0"; sha256="14ph3ll6xli84bpg9s43hmigwbnyprzfgmr4yifw77ssqkj0r3wx"; depends=[Biobase gplots limma VennDiagram]; }; + Fletcher2013b = derive2 { name="Fletcher2013b"; version="1.10.0"; sha256="1wilz0mwizar8491wkym5x3xwxfxmyd9r1djh3xnc9gnq88df0dy"; depends=[Fletcher2013a igraph RColorBrewer RedeR RTN]; }; + FlowSorted_Blood_450k = derive2 { name="FlowSorted.Blood.450k"; version="1.12.0"; sha256="0q06szq9vs46frgax6896wkrxw5rb89854vnib68kaxkmyqrs4rp"; depends=[minfi]; }; + FlowSorted_CordBlood_450k = derive2 { name="FlowSorted.CordBlood.450k"; version="1.2.0"; sha256="1d4caj4zrjlwkpbiclqxjyzzz3vg97p61hkmrxa18hbq8v9c67z1"; depends=[minfi]; }; + FlowSorted_CordBloodNorway_450k = derive2 { name="FlowSorted.CordBloodNorway.450k"; version="1.0.0"; sha256="0z966py4bgxnifly56mlyqvi5v4mh1ay5nhfb7fd9qciq42jclzf"; depends=[minfi]; }; + FlowSorted_DLPFC_450k = derive2 { name="FlowSorted.DLPFC.450k"; version="1.10.0"; sha256="1dgaylgx19cbvvcrdr3wwr9rp3jdx89mlxzc4fivnzllmf1dyyqa"; depends=[minfi]; }; + FunciSNP_data = derive2 { name="FunciSNP.data"; version="1.10.0"; sha256="0r0iv8hp25ld9vpyij9lrk0xphaxcz4j4panyc83i18d6s9jw51s"; depends=[IRanges rtracklayer]; }; + GGdata = derive2 { name="GGdata"; version="1.12.0"; sha256="0h564577s3aklgg2a34026nacfzq3mpfmwmsl19dcmk7all5i100"; depends=[AnnotationDbi Biobase GGBase illuminaHumanv1_db snpStats]; }; + GSBenchMark = derive2 { name="GSBenchMark"; version="0.108.0"; sha256="13lc52xdv0mk4mr54i33k8rwb19496f8g8dj7xhh9vvx3dkcrl5k"; depends=[]; }; + GSE62944 = derive2 { name="GSE62944"; version="1.2.0"; sha256="0y8f1cq8bwkjr79vias3snclqcddd8bmh3rl041s4pv5adxgddgn"; depends=[Biobase GEOquery]; }; + GSVAdata = derive2 { name="GSVAdata"; version="1.10.0"; sha256="0lbh07ygyns6db3g0208691q7ry0mjg2lhis4pqw6rr122mvhh4l"; depends=[Biobase GSEABase hgu95a_db]; }; + GWASdata = derive2 { name="GWASdata"; version="1.12.0"; sha256="0ygkrm7gybfj4wb8rc56zrwyfbpgl1kz50dyrz5glwkgzxqn00dq"; depends=[GWASTools]; }; + GeuvadisTranscriptExpr = derive2 { name="GeuvadisTranscriptExpr"; version="1.2.0"; sha256="0jlmkqkjrffspny20w6yci319ry63sjnsychz6z9gwacy72fz14y"; depends=[]; }; + HEEBOdata = derive2 { name="HEEBOdata"; version="1.12.0"; sha256="1j79sxx3ig61ny8r0j40m4fba5rf61k8rq23b5w6rcq6zwysymh6"; depends=[]; }; + HIVcDNAvantWout03 = derive2 { name="HIVcDNAvantWout03"; version="1.14.0"; sha256="0h42jvnmfdr14glnlspgiznxx5qh19pn6abw4qyf2q24yps5hrpd"; depends=[]; }; + HSMMSingleCell = derive2 { name="HSMMSingleCell"; version="0.108.0"; sha256="0i48h84qpcwraj8rhmisk6g7l6m9wf5a4p5pl6kr0ipfpr6fnh2b"; depends=[]; }; + HarmanData = derive2 { name="HarmanData"; version="1.2.0"; sha256="0xlqp2fx8glhykdnc38mjsxjc78bb3q72jx168djq2r0z3gxivai"; depends=[]; }; + HelloRangesData = derive2 { name="HelloRangesData"; version="1.0.0"; sha256="0lcmww0pyx3pjqnhvkdz9zv5s0cbrgxd7hvf0fz7hkcqn3sdw2p6"; depends=[]; }; + HiCDataHumanIMR90 = derive2 { name="HiCDataHumanIMR90"; version="0.108.0"; sha256="1sw1i7i5hi1kx7h9nqbnxb6h4wl97yfirsfw4m9sb879ycbwq58p"; depends=[]; }; + HiCDataLymphoblast = derive2 { name="HiCDataLymphoblast"; version="1.10.0"; sha256="1mka0is34lxg7cyrsdahkm11xnvlz17qk7bs8bwlkxc7gz90aj3j"; depends=[]; }; + Hiiragi2013 = derive2 { name="Hiiragi2013"; version="1.10.0"; sha256="0lirsd1875v3qkmszj2pbaj8r552ndlvxhfhbl62rwsia5g5i356"; depends=[affy Biobase boot clue cluster genefilter geneplotter gplots gtools KEGGREST lattice latticeExtra MASS mouse4302_db RColorBrewer xtable]; }; + HumanAffyData = derive2 { name="HumanAffyData"; version="1.0.0"; sha256="03cxc5bs8q27n8jrclnndgw02mjqf9wn4gc8z39x2bd4gwhjjvpv"; depends=[Biobase ExperimentHub]; }; + IHWpaper = derive2 { name="IHWpaper"; version="1.2.0"; sha256="0d0rns36wb57vizgmjwsjmgb3qgp8ng31d81n1z0wzhdwrdir9vv"; depends=[Biobase BiocGenerics BiocParallel cowplot DESeq2 dplyr fdrtool genefilter ggplot2 IHW qvalue Rcpp SummarizedExperiment]; }; + ITALICSData = derive2 { name="ITALICSData"; version="2.12.0"; sha256="1l3xvgav4k3d5xn0wa0046dx2i395gndvwh8ni1452dx98wj8xlw"; depends=[]; }; + Illumina450ProbeVariants_db = derive2 { name="Illumina450ProbeVariants.db"; version="1.10.0"; sha256="17mcl8850pzfr5lmdis8659kfbfy63qgp61h3wrd1nbqn0skk5q8"; depends=[]; }; + IlluminaDataTestFiles = derive2 { name="IlluminaDataTestFiles"; version="1.12.0"; sha256="1d4ycz9di7nqqpf2kcjaldg49s8jfvyfgb5q5i1ni68grzfi6p4k"; depends=[]; }; + Iyer517 = derive2 { name="Iyer517"; version="1.16.0"; sha256="0gs7793q5zbgiynpvkq46l0yc862sfy87090jkvw1m6mlci89qkk"; depends=[Biobase]; }; + JASPAR2014 = derive2 { name="JASPAR2014"; version="1.10.0"; sha256="1cbqrn54fb7jqfaswlvq4ljshfwg08ra07sh1g4dpv0nb2kkgv18"; depends=[Biostrings]; }; + JASPAR2016 = derive2 { name="JASPAR2016"; version="1.2.0"; sha256="0j0ilzml2i0j7bql2qly14h1xnrvdar65fkaxkvv2ncbyxgisiky"; depends=[]; }; + JctSeqData = derive2 { name="JctSeqData"; version="1.4.0"; sha256="0gw78wm9s8mz87zidfm49ly79gws8xfd7y4my4k39l1caqhlzbdd"; depends=[]; }; + KEGGandMetacoreDzPathwaysGEO = derive2 { name="KEGGandMetacoreDzPathwaysGEO"; version="0.108.0"; sha256="1q209v42ncczqwfmc71i0s3x6axlzqi3k474xccnhpsxcaz3s0a6"; depends=[Biobase BiocGenerics]; }; + KEGGdzPathwaysGEO = derive2 { name="KEGGdzPathwaysGEO"; version="1.12.0"; sha256="05mplbzvwfqnn8ffdha1s99bhkq537vsmk46zq217cn0cl4csqrl"; depends=[Biobase BiocGenerics]; }; + KOdata = derive2 { name="KOdata"; version="1.0.0"; sha256="1ggr9ayhz3h2x7g4n3l3pnnhdznw1iyp45n8sixp90ha9133hv9b"; depends=[]; }; + LiebermanAidenHiC2009 = derive2 { name="LiebermanAidenHiC2009"; version="0.12.0"; sha256="101xq53ra360fhifn274nmdsbbj7pralhhgzzy0pr00a48x68lwc"; depends=[IRanges KernSmooth]; }; + ListerEtAlBSseq = derive2 { name="ListerEtAlBSseq"; version="1.6.0"; sha256="05g6qn1zkbk6daps9nnzqnn748qxda0avi2mbzsrcfqp231dkhs8"; depends=[methylPipe]; }; + LungCancerACvsSCCGEO = derive2 { name="LungCancerACvsSCCGEO"; version="1.10.0"; sha256="13x5hj6503aavyv4bygf26krvj8ppwaalrhizwylkdn4zglv4nv1"; depends=[]; }; + LungCancerLines = derive2 { name="LungCancerLines"; version="0.12.0"; sha256="1xsas3d0n6h5xy03ybqy82cfh1gq97lim33mi163j598yhd1c6zs"; depends=[Rsamtools]; }; + M3DExampleData = derive2 { name="M3DExampleData"; version="1.0.0"; sha256="07awll0dmi7wnr5w7nc89g1mqf6b9r2mw858x0vzwkwf58qixqh0"; depends=[]; }; + MAQCsubset = derive2 { name="MAQCsubset"; version="1.12.0"; sha256="1gngz2a17n4lmcy59wcxywlgarp9h985wzmxz59vymx9n3in5lj5"; depends=[affy Biobase lumi]; }; + MAQCsubsetAFX = derive2 { name="MAQCsubsetAFX"; version="1.12.0"; sha256="1ic7xdlfw0mikgmq961dc58sqfiyq2464q9w49hblcl25gf2pxi0"; depends=[affy Biobase]; }; + MAQCsubsetILM = derive2 { name="MAQCsubsetILM"; version="1.12.0"; sha256="1jiydpacyvdvlynlhcqrnc9xysbvn755lzrcz8pm2h79wanpcpsp"; depends=[Biobase lumi]; }; + MEALData = derive2 { name="MEALData"; version="1.4.0"; sha256="01pn75kkvk6w1xim9hwqqpjv9gb1g7a4f4110hhllabhih3ygjlv"; depends=[]; }; + MEDIPSData = derive2 { name="MEDIPSData"; version="1.10.0"; sha256="1vdmh5rlygjmrkzy599rcr90anci3dzzz666b87b2w3z04vvyyqp"; depends=[]; }; + MEEBOdata = derive2 { name="MEEBOdata"; version="1.12.0"; sha256="0c4b69dhpkxarbna63dzacm81kizfdm425xmcb4xs0zs6jv6kj4j"; depends=[]; }; + MMDiffBamSubset = derive2 { name="MMDiffBamSubset"; version="1.10.0"; sha256="0yilicgglvb22gl5zv7rdjc5yczfz7kvzysnajb0qgpw94ha1wjx"; depends=[]; }; + MSBdata = derive2 { name="MSBdata"; version="0.12.0"; sha256="1g0piddp8qpqf8nncsv73zymad5qmf2hxam44sn1m6227m4r8xdc"; depends=[]; }; + MUGAExampleData = derive2 { name="MUGAExampleData"; version="0.108.0"; sha256="0hw4f6syk1m4zxr423cx7asahq1lkbi7pnhspda7m5127fs5ikxa"; depends=[]; }; + MethylAidData = derive2 { name="MethylAidData"; version="1.6.0"; sha256="1ws6vn9pg1hmcyajrvyg645glj2khg43v75ppn72ylfysx8h86yl"; depends=[MethylAid]; }; + Mulder2012 = derive2 { name="Mulder2012"; version="0.14.0"; sha256="0ah5digpg8j3dwhqx0gqf0r46vwpqmglk89k4h504vn18ff99vbi"; depends=[HTSanalyzeR igraph KEGG_db MASS org_Hs_eg_db PANR pvclust RedeR]; }; + NCIgraphData = derive2 { name="NCIgraphData"; version="1.10.0"; sha256="1pdm201xvhhbdd2blrg2yxjhm00pqvkxk0x1saykb6rrdq2zl16w"; depends=[]; }; + NGScopyData = derive2 { name="NGScopyData"; version="0.108.0"; sha256="0bk50jfmbq8p8c81jmcy85xqnqrw2amsa3f7hdnkj36k2gmqzzyf"; depends=[]; }; + Neve2006 = derive2 { name="Neve2006"; version="0.12.0"; sha256="0s0brv5k92bhls8flbq8qbxs53gnsgibr9mqb3jkhjz039ir749s"; depends=[annotate Biobase hgu133a_db]; }; + PCHiCdata = derive2 { name="PCHiCdata"; version="1.2.0"; sha256="1bksxvax6j9wxjszkq0cx7jx84i14qb9dqlgjahjr559slkqbzmh"; depends=[Chicago]; }; + PGPC = derive2 { name="PGPC"; version="1.2.0"; sha256="0im1s07l3rbcwmglm1vw5yq8qp307bbbkij851cbs639wlq7s22w"; depends=[ChemmineR EBImage geneplotter ggplot2 gplots imageHTS limma plyr RColorBrewer reshape2 SearchTrees splots]; }; + PREDAsampledata = derive2 { name="PREDAsampledata"; version="0.14.1"; sha256="0p898qdp5fnfads1n6rlwi6c2zp332m0jqdw21fsr3lx59d3s8jv"; depends=[affy annotate Biobase gahgu133plus2_db gahgu133plus2cdf PREDA]; }; + PWMEnrich_Dmelanogaster_background = derive2 { name="PWMEnrich.Dmelanogaster.background"; version="4.8.0"; sha256="19b2q9p76cyjl8dgmjagdr9zxr2xfinpp4qr26772s7bsxwq0rll"; depends=[PWMEnrich]; }; + PWMEnrich_Hsapiens_background = derive2 { name="PWMEnrich.Hsapiens.background"; version="4.8.0"; sha256="0g2mjiyv415n0cl0nrj5va61f5pf9wdv27q92xsbzp0fgybjd4hy"; depends=[PWMEnrich]; }; + PWMEnrich_Mmusculus_background = derive2 { name="PWMEnrich.Mmusculus.background"; version="4.8.0"; sha256="0zhrvynj3my4pdd57nybw62jkaqm039i7vm9v253qzdaf8h0xs3w"; depends=[PWMEnrich]; }; + PasillaTranscriptExpr = derive2 { name="PasillaTranscriptExpr"; version="1.2.0"; sha256="1i2qa0rd0ncx77cr1d3f4wb939na5ycpli3q3d8k2l027nl4rjks"; depends=[]; }; + PathNetData = derive2 { name="PathNetData"; version="1.10.0"; sha256="16k9nvxhs80vfcvjhr3dssxjq53zlm1802dkr24icngpnfmlwnj2"; depends=[]; }; + ProData = derive2 { name="ProData"; version="1.12.0"; sha256="14mrgfxk3jrzy3ghdcrh8flfkm4b6xi42sjb8sws57jfcda0zd2v"; depends=[Biobase]; }; + PtH2O2lipids = derive2 { name="PtH2O2lipids"; version="1.0.0"; sha256="1gsz60vg8h0w13v29bkj3pczivn7cpkg515rl5rj42vjxbw4mnsh"; depends=[CAMERA LOBSTAHS xcms]; }; + QDNAseq_hg19 = derive2 { name="QDNAseq.hg19"; version="1.4.0"; sha256="1l0m384swvnxz4jrcgzc0a4fr03g12by1b5y9ncwdkwrz8imr52q"; depends=[QDNAseq]; }; + QDNAseq_mm10 = derive2 { name="QDNAseq.mm10"; version="1.4.0"; sha256="1sp8jsjy0gji38sx44qdrp9v0s0inw0r7hrgwbjvr6vn6xmifg6i"; depends=[QDNAseq]; }; + QUBICdata = derive2 { name="QUBICdata"; version="1.2.0"; sha256="148rgjgj1fkvc4nw7mszhc2dagljhx672vpyvldjr4cnkwwd9vwz"; depends=[]; }; + RIPSeekerData = derive2 { name="RIPSeekerData"; version="1.10.0"; sha256="0bfpr197gjhwszpmvdfkmfa92yrc9jp567h5whzl0mb687k6ax3n"; depends=[RIPSeeker]; }; + RMassBankData = derive2 { name="RMassBankData"; version="1.12.0"; sha256="1fzylbwhqn5al98c1jmdj7bzn7np233h617hbzcxblknaglafv0m"; depends=[]; }; + RNAinteractMAPK = derive2 { name="RNAinteractMAPK"; version="1.12.0"; sha256="0dv23vr84xr3rjk0syx9d1x9zj2d42rl3yfsbh2aaf1rcrjafc14"; depends=[fields gdata genefilter MASS RNAinteract sparseLDA]; }; + RNAseqData_HNRNPC_bam_chr14 = derive2 { name="RNAseqData.HNRNPC.bam.chr14"; version="0.12.0"; sha256="13pb2ljr4mq741vc443r573ynbynjsrhmas5gf2qnyn4j4wj5bra"; depends=[]; }; + RRBSdata = derive2 { name="RRBSdata"; version="0.108.0"; sha256="0sjw006kzikck8kdfvpqyx8bkhmfcbz363imgm72avzdqn7z5430"; depends=[BiSeq]; }; + RTCGA_CNV = derive2 { name="RTCGA.CNV"; version="1.2.0"; sha256="0gf5l0mzihhl4rhfqd81g4ql8pvwm2lgj9qjybfp94pr3h9kkfvx"; depends=[RTCGA]; }; + RTCGA_PANCAN12 = derive2 { name="RTCGA.PANCAN12"; version="1.2.0"; sha256="0kkg0ds8p5rrjcdzq81g1bplxl685k5iki9w11kwpkmnnxslf5f8"; depends=[RTCGA]; }; + RTCGA_RPPA = derive2 { name="RTCGA.RPPA"; version="1.2.0"; sha256="0088cm640mzbzbyj1pmvi35l0s2zpl5x2pmhj2lz2zjp4dis2g3p"; depends=[RTCGA]; }; + RTCGA_clinical = derive2 { name="RTCGA.clinical"; version="20151101.4.0"; sha256="0qhg1dx77xarjzb41dpvhlvl9aqwsyscavk3n3w33zpn1r087v33"; depends=[RTCGA]; }; + RTCGA_mRNA = derive2 { name="RTCGA.mRNA"; version="1.2.0"; sha256="1grrcrd8lsjfk056r018y2rkn2zr31k4jc854mllh7sgpg0jr6br"; depends=[RTCGA]; }; + RTCGA_miRNASeq = derive2 { name="RTCGA.miRNASeq"; version="1.2.0"; sha256="1mfbq20s2zp234arkqy0g5km7y8jnymwnm4vl13vxqqcv12f3kr8"; depends=[RTCGA]; }; + RTCGA_mutations = derive2 { name="RTCGA.mutations"; version="20151101.4.0"; sha256="0jxr2g8x5z4vyhs9n3ciiis45bs3jg3vg1v4mwxl4v4gys8p3i9b"; depends=[RTCGA]; }; + RTCGA_rnaseq = derive2 { name="RTCGA.rnaseq"; version="20151101.4.0"; sha256="0ag3kmh2zfg9rqpmiih686klpcqd05l2cf5zfvg0vjwcim30xph2"; depends=[RTCGA]; }; + RUVnormalizeData = derive2 { name="RUVnormalizeData"; version="0.108.0"; sha256="134ixgi809nmp54p7h94878pl61w3djrizvb32cb228a6djc1aj4"; depends=[Biobase]; }; + RforProteomics = derive2 { name="RforProteomics"; version="1.12.0"; sha256="1hzgq16mhrd0n7myav91ykmbvi3r71g625x52lvi61shjism5jp7"; depends=[Biobase BiocInstaller biocViews interactiveDisplay MSnbase R_utils rpx shiny]; }; + RnBeads_hg19 = derive2 { name="RnBeads.hg19"; version="1.6.0"; sha256="1dssr1d9md7xl7fm1b537wxsa1bqqwjvb8mnrmqwl3ish0asy525"; depends=[GenomicRanges]; }; + RnBeads_hg38 = derive2 { name="RnBeads.hg38"; version="1.6.0"; sha256="172rbvi4gqsygb7fhdymzm0a2r4wyikgzfaxgjj4bwkl24lss6ac"; depends=[GenomicRanges]; }; + RnBeads_mm10 = derive2 { name="RnBeads.mm10"; version="1.6.0"; sha256="100dzzmmvmb5s43hckn286waja0qkd5rhba0cas3ifg5n21inbyc"; depends=[GenomicRanges]; }; + RnBeads_mm9 = derive2 { name="RnBeads.mm9"; version="1.6.0"; sha256="1jdr4vz4dp4q1ifjz38s5i6lwdvaws29176679m0xsckmvw8rlf8"; depends=[GenomicRanges]; }; + RnBeads_rn5 = derive2 { name="RnBeads.rn5"; version="1.6.0"; sha256="0bfcs51lmrm5ydd5zbkpkaw69ziq3yg00hi0kkcjrhk7nn1kjp66"; depends=[GenomicRanges]; }; + RnaSeqSampleSizeData = derive2 { name="RnaSeqSampleSizeData"; version="1.6.0"; sha256="01vwk652hhh6rc6l0q0ylnzh0ng5ck91kki37qib7c714fy6f1fa"; depends=[edgeR]; }; + RnaSeqTutorial = derive2 { name="RnaSeqTutorial"; version="0.12.0"; sha256="07jkzxavpyg54ddh4xmzxsilcrr8x8w7lj6c4s02s8j23rxzxi2h"; depends=[easyRNASeq]; }; + SCLCBam = derive2 { name="SCLCBam"; version="1.6.0"; sha256="1lhc5c6icys4qnsbc2ixck3h63fsa8pnypam5k6wbvw79afr4xnm"; depends=[]; }; + SNAData = derive2 { name="SNAData"; version="1.20.0"; sha256="1ny0fdgx2kv6hs0rqnc70aixsa2cs7i2r17dklv529iks49i3n2n"; depends=[graph]; }; + SNAGEEdata = derive2 { name="SNAGEEdata"; version="1.10.0"; sha256="182agiw245zrb7lbyn1c38w1kljqs73lkvhvrlrilww1bfhwlrwc"; depends=[]; }; + SNPhoodData = derive2 { name="SNPhoodData"; version="1.4.0"; sha256="1w36157kdn1fji5pgj75bf88isfhvavpgyxnm9dfnzz5r1qaxx79"; depends=[]; }; + SVM2CRMdata = derive2 { name="SVM2CRMdata"; version="1.6.0"; sha256="1rsagb2nlc8airrdql7sa4rl1h34nhmds4lz0yx5i3dca8jzqn61"; depends=[]; }; + SomatiCAData = derive2 { name="SomatiCAData"; version="1.12.0"; sha256="1cqbprdlrz3yz1zjjrd33wy4ybhkfq943pv3pi0bx4yz9gqc5625"; depends=[]; }; + SomaticCancerAlterations = derive2 { name="SomaticCancerAlterations"; version="1.10.0"; sha256="0sqdgmqs3ds3hnfn7nmmzhs8m5if8wy8rrfp7q76qhz7winqmqxh"; depends=[exomeCopy GenomicRanges IRanges S4Vectors stringr]; }; + SpikeIn = derive2 { name="SpikeIn"; version="1.16.0"; sha256="0nvxix2hsamcffdg6zqlvavx6l41qmfz7q1ycq99rjmv4rznl1z1"; depends=[affy]; }; + SpikeInSubset = derive2 { name="SpikeInSubset"; version="1.14.0"; sha256="16yisl8m9ggb995snsbhsfxxnqr2v2d5k8ay9w2hipkacaiskwcm"; depends=[affy Biobase]; }; + TBX20BamSubset = derive2 { name="TBX20BamSubset"; version="1.10.0"; sha256="1008i15x17k20596da1ai2dxqhyqi9v6bpskd0c66xvhnifmzpna"; depends=[Rsamtools xtable]; }; + TCGAMethylation450k = derive2 { name="TCGAMethylation450k"; version="1.10.0"; sha256="089ddz2w5kqn3zc07ji9lb7k6msd7r4a6j6aymkx59d10qlx97f6"; depends=[]; }; + TCGAcrcmRNA = derive2 { name="TCGAcrcmRNA"; version="0.108.0"; sha256="0zkawybz6fyfcsga92vw6mx1y1qb6nrp9qcmjvd8ki9phhg7k8yb"; depends=[Biobase]; }; + TCGAcrcmiRNA = derive2 { name="TCGAcrcmiRNA"; version="0.108.0"; sha256="13ipkl1rd2s0vdz32jp30hz3fz7d9hmhfx626jy9q576iqpqb94j"; depends=[Biobase]; }; + TargetScoreData = derive2 { name="TargetScoreData"; version="1.10.0"; sha256="1jw9nhylj82g5gmhl1a6pirf4jyb1i79mm9a3afqrcgv55a5ksvp"; depends=[]; }; + TargetSearchData = derive2 { name="TargetSearchData"; version="1.12.0"; sha256="0acijg56wx91xqrmgqp1pk8cwl3wf5j4f8csdd9p46frlfa5iw8c"; depends=[TargetSearch]; }; + TimerQuant = derive2 { name="TimerQuant"; version="1.4.0"; sha256="1pihpj8q0vrhwip6c35lnv78r3nqcs1p18npb26bxhv02hb8cc6i"; depends=[deSolve dplyr ggplot2 gridExtra locfit shiny]; }; + WES_1KG_WUGSC = derive2 { name="WES.1KG.WUGSC"; version="1.6.0"; sha256="0lpmrqmgcv96rbfylgsaffwwp5qqnj7kmfniahhj4zsxyjsy90fg"; depends=[]; }; + XhybCasneuf = derive2 { name="XhybCasneuf"; version="1.12.0"; sha256="00pdinf4mnl5mbwlzh7vwqw775ag2v2g5b5lqnhmxsnyfqsxgpb5"; depends=[affy ath1121501cdf RColorBrewer tinesath1cdf]; }; + affycompData = derive2 { name="affycompData"; version="1.12.0"; sha256="1yz3y8y169qla8x194zlc3im43827a7233gla6arv552yg3fj703"; depends=[affycomp Biobase]; }; + affydata = derive2 { name="affydata"; version="1.22.0"; sha256="1zizi0p3r3y9h6kk2a1hci9x23i2wbq1krvl9nxd6jzx09fq25sv"; depends=[affy]; }; + airway = derive2 { name="airway"; version="0.108.0"; sha256="00vxi6i9c5c14gfqm5w9q6lg0h1hb96rfm8jqsvw81lpqqlnyjgd"; depends=[SummarizedExperiment]; }; + alpineData = derive2 { name="alpineData"; version="1.0.0"; sha256="0s3xls7b71xn6f9fsqim79cnv4mf5xz1dli9rr4ralzllvh9hm9d"; depends=[AnnotationHub ExperimentHub ExperimentHubData]; }; + antiProfilesData = derive2 { name="antiProfilesData"; version="1.10.0"; sha256="1fzjic8prjwpx43imm73g0znzry42rlziyzr5n6zkbgqx44kh398"; depends=[Biobase]; }; + aracne_networks = derive2 { name="aracne.networks"; version="1.0.0"; sha256="1y2n3xdaccfmij7jaxgzjh1bwvaczp8wsd6757fm8mn1qgalgjdc"; depends=[viper]; }; + bcellViper = derive2 { name="bcellViper"; version="1.10.0"; sha256="1pc4av4i0iwxg0v5aqb9rn0m2z8vnqqwxs57x3nsdirhl7pv92qm"; depends=[Biobase]; }; + beadarrayExampleData = derive2 { name="beadarrayExampleData"; version="1.12.0"; sha256="1kknkispmbxhwikhl0b3g2p0885gm82h3bdl6id4rwxvli86db8s"; depends=[beadarray Biobase]; }; + beta7 = derive2 { name="beta7"; version="1.12.0"; sha256="0lm2lz36lmz6kxp1ia7cfd129kif9a2vyn2cngjsvhvm2pxplrl5"; depends=[marray]; }; + bladderbatch = derive2 { name="bladderbatch"; version="1.12.0"; sha256="0dsz57a9si7i06nwvmvn0l65jhc1xbc3ywjh1z32smm8rvn8x90b"; depends=[Biobase]; }; + blimaTestingData = derive2 { name="blimaTestingData"; version="0.108.0"; sha256="02fksg7kpb9knj7f47l0dbc016min91xf9d5xccpa833wylylyjj"; depends=[]; }; + breastCancerMAINZ = derive2 { name="breastCancerMAINZ"; version="1.12.0"; sha256="0smmvhb38z6wa7inbg5y8skl10p7yybq9qh2847xpzdnivldxfwa"; depends=[]; }; + breastCancerNKI = derive2 { name="breastCancerNKI"; version="1.12.0"; sha256="0bznvksrmpxp0ba9md96ch2qsk67jyda33b74bzk0hrxkijhm1i4"; depends=[]; }; + breastCancerTRANSBIG = derive2 { name="breastCancerTRANSBIG"; version="1.12.0"; sha256="0sghqg2fs7khb54x2p3mlc7mynbp417bccszcij9gq43njwfdra0"; depends=[]; }; + breastCancerUNT = derive2 { name="breastCancerUNT"; version="1.12.0"; sha256="0pg862q0m9m51iqk85gx9ihl17ld0x7i7j39g0y7bcvr7cy1djrd"; depends=[]; }; + breastCancerUPP = derive2 { name="breastCancerUPP"; version="1.12.0"; sha256="0pidz7safi6z2nbrz2wrjqx1ygyxg6ggagv4sfdy53ym07lwfdz3"; depends=[]; }; + breastCancerVDX = derive2 { name="breastCancerVDX"; version="1.12.0"; sha256="197g42apvsp9vaipj4zf3kma90j8zsvx9b8q4crdl5czvkzmpixa"; depends=[]; }; + bronchialIL13 = derive2 { name="bronchialIL13"; version="1.12.0"; sha256="0amg5fn0dprnz5wwjacm73xbih1bbw04f0vm3rfplpiwqh83cq1g"; depends=[affy]; }; + bsseqData = derive2 { name="bsseqData"; version="0.12.0"; sha256="0m0dj3rd7m80la8h58s1lfxfkmz3a242vp3i1yiv9y6c0hca7yq4"; depends=[bsseq]; }; + cMap2data = derive2 { name="cMap2data"; version="1.10.0"; sha256="0l7hnr6w5g0n0ma24xm57dlqdrrlrhm6a4cw4p65hwn9djxxiz1m"; depends=[]; }; + cancerdata = derive2 { name="cancerdata"; version="1.12.0"; sha256="0rzp8a210vk8j9nlf1g228jsccdbabl99jbd27qi90bbs0kdnkp3"; depends=[Biobase]; }; + ccTutorial = derive2 { name="ccTutorial"; version="1.12.0"; sha256="17r030iajkaash8jfzfdb7d2xfd5mn9q27mkc11dycpqbji61q1q"; depends=[affy Biobase Ringo topGO]; }; + ccdata = derive2 { name="ccdata"; version="1.0.0"; sha256="05raawlm17vhiap34z812g1ri5yc77h7qs4lj1gfk1kkcpj2knsf"; depends=[]; }; + ceu1kg = derive2 { name="ceu1kg"; version="0.12.0"; sha256="09xi5fvr7cigs1qs98phcapzqi8jam34gky2pxksi9gkw2n9j451"; depends=[Biobase GGBase GGtools]; }; + ceu1kgv = derive2 { name="ceu1kgv"; version="0.16.0"; sha256="11hyhddf395hyypxsl8na23pwcwlnmr639c927wxqibxxp1lfqsk"; depends=[Biobase GGBase]; }; + ceuhm3 = derive2 { name="ceuhm3"; version="0.12.0"; sha256="03qkfk9mxz510lmr9spv74d3138bvfcpsgp0qnjw3jj2xiwn4jqq"; depends=[Biobase GGBase GGtools]; }; + cgdv17 = derive2 { name="cgdv17"; version="0.12.0"; sha256="1cl725dhyh81rsxgv2icfljczbcgsnqba383gjfyf06d2qarby1y"; depends=[Biobase BiocGenerics GenomicRanges IRanges S4Vectors VariantAnnotation]; }; + charmData = derive2 { name="charmData"; version="1.10.0"; sha256="1v760z5br1cj5dj97ayl68dv202086v2mcnhn6bpv0kf62q9mia2"; depends=[charm pd_charm_hg18_example]; }; + chipenrich_data = derive2 { name="chipenrich.data"; version="1.10.0"; sha256="0zcj4pa03ny4b1rng4ima23jc6sqvsznp52d59vipnqd4jg1ic95"; depends=[BiocGenerics GenomicRanges IRanges]; }; + chromstaRData = derive2 { name="chromstaRData"; version="1.0.0"; sha256="0d0g20mg36mxldl9f0bzqbz9vzp526pqy501k0g7bmj5sbgd2p3s"; depends=[]; }; + cnvGSAdata = derive2 { name="cnvGSAdata"; version="1.10.0"; sha256="04bkk8360pc0sp8n1z16smj888gbglgghklciwpzk2d513wwapdr"; depends=[cnvGSA]; }; + colonCA = derive2 { name="colonCA"; version="1.16.0"; sha256="1kjlw5qi6yvk6amvnmjjnr5ypvqmslmm9lmkgdgab3s38hyddj2a"; depends=[Biobase]; }; + curatedBladderData = derive2 { name="curatedBladderData"; version="1.10.0"; sha256="1k957gad0xlv0nzcimypf32dpqvldc1w8lj2a274y8spb66imfnw"; depends=[affy]; }; + curatedBreastData = derive2 { name="curatedBreastData"; version="2.0.1"; sha256="1l767mg3bknp91is7mqb13w2kpdihf4vbphwhqyvmzsl5rv2vc7y"; depends=[Biobase BiocStyle ggplot2 impute XML]; }; + curatedCRCData = derive2 { name="curatedCRCData"; version="2.6.0"; sha256="1l1lzkyrvpz334xda4z3mxh2ql3zhhmc376znrjfryzi5jbypnh4"; depends=[BiocGenerics nlme]; }; + curatedMetagenomicData = derive2 { name="curatedMetagenomicData"; version="1.0.4"; sha256="0xpq25rmg8bxwsvm35qm20l6b7a3kg5p9ngvj2dvnf00jn7vv2bj"; depends=[AnnotationHub Biobase BiocInstaller dplyr ExperimentHub magrittr phyloseq tidyr]; }; + curatedOvarianData = derive2 { name="curatedOvarianData"; version="1.12.0"; sha256="1qjmmxh0cb4y418rl5wg8inkj5cffniw7jd6vjj3j2yiaq9b5d6l"; depends=[affy BiocGenerics]; }; + davidTiling = derive2 { name="davidTiling"; version="1.14.0"; sha256="0n7invq1j0lmrylzrggmlndj4ag196rhyn0lvi746p8sxzdapfaf"; depends=[Biobase GO_db tilingArray]; }; + derfinderData = derive2 { name="derfinderData"; version="0.108.0"; sha256="041yq05x9d09n82c9wnwqa1rakkf4p1q3rs9vlacl45bdqdbdsa4"; depends=[]; }; + diffloopdata = derive2 { name="diffloopdata"; version="1.2.0"; sha256="0vvkgfixvs76cymz0nlyzp7sh9jzd1mcbl5pbnnziybwn5fdpw3g"; depends=[]; }; + diggitdata = derive2 { name="diggitdata"; version="1.6.0"; sha256="0xyvd8jdpn3y9s88z489cinacb4bnnp1jqg2aj7h9hhaj95pywsq"; depends=[Biobase viper]; }; + dressCheck = derive2 { name="dressCheck"; version="0.12.0"; sha256="1mm8hlivhcf9f01aqdcipq4wz7x3ga8znpcpi69jgh3iadf5x2xq"; depends=[Biobase]; }; + dyebiasexamples = derive2 { name="dyebiasexamples"; version="1.14.0"; sha256="18ghl3l7ps6xz90gyrnz3zc0rba99yg8ry9fpfbv7yni888hl9bx"; depends=[GEOquery marray]; }; + ecoliLeucine = derive2 { name="ecoliLeucine"; version="1.14.0"; sha256="1s03jpb83j8xgwxdr5z7233175jhd4w7vikalxvh1mvk9bqa8rmk"; depends=[affy ecolicdf]; }; + estrogen = derive2 { name="estrogen"; version="1.20.2"; sha256="19f1gjppzfg21ci6jdxgwv7h14mm89spnj4qr71pwid0a4kiq6gn"; depends=[]; }; + etec16s = derive2 { name="etec16s"; version="1.2.0"; sha256="11c1swf7n9g1vnvidmcjpvzj3hgv4dgx6civv3plvamzfcz3jk29"; depends=[Biobase metagenomeSeq]; }; + faahKO = derive2 { name="faahKO"; version="1.14.0"; sha256="1yxrmnbpi706q23n6jc3hngl378w41dkhzcy4gqlbcgwdhbi9yq5"; depends=[xcms]; }; + fabiaData = derive2 { name="fabiaData"; version="1.12.0"; sha256="1ws09sp07i26ky6pwambw3bvnd2qx2rsvm055hp1j3vrc7qvawwb"; depends=[Biobase]; }; + facopy_annot = derive2 { name="facopy.annot"; version="0.108.0"; sha256="1wxprfj0420qfbls1jd58raa7ff98fhnna804slagrs8r2ka7kqb"; depends=[]; }; + facsDorit = derive2 { name="facsDorit"; version="1.16.0"; sha256="1dla6vv0had55afsv2h8hizkqbng7schadb5w5nbk3va7hzbnjzb"; depends=[prada]; }; + ffpeExampleData = derive2 { name="ffpeExampleData"; version="1.12.0"; sha256="16n6kfcq33byrn0xx43bn52c0rbzw3ars9wxg9yd9rfnf23scmbb"; depends=[lumi]; }; + fibroEset = derive2 { name="fibroEset"; version="1.16.0"; sha256="1sr672f6x52rhic69i8cii04cd204ra0lhpxh0dqm78yxkp5mqxc"; depends=[Biobase]; }; + fission = derive2 { name="fission"; version="0.108.0"; sha256="0fdsaymwv057sb0bddkaqz320wm6bk1hikwy9js4pc5mbi2r9q1w"; depends=[SummarizedExperiment]; }; + flowFitExampleData = derive2 { name="flowFitExampleData"; version="1.10.0"; sha256="1z2q9h4arv8a89a5g5j5pzp1k02kmz1h6g0zrvgvz04ys411phv3"; depends=[flowCore]; }; + flowPloidyData = derive2 { name="flowPloidyData"; version="1.0.0"; sha256="16sgzy2xpjnlm22ca3fvdcfzlfyylsxpjzbv8xaz3lmb7gf8fqix"; depends=[]; }; + flowQBData = derive2 { name="flowQBData"; version="1.0.0"; sha256="1lyj5xkc70l3szxspa6gasnx5g4sv6azwzs0b1cvs5y5kngxpns3"; depends=[]; }; + flowWorkspaceData = derive2 { name="flowWorkspaceData"; version="2.10.0"; sha256="1pfy1f0flkf22a7ijb2xay6za80y9ny5ja2dy6p4z9w8cqyk8vqp"; depends=[]; }; + frmaExampleData = derive2 { name="frmaExampleData"; version="1.10.0"; sha256="1iznkg12c50lzj0xj1fz92ybqap09fysx0f71g84qpmdh7df5aap"; depends=[]; }; + furrowSeg = derive2 { name="furrowSeg"; version="1.2.0"; sha256="0h596g0j6by70ijpli9m2wnxnj7g6gz92vv2dl68s7jnya4n88s9"; depends=[abind dplyr EBImage locfit tiff]; }; + gageData = derive2 { name="gageData"; version="2.12.0"; sha256="1fn4by56fqa9dfyb5a7pjv5f6nsp8gybgp572dyl3jq7bp9imr3j"; depends=[]; }; + gaschYHS = derive2 { name="gaschYHS"; version="1.12.0"; sha256="1cwnik2znx13i4p8g3wxyk19r9pd3flxha04b0y4404pvwxa7gac"; depends=[Biobase]; }; + gatingMLData = derive2 { name="gatingMLData"; version="2.14.0"; sha256="0yshv46pj4fjyz49azbrzdqjzppkx4548fsb2k77dvypim6hiiwm"; depends=[]; }; + gcspikelite = derive2 { name="gcspikelite"; version="1.12.0"; sha256="0a5gmf667wr1vx2qalz4fvk0c49m6590mvv96ijnrdd9p6k1g450"; depends=[]; }; + geneLenDataBase = derive2 { name="geneLenDataBase"; version="1.10.0"; sha256="1a4qqpcid9g1zx5zrpcshlwm8xk1bbppanyfpx077sa0ifpjcxny"; depends=[GenomicFeatures rtracklayer]; }; + genomationData = derive2 { name="genomationData"; version="1.6.0"; sha256="16dqwb7wx1igx77zdbcskx5m1hs4g4gp2hl56zzm70hcagnlkz8y"; depends=[]; }; + geuvPack = derive2 { name="geuvPack"; version="1.6.0"; sha256="17yr9zm3kk7744sdiyyls4g1n6fhwfq1gafj1713viygk46ff0ps"; depends=[SummarizedExperiment]; }; + geuvStore2 = derive2 { name="geuvStore2"; version="1.4.0"; sha256="1vrb5a62p6wm9vsf7q9hwjr0n5yv5cqr3z50jd6ymwxb9jy3f4vg"; depends=[BatchJobs GenomicRanges gQTLBase]; }; + golubEsets = derive2 { name="golubEsets"; version="1.16.0"; sha256="13lhfhagnc17yva53ax0847mzrlp65bsn8b9haq678kjmd0ry25k"; depends=[Biobase]; }; + grndata = derive2 { name="grndata"; version="1.6.0"; sha256="0hqli6f9x7amhlwgszhhvrhbazb3ga0r31107n5v5nxfwqmbmgwg"; depends=[]; }; + gskb = derive2 { name="gskb"; version="1.6.1"; sha256="1az4dw0hwh2ba1v9k5zajgcicxihmr668cvw5qqka14mvh1im30h"; depends=[]; }; + h5vcData = derive2 { name="h5vcData"; version="1.108.0"; sha256="13rh4bk47q2nkfgj6sbwbifcidmf34i7s4dhymr8gabplxfcy9mj"; depends=[]; }; + hapmap100khind = derive2 { name="hapmap100khind"; version="1.16.0"; sha256="1aaiszx3dhphx62g246w9qngadqj9azkyk7k49igsng329mz8836"; depends=[]; }; + hapmap100kxba = derive2 { name="hapmap100kxba"; version="1.16.0"; sha256="1awqvkxcnb3zmi5cds6krs4hc4q90q7kn592ir9a3ypsqsbva4dz"; depends=[]; }; + hapmap500knsp = derive2 { name="hapmap500knsp"; version="1.16.0"; sha256="0cgwy7fqmhg947vfhl4cymj5ssb7avdj330cj7cjil2zilcg3a52"; depends=[]; }; + hapmap500ksty = derive2 { name="hapmap500ksty"; version="1.16.0"; sha256="11y06piiwgh1v6c489fkjxf8yw9zfc0llrhhnx2syhscfdgw94md"; depends=[]; }; + hapmapsnp5 = derive2 { name="hapmapsnp5"; version="1.16.0"; sha256="1a0x1prw77d1lddlbdnvqank98xx8gd7a1a8n6c6fwkjynxn32ha"; depends=[]; }; + hapmapsnp6 = derive2 { name="hapmapsnp6"; version="1.16.0"; sha256="0rppn6x3f2fpr369mv04pg6pvbmp0j4lnyj84l0vvmqrjyij3vqz"; depends=[]; }; + harbChIP = derive2 { name="harbChIP"; version="1.12.0"; sha256="01spjp27icgfjwf3cjvz8w5kg6gpqmlkfxdm3j2irn9qvpphw186"; depends=[Biobase Biostrings IRanges]; }; + healthyFlowData = derive2 { name="healthyFlowData"; version="1.12.0"; sha256="1dfcc1v22wbzbbsrkjvy8mhv6brxisz5yv1g7zrpswnmchbqxkvd"; depends=[flowCore]; }; + hgu133abarcodevecs = derive2 { name="hgu133abarcodevecs"; version="1.12.0"; sha256="1ig7myihlmcd39g6qqmbb8fm59vpizfxps4x8pbj676p1578iaw9"; depends=[]; }; + hgu133plus2barcodevecs = derive2 { name="hgu133plus2barcodevecs"; version="1.12.0"; sha256="0bnl9z34xn4frqlc9pvnvp4ng1ky0vn5zvjwjv6hc6dki14cgfxp"; depends=[]; }; + hgu2beta7 = derive2 { name="hgu2beta7"; version="1.14.0"; sha256="115zgss29249az653hw2cd02skmr9fbivsh6zj837m4scnbjwpqz"; depends=[]; }; + hmyriB36 = derive2 { name="hmyriB36"; version="1.10.0"; sha256="1whpk1479qhlxmd44bhpsm1xlz2z4pxn918kpwis9mn1inwbmwp0"; depends=[Biobase GGBase]; }; + humanStemCell = derive2 { name="humanStemCell"; version="0.14.0"; sha256="16ad8syrainj8zpp9mhqfxq8xsn9jfdiyf29zjhdb4pnci3rqf7i"; depends=[Biobase hgu133plus2_db]; }; + iontreeData = derive2 { name="iontreeData"; version="1.10.0"; sha256="187d9mdamp3kb1nvp0ckhza6ws4ga9c4fw35isnc1jsssag1pf7j"; depends=[]; }; + kidpack = derive2 { name="kidpack"; version="1.16.0"; sha256="10cab09hdyrndnjgazbvlm3c89qmmj458nbvdd8liiipq1r6f3qv"; depends=[Biobase]; }; + leeBamViews = derive2 { name="leeBamViews"; version="1.10.0"; sha256="0s9brwvhmmylbs7fjkg4g72kd6kdycy0qmk5hgldz3n266pna293"; depends=[Biobase BSgenome GenomicAlignments GenomicRanges Rsamtools]; }; + leukemiasEset = derive2 { name="leukemiasEset"; version="1.10.0"; sha256="1n3np631cbdvd809af4s9ngrz2lrvclb313dwz6zhjsp0y0gs6n9"; depends=[Biobase]; }; + lumiBarnes = derive2 { name="lumiBarnes"; version="1.14.0"; sha256="1bagqlq1j6z578zal05xxvvqnfi33rrlgbdq7sj484wyr6jbgxim"; depends=[Biobase lumi]; }; + lungExpression = derive2 { name="lungExpression"; version="0.12.0"; sha256="1lqc2rcsyqzn9799ak61dgrb917f9cfgn7x7ck0d4629sdczm7x7"; depends=[Biobase]; }; + lydata = derive2 { name="lydata"; version="1.0.0"; sha256="1c1g17q3ffc4k82ppb1vzi3567wza2q8p06ahd9xnni5hmb5v8jv"; depends=[]; }; + mAPKLData = derive2 { name="mAPKLData"; version="1.6.0"; sha256="02vx2v0sdzgwzpcgcnszs8q4jdimsis6lyfq6f4pm4b7fccy1as3"; depends=[]; }; + mammaPrintData = derive2 { name="mammaPrintData"; version="1.10.0"; sha256="1pn0i0bhjs2kyrafafhh8kfgvs0x6nnny8p6zpnivyn4y8hjh5lf"; depends=[]; }; + maqcExpression4plex = derive2 { name="maqcExpression4plex"; version="1.18.0"; sha256="1ijr4856mdfapcpbmndxhllsvmhih1cra8zm6k9wz1id29b12s2g"; depends=[]; }; + metaMSdata = derive2 { name="metaMSdata"; version="1.10.0"; sha256="1f2f7798j1pc74414mvx48w6bbxbsk2rm7l1298sfl1av914yl7a"; depends=[]; }; + miRNATarget = derive2 { name="miRNATarget"; version="1.12.0"; sha256="0k5vgccwfnybbwngbzyz1j98h9jwidv3ypfymz01yjr6cahn5fgv"; depends=[Biobase]; }; + miRcompData = derive2 { name="miRcompData"; version="1.4.0"; sha256="1gabbbvnmw38snv2zn3i3763n4r38zr9rv854snmy9fhykry0rlq"; depends=[]; }; + minfiData = derive2 { name="minfiData"; version="0.20.0"; sha256="1gg2dg3s92vqnigdg56j91zifv2kl9asiqrrbjmac0pyd0vi555c"; depends=[IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest minfi]; }; + minfiDataEPIC = derive2 { name="minfiDataEPIC"; version="1.0.0"; sha256="1dmjdfnwia8ka2lya1fin4kj6anjn9szhphnypzhaxxzmli11x2a"; depends=[IlluminaHumanMethylationEPICanno_ilm10b2_hg19 IlluminaHumanMethylationEPICmanifest minfi]; }; + minionSummaryData = derive2 { name="minionSummaryData"; version="1.4.0"; sha256="19xlsnfcr9fh7f3nmd0aj6sd03c0bd6ibfbx4rkxsmgfsdfvidzh"; depends=[]; }; + mitoODEdata = derive2 { name="mitoODEdata"; version="1.10.0"; sha256="1br92nqvfhc67dsz2b10mzp19rk8bbfb9zaawk6n4pyfn4pdcn4w"; depends=[]; }; + mosaicsExample = derive2 { name="mosaicsExample"; version="1.12.0"; sha256="0fgb8ifaygs31ck0xybwr5p85zvkw236lilzcsn9hnsdp2zckkff"; depends=[]; }; + mouse4302barcodevecs = derive2 { name="mouse4302barcodevecs"; version="1.12.0"; sha256="0g2g5kpgpv436k09n43jilzb539faqvp9k41h3xfgw8kqsln10fp"; depends=[]; }; + msPurityData = derive2 { name="msPurityData"; version="1.0.0"; sha256="08kz9ihbjxfi64sds5s04ay9g8y1y6fjyaxvd2mvqvzwd3hykzqh"; depends=[]; }; + msd16s = derive2 { name="msd16s"; version="0.108.0"; sha256="0gcs6r3z40lc8rsnlnkf01qbnws7bcvi19gx6r2jrlbma14sb22f"; depends=[Biobase metagenomeSeq]; }; + msdata = derive2 { name="msdata"; version="0.14.0"; sha256="0330ahsx2a5rbqp8kswrq5r85kj5mvv9j5w0bx648isya6j5fzsq"; depends=[]; }; + msqc1 = derive2 { name="msqc1"; version="1.2.0"; sha256="03f3jlpl2q9kkb1q2bzxda5yddgpwhhnbb5y209j101yf2z1qv4b"; depends=[lattice]; }; + mtbls2 = derive2 { name="mtbls2"; version="1.4.0"; sha256="02dzwsjagrwgnrsp16h72x3sgl5gms8xnv0vjbfm9m6ynjcfr2y2"; depends=[]; }; + mvoutData = derive2 { name="mvoutData"; version="1.10.0"; sha256="1hmsk9zlxrqf5znf0rlj1rmsdzdwvr8xnxz6q85ggrr1l9n76g3c"; depends=[affy Biobase lumi]; }; + pRolocdata = derive2 { name="pRolocdata"; version="1.12.0"; sha256="09wisspjxaim23w0lhbk5sczghfjsn00f7qc6zp8d7rvp511c56k"; depends=[Biobase MSnbase]; }; + parathyroidSE = derive2 { name="parathyroidSE"; version="1.12.0"; sha256="1ibf9wia8vn0vmg46rln7lkpd1mm5ahc3cb2kxkzinmsvmqbi2nn"; depends=[SummarizedExperiment]; }; + pasilla = derive2 { name="pasilla"; version="1.2.0"; sha256="0qhmrx4gxprjyd79y3jrx3s8ya6f64jq69lf8ykwgr21h7nsacbl"; depends=[]; }; + pasillaBamSubset = derive2 { name="pasillaBamSubset"; version="0.12.0"; sha256="0ib1n90k231qckd4kv2wjkw7xxc88gc8h651r06rqalgmldfxg8r"; depends=[]; }; + pcaGoPromoter_Hs_hg19 = derive2 { name="pcaGoPromoter.Hs.hg19"; version="1.10.0"; sha256="1n6dbsq6nbalv4iil2qycwzx84710sz16m2qqq44cgjw2pqmp8ki"; depends=[]; }; + pcaGoPromoter_Mm_mm9 = derive2 { name="pcaGoPromoter.Mm.mm9"; version="1.10.0"; sha256="0gr4xc1kah9n9j8q2yq3an780p8l8qgrba06vc8yw28q9s14lcic"; depends=[]; }; + pcaGoPromoter_Rn_rn4 = derive2 { name="pcaGoPromoter.Rn.rn4"; version="1.10.0"; sha256="0xr0qw6z7dm7brp118bdjh53j83pgxgsbfyl2b1s4qdcqp0b0j5i"; depends=[]; }; + pd_atdschip_tiling = derive2 { name="pd.atdschip.tiling"; version="0.12.0"; sha256="0lv60jkg8zqhbz1hnc206zmxpvz961plgj3s2zxl925pzqgw3jdf"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; }; + pepDat = derive2 { name="pepDat"; version="0.108.0"; sha256="01biimjr6j6z1plgsbq9qxk4bzg6mc5v0f5lzwwid8r0n6aq9nfk"; depends=[GenomicRanges]; }; + plasFIA = derive2 { name="plasFIA"; version="1.0.0"; sha256="1qqs5n1zbp94p9g87rah3ikdl7gir0m76nyd7ccd232dxkzyl25r"; depends=[proFIA]; }; + ppiData = derive2 { name="ppiData"; version="0.12.0"; sha256="05cg5hiv314a88wfwnd9milfcin0xmsvvn1zzxqhrj8k7j0smxq9"; depends=[AnnotationDbi graph]; }; + prebsdata = derive2 { name="prebsdata"; version="1.10.0"; sha256="01z22jg4l2l55nrb547xih5ra3rcla4k66j1f210rrsl4r5j89wn"; depends=[]; }; + prostateCancerCamcap = derive2 { name="prostateCancerCamcap"; version="1.2.0"; sha256="0xg4xwj0m892lsix27bmi23dssl6fx3y93g14mwnlpq430135j96"; depends=[Biobase]; }; + prostateCancerGrasso = derive2 { name="prostateCancerGrasso"; version="1.2.0"; sha256="189iyjfaylck58w0pg3xnrpg6yld304dgprpsvfjhmrc306v1q79"; depends=[Biobase]; }; + prostateCancerStockholm = derive2 { name="prostateCancerStockholm"; version="1.2.0"; sha256="0h9909wl798nalf1x8qc4p0yx6851r4pda24y7vyxvy2jrrah3kq"; depends=[Biobase]; }; + prostateCancerTaylor = derive2 { name="prostateCancerTaylor"; version="1.2.0"; sha256="1ncri2z1sz4kb0a080y4xhf7ah3szp890h6b3xvmc5c6i8h2pysz"; depends=[Biobase]; }; + prostateCancerVarambally = derive2 { name="prostateCancerVarambally"; version="1.2.0"; sha256="1kffm7b9rhb6jqsz354almakc2dc5zxczhzg9l2wj59knw6527js"; depends=[Biobase]; }; + pumadata = derive2 { name="pumadata"; version="2.10.0"; sha256="03xx41j8w6lip7rsj0fpnq4jrlmhki63wqnmfh9816gc8g7a5yrh"; depends=[affy Biobase oligo puma]; }; + rRDPData = derive2 { name="rRDPData"; version="0.108.0"; sha256="05a42rayxnyzajzabvgzrbj56x7sax96g090r529fd4055582s52"; depends=[rRDP]; }; + rcellminerData = derive2 { name="rcellminerData"; version="1.6.0"; sha256="1c95166shc6yflpgl0wfq26mmr5qypiwhidf0vfkgpp0zk30hfd2"; depends=[Biobase]; }; + rheumaticConditionWOLLBOLD = derive2 { name="rheumaticConditionWOLLBOLD"; version="1.12.0"; sha256="1gc5vpxjgnjpar757x7i5sk7kqy5jhvd11kad1liwfnz694zgkn8"; depends=[]; }; + scRNAseq = derive2 { name="scRNAseq"; version="1.0.0"; sha256="0zh3bashqamivddjahaisl92d8ipzahki10wq8sz6myrb57iavlx"; depends=[SummarizedExperiment]; }; + seq2pathway_data = derive2 { name="seq2pathway.data"; version="1.6.0"; sha256="057rs9s9lf6z3z3k1671r0fzk24jl8pmn1zn0a8x2n66d3bpqv4d"; depends=[]; }; + seqCNA_annot = derive2 { name="seqCNA.annot"; version="1.10.0"; sha256="1g350lys9gdrfkwsmb460y9pbjkzcgxwn22xfsl430mblh09ryhm"; depends=[]; }; + seqc = derive2 { name="seqc"; version="1.8.0"; sha256="0fik3w4qs9a01x54im5ckjwywvr1w0jvcmb0x2ym0xba4q4ypvlv"; depends=[]; }; + serumStimulation = derive2 { name="serumStimulation"; version="1.10.0"; sha256="1nl0qi64kihvvp7kkc7y7zl3m938n7mrkw4vrmdshc00j3ydl1k0"; depends=[]; }; + seventyGeneData = derive2 { name="seventyGeneData"; version="1.10.0"; sha256="1c7zkhv1ijxxy3qiq6rwniay10kqybfqzqysfb94wasp688dixwp"; depends=[]; }; + shinyMethylData = derive2 { name="shinyMethylData"; version="0.108.0"; sha256="13b3c66ijax8d3cw26wjmx2cjnh06z8dx2ahq0xwic3rj2r8ax61"; depends=[]; }; + simpIntLists = derive2 { name="simpIntLists"; version="1.10.0"; sha256="1k8rck49bpp7h2why7fl6bvhv67krzhc4c0ppily3ah2s9vyxm0a"; depends=[]; }; + stemHypoxia = derive2 { name="stemHypoxia"; version="1.10.0"; sha256="1vb3c0k3zrkng95ym4h17y48bcq6xb4izj326w4blajcfyil7kdc"; depends=[]; }; + stjudem = derive2 { name="stjudem"; version="1.14.0"; sha256="09gi8z5ay7hyikqr26npyhim4dzi2hkidnis46ckzfqx9dlar94h"; depends=[]; }; + synapterdata = derive2 { name="synapterdata"; version="1.12.0"; sha256="1ynqzxn8a76788chcfq1vw7mrsm7c39qdjzjr42x4lvabr32gd9p"; depends=[synapter]; }; + systemPipeRdata = derive2 { name="systemPipeRdata"; version="1.4.0"; sha256="1wbf4488b6zmh72m3zpq5la8qybn6gfr89k7r4572i0awgyxccws"; depends=[BiocGenerics]; }; + tinesath1cdf = derive2 { name="tinesath1cdf"; version="1.12.0"; sha256="1gbab6zlzc7f2ywsv198yyf9fr2yq2a7y942mjclfg7ji0zf81kw"; depends=[]; }; + tinesath1probe = derive2 { name="tinesath1probe"; version="1.12.0"; sha256="06r5vxqqglrgpqyf3837kxl6rb5qcxk61b1g1vyi15kb7rzz0qyp"; depends=[AnnotationDbi]; }; + tofsimsData = derive2 { name="tofsimsData"; version="1.2.0"; sha256="1786gqxz4vhvjc0cxc2gi5hz9wnvspb3kmmap1nssjnd44cq8ypa"; depends=[]; }; + tweeDEseqCountData = derive2 { name="tweeDEseqCountData"; version="1.12.0"; sha256="0a6g2lnj5m958yagnkn3fl4x0fw6m4gp9xq0jsv6z7ixs2p73xin"; depends=[Biobase]; }; + tximportData = derive2 { name="tximportData"; version="1.2.0"; sha256="0618jzzacpl7cipcby5v3rd2rb3x9vqiaf9i1arn83h4znwlnykh"; depends=[]; }; + waveTilingData = derive2 { name="waveTilingData"; version="1.10.0"; sha256="1ndqbqisfr2vnfqlmjxvwvkcbs042rqvsqhlpa4pg9l18nfv3zqh"; depends=[]; }; + yeastCC = derive2 { name="yeastCC"; version="1.14.0"; sha256="1sjy4c6jvhpjpr47l0mpa7mms65jj7c1fhv2dxiqxap5pcxl9s40"; depends=[Biobase]; }; + yeastExpData = derive2 { name="yeastExpData"; version="0.20.0"; sha256="17bassc4xn9amlsa33rscgbkk50xwrz3i3vlh9ym1184wq14jmp8"; depends=[graph]; }; + yeastGSData = derive2 { name="yeastGSData"; version="0.12.0"; sha256="0s3458lvcn7xpnwkygl426zqm7h35cl59r0rlp0znnrjvr3f16k3"; depends=[]; }; + yeastNagalakshmi = derive2 { name="yeastNagalakshmi"; version="1.10.0"; sha256="1085snsd7wsi9sjsqm551i2bnv8pf234vvz6xpw9fz0inr6m5wqq"; depends=[]; }; + yri1kgv = derive2 { name="yri1kgv"; version="0.16.0"; sha256="0xqlqi665ww3w00g5wv089ydjs74iy07xqzbn19bpdqnkypm83rx"; depends=[Biobase GGBase]; }; + zebrafishRNASeq = derive2 { name="zebrafishRNASeq"; version="0.108.0"; sha256="04pbkfqb6l8qgxl1263jhhd7gm8hz908c47q5s1f1nvc3403dlbp"; depends=[]; }; } diff --git a/pkgs/development/r-modules/bioc-packages.nix b/pkgs/development/r-modules/bioc-packages.nix index a5bfe4ccea0..5f72f46f2a0 100644 --- a/pkgs/development/r-modules/bioc-packages.nix +++ b/pkgs/development/r-modules/bioc-packages.nix @@ -134,7 +134,6 @@ in with self; { CellMapper = derive2 { name="CellMapper"; version="1.0.0"; sha256="1ixii9ppg7jhwvazzzjy3dq01x35yc3k81j698988dfrdls0plcv"; depends=[S4Vectors]; }; CellNOptR = derive2 { name="CellNOptR"; version="1.20.0"; sha256="1awz7k09rx03f8dq5g9mmnlizpx6232vvc03ycah3r1wwzgfzlhd"; depends=[ggplot2 graph hash RBGL RCurl Rgraphviz XML]; }; CexoR = derive2 { name="CexoR"; version="1.12.0"; sha256="110c7p0y3l7b491bvr78n5z8f4gmfgfjndbd8pnhn0k7abb9bvs9"; depends=[genomation GenomeInfoDb GenomicRanges idr IRanges RColorBrewer Rsamtools rtracklayer S4Vectors]; }; - ChAMP = derive2 { name="ChAMP"; version="2.6.4"; sha256="1f8ngnzp6yq4x746vid72ind2bi7l1wdfnipyj2wn0gsh2jpxa7c"; depends=[bumphunter ChAMPdata dendextend DMRcate DNAcopy doParallel FEM GenomicRanges goseq Illumina450ProbeVariants_db IlluminaHumanMethylation450kmanifest IlluminaHumanMethylationEPICmanifest impute isva limma marray matrixStats minfi plotly plyr preprocessCore quadprog qvalue RColorBrewer RefFreeEWAS RPMM shiny shinythemes sva wateRmelon]; }; ChIPComp = derive2 { name="ChIPComp"; version="1.4.0"; sha256="0wr9qrw9mnjl28fw764vhjb2shif6fl3z0hbwkhrfiz1974rdw0v"; depends=[BiocGenerics BSgenome_Hsapiens_UCSC_hg19 BSgenome_Mmusculus_UCSC_mm9 GenomeInfoDb GenomicRanges IRanges limma Rsamtools rtracklayer S4Vectors]; }; ChIPQC = derive2 { name="ChIPQC"; version="1.10.3"; sha256="1nabghyndp4bky6msb4k6gcxpgysz7rir545d5afrfi4gbk1rpfi"; depends=[Biobase BiocGenerics BiocParallel chipseq DiffBind GenomicAlignments GenomicFeatures GenomicRanges ggplot2 gtools IRanges Nozzle_R1 reshape2 Rsamtools S4Vectors TxDb_Celegans_UCSC_ce6_ensGene TxDb_Dmelanogaster_UCSC_dm3_ensGene TxDb_Hsapiens_UCSC_hg18_knownGene TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Hsapiens_UCSC_hg38_knownGene TxDb_Mmusculus_UCSC_mm10_knownGene TxDb_Mmusculus_UCSC_mm9_knownGene TxDb_Rnorvegicus_UCSC_rn4_ensGene]; }; ChIPXpress = derive2 { name="ChIPXpress"; version="1.16.0"; sha256="19lx482jhh4h97nic57lk198a0x1xc51cnx79l9h6r9r86ncxl0w"; depends=[affy biganalytics bigmemory Biobase ChIPXpressData frma GEOquery]; }; @@ -350,6 +349,7 @@ in with self; { KCsmart = derive2 { name="KCsmart"; version="2.32.0"; sha256="1ppvnd6rs4bwxjr6qhhz5wd4fx9r3xg2mr0zjs8y7srm3k6k2djl"; depends=[BiocGenerics KernSmooth multtest siggenes]; }; KEGGREST = derive2 { name="KEGGREST"; version="1.14.1"; sha256="0dcdmbkqxy0d4gg8lqlaflmjljzl9h1p2mlxnmvwgx34vnpx386y"; depends=[Biostrings httr png]; }; KEGGgraph = derive2 { name="KEGGgraph"; version="1.32.0"; sha256="1r5ib197swfr38ia0g23d78kx0dkgjssjmi5fc18z3nfparhkxdq"; depends=[graph XML]; }; + KEGGlincs = derive2 { name="KEGGlincs"; version="1.0.0"; sha256="0jrfzx0s3xkk19pzm7iffk2cx6njihrclrn3iw2d3zvd015k47l3"; depends=[AnnotationDbi gtools hgu133a_db httr igraph KEGGgraph KEGGREST KOdata org_Hs_eg_db plyr RJSONIO]; }; KEGGprofile = derive2 { name="KEGGprofile"; version="1.16.0"; sha256="1ir3vma3n9bh8bkym0h5p2s6wbi7cjsvlz99mc34nkzqn0jxm0yl"; depends=[AnnotationDbi biomaRt KEGG_db KEGGREST png TeachingDemos XML]; }; LBE = derive2 { name="LBE"; version="1.42.0"; sha256="103m1j86mlqrrjzy9w5zms0hksqjbn20jqnrf83fga4z958w32fa"; depends=[]; }; LEA = derive2 { name="LEA"; version="1.6.0"; sha256="1ckygk393awmd963g7jykmfzcpysgi4d29psc5iqdz0h2cxrczjd"; depends=[]; }; @@ -736,6 +736,7 @@ in with self; { cancerclass = derive2 { name="cancerclass"; version="1.18.0"; sha256="1zff6wz0529gc22c9bfnwa95xxadyhfbxjvr1b51w4zgms2bicfr"; depends=[binom Biobase]; }; casper = derive2 { name="casper"; version="2.8.0"; sha256="0ckqx8i7pgmjhznpw8pggc2f1147sd7vqhw2a4f0na9mv27l74iq"; depends=[Biobase BiocGenerics coda EBarrays gaga GenomeInfoDb GenomicFeatures GenomicRanges gtools IRanges limma mgcv Rsamtools rtracklayer S4Vectors sqldf survival VGAM]; }; categoryCompare = derive2 { name="categoryCompare"; version="1.18.0"; sha256="0ppis6agdpccjg8bwr91axy770v67al93pg50zmk1rvbfl25b9gz"; depends=[annotate AnnotationDbi Biobase BiocGenerics Category colorspace GOstats graph GSEABase hwriter RCytoscape]; }; + ccmap = derive2 { name="ccmap"; version="1.0.0"; sha256="1djajivpfz8cgdq5nnhyr48gvdq8igjqfkxbibw975y7ybsrc44z"; depends=[AnnotationDbi BiocInstaller ccdata data_table doParallel foreach xgboost]; }; ccrepe = derive2 { name="ccrepe"; version="1.10.0"; sha256="14y97n28jqj78xscprgbnlwq4abf1vks3ipmp0w9y1yjj0jk0xl2"; depends=[infotheo]; }; cellGrowth = derive2 { name="cellGrowth"; version="1.18.0"; sha256="1yxlcli3h35aw9nzffnpv4nby255bmlkrwcdh6rr7i04393qjpzc"; depends=[lattice locfit]; }; cellHTS2 = derive2 { name="cellHTS2"; version="2.38.0"; sha256="117g37rvi92i21mg2ifxy9dxilvgf52nz3f51jdlcgf1w5zvm3n1"; depends=[Biobase Category genefilter GSEABase hwriter locfit prada RColorBrewer splots vsn]; }; @@ -750,6 +751,7 @@ in with self; { chroGPS = derive2 { name="chroGPS"; version="1.22.0"; sha256="0kq1dgik5dkhqb1as9zpwzpyhbw16c766vyn5all4frh0mpdiy0z"; depends=[Biobase changepoint cluster DPpackage GenomicRanges ICSNP MASS]; }; chromDraw = derive2 { name="chromDraw"; version="2.4.0"; sha256="0rzrcjzwqjb40l8yc25gscl6hnxwprrv738p46kmdh3a08ghxv5v"; depends=[GenomicRanges Rcpp]; }; chromPlot = derive2 { name="chromPlot"; version="1.2.0"; sha256="06wg345hkkpaq0m620sqgnwvk11qfkhn5yr8nyv9cbdbihqvg0if"; depends=[biomaRt GenomicRanges]; }; + chromstaR = derive2 { name="chromstaR"; version="1.0.0"; sha256="1qyb07dsag64gspjk29nd3ppylzicsq7rnjafdfhs9pjqwv0vshf"; depends=[bamsignals chromstaRData doParallel foreach GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges reshape2 Rsamtools S4Vectors]; }; cisPath = derive2 { name="cisPath"; version="1.14.0"; sha256="108d1m3d07zblij9wsz2l6bw226bvwwl8w0gq3wdxjmgyjj48jzi"; depends=[]; }; cleanUpdTSeq = derive2 { name="cleanUpdTSeq"; version="1.12.0"; sha256="09bbqapri4vw9mdlch0hw6v49mxqbknrrj5q9ssyzhjhikz954sq"; depends=[BiocGenerics BSgenome BSgenome_Drerio_UCSC_danRer7 e1071 GenomicRanges seqinr]; }; cleaver = derive2 { name="cleaver"; version="1.12.0"; sha256="0dnl7ihxhl640k91div133rz9kxa43wkvfyxkyqv31winymk0fy4"; depends=[Biostrings IRanges S4Vectors]; }; diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix index 756aced3176..4b592385fb0 100644 --- a/pkgs/development/r-modules/cran-packages.nix +++ b/pkgs/development/r-modules/cran-packages.nix @@ -4,7 +4,7 @@ # Rscript generate-r-packages.R cran >new && mv new cran-packages.nix { self, derive }: -let derive2 = derive { snapshot = "2017-04-20"; }; +let derive2 = derive { snapshot = "2017-06-30"; }; in with self; { A3 = derive2 { name="A3"; version="1.0.0"; sha256="017hq9pjsv1h9i7cqk5cfx27as54shlhdsdvr6jkhb8jfkpdb6cw"; depends=[pbapply xtable]; }; ABC_RAP = derive2 { name="ABC.RAP"; version="0.9.0"; sha256="1kdspln17v0krvahcd55vib4dv5azp60b3r1zf489x10qqbp1mxk"; depends=[]; }; @@ -16,7 +16,7 @@ in with self; { ACCLMA = derive2 { name="ACCLMA"; version="1.0"; sha256="1na27sp18fq12gp6vxgqw1ffsz2yi1d8xvrxbrzx5g1kqxrayy0v"; depends=[]; }; ACD = derive2 { name="ACD"; version="1.5.3"; sha256="1a67bi3hklq8nlc50r0qnyr4k7m9kpvijy8sqqpm54by5hsysfd6"; depends=[]; }; ACDm = derive2 { name="ACDm"; version="1.0.4"; sha256="0b4f02ga5ra66mbrm79g0bnlzmii82rks9kmxixxqgf18yhlyjil"; depends=[dplyr ggplot2 plyr Rsolnp zoo]; }; - ACEt = derive2 { name="ACEt"; version="1.7.1"; sha256="1h0lfzz3ydkr8idbsqhddcwsc0q7rschgypf4vb4v62f636fxw9b"; depends=[BH MASS Rcpp RcppArmadillo]; }; + ACEt = derive2 { name="ACEt"; version="1.8.0"; sha256="0626d6kg485xjya164wagrr5z223jvi93ywbwpdns7fkm03c0dlq"; depends=[BH MASS Rcpp RcppArmadillo]; }; ACMEeqtl = derive2 { name="ACMEeqtl"; version="1.4"; sha256="02hc33g35x59jn9skcspgam1qskjvwy5djrg2djl9qmwq4aj0j9k"; depends=[filematrix]; }; ACNE = derive2 { name="ACNE"; version="0.8.1"; sha256="0kzapsalzw6jsi990qicp4glijh5ddnfimsg5pidgbwxg4i05grl"; depends=[aroma_affymetrix aroma_core MASS matrixStats R_filesets R_methodsS3 R_oo R_utils]; }; ACSNMineR = derive2 { name="ACSNMineR"; version="0.16.8.25"; sha256="0gh604s8qall6zfjlwcg2ilxjvz08dplf9k5g47idhv43scm748l"; depends=[ggplot2 gridExtra scales]; }; @@ -35,10 +35,11 @@ in with self; { AFM = derive2 { name="AFM"; version="1.2.2"; sha256="132zbxim3cbyxhv27l9i3jyhf5c47ckzsg4qndpwbyjhd0p9x7qh"; depends=[data_table dbscan fftwtools fractaldim ggplot2 gridExtra gstat igraph moments plyr png pracma rgl scales shiny shinyjs sp stringr]; }; AGD = derive2 { name="AGD"; version="0.35"; sha256="1dk8m3zqvapwhz0677d3b2cbrin14p9adn5annzgjrxgw7ms4mg0"; depends=[gamlss gamlss_dist]; }; AGSDest = derive2 { name="AGSDest"; version="2.3.1"; sha256="10jakc2qs5gnbp0g4k05isy0ii73ric50gmwkbb1khf9x0b5v6dg"; depends=[ldbounds]; }; + AHMbook = derive2 { name="AHMbook"; version="0.1.4"; sha256="1cxyk420pzhh1scagxjmpm328xrcc1mpdrrch92yfgbgx09zkr4c"; depends=[coda plotrix RandomFields raster sp unmarked]; }; AHR = derive2 { name="AHR"; version="1.4.2"; sha256="15khncbbnpbvj6rcn6rklzhv5a0mmfyjljv77bsx96zfis7mk2d7"; depends=[etm MASS Rcpp RcppArmadillo survival]; }; - AICcmodavg = derive2 { name="AICcmodavg"; version="2.1-0"; sha256="0zksb2qxb1q054kwg4acp94hxqiasd0yw1bkllp2r38640bvlj3b"; depends=[lattice MASS Matrix nlme survival unmarked VGAM xtable]; }; - AID = derive2 { name="AID"; version="1.7"; sha256="0c0057rp10aav41z7ilppbv8gsqf8ik2srygr5wx95b7hl1a4cvb"; depends=[MASS nortest tseries]; }; - AIG = derive2 { name="AIG"; version="0.1.3"; sha256="1wm22kf0vpvki0p4gixx4aavij2r2ns4pjv5kidfj12z1r4yc7y5"; depends=[dplyr magrittr mgcv rgl]; }; + AICcmodavg = derive2 { name="AICcmodavg"; version="2.1-1"; sha256="0y2lgvy0a78wdx4xcq85fkhl4hyvjdljrj199mibisfgkh61amb1"; depends=[lattice MASS Matrix nlme survival unmarked VGAM xtable]; }; + AID = derive2 { name="AID"; version="2.0"; sha256="01lr72r0b72kp8b979px82g2gmkw6nckjbm54njlxdspbjgfbkk2"; depends=[ggplot2 MASS nortest tseries]; }; + AIG = derive2 { name="AIG"; version="0.1.6"; sha256="18yz034l6znrzfq1gr2xcs6s8wwk104jdazcs67a85c6rjchkij1"; depends=[dplyr magrittr mgcv rgl]; }; AIM = derive2 { name="AIM"; version="1.01"; sha256="11lkfilxk265a7jkc1wq5xlgxa56xhg302f1q9xb7gmjnzdigb21"; depends=[survival]; }; ALA4R = derive2 { name="ALA4R"; version="1.5.6"; sha256="0fj5y6z179glhc2jj3ksd5w29xmlqm71n23hp1vynrza70fz0gna"; depends=[assertthat digest httr jsonlite plyr RCurl sp stringr wellknown]; }; ALDqr = derive2 { name="ALDqr"; version="1.0"; sha256="0gk8hxh4p0fi47sf1zsvvxxbzp38vzk60wh8hmc63phnjab6qkv4"; depends=[HyperbolicDist sn]; }; @@ -56,17 +57,19 @@ in with self; { AMORE = derive2 { name="AMORE"; version="0.2-15"; sha256="00zfqcsah2353mrhqkv8bbh24l8gaxk4y78icr9kxy4pqb2988yz"; depends=[]; }; ANLP = derive2 { name="ANLP"; version="1.3"; sha256="1m1jnfaqny6qprgyk4f3naan5i5cildawv322h6mc25nypwl12m4"; depends=[dplyr qdap RWeka tm]; }; ANOM = derive2 { name="ANOM"; version="0.5"; sha256="14nfy9xplbabfprwxz5fvx26nmqhp657vr6d90dc8vk8ds63ckiz"; depends=[ggplot2 MCPAN multcomp nparcomp SimComp]; }; + ANOVAreplication = derive2 { name="ANOVAreplication"; version="1.0.0"; sha256="0wqzsyp8bs8ib1l98pqm4hl6xqziqras4k7xykvgmfcgbwfmsbhd"; depends=[quadprog shiny]; }; APSIM = derive2 { name="APSIM"; version="0.9.1"; sha256="0ws9zl2c5m58j0rpbhkpd1rs0pasd4fazd25xw7b3s9b738clfwa"; depends=[data_table lubridate plyr RSQLite sirad stringr]; }; APSIMBatch = derive2 { name="APSIMBatch"; version="0.1.0.2374"; sha256="0j44ijq1v1k60lka9nmw8m1jfjw7pidny9bvswqy5v82gzmwl29d"; depends=[]; }; APfun = derive2 { name="APfun"; version="0.1.1"; sha256="0vb5lmyq8wnwnxikhslaqxd65rs2pv0k3l5bghdzj6s0hp1j6kxp"; depends=[raster rgdal]; }; APtools = derive2 { name="APtools"; version="3.0"; sha256="0v5xgznc8hvw3gid8x5chksc62zpwbx34qsh64sv7d1kqmh5w26j"; depends=[survival]; }; + AR = derive2 { name="AR"; version="1.0"; sha256="1h9rzlwnfm646s7423pcxz0zqykyadiw4sbxlygy2382la81x69x"; depends=[DISTRIB]; }; AR1seg = derive2 { name="AR1seg"; version="1.0"; sha256="0v9adx5wj9r4jwl3bqqmj0byiqfp585jz013qfqrq601wj8v4zi3"; depends=[Segmentor3IsBack]; }; ARCensReg = derive2 { name="ARCensReg"; version="2.1"; sha256="05zjk1wxqfigzg80lvx1940a059jfdr9zbzgzmz2n01glj1lvj63"; depends=[msm mvtnorm numDeriv tmvtnorm]; }; ARPobservation = derive2 { name="ARPobservation"; version="1.1"; sha256="1cdhn11jf1nf03jyvs17ygmjq9pb5rvmyyrq9fp7ifmvcgbkwsms"; depends=[]; }; ART = derive2 { name="ART"; version="1.0"; sha256="186w1ivj5v3h906crl953qxgai5wiznaih83dgvwgnmabs9p1wvk"; depends=[car]; }; ARTIVA = derive2 { name="ARTIVA"; version="1.2.3"; sha256="1jdvsslc8parz7wibcv51fx62brl2mc6i482hz43j1npsms2z1hl"; depends=[gplots igraph MASS]; }; ARTP = derive2 { name="ARTP"; version="2.0.4"; sha256="1f6ay9lyaqsc33b0larb8v6imp5adaycya84wif2sg32rv4gx3yl"; depends=[]; }; - ARTP2 = derive2 { name="ARTP2"; version="0.9.30.1"; sha256="1jn1ai19s1jrrhl6nm7miw46l27jr0rgy7gy54ajbrrbdd4j70fy"; depends=[data_table Formula]; }; + ARTP2 = derive2 { name="ARTP2"; version="0.9.32"; sha256="12mrxssjcj08svdsrxv2nm53mzsgy1k0whd5zzy6fz327bjyqsrz"; depends=[data_table Formula]; }; ARTool = derive2 { name="ARTool"; version="0.10.4"; sha256="1malrjv4myk9nj3dndgpzscfhky4y6lj8xbfg8h2b29g7s2k846q"; depends=[car dplyr lme4 magrittr plyr]; }; ASMap = derive2 { name="ASMap"; version="0.4-7"; sha256="1xsgz05ck60aflnnbhwwbrnizwq92g5ickdnx39fqlj6mpxircw4"; depends=[fields gtools lattice qtl RColorBrewer]; }; ASPBay = derive2 { name="ASPBay"; version="1.2"; sha256="0b1qpyvmj7z10ixrmdxp42bj9s72c1l9rihzmv9p58f12a5aznjz"; depends=[hexbin Rcpp RcppArmadillo]; }; @@ -77,15 +80,17 @@ in with self; { AUCRF = derive2 { name="AUCRF"; version="1.1"; sha256="00d7jcg2dyvf7sc9w7vxxd85m7nsbcmfqsavrv236vxfpfc9yn7i"; depends=[randomForest]; }; AUtests = derive2 { name="AUtests"; version="0.98"; sha256="0m2nl55qfwfzlf92f43b9q75xqvrlx7qzcz6qlnjbjcr80s0qj9q"; depends=[logistf]; }; AWR = derive2 { name="AWR"; version="1.11.89"; sha256="0mg48720ny2a28yfwqx5p4r7g7rbjbzzgbkd2m31hfyz4vnrsr4v"; depends=[rJava]; }; + AWR_Athena = derive2 { name="AWR.Athena"; version="1.1.0"; sha256="0vix7lx3kl0gm5jy1w4dp60qff485j5mvfvd972qs4zhcn4yv02b"; depends=[rJava RJDBC]; }; AWR_KMS = derive2 { name="AWR.KMS"; version="0.1"; sha256="00aqhyqlncsv0vfcyhaazxaclwm63v5kscssash7529avdwd4gqg"; depends=[AWR jsonlite rJava]; }; AWR_Kinesis = derive2 { name="AWR.Kinesis"; version="1.7.3"; sha256="1gfjzbb8xxfd2x5zabysqi0x10sb1c9826wqw8y555nsxgksqxz8"; depends=[AWR futile_logger jsonlite rJava]; }; - AbSim = derive2 { name="AbSim"; version="0.2.1"; sha256="1xm257dml73zjka5cs7z6yrff05xk1ab68f5xc4yqb8kkymimbrp"; depends=[ape poweRlaw]; }; + AbSim = derive2 { name="AbSim"; version="0.2.2"; sha256="0z2d3rjpr4fw0m3b1hdb5dz7mciw61jadbapgs0258j3j3r4knyp"; depends=[ape poweRlaw]; }; AbsFilterGSEA = derive2 { name="AbsFilterGSEA"; version="1.5"; sha256="0071llj6xqsj495nlnvhzsqbrvls7fs3xscng537332xinmfhwdr"; depends=[DESeq limma Rcpp RcppArmadillo]; }; AcceptanceSampling = derive2 { name="AcceptanceSampling"; version="1.0-5"; sha256="18krmmyn8pn11aqd81kbvka68lnd36mnpdh7p3pz9r4m4vjj007x"; depends=[]; }; AcousticNDLCodeR = derive2 { name="AcousticNDLCodeR"; version="1.0.1"; sha256="16rmwz51fy84w83vwnq2nv9mcrp4gi9ciirj5555gl1224b9i2am"; depends=[seewave tuneR zoo]; }; AcrossTic = derive2 { name="AcrossTic"; version="1.0-3"; sha256="03180h79jhjd66ibrnsfp3yyp2jlfysp7cymw46phzj2palghsc0"; depends=[lpSolve treeClust]; }; Actigraphy = derive2 { name="Actigraphy"; version="1.3.2"; sha256="0y0ccmxhdfhdmi4k6pbfvnqknkqbgvfsf2qf7z7rc4xpfgym6574"; depends=[fda SDMTools]; }; ActuDistns = derive2 { name="ActuDistns"; version="3.0"; sha256="04rff9czcgac80clpv32a1dl0jbyvfsa7wqxyywgk99w672x50i2"; depends=[actuar hypergeo reliaR]; }; + AcuityView = derive2 { name="AcuityView"; version="0.1"; sha256="0f0iclmnwdc8ixiiai4svk4x1g3pjy7dhm3cm58fv6ckx12d3d2l"; depends=[fftwtools imager plotrix]; }; AdMit = derive2 { name="AdMit"; version="2.1.3"; sha256="150zjxl56axhpgm25hzyhwwc5g77pkgi291d2v56zbjjqycfz2v8"; depends=[mvtnorm]; }; AdapEnetClass = derive2 { name="AdapEnetClass"; version="1.2"; sha256="01k3mj4g1ckbng7wkzzn9h0k9yf01cpnnkly0sjda574c5jhj0rc"; depends=[glmnet imputeYn lars quadprog]; }; AdaptFit = derive2 { name="AdaptFit"; version="0.2-2"; sha256="124lj1sq5cbp35z4ybkc7ci3fi6pgf8pc5k9mpqmyb6dj870q836"; depends=[cluster MASS nlme SemiPar]; }; @@ -93,6 +98,7 @@ in with self; { AdaptGauss = derive2 { name="AdaptGauss"; version="1.3.3"; sha256="0f6wk9ds8ayzi0fj1dz1m3755d1sjv4v5vc1hjhfxaim127kmbqh"; depends=[caTools ggplot2 shiny]; }; AdaptiveSparsity = derive2 { name="AdaptiveSparsity"; version="1.4"; sha256="1az7isvalf3kmdiycrfl6s9k9xqk22k1mc6rh8v0jmcz402qyq8z"; depends=[Rcpp RcppArmadillo]; }; AdequacyModel = derive2 { name="AdequacyModel"; version="2.0.0"; sha256="0amp6ic1wylk24sp9wpx3ci38njj7b9qjqfp89j39hkl6kc1q7sq"; depends=[]; }; + AdhereR = derive2 { name="AdhereR"; version="0.1.0"; sha256="07r3a8bfhwm2pghhngavw4z6gv42dyq21dz2lypapcv32qnxkaag"; depends=[data_table lubridate manipulate snow]; }; AdjBQR = derive2 { name="AdjBQR"; version="1.0"; sha256="14437pyz9v09ighwqvy1lcw0vfp2gaqzs9nzrb1gkfbb8ndzjw7k"; depends=[coda MHadaptive quantreg survival]; }; AdvBinomApps = derive2 { name="AdvBinomApps"; version="1.0"; sha256="1cnmn6c2dyl8qfl7g5sqwbjb52psqxzrj1mbm06zak2y1j7j8f49"; depends=[GenBinomApps rootSolve]; }; AggregateR = derive2 { name="AggregateR"; version="0.0.2"; sha256="15gxzs3baa6f1rqwv7s7k6zybx0za1mpzc7db1n47jy9rbh2yxb2"; depends=[dummy]; }; @@ -120,14 +126,14 @@ in with self; { AntAngioCOOL = derive2 { name="AntAngioCOOL"; version="1.2"; sha256="1krwms0y3xppc2y4m0az51wcbh4jq7mlr0jwinp66w8gh4k3qnp2"; depends=[caret rJava rpart RWeka]; }; AntWeb = derive2 { name="AntWeb"; version="0.7"; sha256="1ykfg3zzjdvjppr2l4f26lx00cn5vaqhhz1j1b5yh113ggyl40qw"; depends=[assertthat httr leafletR plyr rjson]; }; AnthropMMD = derive2 { name="AnthropMMD"; version="1.0.1"; sha256="1zb5qxmnbp2ha7hsnb4cvlc6n83gimwsq2g5pwkg7yqi5xgcp1ff"; depends=[tcltk2]; }; - Anthropometry = derive2 { name="Anthropometry"; version="1.7"; sha256="09bmd7gvkxm2jvcjzz0dqj5frr07fzb3r4qzih404zynrg859r9s"; depends=[archetypes biclust cluster depth FNN ICGE nnls rgl shapes]; }; + Anthropometry = derive2 { name="Anthropometry"; version="1.8"; sha256="0drbpffi9qx04vrf60fim30l4xkyvn13mvpr3csyqdfhi0wwn990"; depends=[archetypes biclust cluster depth FNN ICGE nnls rgl shapes]; }; ApacheLogProcessor = derive2 { name="ApacheLogProcessor"; version="0.2.2"; sha256="01h8hi76nlwn9hnfyvzyg2d25s2r0vgpl5rz37yqkhjs5xr3rpyi"; depends=[doParallel foreach stringr]; }; AppliedPredictiveModeling = derive2 { name="AppliedPredictiveModeling"; version="1.1-6"; sha256="004d2k3mhl45inb7kx1ph8xc8h9bgm7f7l3prmvqrl5792400cn4"; depends=[CORElearn MASS plyr reshape2]; }; AquaEnv = derive2 { name="AquaEnv"; version="1.0-4"; sha256="07yx7mbslqgqg7ky67n3xfhskaj7s3w5mvl7xkih48xbsdlmxi4l"; depends=[minpack_lm]; }; ArArRedux = derive2 { name="ArArRedux"; version="0.2"; sha256="0ql9yx46sgqkc3jd7yaw3vwg8rnykbsvpcahrgc66753kcxih04q"; depends=[]; }; ArCo = derive2 { name="ArCo"; version="0.1-2"; sha256="1p6vz6kqdx81j0d37scfwhpz7bf0xhij01nk3aj3a5wmbg96iv25"; depends=[boot glmnet Matrix]; }; ArDec = derive2 { name="ArDec"; version="2.0"; sha256="14niggcq7xlvpdhxhy8j870gb11cpk4rwn9gwsfmcfvh49g58i80"; depends=[]; }; - ArchaeoPhases = derive2 { name="ArchaeoPhases"; version="1.1"; sha256="0i64mhyz48advljdvgyf6fvj523wf5f3kfy6zdbrwcyv0ffqln6q"; depends=[coda dplyr DT ggplot2 ggthemes hdrcde readr shiny shinythemes]; }; + ArchaeoPhases = derive2 { name="ArchaeoPhases"; version="1.2"; sha256="13canmrg1k4crxhzmrjpnkm8fwb4cv75wp7qjq6hl7bj5nqnva55"; depends=[coda dplyr DT ggplot2 ggthemes hdrcde readr shiny shinythemes]; }; ArfimaMLM = derive2 { name="ArfimaMLM"; version="1.3"; sha256="0s5igf703zzvagsbdxf5yv4gn0vdq51b7fvbc8xkgvlmv91yy372"; depends=[fracdiff fractal lme4]; }; ArgumentCheck = derive2 { name="ArgumentCheck"; version="0.10.2"; sha256="0mgx7mzbg2wynixcf9hvs0i9p4zka7c3chrfvjmvvvwwgsy24hkc"; depends=[]; }; ArrayBin = derive2 { name="ArrayBin"; version="0.2"; sha256="0jlhcv2d7pmqi32w71nz063ri1yj4i4isr3msnw7ckzvi9r42jwm"; depends=[SAGx]; }; @@ -154,15 +160,17 @@ in with self; { BAMMtools = derive2 { name="BAMMtools"; version="2.1.6"; sha256="01mb40w3g0xy93pl9064ky8kd46sa7qlz6by1r6kchcfhajx8plv"; depends=[ape gplots Rcpp]; }; BANFF = derive2 { name="BANFF"; version="2.0"; sha256="1c5wdwqqvkcm9910lhd387snd7myv9qzs9vfk87vzp3di7hdi4l6"; depends=[coda doParallel DPpackage flexmix foreach GGally igraph mclust network pscl truncnorm]; }; BANOVA = derive2 { name="BANOVA"; version="0.8"; sha256="0kjmhb1y3vkm8yw4z5fqmr1ripblk82svg2ik15ml2xnriwgdpwp"; depends=[coda rjags runjags]; }; - BART = derive2 { name="BART"; version="1.1"; sha256="0cys62j10s7qg7qc0ciak4654j7n48sf67nmppdwaavga309g46d"; depends=[Rcpp survival]; }; - BAS = derive2 { name="BAS"; version="1.4.5"; sha256="0ivi39yklnqdg6108w8k3wx9yw2nfcppiwn3mymh1vsdwv9ykaky"; depends=[]; }; + BART = derive2 { name="BART"; version="1.2"; sha256="0clg63avxldr4h6dzv3pl087ms2a2zhg570xy7l9zjgh00v2zb2p"; depends=[Rcpp survival]; }; + BAS = derive2 { name="BAS"; version="1.4.6"; sha256="0fhldihrl94aj4kx5wlqyy7i8d9cm92zhk33ilarrymmksccinmp"; depends=[]; }; BASIX = derive2 { name="BASIX"; version="1.1"; sha256="18dkvv1iwskfnlpl6xridcgqpalbbpm2616mvc3hfrc0b26v01id"; depends=[]; }; BASS = derive2 { name="BASS"; version="0.2.2"; sha256="1q3sihp2iv1ikggzgd2k3vh2myz8bz31rzlaavw0n84d0h1zjxy2"; depends=[]; }; - BAT = derive2 { name="BAT"; version="1.5.5"; sha256="1kgrc2crj834qlnac2kb18pp3dfpryhsrh4l84jpm561kk3wzcqb"; depends=[nls2 raster spatstat vegan]; }; + BAT = derive2 { name="BAT"; version="1.5.6"; sha256="0m6yfxymhzi8n2l421ngy6cz3qa5v7yrd1jhpi8ymlnf8dysd57x"; depends=[nls2 raster spatstat vegan]; }; + BAYESDEF = derive2 { name="BAYESDEF"; version="0.1.0"; sha256="030xskgqqg0n85mphjv32ks4ysvxb36f6ayy0176gps14jhmhcp7"; depends=[glmnet gWidgets readxl REdaS]; }; BAYSTAR = derive2 { name="BAYSTAR"; version="0.2-9"; sha256="0crillww1f1jvhjw639sf09lpc3wpzd69milah143gk9zlrkhmz2"; depends=[coda mvtnorm]; }; BB = derive2 { name="BB"; version="2014.10-1"; sha256="1lig3vxhyxy8cnic5bczms8pajmdvwr2ijad1rkdndpglving7x0"; depends=[quadprog]; }; BBEST = derive2 { name="BBEST"; version="0.1-6"; sha256="1hvgi3679ixpq0c5qbxhkp1j0953k3lklglgxrq9mz2ry6z9n038"; depends=[DEoptim ggplot2 reshape2 shiny wmtsa]; }; BBMM = derive2 { name="BBMM"; version="3.0"; sha256="1cvv786wf1rr5906qg1di2krrv5jgw3dnyl8z2pvs8jyn0kb3fkj"; depends=[]; }; + BBMV = derive2 { name="BBMV"; version="1.0"; sha256="0jmgfk91q94d7hp9vn1iv7k7kn611690fs63ahhvxky7mmmn4wsi"; depends=[ape]; }; BBRecapture = derive2 { name="BBRecapture"; version="0.1"; sha256="05xzp5zjmkh0cyl47qfsz0l8drg8mimssybhycc4q69aif9scqxb"; depends=[HI lme4 locfit secr]; }; BBmisc = derive2 { name="BBmisc"; version="1.11"; sha256="1lh1n4bvxzivb5rbz69mvd8xdgr3gr2bnqd68a39sd1530l8r90y"; depends=[checkmate]; }; BCA = derive2 { name="BCA"; version="0.9-3"; sha256="0ksd6b0ykydgdn33x29bwwqkrp23cvdj3imps0l6qs1p4465j5nf"; depends=[car clv flexclust Rcmdr RcmdrMisc rpart]; }; @@ -176,54 +184,59 @@ in with self; { BCRA = derive2 { name="BCRA"; version="1.0"; sha256="1bbxh1kf35h31c4k565kk6grdhp5pnn8vr3nr6vnp32dp4pc05zh"; depends=[]; }; BCSub = derive2 { name="BCSub"; version="0.5"; sha256="0c8dlxsx23qfyygmajg2amj78ax01kb3808d9hvy7g3hkgp2i2fp"; depends=[MASS mcclust nFactors Rcpp RcppArmadillo]; }; BCellMA = derive2 { name="BCellMA"; version="0.3.4"; sha256="1njprs7ksv0w18ffs0agz0290aa2akw48225iaa3bjhbl08dpidl"; depends=[ggplot2 reshape2]; }; + BCgee = derive2 { name="BCgee"; version="0.1"; sha256="0ad0dj2ymgvkmcmq3jlpmn0pgigdql0xgvcwsbpdydv33a6snr04"; depends=[]; }; BDWreg = derive2 { name="BDWreg"; version="1.2.0"; sha256="07j6dy69q1as1nwgp2790wzpzmjich2256cddhl7n3h2rs1dja74"; depends=[coda doParallel DWreg foreach MASS]; }; - BDgraph = derive2 { name="BDgraph"; version="2.35"; sha256="03n6wyiv0cib5kxds2j6wyp1kqlwq9pjyxyf60yk4148yc4b7l6l"; depends=[igraph Matrix]; }; + BDgraph = derive2 { name="BDgraph"; version="2.39"; sha256="10k463mb6gkvvsyviz00a71ayvk2ygvf0s88x6cla7rvihdzrq7s"; depends=[igraph Matrix]; }; BEACH = derive2 { name="BEACH"; version="1.1.2"; sha256="10533ac575mcw9mv1lf3dgjjaf1hgzv3yn7ys9qi6b2k5fynhsg0"; depends=[devtools DT haven plyr readxl rJava rtf sas7bdat SASxport shiny WriteXLS xtable]; }; - BEANSP = derive2 { name="BEANSP"; version="1.0"; sha256="0xcb81pk3iidb3dz9l4hm6cwx8hrbg5qz0sfi59yx2f7nsazr4xk"; depends=[]; }; BEDASSLE = derive2 { name="BEDASSLE"; version="1.5"; sha256="1bz3lr0waly9vj9adwhmgs3lq7zjdkcbvm3y9rnn72qlrwmv5fbn"; depends=[emdbook MASS matrixcalc]; }; - BEDMatrix = derive2 { name="BEDMatrix"; version="1.3.0"; sha256="0i8g9kc8vq79mbzds7s5c10kvbx3bw6c964jx33cga2z788wcv4s"; depends=[BH Rcpp]; }; + BEDMatrix = derive2 { name="BEDMatrix"; version="1.4.0"; sha256="0aha33skksh45fx248lx6v8cxwgkiripw3avspb8arbld9rmqwxn"; depends=[BH crochet Rcpp]; }; BEQI2 = derive2 { name="BEQI2"; version="2.0-0"; sha256="19q29kkwww5hziffkm2yx7n4cpfcsyh0z4mljdcnjkwfp732sjig"; depends=[jsonlite knitr markdown plyr reshape2 xtable]; }; - BEST = derive2 { name="BEST"; version="0.4.0"; sha256="1clch2271x9r5frgpis31b13jjgp4sdxd75s44chcislyzlinrlp"; depends=[coda jagsUI]; }; - BETS = derive2 { name="BETS"; version="0.2.0"; sha256="0jw893k06wkzl4qk5mzpxhbg52f29pzg53kjg79kaknsiqbxi1m1"; depends=[DBI DT dygraphs forecast foreign ggplot2 grnn miniUI plotly RCurl rmarkdown RMySQL rstudioapi seasonal shiny sqldf stringr urca webshot zoo]; }; + BEST = derive2 { name="BEST"; version="0.5.0"; sha256="178vn0ps6nr7qjayavnvmbyx6gq57dni5llsncl89kkz633mb2hg"; depends=[coda HDInterval rjags]; }; + BETS = derive2 { name="BETS"; version="0.2.1"; sha256="00pf2v8spbmih129yl97rkq3mjsrkckqbx745sk2vppzlimws1k8"; depends=[DBI DT dygraphs forecast foreign ggplot2 grnn miniUI plotly RCurl rmarkdown RMySQL rstudioapi seasonal shiny sqldf stringr urca webshot zoo]; }; + BGData = derive2 { name="BGData"; version="1.0.0"; sha256="0xd7xpnvhpyvv6caxyif7wa25llvrnyzmmk4z6rp7absjqbz2alc"; depends=[BEDMatrix bigmemory bit ff LinkedMatrix symDMatrix]; }; BGLR = derive2 { name="BGLR"; version="1.0.5"; sha256="14a979rnasaklkfafzpkhr6mqv0ga7fsfxq63scpnlwa2aasgn83"; depends=[]; }; BGPhazard = derive2 { name="BGPhazard"; version="1.2.3"; sha256="1yp92y5y3xh0hb1ring6jrma8g4q6210hm9572j8ji1jkafzxjw1"; depends=[survival]; }; BGSIMD = derive2 { name="BGSIMD"; version="1.0"; sha256="0xkr56z8l72wps7faqi5pna1nzalc3qj09jvd3v9zy8s7zf5r7w4"; depends=[]; }; BH = derive2 { name="BH"; version="1.62.0-1"; sha256="01vfdpfznd4ynqql33z238xr262mvy3i80lyi8l3a3p3hi0a262p"; depends=[]; }; BHH2 = derive2 { name="BHH2"; version="2016.05.31"; sha256="1m4fcx979nbm97hi89vbjjix0sx6qhdzs486risck9bi7yzih5k4"; depends=[]; }; + BHMSMAfMRI = derive2 { name="BHMSMAfMRI"; version="1.1"; sha256="1qygizn2np9amkm1f1332zp9ab9ky423plr9lahgwzdxn1c2c5c2"; depends=[AnalyzeFMRI fmri wavethresh]; }; + BHPMF = derive2 { name="BHPMF"; version="1.0"; sha256="0b7dl4wxhkk47cnj1dxdjnf094cabqb8ncyl7pdi0zx6h4py9h8w"; depends=[Matrix]; }; BIEN = derive2 { name="BIEN"; version="1.1.0"; sha256="1n6a1si3llaqm69nvh348dnvaf05g1kcklwvrys7nnr3kr3adslr"; depends=[ape DBI rgdal rgeos RPostgreSQL sp]; }; - BIFIEsurvey = derive2 { name="BIFIEsurvey"; version="1.13-24"; sha256="03p4k067s5wl7i9qy1iym9ndq4977a42nbbcac40akvibqpzhgdy"; depends=[miceadds mitools Rcpp RcppArmadillo TAM]; }; + BIFIEsurvey = derive2 { name="BIFIEsurvey"; version="2.1-6"; sha256="1bvnjwccfrbl2v2wjks775s126a4z8h9fyxngzxicxq2n6i51wzc"; depends=[miceadds mitools Rcpp RcppArmadillo survey TAM]; }; BIGDAWG = derive2 { name="BIGDAWG"; version="1.5.5"; sha256="1blqaxhx9ffa036zcz30kmkhh58l0ybmyrb2sb947f2i13h7qsk0"; depends=[haplo_stats XML]; }; BIOM_utils = derive2 { name="BIOM.utils"; version="0.9"; sha256="0xckhdvf15a62awfk9rjyqbi6rm7p4awxz7vg2m7bqiqzdll80p7"; depends=[]; }; BIOMASS = derive2 { name="BIOMASS"; version="1.1"; sha256="1qawp10hw7xhqyg9bdwvgxbksiwhga7h6vwp8m7q30ibwfv5kamg"; depends=[httr jsonlite minpack_lm msm raster]; }; - BIOdry = derive2 { name="BIOdry"; version="0.4"; sha256="00xv6qyrmfsyp2qfb8ffii0ifxx18wj7lxzb2svdmqbg8xz8pnbv"; depends=[ecodist nlme]; }; + BIOdry = derive2 { name="BIOdry"; version="0.5"; sha256="0isvqs2bgirxwb7b1dbn70zfx9b4mw7fp33fwmxq0dx6k1r4f87g"; depends=[ecodist nlme]; }; BIPOD = derive2 { name="BIPOD"; version="0.2.1"; sha256="04r58gzk3hldbn115j9ik4bclzz5xb2i3x6b90m2w9sq7ymn3zg1"; depends=[Rcpp RcppArmadillo]; }; BKPC = derive2 { name="BKPC"; version="1.0"; sha256="1c5n2vdpsk00slqyxxq2c8d7ix8jdbyigrh23ykd4b95mynp9kdv"; depends=[kernlab]; }; BLCOP = derive2 { name="BLCOP"; version="0.3.1"; sha256="1qfkljw5b1k4b5jd08hw6dsmvgr7vg3kjyib5s13q0mkxvclasym"; depends=[fBasics fMultivar fPortfolio MASS quadprog RUnit timeSeries]; }; BLModel = derive2 { name="BLModel"; version="1.0.2"; sha256="0l5f2v5ggadmrci3qhhmxm3j9i6jii0anq5rv5vk50y2qzii2q15"; depends=[]; }; - BLPestimatoR = derive2 { name="BLPestimatoR"; version="0.1.2"; sha256="1l4qhxj4lj6p80p85nl7ld0ynq5qlq4afibza1spy7j80av2isy6"; depends=[mvQuad numDeriv randtoolbox Rcpp ucminf]; }; + BLPestimatoR = derive2 { name="BLPestimatoR"; version="0.1.4"; sha256="007p7lc76q0mwsznh4n4n0j80z1mh5i5897sfd4igy4psmyxkb4y"; depends=[mvQuad numDeriv randtoolbox Rcpp ucminf]; }; BLR = derive2 { name="BLR"; version="1.4"; sha256="0wy3c8nnzkdhwb5s1ygdid47hpdx72ryim36mnicrydy0msjivja"; depends=[SuppDists]; }; - BMA = derive2 { name="BMA"; version="3.18.6"; sha256="1yx54miy5vn8rb5aynsjsfjxkblq0n1k86h1iyr14rf4q9sd3phi"; depends=[inline leaps robustbase rrcov survival]; }; + BMA = derive2 { name="BMA"; version="3.18.7"; sha256="095iwlbjklg1pkp5jiw0srg7jh9cn50g8z4namrs4xsmlh7if65z"; depends=[inline leaps robustbase rrcov survival]; }; BMAmevt = derive2 { name="BMAmevt"; version="1.0.1"; sha256="1krx8isj2wp3panjcbc2ysrc2pxz2casj12qq9p18imaa326l53y"; depends=[coda]; }; BMN = derive2 { name="BMN"; version="1.02"; sha256="12gyq01cn6a9ixqgki1ihx5jrp2gw6jdj7q210rb12xlvj3p6x7w"; depends=[]; }; BMRV = derive2 { name="BMRV"; version="1.32"; sha256="1j1cwjk3l7f06nqdwrqdyhzm43bb8hj5wgdd14zc1grxyfc9ya95"; depends=[BH]; }; BMS = derive2 { name="BMS"; version="0.3.4"; sha256="0z3mk1xd1fphf80kdbashkn04jwsr2bghms4d7nav3pw73q41wql"; depends=[]; }; BMhyd = derive2 { name="BMhyd"; version="1.2-8"; sha256="14pv5f621zq5x9i408zjm8k80hcsabkjpdf86gk3ylgw5yqcivrx"; depends=[ape corpcor geiger mvtnorm numDeriv phylobase phytools TreeSim]; }; + BMisc = derive2 { name="BMisc"; version="1.0.1"; sha256="0r16aacsdag3b6vz0jbfvchdy10giwchdcnhri20l6bg7kwjvjwb"; depends=[formula_tools]; }; BNDataGenerator = derive2 { name="BNDataGenerator"; version="1.0"; sha256="17zi83jhpn9ygavkpr9haffvd4622sca18jzzxxxmfq0ilrj201g"; depends=[]; }; BNPMIXcluster = derive2 { name="BNPMIXcluster"; version="0.2.0"; sha256="1w8p8fkiai2xqgf0w8imv55p8s1nvsfdfmyrq2cnc5b8m1gw457k"; depends=[MASS matrixcalc mvtnorm plyr truncnorm]; }; BNPTSclust = derive2 { name="BNPTSclust"; version="1.1"; sha256="1zmxwg6zn3nqqm1sw2n4pvq47mv7ygb4lf1c6yhn3xaf1rqmf26s"; depends=[MASS mvtnorm]; }; BNPdensity = derive2 { name="BNPdensity"; version="2017.03"; sha256="0anpi75wwx91dbm937ydgcpd8wchm0nyciy4xdhppsvzq9v3d2hp"; depends=[]; }; + BNSL = derive2 { name="BNSL"; version="0.1.2"; sha256="0phvbxijrb29hs20g1f1nz5s449zv7mgrymlczc5vpsq8nq2y4vm"; depends=[bnlearn igraph Rcpp]; }; BNSP = derive2 { name="BNSP"; version="1.1.1"; sha256="00rmfn0ivrjghwzpfig3znwpswj0l1jvs9kvkknb1z33kvwbc9b4"; depends=[]; }; BOG = derive2 { name="BOG"; version="2.0"; sha256="0lz5af813b67hfl4hzcydn58sjhgn5706n2h44g488bks928k940"; depends=[DIME hash]; }; BOIN = derive2 { name="BOIN"; version="2.4"; sha256="0vb3bkaq9vl1yqm3dhdpd27nhv2095n3lp90fr961jpwj1xhjh5l"; depends=[Iso]; }; BPEC = derive2 { name="BPEC"; version="1.0"; sha256="15ys0nzy6988yw1lf4lmv2h9i164cbl41x261gdyvmg0dy62qsnc"; depends=[ape coda fields igraph maps maptools mvtnorm phytools R2G2 sp]; }; - BRugs = derive2 { name="BRugs"; version="0.8-6"; sha256="0nvp3lwliq72qibvz4bg6c7ixxmhgwl87hyl2qvkgiavix3nkxk7"; depends=[coda]; }; + BRugs = derive2 { name="BRugs"; version="0.9-0"; sha256="0f0v30mvfw97vfwzkjpqzf2894b2yhksja0xhpranprk135srxp0"; depends=[coda]; }; BSDA = derive2 { name="BSDA"; version="1.01"; sha256="06mgmwwh56bj27wdya8ln9mr3v5gb6fcca7v9s256k64i19z12yi"; depends=[e1071 lattice]; }; BSGS = derive2 { name="BSGS"; version="2.0"; sha256="08m8g4zbsp55msqbic4f17lcry07mdn0f5a61zdcy2msn2ihzzf9"; depends=[batchmeans MASS plyr pscl]; }; BSGW = derive2 { name="BSGW"; version="0.9.2"; sha256="1q6qvm9yxh35wywrzs3kr31jsa0bmbwrqh0r3qjc0dzi6q8n6pjy"; depends=[doParallel foreach MfUSampler survival]; }; BSSasymp = derive2 { name="BSSasymp"; version="1.2-0"; sha256="1xs6gfvsla7h1sldckjfpw3qx7fhxiqzv849g3k6w1309r7pv75r"; depends=[fICA JADE]; }; BSagri = derive2 { name="BSagri"; version="0.1-8"; sha256="148pr4lkgdi4bwc9lavgj356nh240iazz28xklq14rw4gzhmz2k4"; depends=[boot gamlss MCPAN mratios multcomp mvtnorm]; }; BSquare = derive2 { name="BSquare"; version="1.1"; sha256="1s16307m5gj60nv4m652iisyqi3jw5pmnvar6f52rw1sypfp5n49"; depends=[quadprog quantreg VGAM]; }; - BTLLasso = derive2 { name="BTLLasso"; version="0.1-5"; sha256="1kvb6hvg3v81p9bkc8z3dqhmmfj1rxzzpx9n3lknmfrynq1a6748"; depends=[Matrix Rcpp RcppArmadillo stringr]; }; + BTLLasso = derive2 { name="BTLLasso"; version="0.1-6"; sha256="03yfkwgjscki9xbv6myyhdhbz6xrd81zny576vvwqyz14l1sygs0"; depends=[Matrix Rcpp RcppArmadillo stringr TeachingDemos]; }; BTR = derive2 { name="BTR"; version="1.2.4"; sha256="0vf71a36id6zgx0phb0kyry7y9xcdhnincxh3fryzhdigxkahg4h"; depends=[diptest doParallel entropy foreach igraph infotheo poweRlaw Rcpp]; }; BTSPAS = derive2 { name="BTSPAS"; version="2014.0901"; sha256="0ankkhm38rvq06g0jnbvjbja4jv8lg21dsc0rxsy174b1i6vjhwi"; depends=[actuar coda ggplot2 plyr R2OpenBUGS rjags]; }; BTYD = derive2 { name="BTYD"; version="2.4"; sha256="13szcsgsrd7mwc4f47xrfrmsm2sg5sf7pfm21ly4cbvqcz8m0147"; depends=[hypergeo Matrix]; }; @@ -236,15 +249,16 @@ in with self; { BaPreStoPro = derive2 { name="BaPreStoPro"; version="0.1"; sha256="0zyyyrr5h8dhjsmgaii8jmb8ignvixpc9nzbfishw9yymjswvm57"; depends=[]; }; BaSTA = derive2 { name="BaSTA"; version="1.9.4"; sha256="1j092gsdip7rpw0g74ha0kjsrqpp5swi7wd4sxlmx6zarcqnxlal"; depends=[snowfall]; }; BaTFLED3D = derive2 { name="BaTFLED3D"; version="0.2.1"; sha256="0qqq7f2s9jqr85xvab9d4pma4aknlfigh4vgm445bwamb6x8ms2n"; depends=[foreach iterators R6 RColorBrewer rTensor]; }; - BacArena = derive2 { name="BacArena"; version="1.5.1"; sha256="03rk0b1dbyzhwdfj3q4a91hwhzng76fshnbnbyfblmnnnsfk4v9g"; depends=[deSolve ggplot2 glpkAPI igraph Matrix Rcpp RcppArmadillo RcppEigen ReacTran reshape2 sybil]; }; + BacArena = derive2 { name="BacArena"; version="1.6"; sha256="1w25xrb0gafcw3h7bf44x96zyv108gzlk273nf2835768m4psacr"; depends=[deSolve ggplot2 glpkAPI igraph Matrix plyr Rcpp RcppArmadillo RcppEigen ReacTran reshape2 sybil]; }; Bagidis = derive2 { name="Bagidis"; version="1.0"; sha256="1prdbkc0qgzkkrkhp43pjyg35q9ivngk8wa4a7khlnfsj21jaraf"; depends=[abind]; }; BalanceCheck = derive2 { name="BalanceCheck"; version="0.1"; sha256="09mkssic173glgcn592cb6zmz80kndggqc4hc800f91xnfql0332"; depends=[ade4 mvtnorm]; }; BalancedSampling = derive2 { name="BalancedSampling"; version="1.5.2"; sha256="0a4mb5lwjcy5d3h0ypsqmqniqx3dm64mssj65apgl48wqbm6zvv0"; depends=[Rcpp]; }; + BarBorGradient = derive2 { name="BarBorGradient"; version="1.0.5"; sha256="0g2g7hrm23as1xbj79g48r8sj3gsj66fmi895jqlqfbqrl2fl7a5"; depends=[]; }; BarcodingR = derive2 { name="BarcodingR"; version="1.0-2"; sha256="1mn5rdax8v1s2z3apk9z0kzy4hw19m8ql6j91l6wd29g2n2bjqxx"; depends=[ape class nnet sp]; }; Barnard = derive2 { name="Barnard"; version="1.8"; sha256="1ki58hjs5kpmp76kwj1qi6hwmdvjphqb1lvrlhnmkgqxg4hw4vqg"; depends=[]; }; Barycenter = derive2 { name="Barycenter"; version="1.0"; sha256="0dqa3fzrwcaqgkj883v9cn5v0zl3rl32zlqzx9lbqzbrlchxgc3k"; depends=[Rcpp RcppArmadillo]; }; BatchExperiments = derive2 { name="BatchExperiments"; version="1.4.1"; sha256="0fg7p0q6avc0kcwcd3z4q3akrr2mkrx2yf9zcd6hhz22l3x4aphz"; depends=[BatchJobs BBmisc checkmate DBI plyr RSQLite]; }; - BatchGetSymbols = derive2 { name="BatchGetSymbols"; version="1.1"; sha256="1njivlrn3wyr5frwqd9d152y0xlvh6d38p9i1p87bnpjpzcc7iyv"; depends=[curl quantmod rvest stringr]; }; + BatchGetSymbols = derive2 { name="BatchGetSymbols"; version="1.2"; sha256="06ndhdsnpc7i367xksghgkwx1m6h6finwj0sab9ivcwpqb4n5h6f"; depends=[curl quantmod rvest stringr]; }; BatchJobs = derive2 { name="BatchJobs"; version="1.6"; sha256="1kb99024jih5bycc226bl4jyvbbl1sg72q3m2wnlshl7s8p6vva0"; depends=[BBmisc brew checkmate DBI digest fail RSQLite sendmailR stringr]; }; BatchMap = derive2 { name="BatchMap"; version="1.0.1.0"; sha256="1kwx28vbzhnglyjxrny4dky89sabvnapsywsjvnayw4plfa6igy5"; depends=[ggplot2 Rcpp RcppArmadillo reshape2]; }; BayClone2 = derive2 { name="BayClone2"; version="1.1"; sha256="1wprdj22zh8fwqawcv4m2n2y7sqwh2f6m9b0cq0rp4ll774yz30i"; depends=[combinat]; }; @@ -268,6 +282,7 @@ in with self; { BayesMed = derive2 { name="BayesMed"; version="1.0.1"; sha256="1ysc7sh0drqxbisi2dz6gj4jlw6qsd879bbhr5pra7nxgmk4h650"; depends=[MCMCpack polspline QRM R2jags]; }; BayesMixSurv = derive2 { name="BayesMixSurv"; version="0.9.1"; sha256="19kf39881q00pap9afwvvggk4s4w3qpz17b7065nig1mvk8dnp8r"; depends=[survival]; }; BayesNI = derive2 { name="BayesNI"; version="0.1"; sha256="0zvr6rkb5zxgl53xby69d0j3yrfnlcmac6kwkxz77q5616w9dwq0"; depends=[]; }; + BayesNetBP = derive2 { name="BayesNetBP"; version="1.2.1"; sha256="03ml9nkcnn183cc06rxiw5fjx5nzkpz16cmkn9rnbyf9305zrwra"; depends=[doBy fields graph gRbase igraph qtl qtlnet RColorBrewer Rgraphviz]; }; BayesPieceHazSelect = derive2 { name="BayesPieceHazSelect"; version="1.1.0"; sha256="0znbmv7crqycdx75jh02h6z8d6cifjszbrldv2yva4mkjxsydag5"; depends=[mvtnorm]; }; BayesPiecewiseICAR = derive2 { name="BayesPiecewiseICAR"; version="0.2.1"; sha256="1qrmw7zmygdzz84p76hyh2d8dx88b8xhbbd7radqm39g35zq5wz6"; depends=[mvtnorm]; }; BayesS5 = derive2 { name="BayesS5"; version="1.30"; sha256="1nx61sq1d20238hbgr9p9hrmnxsxpsjhnb4sdhmqg1m7klq8qyrw"; depends=[abind Matrix snowfall]; }; @@ -277,27 +292,29 @@ in with self; { BayesSummaryStatLM = derive2 { name="BayesSummaryStatLM"; version="1.0-1"; sha256="05mlgyi4fglvjkpqyw3vcjpipqllx37svcb20c1mrsa46m6fm4s7"; depends=[ff mvnfast]; }; BayesTree = derive2 { name="BayesTree"; version="0.3-1.4"; sha256="0saca1ln582szqzc2c78z24b1lszzhc9hvsin73kb7r2dlg5ciii"; depends=[nnet]; }; BayesTreePrior = derive2 { name="BayesTreePrior"; version="1.0.1"; sha256="13igmvw1wj8kzfijzsrhdqr52kv4vqrm91i71ay6f7jnkry3spaw"; depends=[]; }; + BayesTwin = derive2 { name="BayesTwin"; version="1.0"; sha256="026blnhihbx9bpd63mxhbp0kpvj0lwbj7mg72alyfr2jnrh1n3lp"; depends=[coda foreign matrixStats rjags]; }; BayesValidate = derive2 { name="BayesValidate"; version="0.0"; sha256="1gli65avpkb90asx92l1yjbwaxcsyb920idyjwgd2sl2b3l657ly"; depends=[]; }; BayesVarSel = derive2 { name="BayesVarSel"; version="1.7.0"; sha256="10w9l8jz7j72npl0z2smngrsmb4ga88gn37ps1xn3fyql999iz7d"; depends=[MASS mvtnorm]; }; BayesX = derive2 { name="BayesX"; version="0.2-9"; sha256="0p170m8zkaspiah1fdyql9lj9yqg6sl525blzq7wwgx5wx4rvncs"; depends=[coda colorspace maptools shapefiles sp]; }; BayesXsrc = derive2 { name="BayesXsrc"; version="2.1-2"; sha256="114804f6maak5dmwzw4cbigjcdw7c6sgx48af35yrvkspi1gsz3b"; depends=[]; }; BayesianAnimalTracker = derive2 { name="BayesianAnimalTracker"; version="1.2"; sha256="1pgjijqznfdpvw296h5vksnxgspxs7qhy6s84ww7abnlhg59bz5s"; depends=[TrackReconstruction]; }; BayesianNetwork = derive2 { name="BayesianNetwork"; version="0.1.1"; sha256="1vclgdqqldkwhiilv44ihflbadllna5hvggbjbpz0r3365alnmq6"; depends=[bnlearn d3heatmap lattice networkD3 rhandsontable shiny shinydashboard]; }; - BayesianTools = derive2 { name="BayesianTools"; version="0.1.1"; sha256="1x5f2lgby8qpdiv6d843a6rhmfdm3vd60gii07r09lv3f494bq76"; depends=[coda ellipse emulator IDPmisc MASS Matrix msm mvtnorm numDeriv Rcpp vioplot]; }; + BayesianTools = derive2 { name="BayesianTools"; version="0.1.2"; sha256="0v6jqiv5rkdra3zjnsd64ja9x4arv61fm8mprx45d27fvy80dpbv"; depends=[coda ellipse emulator IDPmisc MASS Matrix msm mvtnorm numDeriv Rcpp vioplot]; }; Bayesianbetareg = derive2 { name="Bayesianbetareg"; version="1.2"; sha256="0imsz2761ngbnap0vnxks9527la51m5g8gkkn1vrgwis43i6qcgs"; depends=[betareg mvtnorm]; }; Bayesthresh = derive2 { name="Bayesthresh"; version="2.0.1"; sha256="0w26h1ragqcg1i4h7c2y6vd8fig2jb2zrnvvchgg5z2hg9qdplsf"; depends=[coda lme4 MASS matrixcalc mvtnorm VGAM]; }; BaylorEdPsych = derive2 { name="BaylorEdPsych"; version="0.5"; sha256="1kq6nvzdqwawygp7k62lw5hyccsj81jg82hq60yidgxnmmnnf7y2"; depends=[]; }; BcDiag = derive2 { name="BcDiag"; version="1.0.10"; sha256="1gyinmx5wn2kk70hiy28ghilkhfirfjbfqdrqq5h3wfb4khnq6pz"; depends=[fabia]; }; Bchron = derive2 { name="Bchron"; version="4.2.6"; sha256="0i77a72cq6ddpfgs2p0f3bskb03428jxxyq8chjyirsws1amzp92"; depends=[coda ellipse inline MASS mclust]; }; Bclim = derive2 { name="Bclim"; version="3.1.2"; sha256="0dd4fx3rlljj3zb1m8q1bam1bswg497l3y8k0h0mkvjn94b4jbag"; depends=[ggplot2 MASS mclust statmod]; }; + BeSS = derive2 { name="BeSS"; version="1.0.2"; sha256="0kg9aa6jrnrmcfdyj3yl1ssqgwlvv15wyqi88s0h3p9ay68pykdj"; depends=[glmnet Matrix Rcpp RcppEigen survival]; }; Benchmarking = derive2 { name="Benchmarking"; version="0.26"; sha256="00w7a16lhra6rjylyj26q67mvgbc3wa27a2wmiwjz5yh7wdnh193"; depends=[lpSolveAPI ucminf]; }; BenfordTests = derive2 { name="BenfordTests"; version="1.2.0"; sha256="1nnj0w0zwcmg7maqmmpixx7alvsyxva370ssc26ahg6kxy5a621w"; depends=[]; }; Bergm = derive2 { name="Bergm"; version="4.0.0"; sha256="1iw9k9v540bnrjqqq9hvpjh8g4cr53sli31ldw4k1savzq0jirdf"; depends=[coda ergm MCMCpack mvtnorm network]; }; Bessel = derive2 { name="Bessel"; version="0.5-5"; sha256="1apcpwqgnbsn544x2mfjkp4136xn33pijazmbzas7lr14syl5a6b"; depends=[Rmpfr]; }; BetaBit = derive2 { name="BetaBit"; version="1.3"; sha256="1x9mfnijgi8726p82d52g2zgmliwsc97v2g96mz9ccz2vqqnwq4w"; depends=[digest]; }; - BeviMed = derive2 { name="BeviMed"; version="4.0"; sha256="16hwjs3kv1f49la2p5qlywc02n9g7g7qzb5v4m7p2mmi0p2ybmvm"; depends=[Rcpp]; }; + BeviMed = derive2 { name="BeviMed"; version="5.0"; sha256="0nkb7phlvvk54m1bkphy788l64vzpnbbvrcsz1n7h79kl4d7kd8d"; depends=[Rcpp]; }; Bhat = derive2 { name="Bhat"; version="0.9-10"; sha256="1vg4pzrk3y0dk1kbf80mxsbz9ammkysh6bn26maiplmjagbj954v"; depends=[]; }; - BiBitR = derive2 { name="BiBitR"; version="0.2.2"; sha256="13v8kwf8rnagf978v26a5qn19x44lzdz61n80rw8vxi2ydxbdbr9"; depends=[biclust foreign]; }; + BiBitR = derive2 { name="BiBitR"; version="0.3.0"; sha256="00b6d0h921a0wh4mydgi5kcpacx7pd21zbidmz02hs09vq30k030"; depends=[biclust cluster dendextend foreign lattice randomcoloR viridis]; }; BiDimRegression = derive2 { name="BiDimRegression"; version="1.0.6"; sha256="1kgrk4xanvxqdq619ha08wwplmsn2xqygx4dziagx48iqfpp1lxj"; depends=[nlme]; }; BiSEp = derive2 { name="BiSEp"; version="2.2"; sha256="1ha7rc1q54dr2xl4bpkiwl703igmmi9qphsgv2h0flq7iz0gr351"; depends=[AnnotationDbi GOSemSim mclust]; }; BiTrinA = derive2 { name="BiTrinA"; version="1.2"; sha256="0q2wqxj2ipmppilhvq80cnvhnhcp26h422i8ghx26nrkswhx378s"; depends=[diptest]; }; @@ -314,14 +331,14 @@ in with self; { BinaryEPPM = derive2 { name="BinaryEPPM"; version="2.0"; sha256="08w5zcyrfz55x86nwpb4k0w0lpk1ncirjp30p46421w0xz8swk10"; depends=[expm Formula lmtest numDeriv]; }; BioFTF = derive2 { name="BioFTF"; version="1.2-0"; sha256="03r6fhpc4dqrcnbl73j9kav1l7rblgfldpbkl2p367vv20xggqih"; depends=[]; }; BioGeoBEARS = derive2 { name="BioGeoBEARS"; version="0.2.1"; sha256="0wyddc5ma47ljpqipfkwsgddp12m9iy4kqwwgklyhf0rqia56b1h"; depends=[ape cladoRcpp FD gdata optimx phylobase plotrix rexpokit xtable]; }; - BioInstaller = derive2 { name="BioInstaller"; version="0.0.3"; sha256="0fk9ix0iaaw1wsvfkh5zz9yjf740976akpanx7qdbzwhjn08r36x"; depends=[configr futile_logger git2r R_utils RCurl stringr]; }; + BioInstaller = derive2 { name="BioInstaller"; version="0.1.2"; sha256="1kf8d1l71ch04a73ysp3i8r3a5zdsk3df40lcwv4bij1hqgvjhl2"; depends=[configr devtools futile_logger git2r R_utils RCurl rvest stringi stringr]; }; BioMark = derive2 { name="BioMark"; version="0.4.5"; sha256="1ifc72bayy3azbilajqqzl0is6z7l1zaadchcg3n8lhmjrv5sk3m"; depends=[glmnet MASS pls st]; }; BioPET = derive2 { name="BioPET"; version="0.2.1"; sha256="0pwkgffm8hlgvpk3dfzskl50kp9b4rnxc8aj119kwrmlfazhhl50"; depends=[ggplot2 gridExtra pROC VGAM]; }; BioPhysConnectoR = derive2 { name="BioPhysConnectoR"; version="1.6-10"; sha256="1cc22knlvbvwsrz2a7syk2ampm1ljc44ykv5wf0szhnh75pxg13l"; depends=[matrixcalc snow]; }; BioStatR = derive2 { name="BioStatR"; version="2.0.0"; sha256="1k3z337lj8r06xgrqgi5h67hhkz2s5hggj6dhcciq26i1nzafsw6"; depends=[ggplot2]; }; Biocomb = derive2 { name="Biocomb"; version="0.3"; sha256="0shhsljg0knfp83b3hrs2c674sqx2348h5m99jhf19jf1i98pf1k"; depends=[arules class e1071 FSelector gtools MASS nnet pamr pROC randomForest Rcpp rgl ROCR rpart RWeka]; }; Biodem = derive2 { name="Biodem"; version="0.4"; sha256="0k0p4s21089wg3r3pvyy9cxsdf4ijdl598gmxynbzvwpr670qnsh"; depends=[]; }; - BiodiversityR = derive2 { name="BiodiversityR"; version="2.8-0"; sha256="0jfnwa7abwrharlwv9v9fdb5dq3mb74wjsc3ak9lp00s8nlj7jl0"; depends=[Rcmdr vegan]; }; + BiodiversityR = derive2 { name="BiodiversityR"; version="2.8-3"; sha256="11574bspbp7kfm0g9mmpi0vh0lyfrjqkccpdsrashsbcij96rcv6"; depends=[Rcmdr vegan]; }; Biograph = derive2 { name="Biograph"; version="2.0.6"; sha256="0vklqwbifbac3v9ws9fs22yxpqqk5b3m96qzr8j0irnimb5kgh5p"; depends=[Epi etm ggplot2 lubridate msm mstate mvna plyr reshape survival]; }; Biolinv = derive2 { name="Biolinv"; version="0.1-1"; sha256="1fnx9fcybw8agc2zba61lk4ygq8qi3b747i5cnh1b3vh6dw5fapq"; depends=[classInt fields raster sp spatstat]; }; BisRNA = derive2 { name="BisRNA"; version="0.2.1"; sha256="1sjx53lkdhiygr2w7drs9c47hnmv2s232bsd96d6k2xn6yai593i"; depends=[knitr MASS]; }; @@ -334,43 +351,45 @@ in with self; { BlockMessage = derive2 { name="BlockMessage"; version="1.0"; sha256="1jrcb9j1ikbpw098gqbcj29yhffa15xav90y6vpginmhbfpwlbf4"; depends=[]; }; Blossom = derive2 { name="Blossom"; version="1.4"; sha256="0002rvz0mlwl2clglzqldg0x5l8lj07qh74ifpdaf1lrdailh328"; depends=[]; }; Bmix = derive2 { name="Bmix"; version="0.6"; sha256="17swhn2p7jv29fkspacg2v181lkc9yd3xww2fx31xs8hsndcm857"; depends=[mvtnorm]; }; - BoSSA = derive2 { name="BoSSA"; version="2.0"; sha256="1cj2k8ra26mnnvn3gqwl3z6qr9sy63rnszgb3a9y6dh4dkgk6hd2"; depends=[ape jsonlite RSQLite]; }; + BoSSA = derive2 { name="BoSSA"; version="2.1"; sha256="0y9ayr5yb92w9q8lqaqsnkfmy8nvi4r1yvasf7avp2bvf19c7x2w"; depends=[ape jsonlite phangorn plotrix RSQLite]; }; BoardGames = derive2 { name="BoardGames"; version="1.0.0"; sha256="1w3ghs29qlnjrd46lvv055snclwwy6a22fgdqszqm377w4favnhm"; depends=[]; }; Bolstad = derive2 { name="Bolstad"; version="0.2-34"; sha256="0snqy580glwpv37hvjnivb3f06hf2prqply1nj5ks5aryabiiz59"; depends=[mvtnorm]; }; Bolstad2 = derive2 { name="Bolstad2"; version="1.0-28"; sha256="08cfadvl9jl9278ilsf8cm2i2a3i8zsa2f3vjzw2nlv85fwi2c7v"; depends=[]; }; BonEV = derive2 { name="BonEV"; version="1.0"; sha256="0lmgrg53b0abb5hidyjjmwn7lf2ani84k9fil7g6j6mdajjhh1b7"; depends=[qvalue]; }; BoolFilter = derive2 { name="BoolFilter"; version="1.0.0"; sha256="14z4fzf8p4wgi939qs6v39a3xizccjcx7j4szsydllpkvxbwggbw"; depends=[BoolNet Rlab]; }; BoolNet = derive2 { name="BoolNet"; version="2.1.3"; sha256="1s64a46wfp31jsyfdg2m8269qaq7x798y2bj0dyk69di1nxx2daa"; depends=[igraph XML]; }; - Boom = derive2 { name="Boom"; version="0.6"; sha256="1cz78f469lhf1s9hiimz992fablfwkpm0v268vj7028lp1jj6hix"; depends=[BH MASS]; }; - BoomSpikeSlab = derive2 { name="BoomSpikeSlab"; version="0.8.0"; sha256="0zkz7jsdn3adi2frnxxpnaqss81ylj6lzhbnj88qvmvgfdxgk6ls"; depends=[BH Boom]; }; + Boom = derive2 { name="Boom"; version="0.7"; sha256="1jfy1namnrpnly992jvhv5qiwnj5mdz5vp6f1xglsgd4wf39sfxb"; depends=[BH MASS]; }; + BoomSpikeSlab = derive2 { name="BoomSpikeSlab"; version="0.9.0"; sha256="05pd55jrbmg3pipc5nhq80g9bk47g4rkjx89q788bz7lzn11gdsn"; depends=[BH Boom]; }; BootMRMR = derive2 { name="BootMRMR"; version="0.1"; sha256="07am80603pv1dh5ma3zb0idnslkzm5m3ym8sd1nhkh8zbc6qqmzs"; depends=[]; }; BootPR = derive2 { name="BootPR"; version="0.60"; sha256="03zw7hz4gyhp6iq3sb03pc5k2fhvrpkspzi22zks25s1l7mq51bi"; depends=[]; }; BootWPTOS = derive2 { name="BootWPTOS"; version="1.2"; sha256="1860l11xg7444l3x42rq3636csla23gg0mi5in1zibjwn1ddc202"; depends=[fractal wavethresh]; }; Boruta = derive2 { name="Boruta"; version="5.2.0"; sha256="111rp7lbq79p7c1w4dkzhb9wh32mns5p17xxq0qbjzaiv41377dy"; depends=[ranger]; }; BradleyTerry2 = derive2 { name="BradleyTerry2"; version="1.0-6"; sha256="1080q7fw4yfl2y0jh3w2xz342i5yhhhavq40i3902bsmjj8g531d"; depends=[brglm gtools lme4]; }; + BradleyTerryScalable = derive2 { name="BradleyTerryScalable"; version="0.1.0"; sha256="0g12fkfs2sykyd6fzf924zv8gj2js452c4pf0pz2p6156chwrk8c"; depends=[dplyr igraph Matrix purrr Rcpp RcppArmadillo]; }; BrailleR = derive2 { name="BrailleR"; version="0.24.2"; sha256="07kd9x176gd3ccpskv7vn22jam1pknsywcd09qj7l4zfbv9l0rqx"; depends=[devtools extrafont gridGraphics gridSVG knitr moments nortest pander rmarkdown xtable]; }; Branching = derive2 { name="Branching"; version="0.9.4"; sha256="1c209gdasm7qipv2gg4d1hr0jmhnzz5rddgjxb7xacazc0c2mhff"; depends=[]; }; Brobdingnag = derive2 { name="Brobdingnag"; version="1.2-4"; sha256="1saxa492f32f511vw0ys55z3kgyzhswxkylw9k9ccl87zgbszf3a"; depends=[]; }; + BrownDog = derive2 { name="BrownDog"; version="0.2.0"; sha256="0i1rvrxb67kx3m3p84b7rrajjz5k3xj18qy631iqkg596p007940"; depends=[httpuv jsonlite RCurl]; }; Brq = derive2 { name="Brq"; version="2.0"; sha256="0j6d1m2drzy1wyr5y25qb8gs6555vh0lkyh415kw17x9dj4ks0zx"; depends=[]; }; BsMD = derive2 { name="BsMD"; version="2013.0718"; sha256="1yvazqlbmm221r7nkhrhi309gkk6vx7ji5xlvf07klya2zg20gcj"; depends=[]; }; BurStFin = derive2 { name="BurStFin"; version="1.02"; sha256="16w2s0bg73swdps9r0i8lwvf1najiqyx7w7f91xrsfhmnqkkjzka"; depends=[]; }; BurStMisc = derive2 { name="BurStMisc"; version="1.1"; sha256="0cyi42zkn2dby162x9f95b3hpqxbzx25s7nahb4p86r60xj3a5c0"; depends=[]; }; BuyseTest = derive2 { name="BuyseTest"; version="1.0"; sha256="1nfj2ajah2dg1p47g2z0zf9s24sxj4dfn3nny1h4qmqwcb4vs55g"; depends=[data_table lava Rcpp RcppArmadillo snowfall survival]; }; C50 = derive2 { name="C50"; version="0.1.0-24"; sha256="17ay0rbm2cg2s27mh09xg0knk7idx6f761sc849m41vsc6pfhzk1"; depends=[partykit]; }; - CADFtest = derive2 { name="CADFtest"; version="0.3-2"; sha256="00nsnzgjwkif7mbrw7msswjxhi9aysjdx3qg3i4mdmj1rmp7c4dc"; depends=[dynlm sandwich tseries urca]; }; - CADStat = derive2 { name="CADStat"; version="3.0.7"; sha256="0ya1y5c6hw55prr6xargb4ndm6qi6k3q2ysj3qgr4w1bs3wa32ix"; depends=[bio_infer car gdata gmodels gtools iplots JavaGD JGR lattice lme4 MASS MatrixModels minqa nloptr pbkrtest png quantreg Rcpp rJava rpart SparseM XML]; }; - CALF = derive2 { name="CALF"; version="0.1.3"; sha256="0407k1afyaknlvhn5gx909vp4jl5n25r9jyqkhx9zqhzllrj25f2"; depends=[ggplot2]; }; + CADFtest = derive2 { name="CADFtest"; version="0.3-3"; sha256="06bwv728ckalzibxginzfica24w18m4g87i0i064m3q89ghmnlqm"; depends=[dynlm sandwich tseries urca]; }; + CADStat = derive2 { name="CADStat"; version="3.0.8"; sha256="0wdglw1vyd5gz70r9ma0mwshvizv39nb4ahp8pvr70c4qqzsfhc0"; depends=[bio_infer car gdata gmodels JavaGD JGR lattice MASS quantreg rJava rpart XML]; }; + CALF = derive2 { name="CALF"; version="0.2.0"; sha256="12w1vr0rk6m4lv6zvqrf45k81d301ln1253wyy9xi6mv1hkabg0v"; depends=[ggplot2]; }; CALIBERrfimpute = derive2 { name="CALIBERrfimpute"; version="0.1-6"; sha256="036nwnday098mawc9qlgl3jjjcdjnja1immg6xkq27hvv2xfbz82"; depends=[mice mvtnorm randomForest]; }; CAM = derive2 { name="CAM"; version="1.0"; sha256="07mmrz6j8cm6zgaw2zcxgkxb7abd651kb80526r271snjgvpr5bl"; depends=[glmnet Matrix mboost mgcv]; }; CAMAN = derive2 { name="CAMAN"; version="0.74"; sha256="0d932fbqzlxlhn7m8zfx7wr02pc7fm8398rym1jh2cdy2fk5im08"; depends=[mvtnorm sp]; }; CANSIM2R = derive2 { name="CANSIM2R"; version="0.11"; sha256="12d5558b3wldla3sgwqdqwmfixcqfa8h92bq4a8ia284946vcbbf"; depends=[Hmisc reshape2]; }; - CARBayes = derive2 { name="CARBayes"; version="4.7"; sha256="0frpkq0hqxmdzv5hliyvw3g8cb26llnh9wjabqqm0sdpnzx64d37"; depends=[CARBayesdata coda MASS matrixcalc MCMCpack Rcpp sp spam spdep truncnorm]; }; + CARBayes = derive2 { name="CARBayes"; version="5.0"; sha256="0kii28mf75m7ij1l0bz2w93h7m1wwq1xjvv3d3nf3ps9h8rxzi8d"; depends=[CARBayesdata coda MASS matrixcalc MCMCpack Rcpp sp spam spdep truncnorm]; }; CARBayesST = derive2 { name="CARBayesST"; version="2.5"; sha256="1rzw05qq395zymmnk54a4qkq9b9mqwwmiaac0qgqq4k2ig9l5271"; depends=[CARBayesdata coda dplyr MASS matrixcalc Rcpp sp spam spdep testthat truncdist truncnorm]; }; CARBayesdata = derive2 { name="CARBayesdata"; version="2.0"; sha256="0mlqlqm50k4lqyvbjva7vji9jqa3rwi5ky5521rp5l4nqlj53sfb"; depends=[shapefiles sp]; }; CARE1 = derive2 { name="CARE1"; version="1.1.0"; sha256="1zwl4zv60mrzlzfgd7n37jjlr0j918a8ji36n94s5xw8wwipiznw"; depends=[]; }; CARLIT = derive2 { name="CARLIT"; version="1.0"; sha256="04kpjfps4ydf8fj75isqp16g1asdsyf8nszhbfkpw1zxkrmiksyp"; depends=[]; }; CARrampsOcl = derive2 { name="CARrampsOcl"; version="0.1.4"; sha256="1sdrir7h7xl1imipm9b71vca062dxqsqd8mg3w9f3s80x2aghxl8"; depends=[fields OpenCL]; }; - CATT = derive2 { name="CATT"; version="1.0"; sha256="1hnhzla14y0cii51pi53a42bmsxcqvylj88fyvgpfavmvz301f7d"; depends=[]; }; + CATT = derive2 { name="CATT"; version="2.0"; sha256="12xdspl1gbf51snyrl44nn7alfyccdfihibkgvzr66lrby8b8fhg"; depends=[]; }; CATkit = derive2 { name="CATkit"; version="3.0.0.2"; sha256="1afaa1s8clynpna9hwgbgfdp5jciv0n5q9vb27cgyl9n69nla991"; depends=[magic MASS png rtf season signal]; }; CAvariants = derive2 { name="CAvariants"; version="3.4"; sha256="1mrqvcgnxbzah7vhqqqdygds8plwswd2l8w0aq5132byhhc4kiax"; depends=[]; }; CBPS = derive2 { name="CBPS"; version="0.13"; sha256="16g62pvxd2njawk2sfaznhicy1dfxab3v1k0bfrzj5a4l1501l2z"; depends=[MASS MatchIt nnet numDeriv]; }; @@ -384,7 +403,7 @@ in with self; { CDF_PSIdekick = derive2 { name="CDF.PSIdekick"; version="1.2"; sha256="1h2d5xh7zj3d8r63qndvd5c8z52byn1852b51zmj6ypc90fil25x"; depends=[Rcpp]; }; CDFt = derive2 { name="CDFt"; version="1.0.1"; sha256="0sc8ga48l3vvqfjq3ak5j1y27hgr5dw61wp0w5jpwzjz22jzqbap"; depends=[]; }; CDLasso = derive2 { name="CDLasso"; version="1.1"; sha256="0n699y18ia2yqpk78mszgggy7jz5dybwsi2y56kdyblddcmz1yv7"; depends=[]; }; - CDM = derive2 { name="CDM"; version="5.5-21"; sha256="15i2asnc5yyhb8rdw3h9cnapiidvpvmw1gg71dn9vy5z3d1g1g3s"; depends=[lattice MASS mvtnorm plyr polycor psych Rcpp RcppArmadillo sfsmisc]; }; + CDM = derive2 { name="CDM"; version="5.7-16"; sha256="0gc9193c057mmdw5myva2hl345i5hrpzwbhvr6zpwxb9157w7nda"; depends=[lattice MASS mvtnorm plyr polycor psych Rcpp RcppArmadillo sfsmisc]; }; CDNmoney = derive2 { name="CDNmoney"; version="2012.4-2"; sha256="1isbvfq0lygs75y1hn3klqms8q7g1xbkcr8fgj75h1c99d4khvm6"; depends=[]; }; CDROM = derive2 { name="CDROM"; version="1.1"; sha256="0mvhqs4m8jp39x1rk31a1sqqmfq1avcnasgh8bizlyxx62igmi1b"; depends=[]; }; CDVine = derive2 { name="CDVine"; version="1.4"; sha256="0cp78pb6yny4n5q2j9k6xdql588536572gbphnw8zkdmrg65qyz7"; depends=[igraph MASS mvtnorm]; }; @@ -392,13 +411,13 @@ in with self; { CEC = derive2 { name="CEC"; version="0.9.4"; sha256="194n190szwzxjxfdhiah1f50vp6n7f3q567yky7pq1x2hngna5rs"; depends=[]; }; CEGO = derive2 { name="CEGO"; version="2.1.0"; sha256="141gr1sin6sgvjasm6sczvq2za25ybw7wapdljdx2lx7qhgq77rk"; depends=[DEoptim expm MASS Matrix quadprog]; }; CEoptim = derive2 { name="CEoptim"; version="1.2"; sha256="0bbjrhl63cbx1rsr5gclbqhjpnjid8ynk2ygaf1chf8z381n7650"; depends=[MASS msm sna]; }; - CFC = derive2 { name="CFC"; version="1.0.1"; sha256="0p4ijhks2jj9a417k9mp670q59d0wi3pfhqkx005cbsficynf0y2"; depends=[abind doParallel foreach Rcpp RcppArmadillo RcppProgress survival]; }; + CFC = derive2 { name="CFC"; version="1.1.0"; sha256="0yhb314qcdxig5vg0nbzvsqiddlsqlm50vzddhpp0z5n3xfa7h2c"; depends=[abind doParallel foreach Rcpp RcppArmadillo RcppProgress survival]; }; CGP = derive2 { name="CGP"; version="2.0-2"; sha256="1mggv3c8525vbdfdc3yhpp4vm4zzdvbwyxim29zj0lzwjf9fkgqk"; depends=[]; }; CHAT = derive2 { name="CHAT"; version="1.1"; sha256="1hl4xr4lkvb7r36gcbgax6ipqc3rsvn1r03w7fk9gf9bbyg7bkhg"; depends=[DNAcopy DPpackage]; }; CHCN = derive2 { name="CHCN"; version="1.5"; sha256="18n8f002w0p0l1s5mrrsyjddn10kdbb6b7jx1v9h1m81ifdbv0xb"; depends=[bitops RCurl]; }; CHFF = derive2 { name="CHFF"; version="0.1.0"; sha256="0jv75p1bnwsad2vpxf1zwq97al9xxhk2hpnpsilf0jn0w7g9b2d3"; depends=[]; }; CHMM = derive2 { name="CHMM"; version="0.1.0"; sha256="18wpld1anws9hv1z8sgib5nvjdg1wmk4dv5s1ysh8s0rzwnq9x2p"; depends=[mclust]; }; - CHNOSZ = derive2 { name="CHNOSZ"; version="1.0.8"; sha256="03hvvkm7i2q73hkcm79136lzjn99apqmcdlfghbz0318490gxin5"; depends=[]; }; + CHNOSZ = derive2 { name="CHNOSZ"; version="1.1.0"; sha256="1nbszjvz43ijxdq8pv7bci7csbggg5gg16r3538gxd8yainrwkjr"; depends=[colorspace]; }; CHsharp = derive2 { name="CHsharp"; version="0.4"; sha256="19mb5zzi9x4pm2z9jbha5dz4k5f1iqjv31aisyv4qh14k5ysdz2i"; depends=[KernSmooth scatterplot3d]; }; CIAAWconsensus = derive2 { name="CIAAWconsensus"; version="1.1"; sha256="11cicxfvjhbrfjsczsv25xdy7pckmz1bnjx7xq5jbg3b1wbv4g28"; depends=[Matrix mvtnorm numDeriv stringr]; }; CIDnetworks = derive2 { name="CIDnetworks"; version="0.8.1"; sha256="0k75mdlvm0rccag42pnhsni1kihpqsnj5bsrwlj7hdf7n8k1xb77"; depends=[igraph MASS msm mvtnorm numDeriv pbivnorm Rcpp]; }; @@ -424,7 +443,7 @@ in with self; { COMBAT = derive2 { name="COMBAT"; version="0.0.2"; sha256="1sda41db8h5gi7gqq0hj433dd6lh4xj75skjgmgqa3p80rndw461"; depends=[corpcor mvtnorm]; }; COMBIA = derive2 { name="COMBIA"; version="1.0-4"; sha256="02yadw3zjkj0ljq2c5k5zfsn8qnlvr6gxgafzrqw9g95cawv8q4x"; depends=[gdata hash lattice latticeExtra oro_nifti]; }; COMMUNAL = derive2 { name="COMMUNAL"; version="1.1.0"; sha256="1fv5dlqajpsd9k99sfikj3ai4jpzz2fh4s3gfglwrajk0nzlxjg2"; depends=[cluster clValid fpc]; }; - COMPoissonReg = derive2 { name="COMPoissonReg"; version="0.4.0"; sha256="09srjrav5x6hfgf0b0k1pjbr8ddkjjibzar971z5vr1m7wh4a29n"; depends=[]; }; + COMPoissonReg = derive2 { name="COMPoissonReg"; version="0.4.1"; sha256="14gjrf2hj7dy4hd0qnh6vqjzh7gc6g7gm7rh1d8dingkjwmjzrqb"; depends=[]; }; CONDOP = derive2 { name="CONDOP"; version="1.0"; sha256="0si9nm93wk9lif3r6jh2nxr4sjq1iqyfavbykja3zcy6yn05i19s"; depends=[earth GenomeInfoDb GenomicRanges IRanges mclust plyr randomForest rminer S4Vectors seqinr]; }; CONS = derive2 { name="CONS"; version="0.1.1"; sha256="0w0rca4z3hij0lbabpdnhv2lb52gx574g7bqp6q16772pi4685hf"; depends=[FactoMineR gridExtra gWidgets pander raster readxl REdaS]; }; CORE = derive2 { name="CORE"; version="3.0"; sha256="0wq9i7nscnzqiqz6zh6hglm7924261bw169q3x6l9i6jgqhvn32d"; depends=[]; }; @@ -441,6 +460,7 @@ in with self; { CPsurv = derive2 { name="CPsurv"; version="1.0.0"; sha256="1r68pp3jbcbwgfac132h30qx6ah780aychr49rlncn17xbdalxsh"; depends=[muhaz survival]; }; CR = derive2 { name="CR"; version="1.0"; sha256="0smb2i560dwbxg3mp1svfxmaiw193pd3klwqq0i27czf07k1xfvj"; depends=[]; }; CRAC = derive2 { name="CRAC"; version="1.0"; sha256="0vnqmmmwakx5jnzqp20dng35p7rvmz3ypm2m7bs41m8nhh2wq1xa"; depends=[]; }; + CRANsearcher = derive2 { name="CRANsearcher"; version="1.0.0"; sha256="09gw1s28gb0l2cn4w3asl6zlr7wfacxwafbdrayajwckyfkjl5dl"; depends=[curl dplyr DT lubridate miniUI shiny shinyjs stringr]; }; CRF = derive2 { name="CRF"; version="0.3-14"; sha256="0xhjj76730yjlpwbhcpdzqp7s37a9rhf4adk1s7hfb0jm8b76fgh"; depends=[Matrix Rglpk]; }; CRM = derive2 { name="CRM"; version="1.1.1"; sha256="09h6xvqc2h2gxhdhc7592z93cnw16l549pn9i26ml0f0n20hljmf"; depends=[]; }; CRTSize = derive2 { name="CRTSize"; version="1.0"; sha256="1d45zx26bf0zk0piham69gvb8djqf48g6iisbldv0ds3s2hhcsin"; depends=[]; }; @@ -451,7 +471,7 @@ in with self; { CTT = derive2 { name="CTT"; version="2.1"; sha256="0v8k54x9pib6hq3nz3m80g1a3p003f7bn8wnj9swwvacc90d6n44"; depends=[]; }; CTTShiny = derive2 { name="CTTShiny"; version="0.1"; sha256="1c9vsiqyig6kfjpy3dfrysc466h4v9530m49aynz65i1njplswyh"; depends=[CTT ltm psych shiny shinyAce]; }; CUB = derive2 { name="CUB"; version="1.0"; sha256="1csgsfxq80kh7s52f2658gs4c6nf1vpcmq0xizcjira2wnwpdzmv"; depends=[Formula]; }; - CUFF = derive2 { name="CUFF"; version="1.2"; sha256="11sqd84sq8rmbvx4mqvmfajxzsj68n286dgmv7vm9lkmvc7765bs"; depends=[openxlsx xtable]; }; + CUFF = derive2 { name="CUFF"; version="1.3"; sha256="1lv3gzh2wmw2dfmyc1fpxng221y1nr9qjxq8fjaxd71khcmzbykg"; depends=[openxlsx xtable]; }; CUMP = derive2 { name="CUMP"; version="2.0"; sha256="0rdscywmi4sylpjpr8r472iapddizb1mqyrd532cvw6frxins7w0"; depends=[]; }; CUSUMdesign = derive2 { name="CUSUMdesign"; version="1.1.3"; sha256="149d16d5y7zxkzq8gmb5spfrvirv0vyhk2qx0v7vclkr8adz9sva"; depends=[]; }; CVD = derive2 { name="CVD"; version="1.0.2"; sha256="0agb0liwbp4wvmxbyxgfb7471ki1agfb6ssh77kvwbkxqmrc8d96"; depends=[]; }; @@ -472,7 +492,7 @@ in with self; { CateSelection = derive2 { name="CateSelection"; version="1.0"; sha256="194lk6anrb05gaarwdg8lj5wm6k61b4r702cja3nf3z91i8paqi7"; depends=[]; }; CausalFX = derive2 { name="CausalFX"; version="1.0.1"; sha256="0v0diqq9fa1v9n3v5m5shvwlgmj91cbbb78243rwib1h3pyacihf"; depends=[igraph rcdd rje]; }; CausalGAM = derive2 { name="CausalGAM"; version="0.1-3"; sha256="0g68m2kxixwr7rx65r57m1n0qa161igc428zh9rj91fg6h4pdq4w"; depends=[gam]; }; - CausalImpact = derive2 { name="CausalImpact"; version="1.2.0"; sha256="0l7477m320nzwpvkcnj14rj9sh4brzc48kgzh0cadfm3145583sr"; depends=[assertthat Boom bsts dplyr ggplot2 zoo]; }; + CausalImpact = derive2 { name="CausalImpact"; version="1.2.1"; sha256="1y17icqia2iwd0q7nm1ngb3r51xq9r2qqm6k271znfpmv6pkp890"; depends=[assertthat Boom bsts dplyr ggplot2 zoo]; }; Causata = derive2 { name="Causata"; version="4.2-0"; sha256="04lndjy4rdf063z75zv42b000z06ffnr91pv2sql1ks6w60zmh1m"; depends=[boot data_table foreach ggplot2 glmnet R_utils RCurl rjson RMySQL stringr XML yaml]; }; CePa = derive2 { name="CePa"; version="0.5"; sha256="1y2q72j8bqx509i62a2x9j40rj5bkpgx4z6fwj05ibazc1441asd"; depends=[igraph snow]; }; CellularAutomaton = derive2 { name="CellularAutomaton"; version="1.1-1"; sha256="0kmw2ic161xwalqa63hznic4n4hdz20hsilf2awlcldg7m9si1zd"; depends=[R_methodsS3 R_oo]; }; @@ -489,31 +509,36 @@ in with self; { ChannelAttributionApp = derive2 { name="ChannelAttributionApp"; version="1.1"; sha256="0qy92ij1riynz7dhri3z85pafww5w9j1gx1bcgr8phlr32a7had7"; depends=[ChannelAttribution data_table ggplot2 shiny]; }; Chaos01 = derive2 { name="Chaos01"; version="1.0.1"; sha256="061z1cm55d0vxf9ly8hdhqb0qapqkyvhnfg44nnfh43a6a6kv339"; depends=[]; }; ChaosGame = derive2 { name="ChaosGame"; version="0.2"; sha256="1d6c2zjh7d5d1abi07d9akjjbpccvlnra96f2w58rdr87dy757zq"; depends=[colorRamps ggplot2 gridExtra plot3D RColorBrewer rgl sphereplot]; }; + CharFun = derive2 { name="CharFun"; version="0.1.0"; sha256="0cqy1na1lh9w3nspy68yylali9y5b64jlgh4fyzas556239dnyk7"; depends=[Bessel]; }; ChargeTransport = derive2 { name="ChargeTransport"; version="1.0.2"; sha256="0mq06ckp3yyj5g1z2sla79fiqdk2nlbclm618frhqcgmq93h0vha"; depends=[]; }; CheckDigit = derive2 { name="CheckDigit"; version="0.1-1"; sha256="0091q9f77a0n701n668zaghi6b2k3n2jlb1y91nghijkv32a7d0j"; depends=[]; }; ChemoSpec = derive2 { name="ChemoSpec"; version="4.4.17"; sha256="1v4mzkhr6y90nhxnq28aklh76f3imv1cxch50vj5k23d744djx8f"; depends=[plyr]; }; ChemometricsWithR = derive2 { name="ChemometricsWithR"; version="0.1.9"; sha256="095jahs7n591fam7s6i38h2iw5jbl005n040s1i489zzmsnj2n6d"; depends=[ChemometricsWithRData kohonen MASS pls]; }; ChemometricsWithRData = derive2 { name="ChemometricsWithRData"; version="0.1.3"; sha256="14l1y4md8hxq8gvip5vgg07vcr0d9yyhm5ckhzk8zwprdabn9a10"; depends=[]; }; ChoR = derive2 { name="ChoR"; version="0.0-1"; sha256="1zxzgmww368zfdd3fq4wmj4v9prh8fqdb2d3wplqszxjf1irmb45"; depends=[rJava]; }; + ChocoLattes = derive2 { name="ChocoLattes"; version="0.1.0"; sha256="0ircdar4fswaf34969gzgn83ia891jvwl29jn4s9a87cc4qagzgr"; depends=[ggplot2 knitr plotly R_utils rmarkdown WriteXLS XML]; }; ChoiceModelR = derive2 { name="ChoiceModelR"; version="1.2"; sha256="0dkp3354gvrn44010s8fjbmkpgn1hpl4xbfs5xslql8sk8rw0n2c"; depends=[]; }; CircE = derive2 { name="CircE"; version="1.1"; sha256="14bja3zv9wg389m6khmsy3q12hhnfcp49rvrmw47y6fh5m7ihrz2"; depends=[]; }; + CircMLE = derive2 { name="CircMLE"; version="0.2.0"; sha256="1zqpn3viwb0364pcrc6nfjd25fvn3bmniqnkvqiccwdlfncqqsvq"; depends=[circular]; }; CircNNTSR = derive2 { name="CircNNTSR"; version="2.2"; sha256="0z29dsvcwpra1ny8kj486dpnrak272wmkfnaiyashzcqpnkmkg03"; depends=[]; }; CircOutlier = derive2 { name="CircOutlier"; version="3.2.3"; sha256="1vyac4mjkn6p4p9n5finqqak6g7m3hj04a66v3w797jn1wbd1xly"; depends=[CircStats circular]; }; CircStats = derive2 { name="CircStats"; version="0.2-4"; sha256="1f2pf1ppp843raa82s2qxm3xlcv6zpi578zc4pl0d7qyxqnh603s"; depends=[boot MASS]; }; CircularDDM = derive2 { name="CircularDDM"; version="0.0.9"; sha256="187vq7s8bp822lncv4gi3f98myg8na6cbg92zvdlzbsx50fylipf"; depends=[Rcpp RcppArmadillo]; }; Cite = derive2 { name="Cite"; version="0.1.0"; sha256="1gfjirhswh4dkz88z4gl8m8jznqrvcgd4z3mnszyg1k5w3avlf1q"; depends=[miniUI RefManageR rstudioapi shiny]; }; CityPlot = derive2 { name="CityPlot"; version="2.0"; sha256="0lskgxmagqjglvpq39hgbygkf4qp28i2bj6b4m2av1s3pzb4465g"; depends=[]; }; - Ckmeans_1d_dp = derive2 { name="Ckmeans.1d.dp"; version="4.0.1"; sha256="148yfsz8di73iy81l2b97a7jcr3d3gs4a4jzjgybs7305ld1ngrq"; depends=[]; }; + CityWaterBalance = derive2 { name="CityWaterBalance"; version="0.1.0"; sha256="0nvm6bv2cxszjf33xgn1xcvhrgrgbdcar0jahwf7bs03gdlpmgi1"; depends=[dataRetrieval dplyr EcoHydRology geoknife lubridate reshape2 tgp xts zoo]; }; + Ckmeans_1d_dp = derive2 { name="Ckmeans.1d.dp"; version="4.2.0"; sha256="18hqh2p64vhw3w26viyh049if0d9vgd012hrvdkq9cllzil9scac"; depends=[]; }; ClamR = derive2 { name="ClamR"; version="2.1-1"; sha256="0raz1n79g24a9mc93zj49r20xcmdziw6vvcw5sd3qyjp1ycia13c"; depends=[]; }; ClickClust = derive2 { name="ClickClust"; version="1.1.5"; sha256="0b46f453mffg4ym6yvmh7g3v05mc9gphwfra75j28y1425s87yvw"; depends=[]; }; ClimClass = derive2 { name="ClimClass"; version="2.1.0"; sha256="1r836md31z2r5d9xckkbalzbhm4kf5paljv71kxpy53q92k7yi91"; depends=[geosphere ggplot2 reshape2]; }; ClimDown = derive2 { name="ClimDown"; version="1.0.2"; sha256="0dbv5vn985bi9nqxhq7jcj6k38s8dlbqnln3adgd0ih2fwilvalg"; depends=[abind fields foreach ncdf4 PCICt seas udunits2]; }; - CluMix = derive2 { name="CluMix"; version="1.3.1"; sha256="0kq0max4v9860dv76lprzq5wzdcbvzzjzqnzxrskic5r3yk6jf28"; depends=[Biobase ClustOfVar DescTools extracat FD gplots Hmisc marray Matrix]; }; - ClueR = derive2 { name="ClueR"; version="1.1"; sha256="1pk8l1qsiaypj34kbc3ikznn16ndn1alf1kgx0cx6pkhn2fpan2l"; depends=[e1071]; }; + CluMix = derive2 { name="CluMix"; version="2.0"; sha256="0bp85yhz7mj0ljmqrlj72q817vwcdibsxhadv0jjfxw1bwjhh1mh"; depends=[Biobase ClustOfVar DescTools extracat FD gplots Hmisc marray Matrix]; }; + ClueR = derive2 { name="ClueR"; version="1.2"; sha256="17phjzpdx11sw259xk16h2w28xdaxxpzbh0sxli61icnssw35n7z"; depends=[e1071]; }; ClustGeo = derive2 { name="ClustGeo"; version="1.0"; sha256="0n7i6lwc86cizpn5ibd6k9i41w8fcbh1cdxqm7w52z024w0z40jh"; depends=[FactoMineR plyr rCarto]; }; ClustMMDD = derive2 { name="ClustMMDD"; version="1.0.4"; sha256="0sblf3crpai53dflhyi27yn6mg0xyy9dxhwsk8j57sq5vr50x686"; depends=[Rcpp]; }; ClustOfVar = derive2 { name="ClustOfVar"; version="0.8"; sha256="17y8q2g4yjxs2jl1s8n5svxi021nlm0phs1g5hcnfxzpadq84wbs"; depends=[]; }; ClustVarLV = derive2 { name="ClustVarLV"; version="1.5.1"; sha256="11zydj3iq15sg84kny6nklpmh8wj9j9nklkknzfqnaagai8jgsmy"; depends=[Rcpp]; }; + ClusterBootstrap = derive2 { name="ClusterBootstrap"; version="0.9.3"; sha256="1znyj39mwdi02xhypvr2fsx2yp45w8br7r8qkn831d6fza5pkcyc"; depends=[]; }; ClusterR = derive2 { name="ClusterR"; version="1.0.5"; sha256="1x4rkj4b8n8zirzzmkxa20n50msj6mw41j2gkr276pcs37paf772"; depends=[FD ggplot2 gmp gtools OpenImageR Rcpp RcppArmadillo]; }; ClusterRankTest = derive2 { name="ClusterRankTest"; version="1.0"; sha256="01gzalhibqcdx3a6yc2cm1v77rscva73v5m5m0qkrgqdp9c8ph2a"; depends=[]; }; ClusterStability = derive2 { name="ClusterStability"; version="1.0.3"; sha256="1laa5m3y1rc7jr8q3i9qb3izs7qmadz169w9xm8q3mm3834ngn9b"; depends=[cluster clusterCrit copula Rcpp WeightedCluster]; }; @@ -522,6 +547,7 @@ in with self; { CoFRA = derive2 { name="CoFRA"; version="0.1002"; sha256="0ldf84dxaanww3qkf64mz5gv3yv2rjp9m6dy64xckds66vw6x0m3"; depends=[gplots stringr]; }; CoImp = derive2 { name="CoImp"; version="0.3-1"; sha256="0zj152w4cvnbfl144ggs3ixmyywxf9dqhh04jfydmv2a8n6px89n"; depends=[copula gtools locfit nnet]; }; CoSeg = derive2 { name="CoSeg"; version="0.38"; sha256="1fkaq5zwy8j17jvpv0kzmq40km83qn9s556661ghknzp7w8flih8"; depends=[fGarch kinship2]; }; + CodeDepends = derive2 { name="CodeDepends"; version="0.5-3"; sha256="03p82s0abca2jimzqvxdzykfzca7c7fhm5xsjxybcksr4gggr5sc"; depends=[codetools XML]; }; CoinMinD = derive2 { name="CoinMinD"; version="1.1"; sha256="0invnbj5589wbs0k2w5aq9qak7axc3s0g9nw85c48lnl0v95s91i"; depends=[MCMCpack]; }; CollapsABEL = derive2 { name="CollapsABEL"; version="0.10.11"; sha256="0libm1wv34av3vm2vvbqcnxjh4y1rwfi8qzjca8qdz9490vngags"; depends=[biganalytics bigmemory collUtils dplyr ggplot2 haplo_stats R_utils rJava RSQLite stringr]; }; CollocInfer = derive2 { name="CollocInfer"; version="1.0.4"; sha256="1iwf5g2y7i0j8dc19hdhya4m6g47jj968glnclj7a2yaq2yx37cj"; depends=[deSolve fda MASS Matrix spam]; }; @@ -546,19 +572,22 @@ in with self; { CompareCausalNetworks = derive2 { name="CompareCausalNetworks"; version="0.1.5"; sha256="0z9fjd344wc5bisir7hf64abli7in8b5860y1012vmah4vz9knlr"; depends=[Matrix]; }; CompareTests = derive2 { name="CompareTests"; version="1.2"; sha256="1z96kh851bpr2szgyjszkpv6m5ma6abz7hrm50fgvfpgxkj7f4yi"; depends=[]; }; CompetingRisk = derive2 { name="CompetingRisk"; version="1.0"; sha256="0lfpqz3a8csgmv8cg4clc1dzsgxvssfr5cyn1mgyxfzssch85drm"; depends=[MASS Matrix reshape2 survival wesanderson]; }; - Compind = derive2 { name="Compind"; version="1.1.2"; sha256="14y18vvj13f3wi5gzrwabmj908hh1c2mizw98a36xxzlxw79fipd"; depends=[Benchmarking boot GPArotation Hmisc lpSolve MASS nonparaeff psych]; }; - Compositional = derive2 { name="Compositional"; version="2.3"; sha256="1w2knd1h2827vl31zm9k2h404w9kcavigsj8idi8ndp6c0b2j6pc"; depends=[doParallel emplik fields foreach MASS mixture Rfast sn]; }; + Compind = derive2 { name="Compind"; version="1.2"; sha256="0xlsfrgh3pk0vfwhp81108fpcbhlddv31w449744rhpwzjbnx04b"; depends=[Benchmarking boot GPArotation Hmisc lpSolve MASS nonparaeff psych]; }; + Compositional = derive2 { name="Compositional"; version="2.4"; sha256="1av05vli01c1l5cgd7hmwc2pfgg69zplfj5x0pvnlxvjds668k36"; depends=[doParallel emplik fields foreach MASS mixture Rfast sn]; }; Compounding = derive2 { name="Compounding"; version="1.0.2"; sha256="1xlb3ylwjv70850agir0mx79kcvs43h0n1sm22zcny3509s2r7lf"; depends=[hypergeo]; }; ConConPiWiFun = derive2 { name="ConConPiWiFun"; version="0.4.6"; sha256="1kkc4xp5b6q54b76wk4ga28wl668psbpyivl6bnh3xm21276yx5k"; depends=[Rcpp]; }; - ConR = derive2 { name="ConR"; version="1.1"; sha256="1jl6pp0g7qrp0h5771r03gjiy4g7xbqw12liiqd8cfyl045s07yr"; depends=[fields geosphere maptools raster rgdal rgeos sp spatstat]; }; + ConR = derive2 { name="ConR"; version="1.2.1"; sha256="0k6761x5dfibbbzfzmkc73ahfmw54d5rpj0rj32232qdlk48hqk5"; depends=[fields geosphere maptools raster rgdal rgeos sp spatstat spatstat_utils]; }; ConSpline = derive2 { name="ConSpline"; version="1.1"; sha256="0ap3qxqdby9rf665vh40m6f4wjz7q3cz8i4abw1ccryjlwjv1kzp"; depends=[coneproj]; }; Conake = derive2 { name="Conake"; version="1.0"; sha256="1rj1rv8r53516jqhwp9xqqwjxh4gx1w47c0bw59f87wiy5pbchpf"; depends=[]; }; + CondIndTests = derive2 { name="CondIndTests"; version="0.1.1"; sha256="0n9ishrq9ilray5cq37q7fyizaffbwx36s5lf9z60mh6hn3dppha"; depends=[caTools kernlab lawstat MASS mgcv quantregForest randomForest RPtests]; }; CondReg = derive2 { name="CondReg"; version="0.20"; sha256="1ffnrjfjcb66i9nyvidkcn4k9pcj4r7xanjwzcxcrj2qm39apkqx"; depends=[]; }; + ConfoundedMeta = derive2 { name="ConfoundedMeta"; version="1.1.0"; sha256="1w3xqcwh657k6g84dc14xxnv49c8khr4k3j2yxs2f18ps1ld5b9k"; depends=[ggplot2 metafor]; }; Conigrave = derive2 { name="Conigrave"; version="0.1.1"; sha256="0k9azng63pyq7xic5w00mllbyq17pz8g1zmgr6zpvkmfv13fa6yw"; depends=[ggplot2 miceadds mitools]; }; ConjointChecks = derive2 { name="ConjointChecks"; version="0.0.9"; sha256="097mhiz8zjmmkiiapr3zfx7v35xirg57nqp1swd72dixaa23nhr1"; depends=[]; }; ConnMatTools = derive2 { name="ConnMatTools"; version="0.3.3"; sha256="0zsn3al3di0fd9hkqljpqqy4zbmh97xr6cdi4fzv80ax81fjfqyk"; depends=[]; }; - ConsRank = derive2 { name="ConsRank"; version="2.0.0"; sha256="05anbiahyfbw084zkaqs4p4hzpqrn1lwpicp7n55ndv1agmys22r"; depends=[gtools proxy rgl]; }; + ConsRank = derive2 { name="ConsRank"; version="2.0.1"; sha256="18f1gqa46f8jrcf2zj4njyy78cl0scjs9k8s9mvg0f9dpr44xnan"; depends=[gtools proxy rgl]; }; ContaminatedMixt = derive2 { name="ContaminatedMixt"; version="1.1"; sha256="04i8n8fmf2qs08dmlfls9j2509aqzb665qaz97na0wanbldxidbr"; depends=[caret mclust mixture mnormt mvtnorm]; }; + ContourFunctions = derive2 { name="ContourFunctions"; version="0.1.0"; sha256="1hlff3wx8r1wpkhrz0n27wjnzy6z2q8s9smyb906gwwa9xga7njy"; depends=[]; }; ConvCalendar = derive2 { name="ConvCalendar"; version="1.2"; sha256="0yq9a42gw3pxxwvpbj6zz5a5zl7g5vkswq3mjjv5r28zwa3v05vc"; depends=[]; }; ConvergenceConcepts = derive2 { name="ConvergenceConcepts"; version="1.2.1"; sha256="0kl67ds6369mxl2i93h43r00ji12qkg0k9m4jhcxsb0ydd8rfqgp"; depends=[lattice tkrplot]; }; Copula_Markov = derive2 { name="Copula.Markov"; version="1.1"; sha256="0pgzrgd9bzf2qh9b7h0y4mmszlxk1wxdwlid3xh7rk7pif3mw3qd"; depends=[]; }; @@ -566,9 +595,8 @@ in with self; { CopulaREMADA = derive2 { name="CopulaREMADA"; version="1.0"; sha256="021x40l5p6ip5br3qnca6nywkx9fpmgx5jm8i2dngj6yz6rc3hag"; depends=[matlab statmod tensor]; }; CopulaRegression = derive2 { name="CopulaRegression"; version="0.1-5"; sha256="0dd1n7b23yww36718khi6a5kgy8qjpkrh0k433c265653mf1siq8"; depends=[MASS VineCopula]; }; CopyDetect = derive2 { name="CopyDetect"; version="1.2"; sha256="1sahrlg1gk1q8ciq0a8hxrlyci5i8jxz8pjpy04alckxdrxfpqbi"; depends=[irtoys]; }; - CopyNumber450kCancer = derive2 { name="CopyNumber450kCancer"; version="1.0.4"; sha256="0csmrv5n4lxd19q8q94sxs374lkqilp5x2dj8nxzs0x1v8hn0knm"; depends=[]; }; - CorReg = derive2 { name="CorReg"; version="1.1.9"; sha256="0x5bcqyi03pxsajjbsq3hwp1d4f1b8150n1z0wsdnv1jyg1rc9d7"; depends=[corrplot elasticnet glmnet lars MASS Matrix mclust mvtnorm Rcpp RcppEigen Rmixmod rpart]; }; - Corbi = derive2 { name="Corbi"; version="0.4-1"; sha256="01xspwzgic7yfmnp6l8w33mjnyr8lvajzp6wvwpgq3ffhli5hrf0"; depends=[CRF Matrix mpmi]; }; + CorReg = derive2 { name="CorReg"; version="1.2.1"; sha256="1c7vvlxza0r9r07rr464y3kfkrnzz15l4jc7s727wjrw2az8rnpy"; depends=[corrplot elasticnet glmnet lars MASS Matrix mclust mvtnorm Rcpp RcppEigen Rmixmod rpart]; }; + Corbi = derive2 { name="Corbi"; version="0.4-2"; sha256="0h088iplryaipnfp8svw3djh016z23lv66q51gfbqpvchvjdwypw"; depends=[CRF Matrix mpmi]; }; CorporaCoCo = derive2 { name="CorporaCoCo"; version="1.0-2"; sha256="01hn80aidkzy9b4ki5f8y80hxzp96kqwzbyj7f3fjfvskvw2akhb"; depends=[data_table RColorBrewer rlist]; }; CorrBin = derive2 { name="CorrBin"; version="1.5"; sha256="1kg8kms76z127j2vmf7v162n0sh2jqylw4i7c35x5sig4q22m9gy"; depends=[boot combinat dirmult geepack mvtnorm]; }; CorrMixed = derive2 { name="CorrMixed"; version="0.1-13"; sha256="02zg5kmv5qxnasnz872r3z7x7dmdcniq1x5xyfnnb3niwkdjgxzx"; depends=[nlme psych]; }; @@ -581,17 +609,17 @@ in with self; { Countr = derive2 { name="Countr"; version="3.2.8"; sha256="0nx0xavpm3kkh6q9q4snqjs3dmp45b9dm2zqwg7lkrv0f32inkyp"; depends=[boot car flexsurv Formula MASS Matrix numDeriv optimx Rcpp RcppArmadillo VGAM]; }; CountsEPPM = derive2 { name="CountsEPPM"; version="2.1"; sha256="1w1l4kbk8c2prq7f38maz0fc44j9za6cmj0vydmcgscb9s6f3mg7"; depends=[expm Formula numDeriv]; }; CovSel = derive2 { name="CovSel"; version="1.2.1"; sha256="02fsiykbg96ynqw25vfyrams7fs39xjmfhvb23zjbqb7ql6d0xdk"; depends=[dr MASS np]; }; - CovSelHigh = derive2 { name="CovSelHigh"; version="1.0.0"; sha256="186ji8qvjvm41i85qa2324rs59wvjb4gsjllza5d7db08gqia66z"; depends=[bindata bnlearn doParallel doRNG foreach glmnet MASS Matching randomForest xtable]; }; + CovSelHigh = derive2 { name="CovSelHigh"; version="1.1.0"; sha256="0lxyhs8pvkvkjy5a6jpkxs1vfy0b05l9z87rdyn6hwpf0a5jh2mg"; depends=[bartMachine bindata bnlearn doParallel doRNG foreach glmnet MASS Matching randomForest tmle xtable]; }; CoxBoost = derive2 { name="CoxBoost"; version="1.4"; sha256="1bxkanc8zr4g3abn4ds5wqibv65flvm4y648fs9s0l4vc9vmyshg"; depends=[Matrix prodlim survival]; }; CoxPlus = derive2 { name="CoxPlus"; version="1.1.1"; sha256="038wsz206bgc0pnzx403b5ihcwhxpkrpxmwvrvqcxf8333pb62l5"; depends=[Rcpp RcppArmadillo]; }; CoxRidge = derive2 { name="CoxRidge"; version="0.9.2"; sha256="0p65mg4hzdgks03k1lj90yj6qbk50s94rwvcwzkb5xxxwrijd10r"; depends=[survival]; }; Coxnet = derive2 { name="Coxnet"; version="0.2"; sha256="023l1fcs0g5qqlslqfwb51nkmcqa0d5qp9bibhndd8gq7raz6ws6"; depends=[Matrix Rcpp RcppEigen]; }; CpGFilter = derive2 { name="CpGFilter"; version="1.0"; sha256="07426xlmx0ya3pi1y5c24zr58wr024m38y036h9gz26pw7bpawy2"; depends=[]; }; - CpGassoc = derive2 { name="CpGassoc"; version="2.55"; sha256="0vnksx66z8rfm5s5hn49p9ps26jwn6w2216bqw2k9xv77rr68phn"; depends=[nlme]; }; + CpGassoc = derive2 { name="CpGassoc"; version="2.60"; sha256="1zx18x8pxjl2ajnj7a7lb8383m75ysg17f4mzz0vkgl5mnf617ny"; depends=[nlme]; }; Cprob = derive2 { name="Cprob"; version="1.3"; sha256="1hahvkmniahhar47nha96vcj810895wgvvg9si112hnv3sjaql3r"; depends=[geepack lattice lgtdl prodlim tpr]; }; CreditMetrics = derive2 { name="CreditMetrics"; version="0.0-2"; sha256="16g3xw8r6axqwqv2f0bbqmwicgyx7nwzff59dz967iqna1wh3spi"; depends=[]; }; CrossClustering = derive2 { name="CrossClustering"; version="3.0"; sha256="0l9cdniqf63x4pfkf6y7c2qh056jwadqw45nz9jk78wamqq8hyqv"; depends=[cluster]; }; - CrossScreening = derive2 { name="CrossScreening"; version="0.0.1"; sha256="147zycpq83n3rh6fd2d1vh200avfam63r0rv3yg9mgl3myqrv5v6"; depends=[plyr sensitivitymw tables]; }; + CrossScreening = derive2 { name="CrossScreening"; version="0.1.1"; sha256="1gig80r8p611ysn35ajx7xdjj5wnkcf1vspcf0i06dmh75xpm3w9"; depends=[plyr tables]; }; CrossVA = derive2 { name="CrossVA"; version="0.9.0"; sha256="0q5fc2maxq70s6h6dmj6amn6xzrjn6rzcsnq0cqrah2c8b6y351y"; depends=[lubridate]; }; Crossover = derive2 { name="Crossover"; version="0.1-16"; sha256="19697wy066apkxrm99s7vflc0ih6zxxmyvj7x3dzh2icnv1gg1bb"; depends=[CommonJavaJars crossdes digest ggplot2 JavaGD MASS Matrix multcomp Rcpp RcppArmadillo rJava xtable]; }; CryptRndTest = derive2 { name="CryptRndTest"; version="1.2.2"; sha256="1cg0agwqp1f7pgxdf9wilwparklyfsv900r47fpihnqw3ycvbdai"; depends=[gmp kSamples LambertW MissMech Rmpfr sfsmisc tseries]; }; @@ -599,12 +627,12 @@ in with self; { CuCubes = derive2 { name="CuCubes"; version="0.1.0"; sha256="1cpazar85rp8xfjvy0vxivr61grzvxz7a9mirxvhynln964by6ns"; depends=[]; }; Cubist = derive2 { name="Cubist"; version="0.0.19"; sha256="1bjajcr2qnmqy8cakgiy4q07nj9dygz15a9jry5sa4nbkabpj4qh"; depends=[lattice reshape2]; }; Cyclops = derive2 { name="Cyclops"; version="1.2.2"; sha256="1ly8rmfssjbi04b0k200iqh0gv3zr53x9vhj6hnrg1n3dqw0smn5"; depends=[BH bit ff ffbase Matrix Rcpp RcppEigen RcppParallel]; }; - CytobankAPI = derive2 { name="CytobankAPI"; version="1.0.1"; sha256="097x07wjzwyviix3351m01az5y8dpmmbz7m3rb0by5ncbc3h3v9z"; depends=[httr jsonlite]; }; + CytobankAPI = derive2 { name="CytobankAPI"; version="1.0.1.1"; sha256="0a3r0a97q6mr1mznbhddd37v2ydmh6vhagvpgcfp413fq1abcpi3"; depends=[httr jsonlite]; }; D2C = derive2 { name="D2C"; version="1.2.1"; sha256="0qhq27978id0plyz9mgdi0r1sr3ixnvqm8w6hp5c2wjd1yhhh12s"; depends=[corpcor foreach gRbase lazy MASS randomForest RBGL Rgraphviz]; }; D3GB = derive2 { name="D3GB"; version="1.1"; sha256="1r4hxx2qdws7c7hsnswzfh6az8mn720sk8nygilljl2ghnwpq7pa"; depends=[DBI RSQLite]; }; D3M = derive2 { name="D3M"; version="0.41.1"; sha256="1qr50xq5zccb16a1rgzfbb9bz8bbnxxb522nb8ga159nmb4cwjmp"; depends=[beanplot Rcpp]; }; D3partitionR = derive2 { name="D3partitionR"; version="0.3.1"; sha256="09172g1xz9j746y22wj7vx759a3wnv6skqqzfazl753ms07zrwdc"; depends=[htmlwidgets]; }; - DA_MRFA = derive2 { name="DA.MRFA"; version="1.1"; sha256="1w2m4m1bs7bqnhzcjgpmlvqs4fjfygy8hrh0yr5f527rx0jf1w4n"; depends=[Matrix optimbase psych]; }; + DA_MRFA = derive2 { name="DA.MRFA"; version="1.1.2"; sha256="0gcrvw6zkbrahavmplvcav2h2m3jqmgd5f1s12k7r51nkh19hn21"; depends=[optimbase psych]; }; DAAG = derive2 { name="DAAG"; version="1.22"; sha256="16xp4qk09v9jwm4cs7b4mpn0kgl1va9rw86viwcjc54vjc32953f"; depends=[lattice latticeExtra]; }; DAAGbio = derive2 { name="DAAGbio"; version="0.63-3"; sha256="0n82d9nsvpl6cwp95by8ff9fmdafs2fdi603dlik5890adaw42x4"; depends=[limma]; }; DAAGxtras = derive2 { name="DAAGxtras"; version="0.8-4"; sha256="18lg13mbyharidj5j7ncx8s7d72v2hcnqr00vilhf3djk2mjq7xn"; depends=[]; }; @@ -615,10 +643,10 @@ in with self; { DAMOCLES = derive2 { name="DAMOCLES"; version="1.1"; sha256="07z8mynhqnk1zcvm84w09xzkiy2dfxwhmnpi6gaddr3p0waql4gj"; depends=[ape caper deSolve expm geiger matrixStats picante]; }; DAMisc = derive2 { name="DAMisc"; version="1.4-3"; sha256="1hic53vi7mj4fvggxjl4d3j4zw8wwczh6pldyi8idrhm45hw2nh4"; depends=[boot car effects gdata lattice MASS nnet pscl QRM sm VGAM xtable]; }; DATforDCEMRI = derive2 { name="DATforDCEMRI"; version="0.55"; sha256="0v26a1gi8l21ga5nqcnyfaa7gc8zxq6wk95b96ajgpdybb0l9s53"; depends=[akima lattice locfit matlab R_methodsS3 R_oo xtable]; }; - DBEST = derive2 { name="DBEST"; version="1.5"; sha256="0jh928zxif975d751x15ys9hi5l7rw3vhmpwpbv53pvgsnlxnkaq"; depends=[zoo]; }; + DBEST = derive2 { name="DBEST"; version="1.7"; sha256="1j4aa6pglxmwlafg0927x6dgdjbx7k5hbfahmdmlq7qcni5pg5h6"; depends=[zoo]; }; DBGSA = derive2 { name="DBGSA"; version="1.2"; sha256="04zqh9y3nqcdzs5jn8aaq5idy9zl450ikvl788xs860wlg692qv2"; depends=[fdrtool]; }; - DBI = derive2 { name="DBI"; version="0.6-1"; sha256="1fg158k4n6l3rzx9nrwhp4nwkwpbmv1q7z2xz5rw138zws68fkgr"; depends=[]; }; - DBItest = derive2 { name="DBItest"; version="1.4"; sha256="04d1q04lmmxnaapdalj61k2k4p06vpff0fzr91fa5a2mvaxl6272"; depends=[DBI R6 testthat withr]; }; + DBI = derive2 { name="DBI"; version="0.7"; sha256="04fyrxdpqcygg5wviy637y6lgk64xqjjq31lvv4hwqj5kbaxamr5"; depends=[]; }; + DBItest = derive2 { name="DBItest"; version="1.5"; sha256="1mhygy6wdw22r43jcisyxc852q1lbzx4xi387csf2zqgl86xldw4"; depends=[blob DBI desc hms R6 testthat withr]; }; DBKGrad = derive2 { name="DBKGrad"; version="1.6"; sha256="0207zx0v1x3zhfbs0h1ssxc1b683k111f90k8ybhknb147104knr"; depends=[lattice minpack_lm SDD TSA]; }; DCA = derive2 { name="DCA"; version="1.0"; sha256="13f22vwnxgq9wh2klhprni80092qwpwvbdp7n1apfvhim13mcyf9"; depends=[coin elasticnet GPArotation locfdr modeest mvtnorm PMA]; }; DCG = derive2 { name="DCG"; version="0.9.2"; sha256="1s2dz0vnhdhq23fqds1m2jspaz8k5zvd76z1zlbi6nb5ja5n3j3w"; depends=[]; }; @@ -632,7 +660,8 @@ in with self; { DDD = derive2 { name="DDD"; version="3.4"; sha256="0rjn28ndwa5cp23xdk830qidgs0kg3rx34yipkfg1bi4r7751was"; depends=[ade4 ape deSolve expoRkit Matrix phytools SparseM subplex]; }; DDHFm = derive2 { name="DDHFm"; version="1.1.2"; sha256="0lgh6kcfas06p2yy7zy21r05k5521xbj5af3wwwssp5li1cia35g"; depends=[lokern wavethresh]; }; DDIwR = derive2 { name="DDIwR"; version="0.2-0"; sha256="0dqbldl5c6b8i5q3yk0hwd12lp8z9j4ilnmsqrkj69fv7mys9q3k"; depends=[foreign XML]; }; - DDRTree = derive2 { name="DDRTree"; version="0.1.4"; sha256="02z4j777yxqp09gxwzmn6x5fjz4rbsp1lh4qj20vgdjp8wcn3pn0"; depends=[BH irlba Rcpp RcppEigen]; }; + DDM = derive2 { name="DDM"; version="1.0-0"; sha256="19g06qk3lzasj294x9wfij729mlq6ryvjqkn3rgl5xp1w0gx9wi2"; depends=[]; }; + DDRTree = derive2 { name="DDRTree"; version="0.1.5"; sha256="16s5fjw7kwlxhrkzdny62sx32fvmg3rxjc3wrh6krd31jh1fqlfk"; depends=[BH irlba Rcpp RcppEigen]; }; DECIDE = derive2 { name="DECIDE"; version="1.2"; sha256="18kn2pm9r0ims2k1jfsfzh258wwxz0xg86rsbwgq6szh0azlq3qy"; depends=[]; }; DEEPR = derive2 { name="DEEPR"; version="0.1"; sha256="0q8970q3gpjxwxdf2bkhpnqrxpm00w27b20a9sn9vv314rn1n7s8"; depends=[dirmult]; }; DEMEtics = derive2 { name="DEMEtics"; version="0.8-7"; sha256="1s59qim60d4gp5rxjacdbmxdbpdm7cy9samn088w8fs0q232vjjx"; depends=[]; }; @@ -646,17 +675,17 @@ in with self; { DGCA = derive2 { name="DGCA"; version="1.0.1"; sha256="1lqqzrsidkli4bk4jikq5f75jzqyzhv94n882yic5ndxgv26p9ic"; depends=[matrixStats WGCNA]; }; DHARMa = derive2 { name="DHARMa"; version="0.1.5"; sha256="1mgvpyhllp7pqnas5sbn6393jkin205109g2b4pn3diyb20avqwp"; depends=[ape doParallel foreach gap lme4 lmtest MASS mgcv qrnn sfsmisc]; }; DIFboost = derive2 { name="DIFboost"; version="0.2"; sha256="0wyjk870n18lq0dwhm9ndsh5vv0d8wkrbcky68w454vzrrw1q9h8"; depends=[mboost penalized stabs]; }; - DIFlasso = derive2 { name="DIFlasso"; version="1.0-2"; sha256="1900il14l2wvy5cjvmvg8z11q7ii311s18yif35561jilp2k9zfx"; depends=[grplasso miscTools penalized]; }; + DIFlasso = derive2 { name="DIFlasso"; version="1.0-3"; sha256="195wiy0jjkq6bh2b6wrjmr5l34pzx0i2qqvwp4pzv77sx737ds0v"; depends=[grplasso miscTools penalized]; }; DIFtree = derive2 { name="DIFtree"; version="2.1.4"; sha256="16cyd634jflaszpfq0ymwlbv57ci1iyffwai641jczn8cny504zl"; depends=[penalized plotrix]; }; DIME = derive2 { name="DIME"; version="1.2"; sha256="11l6mk6i3kqphrnq4iwk4b0ridbbpg2pr4pyqaqbsb06ng899xw0"; depends=[]; }; DIRECT = derive2 { name="DIRECT"; version="1.0.1"; sha256="00z4xlc9kxn19lw2b8xq6krsf5v3wfbr1ghl5ah5shr9dnv84lc1"; depends=[]; }; DISTRIB = derive2 { name="DISTRIB"; version="1.0"; sha256="0whwmmdx2k2vrjjkz4ww9v7z9ad3835819pby91119lyic27w727"; depends=[]; }; DJL = derive2 { name="DJL"; version="2.6"; sha256="1vvfh9hpanac2g22k4hqy3y7j3mn34mvasw0rx3y4vjbv3h05yw6"; depends=[car lpSolveAPI]; }; - DLASSO = derive2 { name="DLASSO"; version="1.0.0"; sha256="1rnm9f31d021yk2rhk7zcp2l9zbyxhpvdx32q6jjjjsiignjzc60"; depends=[MASS]; }; - DLMtool = derive2 { name="DLMtool"; version="3.2.3"; sha256="1jfvrr24w543c6dxg7j7s0990phlh56q97710xafdcw5cl4pxgkz"; depends=[abind LBSPR Rcpp readxl snowfall]; }; - DMMF = derive2 { name="DMMF"; version="0.2.8.0"; sha256="1zn0dpf8yn0zblh75qbln3kfxxvnbdjs5bsak1wsyayf964l7yl7"; depends=[raster rgdal sp]; }; + DLASSO = derive2 { name="DLASSO"; version="2.0.2"; sha256="0xdygf6h89d9z4kqb46iqfxgdzq9dmkrxf9ypw78l4d8n9xx2gaa"; depends=[MASS]; }; + DLMtool = derive2 { name="DLMtool"; version="4.2"; sha256="0s133f7xi8lz9hcdmdh8d0msy9l2xr3z2b9778h9g7mp9bh09ran"; depends=[abind coda devtools LBSPR MASS mvtnorm r4ss Rcpp readxl snowfall]; }; + DMMF = derive2 { name="DMMF"; version="0.3.2.0"; sha256="17v7ksmknbgh7h9k2l6mgkykg0rq352nlw585yhfck0bvvb5vdb3"; depends=[raster rgdal sp]; }; DMR = derive2 { name="DMR"; version="2.0"; sha256="1kal3bvhwqs00b6p6kl0ja35pcz9v9y569148qfhy94m319fcpzm"; depends=[magic]; }; - DMRMark = derive2 { name="DMRMark"; version="1.1.0"; sha256="11kwlk0q5c548m28n3hjsnmn8fcbjwsaw29qr4lb503mqsm2k7wn"; depends=[ellipse MCMCpack mvtnorm]; }; + DMRMark = derive2 { name="DMRMark"; version="1.1.1"; sha256="15wr6j0v9kvbv8y6flkp4svfqy059ziv89nxv91vp0pjmavhpdlz"; depends=[ellipse MCMCpack mvtnorm]; }; DMwR = derive2 { name="DMwR"; version="0.4.1"; sha256="1qrykl9zdvgm4c801iix5rxmhk9vbwnrq9cnc58ms5jf34hnmbcf"; depends=[abind class lattice quantmod ROCR rpart xts zoo]; }; DMwR2 = derive2 { name="DMwR2"; version="0.0.2"; sha256="1vzfbz2k05j8r2hpig3d2grb99rnnh2s1sviii3prcyqicxfh0i9"; depends=[class DBI dplyr quantmod readr rpart xts zoo]; }; DNAseqtest = derive2 { name="DNAseqtest"; version="1.0"; sha256="1mpmf40vrpw8m75rlqchsnyrz12pgg5bkz7wfca5yy5sbbiwk5pf"; depends=[]; }; @@ -668,6 +697,7 @@ in with self; { DOT = derive2 { name="DOT"; version="0.1"; sha256="0qh5n57cp9c2n5yn59q4wggz82943pwfanp3kx869aba2x3sj30i"; depends=[V8]; }; DOvalidation = derive2 { name="DOvalidation"; version="0.1.0"; sha256="0vm4sxbchkj2hk91xnzj6lpj05jg2zcinlbcamy0x1lrbjffn9zk"; depends=[]; }; DPBBM = derive2 { name="DPBBM"; version="0.2.5"; sha256="1qypxrcm3sb727lqb09ssjf3hblixqayw3qsyql01imrxwm609i2"; depends=[CEoptim gplots tmvtnorm VGAM]; }; + DPWeibull = derive2 { name="DPWeibull"; version="1.0"; sha256="01ssi5g9g1nx8ljfng6rbjbn3j229ajm16xfx39g5a2i9hndi45h"; depends=[DPpackage matrixStats Rcpp truncdist]; }; DPpackage = derive2 { name="DPpackage"; version="1.1-6"; sha256="01qdl6cp6wkddl9fwwpxwvyhb7lpjxis6wnbm2s288y2n9wi4j24"; depends=[MASS nlme survival]; }; DREGAR = derive2 { name="DREGAR"; version="0.1.3.0"; sha256="15cplshs85r0z659mc7xmj5db7vc95wxs01c34isc22p8z0a287i"; depends=[msgps]; }; DRIP = derive2 { name="DRIP"; version="1.1"; sha256="050xfq30fp9m03ig938bci2haiglj6jj4k327fpz7r2y78cgcnn4"; depends=[caTools readbitmap]; }; @@ -687,10 +717,11 @@ in with self; { DTMCPack = derive2 { name="DTMCPack"; version="0.1-2"; sha256="0bibas5cf06qq834x9q2l2fyh6q9wrg07k8cn6almcyirzax6811"; depends=[]; }; DTR = derive2 { name="DTR"; version="1.7"; sha256="1lzvk9ar6xf3n2vvy8vb9mvrbx3nafzzhvz5g7vf79jd71yz54jd"; depends=[aod ggplot2 survival]; }; DTRlearn = derive2 { name="DTRlearn"; version="1.2"; sha256="1dakwlafs27nkjsiknnwxnb2hgc2xdpi5mb6dmzpjig7hg2f8d3f"; depends=[ggplot2 glmnet kernlab MASS]; }; - DTRreg = derive2 { name="DTRreg"; version="1.1"; sha256="113m1zhhfyjxl1b0ibjamfcpfii3sp32im4mj8lk2ql2mqw7j9yd"; depends=[]; }; + DTRreg = derive2 { name="DTRreg"; version="1.2"; sha256="055m587pvvcysfarxhkvgl30qisgf3v1yry8qrk54vps70scm03v"; depends=[]; }; DVHmetrics = derive2 { name="DVHmetrics"; version="0.3.6"; sha256="0r3wjkr6grrh4nybrg0rs9ialrppjsdjshb47m0knn48vi0iwm77"; depends=[ggplot2 KernSmooth markdown reshape2 shiny]; }; DWreg = derive2 { name="DWreg"; version="2.0"; sha256="0bgahzgcxz86n0ady97l48zyahv3p2iyc2ivbij1xrfx3wcx3b5n"; depends=[DiscreteWeibull Ecdat maxLik survival]; }; DYM = derive2 { name="DYM"; version="0.2"; sha256="1rk0xs224xi68f0mrygny2rklggl4grk866q7y9xck38bwy7aw94"; depends=[]; }; + DZEXPM = derive2 { name="DZEXPM"; version="1.0"; sha256="0qk93jsfrlbq4b9mgwq0fpyad7w81b0hcfa4xgaahd05p2jbcqrj"; depends=[]; }; Daim = derive2 { name="Daim"; version="1.1.0"; sha256="19s0p3a4db89i169n2jz7lf8r7pdmrksw7m3cp9n275b5h8yjimx"; depends=[rms]; }; DamiaNN = derive2 { name="DamiaNN"; version="1.0.0"; sha256="09viy1lilz0b29s3myky03981bfnhxjxxgfhdah33cn5x682rbp4"; depends=[caret testthat]; }; DandEFA = derive2 { name="DandEFA"; version="1.6"; sha256="1ir1z76c8742vqdlwv35l4rhr0x7lhghz24g35zn7b30671lypf8"; depends=[gplots polycor]; }; @@ -700,6 +731,7 @@ in with self; { DataCombine = derive2 { name="DataCombine"; version="0.2.21"; sha256="0iwb4726bk0cjhay694dp43b1553yyk9lpxbncs85kz229b26arm"; depends=[data_table dplyr]; }; DataEntry = derive2 { name="DataEntry"; version="0.9-1"; sha256="127g8vd22rir2xdhv0jdirfg2vq7iyh6y1qak8221jxdifpfvrjj"; depends=[digest gWidgets gWidgetsRGtk2 RGtk2]; }; DataExplorer = derive2 { name="DataExplorer"; version="0.4.0"; sha256="0yxx20wzdnsz924q7mh9sbbbby04vv5rybvyqbk2s78a8lqv7abw"; depends=[data_table ggplot2 gridExtra networkD3 reshape2 rmarkdown scales]; }; + DataGraph = derive2 { name="DataGraph"; version="1.0.1"; sha256="0rvysvkcs926jzhp7iz9d5np0pa31y825ajn9yyzhbdfk5dg2wry"; depends=[Rcpp]; }; DataLoader = derive2 { name="DataLoader"; version="1.3"; sha256="18mih6mb95v5xjvmqwby2mma74fcxwyqdm5w8j3bhi4iwgfn6d7v"; depends=[plyr rChoiceDialogs readxl xlsx]; }; Datasmith = derive2 { name="Datasmith"; version="1.0-1"; sha256="1ba23b8a931pvml2dzw0zkm40akcl2lb6rps6bffrl7lvxiy35y1"; depends=[igraph lbfgs MASS Matrix nloptr truncnorm vegan]; }; Davies = derive2 { name="Davies"; version="1.1-9"; sha256="19n2szki2dc8z01zh5a7bq4scgisnpd2qqbiimgrswjrykgh2fpm"; depends=[]; }; @@ -714,21 +746,23 @@ in with self; { DeducerSurvival = derive2 { name="DeducerSurvival"; version="0.1-0"; sha256="03qk3y4pibvrxbnxbm5rlksw807dvbilip1jbpn1r7k02ibzq676"; depends=[Deducer]; }; DeducerText = derive2 { name="DeducerText"; version="0.1-2"; sha256="0if2p9j74wa5rva4iv0i8iax22grl9j7lqcqzqlywjgqwnlzxa05"; depends=[Deducer RColorBrewer SnowballC tm wordcloud]; }; Delaporte = derive2 { name="Delaporte"; version="6.0.0"; sha256="0jjm84m2lq7p326ji2z207a7r04l9aj1bgy82b3isgj7i01k56xy"; depends=[]; }; + Delta = derive2 { name="Delta"; version="0.1.1.1"; sha256="0wbdb23l5ayiwg0cnkwkqlg7g1n41jsq6m1b8fxf0dn25lfkiqkj"; depends=[]; }; Demerelate = derive2 { name="Demerelate"; version="0.9-3"; sha256="1bsf09di6nh0hznqx829jnbn3092rya03hnc82cns6rm8d3bn0a9"; depends=[fts mlogit sfsmisc vegan]; }; DendSer = derive2 { name="DendSer"; version="1.0.1"; sha256="0id6pqx54zjg5bcc7qbxiigx3wyic771xn9n0hbm7yhybz6p3gz9"; depends=[gclus seriation]; }; + DendroSync = derive2 { name="DendroSync"; version="0.1.0"; sha256="0694pw5wh6ff30gpxxn4spkdyzybqhdvh2p9ciijnn454rqv6qm6"; depends=[ggplot2 gridExtra nlme]; }; DengueRT = derive2 { name="DengueRT"; version="1.0.1"; sha256="11qfg4l6y3j8qh4dcsz13xjjj1n0q71c9a3c180nm5lgqv0nwb81"; depends=[drc ggplot2 nlme]; }; DensParcorr = derive2 { name="DensParcorr"; version="1.0"; sha256="15w0ifcq1js0wyjscfhlbga77sgzqpmz7zmwa77y92iwna8q66ad"; depends=[clime gplots]; }; Density_T_HoldOut = derive2 { name="Density.T.HoldOut"; version="2.00"; sha256="0kh5nns1kqyiqqfsgvxhx774i2mf4gcim8fp5jjyq577x4679r31"; depends=[histogram]; }; - DepthProc = derive2 { name="DepthProc"; version="1.0.7"; sha256="1vnx9lhcrzsyygpq1rii4crxrz4c4vs60dnw0ha0y3j1mh0yxc2k"; depends=[colorspace geometry ggplot2 lattice MASS np Rcpp RcppArmadillo rrcov sm]; }; - Deriv = derive2 { name="Deriv"; version="3.8.0"; sha256="0a5kf5bb46wszq76wc7jasd4g2clmrvs86mrz14hngmhpmlcy7gp"; depends=[]; }; - DescTools = derive2 { name="DescTools"; version="0.99.20"; sha256="0jnyh7sgp3zpiqdpidyw5nv4mg99knnnaqpb1ijrdf0z104vsm2w"; depends=[BH boot expm foreign manipulate MASS mvtnorm Rcpp]; }; - DescToolsAddIns = derive2 { name="DescToolsAddIns"; version="0.9"; sha256="0fwvpp8csqdri7gddh7xzcnzzff14hlypfin2y12a0w4x0hz2fpb"; depends=[DescTools rstudioapi]; }; + DepthProc = derive2 { name="DepthProc"; version="2.0.2"; sha256="0n9hs6fp047gnd8y87rzx5qcr3hqg3pdck97hcbzkd8jsi1b1daw"; depends=[colorspace geometry ggplot2 lattice MASS np Rcpp RcppArmadillo rrcov sm zoo]; }; + Deriv = derive2 { name="Deriv"; version="3.8.1"; sha256="13q3y5981cglykga4qfxpad5sik66m1w273f2j1n0zh58s4da5rz"; depends=[]; }; + DescTools = derive2 { name="DescTools"; version="0.99.21"; sha256="1d4qrhp1xgdky24djixi7d1wv8hpyyn6w02zqxfr10q33lbw0y7w"; depends=[BH boot expm foreign manipulate MASS mvtnorm Rcpp]; }; + DescToolsAddIns = derive2 { name="DescToolsAddIns"; version="0.9.1"; sha256="10q51qakascv14f8yzp2izvd404230wzvygql23ja37xgkyhz3v1"; depends=[DescTools rstudioapi]; }; DescribeDisplay = derive2 { name="DescribeDisplay"; version="0.2.5"; sha256="02b6yjgklsdjh3rikc8f5wfx08ymbygr3fyq1c134xhffhykrlgp"; depends=[GGally ggplot2 plyr reshape2 scales]; }; DetMCD = derive2 { name="DetMCD"; version="0.0.4"; sha256="0jdwwx15k8g3f5izcswsj28nfdw3n50x710mc938031yn7hjmkhg"; depends=[pcaPP Rcpp RcppEigen robustbase]; }; DetR = derive2 { name="DetR"; version="0.0.4"; sha256="0kvmbh7cdy3hmds1znahy1lqhd68y21kmmcki9xbq1b76n4h812n"; depends=[MASS pcaPP Rcpp RcppEigen robustbase]; }; DetSel = derive2 { name="DetSel"; version="1.0.2"; sha256="0igkccclmjwzk7sl414zlhiykym0qwaz5p76wf4i7yrpjgk7mhl9"; depends=[ash]; }; Devore7 = derive2 { name="Devore7"; version="0.7.6"; sha256="1m18p8h9vv4v0aq2fkjyj39vzb8a09azbbczhfiv4y88w540i8nw"; depends=[lattice MASS]; }; - DiagTest3Grp = derive2 { name="DiagTest3Grp"; version="1.6"; sha256="04dxyyqv333rkjf2vlfpal59m7klhw6y7qilym6nw78qb1kqqys7"; depends=[car gplots KernSmooth]; }; + Dforest = derive2 { name="Dforest"; version="0.4.0"; sha256="05a3hhddkyk1jlmgvlswa5bsaqlfpgvprzpays18rd7af60542n8"; depends=[ggplot2 rpart]; }; DiagrammeR = derive2 { name="DiagrammeR"; version="0.9.0"; sha256="09j6h733wm0b9k8l8va2fav6h5cxz6z07kwp29hfxgsjd97rchlg"; depends=[dplyr htmlwidgets igraph influenceR magrittr RColorBrewer rgexf rstudioapi scales stringr tibble viridis visNetwork]; }; DiagrammeRsvg = derive2 { name="DiagrammeRsvg"; version="0.1"; sha256="0j2cm1mx3zrb2k3pcrb96z2z3kws61gyyjsjjv5rqcb5lzdgi65k"; depends=[V8]; }; DiallelAnalysisR = derive2 { name="DiallelAnalysisR"; version="0.1.1"; sha256="1diwzckn0f2dv0vj2mdzy7k3md6j472xzj82ip23adwr27vlfsi3"; depends=[ggplot2]; }; @@ -745,7 +779,7 @@ in with self; { DiffusionRjgqd = derive2 { name="DiffusionRjgqd"; version="0.1.1"; sha256="1yb1jaq324qm2x8cl3bs2dflnsx8yfygpw2m3kk5hzaai9gfkqjf"; depends=[colorspace Rcpp RcppArmadillo rgl]; }; Digiroo2 = derive2 { name="Digiroo2"; version="0.6"; sha256="1b1ahhqz5largjadlk5n6nw2183c05k28mksb1wm26y0lps0vdgr"; depends=[maptools spatstat spdep]; }; DirectStandardisation = derive2 { name="DirectStandardisation"; version="1.2"; sha256="060nscnn7wamnbb45a55wr6rirlbpwwjz0kxiw3aiqkm16ilzfbs"; depends=[]; }; - Directional = derive2 { name="Directional"; version="2.6"; sha256="0qgaxsicrklkarp25k10z8w51gdidl421hnbiiyrjfslxlghqr2n"; depends=[doParallel foreach MASS RcppZiggurat Rfast]; }; + Directional = derive2 { name="Directional"; version="2.7"; sha256="1d2dbsvkdvg4i9d3gyc8i0y2ld01mxaih6plzkz13qrsszy5nrvq"; depends=[doParallel foreach MASS RcppZiggurat Rfast]; }; DirichletReg = derive2 { name="DirichletReg"; version="0.6-3"; sha256="0qvnsbyn3livp5jrnxskf5sf7f2svy5mqkmnhzncb9bwf3kxpyla"; depends=[Formula maxLik rgl]; }; DisHet = derive2 { name="DisHet"; version="0.1.0"; sha256="0j25skxf26zwwrkzjadw6drg5wrhipk0j6wzjl3xzhpfxsz93afp"; depends=[gtools matrixStats]; }; Disake = derive2 { name="Disake"; version="1.5"; sha256="1fw45fmnir6h34jw8917mhyz6cgzbq4ywyyf51qxhm68wgzy9h17"; depends=[]; }; @@ -776,12 +810,12 @@ in with self; { DrBats = derive2 { name="DrBats"; version="0.1.4"; sha256="0jzl1jklxsbqf5hv3a71lckk51jxi1lnbk5zmvd4x3y9b9azl2cq"; depends=[ade4 coda MASS Matrix rstan sde]; }; DrillR = derive2 { name="DrillR"; version="0.1"; sha256="0n7pim5kk0wfdjcc67v4vvdb7wyhn5bcgi2a12nbyfyydss7pk1g"; depends=[httr]; }; DrugClust = derive2 { name="DrugClust"; version="0.2"; sha256="0acvjqwzkbjmy101m501l7fkfxzkp6zflwvn56li5307xv9ggnfg"; depends=[cclust cluster e1071 MESS ROCR]; }; - DstarM = derive2 { name="DstarM"; version="0.2.1"; sha256="166843l9v99rg59iz17qs2gb45qjkxfmg676hd0krg5mhq7xgk8b"; depends=[DEoptim ggplot2 rtdists RWiener]; }; + DstarM = derive2 { name="DstarM"; version="0.2.2"; sha256="014xlj5kipl2jpcgcqs1ynw05x17wbsgc5mhfjn3p96bbp6pkzzy"; depends=[DEoptim ggplot2 rtdists RWiener]; }; DunnettTests = derive2 { name="DunnettTests"; version="2.0"; sha256="1sf0bdxays10n8jh2qy85fv7p593x58d4pas9dwlvvah0bddhggg"; depends=[mvtnorm]; }; DySeq = derive2 { name="DySeq"; version="0.22"; sha256="1sx6mg0bcqb5ff6x305k43zx3fwd16rvxc7xb3ai5h3w7fs9zz7y"; depends=[boot MASS TraMineR]; }; DynClust = derive2 { name="DynClust"; version="3.13"; sha256="020zl2yljp47r03rcbzrbdmwk482xx27awwzv4kdrbchbzwhxqgm"; depends=[]; }; DynNom = derive2 { name="DynNom"; version="4.1.1"; sha256="1c4hykp8fwr6h5y09m4qs23bmbaj6im2c833mv2ymlhy5bwhmnfi"; depends=[BBmisc compare ggplot2 plotly rms shiny stargazer survival]; }; - DynTxRegime = derive2 { name="DynTxRegime"; version="2.1"; sha256="0dxf16zpj6cyx7afbvr4w4d76w4vshbvvkkqla68dbav0yvy7z7i"; depends=[modelObj]; }; + DynTxRegime = derive2 { name="DynTxRegime"; version="3.01"; sha256="0kcg4yqh1srhcn4wp0k97ppwn6w8vh05y9ssn82sjhlgxfbhzzjx"; depends=[dfoptim kernlab modelObj rgenoud]; }; DynamicDistribution = derive2 { name="DynamicDistribution"; version="1.1"; sha256="1s78hpj2pxjs4vixin1i816qjbn3wk7b8rd2zdjp4d4rbxifcqf5"; depends=[]; }; EBASS = derive2 { name="EBASS"; version="0.1"; sha256="14hxzj06wrc4ihflr7dqk28fsjwbcizr0jy54vhv0mk1y1gd4201"; depends=[]; }; EBEN = derive2 { name="EBEN"; version="4.6"; sha256="0gcf5b2viiq69vs8bd8nhk65g9sbzgg212w7zpnz4y6cv9jkk5zz"; depends=[]; }; @@ -789,9 +823,10 @@ in with self; { EBS = derive2 { name="EBS"; version="3.1"; sha256="0flj62lcshrcn5n4fmssgb2qdvg0l6r71rsn3h0clfjhbg96pqz5"; depends=[MASS]; }; EBglmnet = derive2 { name="EBglmnet"; version="4.1"; sha256="0wlscmimj74alcr8k5h1g3alvlpss4g2ah7zkpd42akam3zb4s5z"; depends=[]; }; EBrank = derive2 { name="EBrank"; version="1.0.0"; sha256="1qzhrr3n2zv31mjp224b35324nr9nigzazyfv11j4zhwl1ipf632"; depends=[]; }; - ECOSolveR = derive2 { name="ECOSolveR"; version="0.2"; sha256="1y9gl6gd8im7zhn5j4vhzk0ck620n4l9kwgxig2r27q6h652fqn9"; depends=[Matrix]; }; - ECctmc = derive2 { name="ECctmc"; version="0.2.3"; sha256="1iplg647qs52007h4vx507s643h7knisravif3v6rfyp6fhfl7v2"; depends=[Rcpp RcppArmadillo]; }; - ECharts2Shiny = derive2 { name="ECharts2Shiny"; version="0.2.8"; sha256="1yy3qxp1555h76xybnsxqnwg65flwp473wif9r1wx9965v8v6brq"; depends=[jsonlite shiny]; }; + ECFsup = derive2 { name="ECFsup"; version="0.1-2"; sha256="0fpcab0gjgsc3sx0plpx068rw3a7kfzs2nyrr477a5m0rcbqf1kh"; depends=[foreach Rcpp RcppArmadillo]; }; + ECOSolveR = derive2 { name="ECOSolveR"; version="0.3"; sha256="16cw13cxa24c1dkcn8qwkpim4lrjr7cgr8z59px7wi6fyh6v189g"; depends=[Matrix]; }; + ECctmc = derive2 { name="ECctmc"; version="0.2.4"; sha256="1aw0cbfgzlrkyc3m1rfhbdcdyb8wjcfx6p2mz1hvds86mf1pzv1i"; depends=[Rcpp RcppArmadillo]; }; + ECharts2Shiny = derive2 { name="ECharts2Shiny"; version="0.2.11"; sha256="0s15x7ggsf2wi167hx7198jn11y59ix9a550wnmr43b9vn7rfdw5"; depends=[jsonlite shiny]; }; EDFIR = derive2 { name="EDFIR"; version="1.0"; sha256="0nv1badyg1dri6z91fvs68a72g22vdg0rpi3fkpxw527r11fvrrv"; depends=[geometry lpSolve MASS vertexenum]; }; EDISON = derive2 { name="EDISON"; version="1.1.1"; sha256="12cc13ng5fc4nm0nvqxqplpb2ycz4cln73xqkk85dka2fnpykjc7"; depends=[corpcor MASS]; }; EDR = derive2 { name="EDR"; version="0.6-6"; sha256="10m92p3fy5z2kca4h9awwmvs4pqri92habkvgjvjl5ira09yvyi7"; depends=[sm]; }; @@ -804,22 +839,25 @@ in with self; { EIAdata = derive2 { name="EIAdata"; version="0.0.3"; sha256="12jgw3vi2fminwa4lszczdr4j4svn2k024462sgj1sn07a4a4z2s"; depends=[plyr XML xts zoo]; }; EILA = derive2 { name="EILA"; version="0.1-2"; sha256="0wxl9k4fa0f7jadw3lvn97iwy7n2d02m8wvm9slnhr2n8r8sx3hb"; depends=[class quantreg]; }; EL = derive2 { name="EL"; version="1.0"; sha256="13r7vjy2608h8jph8kwy69rnkg98b2v69117nrl728r3ayc46a18"; depends=[]; }; + EL2Surv = derive2 { name="EL2Surv"; version="1.0"; sha256="1vrm0w9rmy4vfkpzq804p216cxw4vvp91g77k4vvzv4z87gkqfhq"; depends=[survival]; }; ELMR = derive2 { name="ELMR"; version="1.0"; sha256="0pd3drv485xbdyfwm28kjpd0nd0zv1khfwzki1gh5p1gz9ndwr2x"; depends=[]; }; ELT = derive2 { name="ELT"; version="1.6"; sha256="0vbrf912m6f80sqyyrp0z4jhq38fnmcy6hgwy0qh8wgk3p1aqm7c"; depends=[lattice latticeExtra locfit xlsx]; }; ELYP = derive2 { name="ELYP"; version="0.7-3"; sha256="1d91r59m85k91kcjjlvhvbsa9855fyd702bwj7drvk36ssfr8qb9"; depends=[survival]; }; EMA = derive2 { name="EMA"; version="1.4.5"; sha256="16iq5a3yrilchqmkyb4g5bmmgpw6psm88n52gmlax75xbiwk8261"; depends=[affy AnnotationDbi Biobase biomaRt cluster FactoMineR gcrma GSA heatmap_plus MASS multtest siggenes survival xtable]; }; + EMAtools = derive2 { name="EMAtools"; version="0.1.2"; sha256="1kwannv833iq5k2jkjmpa1cmm4dq0dd4w930k352yfri7m2nq4q8"; depends=[DataCombine ggplot2 sjstats]; }; EMC = derive2 { name="EMC"; version="1.3"; sha256="0sdpxf229z3j67mr9s7z4adzvvphgvynna09xkkpdj21mpml23p6"; depends=[MASS mvtnorm]; }; - EMCluster = derive2 { name="EMCluster"; version="0.2-6"; sha256="1sd6vlli7qr4859hydyshkzrrfkgb05k97y3vhx3dp2q5xz8s52b"; depends=[MASS Matrix]; }; + EMCC = derive2 { name="EMCC"; version="1.3"; sha256="166yqr17a72lhimpgbgzpf9frribj47n4rddzqd9m4xmh4f6x7x5"; depends=[EMC MASS mclust]; }; + EMCluster = derive2 { name="EMCluster"; version="0.2-7"; sha256="1ybffri9khfmliwp0xln3yzal7wx1h0qw3s7ixrx7zzvg58blryp"; depends=[MASS Matrix]; }; EMD = derive2 { name="EMD"; version="1.5.7"; sha256="0m2g7akg9h964d6qr1mj20h9pcb2fcmala3skhl0qpy8qz01w5ck"; depends=[fields locfit]; }; - EML = derive2 { name="EML"; version="1.0.1"; sha256="0q5s4gwc3g49v43ffnn7lh5lyxg9bnhcigxwinc1gbry5j8crngv"; depends=[stringr XML]; }; + EML = derive2 { name="EML"; version="1.0.3"; sha256="04qz4rwq0amy9lp6358qjjql46ky2slqrvipngym5klqvm9vi0zi"; depends=[uuid xml2]; }; EMMAgeo = derive2 { name="EMMAgeo"; version="0.9.4"; sha256="1i36s8mzp04alff6lqkc798xjzgn61wdpl5i0awjdvg26ka8v7lj"; depends=[GPArotation limSolve shape shiny]; }; - EMMIXcontrasts = derive2 { name="EMMIXcontrasts"; version="1.0.0"; sha256="1q7bwf7kkpraj38lz5s1lhhghp7a5lzyj5b9x8024g6rh2qlwp7v"; depends=[]; }; + EMMIXcontrasts2 = derive2 { name="EMMIXcontrasts2"; version="0.1.2"; sha256="016vy4cgi8zyzjalp3wi1z49363xddy95iivlqdmb3lcgfl3i7iq"; depends=[]; }; EMMIXcskew = derive2 { name="EMMIXcskew"; version="0.9-4"; sha256="0gzy3nrqw880p4sr08qfbyyjqgq08brfm9pk7xkibdnvlrl6mld2"; depends=[MASS mnormt rgl]; }; - EMMIXskew = derive2 { name="EMMIXskew"; version="1.0.1"; sha256="16jkq0a9k1gf6gia8r65nwa2lh8zny4jmnq51g2rcqm44s5ylqbh"; depends=[KernSmooth lattice mvtnorm]; }; + EMMIXskew = derive2 { name="EMMIXskew"; version="1.0.2"; sha256="1avg6q3z77786wx6gpcn53sv5lhj3d6597kp885i418k4hyh72qv"; depends=[KernSmooth lattice mvtnorm]; }; EMMIXuskew = derive2 { name="EMMIXuskew"; version="0.11-6"; sha256="0japf0l0sj84jna7b5kirp6pgqa4c923ldwphb16ch2xxrgk5n5k"; depends=[MASS]; }; EMMLi = derive2 { name="EMMLi"; version="0.0.3"; sha256="1b36kyzvrdljmkysggv8jyaip78pj32ms0xhj2y568hd419lkh2p"; depends=[]; }; EMMREML = derive2 { name="EMMREML"; version="3.1"; sha256="0qwj4jlfhppjxwcjldh49b6idnagazrxybaid3k2c269wvxwvddq"; depends=[Matrix]; }; - EMP = derive2 { name="EMP"; version="2.0.1"; sha256="1zdy05jfhcgj6415pnm079v8xjg90n3akp1rwq65jbqdar38zj4y"; depends=[ROCR]; }; + EMP = derive2 { name="EMP"; version="2.0.2"; sha256="0l9wyxmcl8b6jiykc4mim6npmz5wrsapk2wgxbfhg27dwdb847ha"; depends=[ROCR]; }; EMSC = derive2 { name="EMSC"; version="0.8"; sha256="1fkwmfiw3cg0wkzcwl68dxzyiz7n35jmvjhq6jxdmb59p10f5z1j"; depends=[pracma]; }; EMSaov = derive2 { name="EMSaov"; version="2.2"; sha256="12y0mj72la4ciwzgr38w9ssik4hixjf5kjsjwrvz6z59hi0ldfly"; depends=[shiny]; }; EMT = derive2 { name="EMT"; version="1.1"; sha256="0m3av1x3jcp3hxnzrfb128kch9gy2zlr6wpy96c5c8kgbngndmph"; depends=[]; }; @@ -845,6 +883,7 @@ in with self; { EasyABC = derive2 { name="EasyABC"; version="1.5"; sha256="17qv6y8sf2iwwqcv5wfg6sii259gv5jyr72dnfpir2bw78wb3mqx"; depends=[abc lhs MASS mnormt pls tensorA]; }; EasyHTMLReport = derive2 { name="EasyHTMLReport"; version="0.1.1"; sha256="1hgg8i7py7bx48cldyc7yydf0bggmbj3fx3kwiv9jh1x5wyh929z"; depends=[base64enc ggplot2 knitr markdown reshape2 scales xtable]; }; EasyMARK = derive2 { name="EasyMARK"; version="1.0"; sha256="10slkblbyxq98c3sxgs194dnkx996khfcpxj6jhz355dp35z7c9d"; depends=[coda doParallel foreach MASS random rjags stringr]; }; + EasyMx = derive2 { name="EasyMx"; version="0.1-3"; sha256="0kzfsnknbpmgj4ikn9sh453irqv5vvdyibmm7f1xmfmnsvcck6p2"; depends=[OpenMx]; }; EasyStrata = derive2 { name="EasyStrata"; version="8.6"; sha256="0agmap9lmqbpfw8ijwxmjkcqjvc1ng0jsadkqpfz71a963nkqdcl"; depends=[Cairo plotrix]; }; EbayesThresh = derive2 { name="EbayesThresh"; version="1.3.2"; sha256="0n7cr917jrvmgwfqki7shvz9g9zpmbz9z8hm5ax7s8nnfzphrh4g"; depends=[]; }; Ecdat = derive2 { name="Ecdat"; version="0.3-1"; sha256="1lvfp2ih8ng3kn3cia687j5fd27iwiak7gk3bhgjp8bnlgblqq02"; depends=[Ecfun]; }; @@ -856,19 +895,22 @@ in with self; { EcoTroph = derive2 { name="EcoTroph"; version="1.6"; sha256="0zi6g0ra107s47r32mm9h6r1wll3avi0mpjmhcr0nj9y48nv14w3"; depends=[XML]; }; EcoVirtual = derive2 { name="EcoVirtual"; version="1.0"; sha256="1adhxwi22psr81xh1szjvn6ycv4zw31xjnswk65iazk3sc4vz7wc"; depends=[]; }; EconDemand = derive2 { name="EconDemand"; version="1.0"; sha256="1slpwiaxj7w21zdri9myrzwbwzl62m3cnp0g4fr2rkdlzgb6j5yj"; depends=[]; }; + EdSurvey = derive2 { name="EdSurvey"; version="1.0.6"; sha256="1p8cxr69ckz6py0hmagm9aq7kp1q48ymffmnpwsvwh2yfkzl90yq"; depends=[data_table LaF lfactors Matrix NAEPprimer wCorr]; }; EditImputeCont = derive2 { name="EditImputeCont"; version="1.0.2"; sha256="1l847892grqp1zf8lbvhxcimw06xcmikyry0wn1wf3l4hw4hiamv"; depends=[editrules Rcpp]; }; EffectLiteR = derive2 { name="EffectLiteR"; version="0.4-2"; sha256="1vkg5gi0gysnw0gz9ah8pdnnlkdfsz0jy53ps2jnnpy8lbr45zc9"; depends=[car foreign ggplot2 lavaan lavaan_survey nnet shiny survey]; }; EffectStars = derive2 { name="EffectStars"; version="1.7"; sha256="068hk7l7arnj7qrcsavvki06rwrivkmz82mddhndx9vzbiidiklm"; depends=[VGAM]; }; EffectStars2 = derive2 { name="EffectStars2"; version="0.1-1"; sha256="1yffwnr563vzdq0ph9xs3w0zg5c7l3ima6skn8cqiafr21w332ss"; depends=[miscTools VGAM]; }; EffectTreat = derive2 { name="EffectTreat"; version="0.3"; sha256="1y8b1867idjbd7i39hhryg4nyijlv6d828z0jspp80fka3sp8xpw"; depends=[]; }; EffectsRelBaseline = derive2 { name="EffectsRelBaseline"; version="0.5"; sha256="1dsnakcrgmlx44599ii92wvhxbxrh0hij59709wsskx1x1152zvh"; depends=[]; }; - EfficientMaxEigenpair = derive2 { name="EfficientMaxEigenpair"; version="0.1.0"; sha256="07d1da73z16swz4dw2g1mcx1k80yghd6nb9818zax61f37wjmin1"; depends=[]; }; + EfficientMaxEigenpair = derive2 { name="EfficientMaxEigenpair"; version="0.1.1"; sha256="1m4cycvq58pvccpkycj7kmyavyz722q48qr1sc102a3a1wjj375j"; depends=[]; }; + ElastH = derive2 { name="ElastH"; version="0.3.1"; sha256="1xgmz0xirvdyjz8l31zb2j91nj0g8ffhvzp44b97473fsj06n1g6"; depends=[dlm]; }; ElemStatLearn = derive2 { name="ElemStatLearn"; version="2015.6.26"; sha256="0r8d0fm4yx7iawcsikksd7i01kbyqz3xkdls74f3ngkvj4iq1rqc"; depends=[]; }; EloChoice = derive2 { name="EloChoice"; version="0.29"; sha256="1r54laim7i8hzgyir47xq7qw8hxzsdw1ss10sljq1rm2lpsci6wk"; depends=[Rcpp RcppArmadillo]; }; EloRating = derive2 { name="EloRating"; version="0.43"; sha256="0gzpi4qjiqn0lzjwy37pkz6fg7dkp2hv2dfqgzfk32wsj0bswgab"; depends=[zoo]; }; ElstonStewart = derive2 { name="ElstonStewart"; version="1.1"; sha256="1y2g4x3fhi78c2406bk8r8c3x9zhx8ya3qlbnypdm65j0minixsn"; depends=[digest kinship2]; }; + Emcdf = derive2 { name="Emcdf"; version="0.1.1"; sha256="0lflaynipdpd14xpi7db5w7a92z53vjyjhp8whv6yynl13kxrcwv"; depends=[lattice Rcpp]; }; EmiStatR = derive2 { name="EmiStatR"; version="1.2.0"; sha256="0g1bs8018vxgnwb578iz5nin13khk7wjj0in47y250j2kcz5nvgn"; depends=[doParallel foreach lattice shiny]; }; - EmpiricalCalibration = derive2 { name="EmpiricalCalibration"; version="1.2.0"; sha256="034rvdfvqqx4prdchdpl04iyd37h37j3gxfscm8idi35nannjph0"; depends=[ggplot2]; }; + EmpiricalCalibration = derive2 { name="EmpiricalCalibration"; version="1.3.1"; sha256="04ivyw09pb49vj7x0mfb62d60ra2byzfj90d67xr47jyxbfhfjah"; depends=[ggplot2]; }; EnQuireR = derive2 { name="EnQuireR"; version="0.10"; sha256="00kyclcr8da79lwpqa1vzkwn6pgf197h2biackwgphb0byhi8ssx"; depends=[FactoMineR MASS Rcmdr SensoMineR]; }; EngrExpt = derive2 { name="EngrExpt"; version="0.1-8"; sha256="0zclvckj2i7j4kfs58hcjcl722vl2y6dcnjz238cjfgwv279gqhp"; depends=[lattice]; }; EnsCat = derive2 { name="EnsCat"; version="1.1"; sha256="1rp354fqq2ihjrmqw9j1qdy86md80xml5sgh2zbyabw3zddmgyn2"; depends=[dendextend ggdendro ggplot2 seqinr]; }; @@ -883,15 +925,16 @@ in with self; { EnvStats = derive2 { name="EnvStats"; version="2.2.1"; sha256="0gjjw2pvqh4m18f7m0pkcr1lsryqmfai1kqc34146h1a4wv7gbdv"; depends=[ggplot2 MASS]; }; EnviroPRA = derive2 { name="EnviroPRA"; version="1.0"; sha256="0yirh3vy7wap0qmm3kvjz9y68gcvp9i8qshv80wh8aijxwklpr8n"; depends=[fitdistrplus kSamples MASS truncdist]; }; EnviroStat = derive2 { name="EnviroStat"; version="0.4-2"; sha256="0ckax6vkx0vwczn21nm1dr8skvpm59xs3dgsa5bs54a3xhn5z9hs"; depends=[MASS]; }; - Epi = derive2 { name="Epi"; version="2.12"; sha256="12c5fryvzrl09h2l5lm9s45an6rf600i7gxgw8nddy7f1p9pa9dz"; depends=[cmprsk data_table etm MASS Matrix numDeriv plyr survival]; }; + Epi = derive2 { name="Epi"; version="2.15"; sha256="0f4ibfz7qf1bbp10i119rqgf1633acybrxzclacacflg28bv2za6"; depends=[cmprsk data_table etm MASS Matrix numDeriv plyr survival]; }; EpiBayes = derive2 { name="EpiBayes"; version="0.1.2"; sha256="1qfir0dl085c9ib1acsygmj7gihc4ar98k5niqdsgnmji88h17y2"; depends=[coda epiR scales shape]; }; EpiContactTrace = derive2 { name="EpiContactTrace"; version="0.10.0"; sha256="0x0ah55nx68mq05hpp29g9h21is3kx9d84r82j4x4asyqjv92s7v"; depends=[]; }; - EpiCurve = derive2 { name="EpiCurve"; version="1.0-0"; sha256="0y614cghigf126vrk4fdwxik2ax6s5ay391pwb3rwhmll4zflw00"; depends=[dplyr ggplot2 ISOweek RColorBrewer]; }; + EpiCurve = derive2 { name="EpiCurve"; version="1.1-0"; sha256="1s6lhhc6n0dfbwaklc8fx9f0yi9r0yf5pf0fs955hiv5al98vaai"; depends=[dplyr ggplot2 ISOweek RColorBrewer scales timeDate]; }; EpiDynamics = derive2 { name="EpiDynamics"; version="0.3.0"; sha256="0hpysjl8wfgylbp4ddxmi5msvlp1w70c6pxggc2bwdgap3s127f3"; depends=[deSolve ggplot2 reshape2]; }; EpiEstim = derive2 { name="EpiEstim"; version="1.1-2"; sha256="0r56iglhkrqvlsf3gbahd544h944fmbyn6jdc113rhjscf6dl605"; depends=[]; }; - EpiILM = derive2 { name="EpiILM"; version="1.1"; sha256="151gx5qr1y8im60pl41pks3w9f6ck4hmwga63f2yq5nb8lk9yn5j"; depends=[]; }; - EpiModel = derive2 { name="EpiModel"; version="1.3.0"; sha256="0v0aw7i4ygr710zhkbw32hxkwa0y5f7qfmfx8q07rcn3k986sj0j"; depends=[ape deSolve doParallel ergm foreach lazyeval network networkDynamic RColorBrewer tergm]; }; + EpiILM = derive2 { name="EpiILM"; version="1.2"; sha256="1mp6j1yk9vzs88clkpwgk0qlbc5b4m94j3isgirsq346006q5jil"; depends=[]; }; + EpiModel = derive2 { name="EpiModel"; version="1.5.0"; sha256="0bmd98dk7gh9x4kdgrdksj88216vxgwmgnk3vfv9caj8b91af9j4"; depends=[ape deSolve doParallel ergm foreach lazyeval network networkDynamic RColorBrewer tergm]; }; EpiWeek = derive2 { name="EpiWeek"; version="1.1"; sha256="19bvjiiz8qn9nlvf3nq238qi1hszlm6asrc03p8ykp6gpl2pi6js"; depends=[]; }; + EpistemicGameTheory = derive2 { name="EpistemicGameTheory"; version="0.1.2"; sha256="0b2gnrvhlsw85qv63ib32pj55l7w63wgvbrj5rb209g6h46fby8m"; depends=[lpSolve]; }; Eplot = derive2 { name="Eplot"; version="1.0"; sha256="1glmkjjj432z9g4gi56pgvfrm5w86iplirnd5hm4s99qci2hgc64"; depends=[]; }; EstCRM = derive2 { name="EstCRM"; version="1.4"; sha256="1p99hmmyiy3havj72jd4xksr1j9gfmy0i7z7f3vqs5sqp72alq1k"; depends=[Hmisc lattice]; }; EstHer = derive2 { name="EstHer"; version="1.0"; sha256="1j8sczwfzil16j85mw5d1c7cxy7wimh0qq7zhmkh7mfnr36m9phr"; depends=[glmnet MASS Rcpp RcppArmadillo]; }; @@ -903,6 +946,7 @@ in with self; { EvalEst = derive2 { name="EvalEst"; version="2015.4-2"; sha256="1jkis39iz3zvi5yfd0arvw7bym6naq45f5cravywg8c37n9v967x"; depends=[dse setRNG tfplot tframe]; }; EvaluationMeasures = derive2 { name="EvaluationMeasures"; version="1.1.0"; sha256="0b65y4rb650hhlgc18z0sm0danrrawqkazzdl9krl877djrgx87g"; depends=[]; }; Evapotranspiration = derive2 { name="Evapotranspiration"; version="1.10"; sha256="0v8jjbmr9qqbn2k6jb7jcqmib89x2g7r8wkipxhb4bck0b0z5c0r"; depends=[zoo]; }; + EventStudy = derive2 { name="EventStudy"; version="0.31"; sha256="0d3pa2981djg2i3960damd1aahyl8id6irgz2fqs1k69dvqykr8p"; depends=[curl data_table dplyr ggplot2 httr jsonlite magrittr miniUI purrr RColorBrewer readr rstudioapi scales shiny stringr testthat tidyquant]; }; EvoRAG = derive2 { name="EvoRAG"; version="2.0"; sha256="0gb269mpl2hbx1cqakv3qicpyrlfb4k8a3a7whhg90masbgmh8f6"; depends=[]; }; Evomorph = derive2 { name="Evomorph"; version="0.9"; sha256="1br2fyggwz2mxpic8sk384xq1lpbpv0j5gf6xyzhkn2n7kfpf6d5"; depends=[geomorph ggplot2 reshape2 stringr]; }; ExPosition = derive2 { name="ExPosition"; version="2.8.19"; sha256="04s9kk8x6khvnryg6lqdwnyn79860dzrjk8a9jyxgzp94rgalnnz"; depends=[prettyGraphs]; }; @@ -910,10 +954,12 @@ in with self; { ExactCIdiff = derive2 { name="ExactCIdiff"; version="1.3"; sha256="1vayq8x7gk1fnr1jrlscg6rb58wncriybw4m1z0glfgzr259103y"; depends=[]; }; ExactPath = derive2 { name="ExactPath"; version="1.0"; sha256="0ngvalmgdswf73q0jr4psg0ihnb7qwkamm6h64l01k5rmgd5nm16"; depends=[lars ncvreg]; }; ExceedanceTools = derive2 { name="ExceedanceTools"; version="1.2.2"; sha256="084sc6pggfbcyavhfnd5whyigw7dyjhb4cxmxi0kh2jiam5k8v5b"; depends=[SpatialTools splancs]; }; + ExcessMass = derive2 { name="ExcessMass"; version="1.0"; sha256="1z8l1lja02wxw8l72s3bq6sgjymn5929n123xk6b7ndd52zlfgf5"; depends=[]; }; ExomeDepth = derive2 { name="ExomeDepth"; version="1.1.10"; sha256="11lg1n9wls96cg1byj5bfircw4bsf0rbk37h8fl0hkh29m6gyy16"; depends=[aod Biostrings GenomicAlignments GenomicRanges IRanges Rsamtools VGAM]; }; ExpDE = derive2 { name="ExpDE"; version="0.1.2"; sha256="0q95d5gklg834f02b2p252jb3kbbjr4sj3wdak9ljibscnnlckml"; depends=[]; }; ExpDes = derive2 { name="ExpDes"; version="1.1.2"; sha256="0qfigbx06b3p04x5v7wban139mp8hg8x77x6nzwa4v6dr226qbkv"; depends=[]; }; ExpDes_pt = derive2 { name="ExpDes.pt"; version="1.1.2"; sha256="0khw2jhg2vxcivgr20ybvrsqhd8l8bir5xjmr4m44za9nhap43bz"; depends=[]; }; + ExpRep = derive2 { name="ExpRep"; version="1.0"; sha256="0spv3wd9c8sr338n5kdzrs28yh7s90fl70wsdnkibmlxhnh3ay3g"; depends=[]; }; ExplainPrediction = derive2 { name="ExplainPrediction"; version="1.1.8"; sha256="15qqfmgcfc77cygp5zabbf8b5bqs3wyj223waqxrryrnhvzdxxvh"; depends=[CORElearn semiArtificial]; }; ExtDist = derive2 { name="ExtDist"; version="0.6-3"; sha256="1vsxm578bb70wnz3mxm7y1n5vs0x5pby99hvxg5y5ksh2g2ascwa"; depends=[numDeriv optimx]; }; ExtremeBounds = derive2 { name="ExtremeBounds"; version="0.1.5.2"; sha256="010k2ddrrmrv4ayr009sm0vdgql5n1hy2b7rxyggj8iqsm8lkxim"; depends=[Formula]; }; @@ -925,7 +971,7 @@ in with self; { FAOSTAT = derive2 { name="FAOSTAT"; version="2.0"; sha256="06z8c964sf73ld4v9vybqjsdxskxp3ssyv0a3mpcs9la5y7n9jaz"; depends=[classInt data_table ggplot2 labeling MASS plyr RJSONIO scales]; }; FAdist = derive2 { name="FAdist"; version="2.2"; sha256="0nw3w4g7y846bm57xyjnb13g7z746kxf8mb2hnljwwsypcg6i2n8"; depends=[]; }; FAiR = derive2 { name="FAiR"; version="0.4-15"; sha256="18nj95fiy3j7kf4nzf692dxja3msnaaj5csg745bnajb48l606wz"; depends=[gWidgetsRGtk2 Matrix rgenoud rrcov]; }; - FAmle = derive2 { name="FAmle"; version="1.3.4"; sha256="0di9mmpsll7339cw1lss3jk4w1cyqhap6y72r793q8w3x14q0j9d"; depends=[mvtnorm]; }; + FAmle = derive2 { name="FAmle"; version="1.3.5"; sha256="1j6x5bbxnrwp9d6xlxc861xslawzfqhi3d11nphyc97afsz0ymnr"; depends=[mvtnorm]; }; FAwR = derive2 { name="FAwR"; version="1.1.1"; sha256="1hzgaxinq81v4f9743lnlj3bkby8pwmaw1gq0fb4yxazav8y7ihy"; depends=[glpkAPI lattice MASS]; }; FBFsearch = derive2 { name="FBFsearch"; version="1.1"; sha256="17fi501prnwwy5dh7kv7cx2zlz2dknjj542ga024s7jvg7i2rhg0"; depends=[Rcpp RcppArmadillo]; }; FBN = derive2 { name="FBN"; version="1.5.1"; sha256="0723krsddfi4cy2i3vd6pi483qjxniychnsi9r8nw7dm052nb4sf"; depends=[]; }; @@ -936,14 +982,15 @@ in with self; { FDGcopulas = derive2 { name="FDGcopulas"; version="1.0"; sha256="1i86ns4hq74y0gnxfschshjlc6if3js0disjb4bwfizaclwbw3as"; depends=[numDeriv randtoolbox Rcpp]; }; FDRreg = derive2 { name="FDRreg"; version="0.1"; sha256="17hppvyncbmyqpi7sin9qsrgffrnx8xjcla2ra6y0sqzam1145y4"; depends=[fda mosaic Rcpp RcppArmadillo]; }; FDRsampsize = derive2 { name="FDRsampsize"; version="1.0"; sha256="0g8kawzyi9x5yndvh330wzqw6rvcnprwq56ngd0j6z51hvvw8qhw"; depends=[]; }; - FDboost = derive2 { name="FDboost"; version="0.2-0"; sha256="10rpi132d16cjr3c08p1py8jjxgf0gk812vi3918sr71m5x0m64i"; depends=[gamboostLSS MASS Matrix mboost mgcv refund stabs zoo]; }; + FDboost = derive2 { name="FDboost"; version="0.3-0"; sha256="06cwd8534k3h7mk6w9z7fyq0gvb74w12gxh3njmy4m7hw8yzicc8"; depends=[gamboostLSS MASS Matrix mboost mgcv stabs zoo]; }; FENmlm = derive2 { name="FENmlm"; version="1.0"; sha256="0mq1qa72hsz3pyqjnbyzcc7shr08cq3hng1fz53mn9mvp11vb135"; depends=[MASS Matrix numDeriv]; }; FFD = derive2 { name="FFD"; version="1.0-6"; sha256="19yqb45qj54fmjkqfjbcqsx3wz6fk8inrqif9ds93xjkm6aaiqgp"; depends=[R2HTML tkrplot]; }; - FFTrees = derive2 { name="FFTrees"; version="1.2.2"; sha256="1s42k48fqkpdjwqhbl7k5hci12p5zz681cys462g1ddc21bxp0gz"; depends=[circlize e1071 glmnet igraph MASS mlbench randomForest rpart snow snowfall yarrr]; }; + FFTrees = derive2 { name="FFTrees"; version="1.3.2"; sha256="17wvbfay5lbqfkvhyxjv6sazcrp0zmmvivgfk9hym3rb8d0jviny"; depends=[circlize e1071 glmnet igraph MASS mlbench progress randomForest rpart stringr yarrr]; }; FField = derive2 { name="FField"; version="0.1.0"; sha256="05q16v2vv64qhbnf2l66dwzmvgzyaq8vxwwdabp534bw7z7zpi8q"; depends=[]; }; FGN = derive2 { name="FGN"; version="2.0-12"; sha256="0jxawb4wm1vcp0131mdnc0r24dw8sd29ih0fc2wh6ahy7mxzajqn"; depends=[akima ltsa]; }; FGSG = derive2 { name="FGSG"; version="1.0.2"; sha256="1r3sjhzf9gcnbcx6rqr1s555z8lcwm3fxl096md2jji336ijlk79"; depends=[]; }; FGalgorithm = derive2 { name="FGalgorithm"; version="1.0"; sha256="1dq6yyb3l6c9fzvk9gs6pb240xb5hvc6fh8p3qd3c91b3m289mcc"; depends=[]; }; + FHDI = derive2 { name="FHDI"; version="1.0"; sha256="0vyqgvcmdlcbplhl19xsl926ncnwwf8r8qb6zng5s8p7w29ydd1k"; depends=[]; }; FHtest = derive2 { name="FHtest"; version="1.3"; sha256="1cay1cl1x4lias55vxc14caznggdw6j8vgqgkxfmvldnvjfljsq1"; depends=[interval KMsurv MASS perm survival]; }; FI = derive2 { name="FI"; version="1.0"; sha256="17qzl8qvxklpqrzsmvw4wq3lyqz3zkidr7ihxc4vdzmmz69pyh2f"; depends=[]; }; FIACH = derive2 { name="FIACH"; version="0.1.2"; sha256="151lc5m8pb7l07kxljm32zy5kd7a4zr5vgsgwsx7ywhijh0r0585"; depends=[Rcpp RcppArmadillo RNiftyReg tkrplot]; }; @@ -951,7 +998,7 @@ in with self; { FITSio = derive2 { name="FITSio"; version="2.1-0"; sha256="021xmbavigg70m96xw1bvsdasi5yj2wmafgb6xw4b09fmyv9hvjp"; depends=[]; }; FKF = derive2 { name="FKF"; version="0.1.3"; sha256="01ibihca39zng4wrvhq8h28bmb2rnsjm21xy22b85kpn3mbnh7f1"; depends=[RUnit]; }; FLIM = derive2 { name="FLIM"; version="1.2"; sha256="180az4zwmfcglmvismyacmh7ri4qg8jvhlisqpway0z5z6fsda6r"; depends=[MASS zoo]; }; - FLLat = derive2 { name="FLLat"; version="1.2"; sha256="0kdc269vsc94pi00n55196a20qiv6c5pxf2xrh34w4x2vkn5mbxz"; depends=[gplots]; }; + FLLat = derive2 { name="FLLat"; version="1.2-1"; sha256="0306bpwp2az4x4m5sv88hlh7vs0y5isfby7lxrn2gjnk76gg6mw1"; depends=[gplots]; }; FLR = derive2 { name="FLR"; version="1.0"; sha256="0k50vi73qj7sjps0s6b2hq1cmpa4qr2vwkpd2wv2w1hhhrj8lm0n"; depends=[combinat]; }; FLSSS = derive2 { name="FLSSS"; version="5.2"; sha256="1px9n0rnjg32ngy8bs0z1jzmspnkn15q273w74vxjykqfd5xayfd"; depends=[Rcpp RcppParallel]; }; FLightR = derive2 { name="FLightR"; version="0.4.6"; sha256="0q1azhpdkasjsca5z4p0gnp5iirs6f9dyg6pn8269x7k1mw0pib4"; depends=[bit CircStats circular fields GeoLight ggmap ggplot2 ggsn maptools mgcv nlme raster RcppArmadillo rgdal rgeos sp truncnorm]; }; @@ -967,16 +1014,17 @@ in with self; { FRAPO = derive2 { name="FRAPO"; version="0.4-1"; sha256="0mjcrplxr0cyybp5hzzwbq5j03w0f3iiiv1yk7mdqr5gb368dchq"; depends=[cccp Rglpk timeSeries]; }; FRB = derive2 { name="FRB"; version="1.8"; sha256="13rp4gqldx84mngrdv5fa9xamkng7b3kgy30ywykcx46gmrym6ps"; depends=[corpcor rrcov]; }; FRCC = derive2 { name="FRCC"; version="1.0"; sha256="1g1rsdqsvwf7wc16dj16y6r0347j8jsv5l1pxvj1h0579zinaf2b"; depends=[calibrate CCP corpcor MASS]; }; - FREGAT = derive2 { name="FREGAT"; version="1.0.2"; sha256="0axl2rgsq8n2p7c89gks3ipbgs2qpapypjdb1d1vb1ffph08fiik"; depends=[Matrix]; }; + FREGAT = derive2 { name="FREGAT"; version="1.0.3"; sha256="01gc6pcj7fsg3ha2ykaji75b7iasrbjcmqhdlbdnhyzzakg50mpl"; depends=[Matrix]; }; FREQ = derive2 { name="FREQ"; version="1.0"; sha256="01nra30pbnqdd63pa87lcws3hnhhzybcjvx2jqyxjghn6khz47j0"; depends=[]; }; FRESA_CAD = derive2 { name="FRESA.CAD"; version="2.2.1"; sha256="065iywjay4a06w97lg2z98qq0j60flq4srchyg7c2a3pjrwppqc2"; depends=[Hmisc miscTools pROC Rcpp RcppArmadillo stringr]; }; FREddyPro = derive2 { name="FREddyPro"; version="1.0"; sha256="0h2rdydcx9pwjl1zxghzb5vqynrwdkscyq6c9adjgz4dngfwyzsw"; depends=[dismo ggplot2 lubridate raster RColorBrewer sp]; }; - FRK = derive2 { name="FRK"; version="0.1.1"; sha256="1zp3ms68fd504wni7i2yddiagh34na78nbziz557n3ylxvpwllh4"; depends=[digest dplyr ggplot2 Hmisc Matrix plyr Rcpp sp spacetime]; }; - FSA = derive2 { name="FSA"; version="0.8.12"; sha256="0byhvv32ayyq8x4kidpdapp41h0jvrp61pjdmpc4whkm9978vb87"; depends=[car dplyr epitools gplots plotrix plyr sciplot]; }; + FRK = derive2 { name="FRK"; version="0.1.4"; sha256="0is7ljz7ryr5dr4jq8r6ys6lb102mk7aaibw3z928q57bim0pxg9"; depends=[digest dplyr ggplot2 Hmisc Matrix plyr Rcpp sp spacetime]; }; + FSA = derive2 { name="FSA"; version="0.8.13"; sha256="0i48x9gz59h9a0dknfb48xpps3slzplrc8r4qgk2ckvjhpi64q7f"; depends=[car dplyr epitools gplots plotrix plyr sciplot]; }; FSAdata = derive2 { name="FSAdata"; version="0.3.6"; sha256="0r4g3s4a7hizxj7zlp8wb5sldnx6kc99vak8ww715bhzpzq40qf8"; depends=[]; }; FSInteract = derive2 { name="FSInteract"; version="0.1.2"; sha256="1aci1398aaz0nrl5jy6yh7xik355wf7pwngrsak4qsi94vdj05iy"; depends=[Matrix Rcpp]; }; + FSTpackage = derive2 { name="FSTpackage"; version="0.1"; sha256="1fjqsl59fg4x9vkbv4b0qmfxlaa2q3rzpl40grv24yg6ixfagmdb"; depends=[CompQuadForm MASS Matrix mvtnorm SKAT]; }; FSelector = derive2 { name="FSelector"; version="0.21"; sha256="0qk54b4svihwcmfdp5k8pcvy60568zlg4z2qqiawr7h4inzmvrlk"; depends=[digest entropy randomForest RWeka]; }; - FSelectorRcpp = derive2 { name="FSelectorRcpp"; version="0.1.2"; sha256="1qisnap16ish55m8k3b37n2i9nvy8wb19wy9i0bnpf0px75bxkmb"; depends=[BH foreach iterators Rcpp RcppArmadillo testthat]; }; + FSelectorRcpp = derive2 { name="FSelectorRcpp"; version="0.1.3"; sha256="1imhl5jz4avqfk2xavkyjnizsg885h13ay6hdlbh1yd1m8d2pxl6"; depends=[BH foreach iterators Rcpp RcppArmadillo testthat]; }; FTICRMS = derive2 { name="FTICRMS"; version="0.8"; sha256="0kv02mdmwflhqdrkhzb55si5qnqqgdadgyabqc2hwr6iccn7aq8c"; depends=[lattice Matrix]; }; FTRLProximal = derive2 { name="FTRLProximal"; version="0.3.0"; sha256="0wnlswvxiw7gvmn9yq1v8jixwspfbvcg3rklqcd0ib38d72ww7w0"; depends=[Matrix]; }; FUNTA = derive2 { name="FUNTA"; version="0.1.0"; sha256="02yxz95s2hs26mfmgwhv5d54yyjz0aczjpnay8b4gpzbpd6aci61"; depends=[]; }; @@ -985,7 +1033,7 @@ in with self; { FactMixtAnalysis = derive2 { name="FactMixtAnalysis"; version="1.0"; sha256="1l4wfp39b7g38vdk6jpd5zq08sjhsg0s71f662aca2rj6l3a2x3r"; depends=[MASS mvtnorm]; }; FactoClass = derive2 { name="FactoClass"; version="1.1.3"; sha256="1vwjxzz8cdvshslx51vnvgybvmki2x3zfax2q6czxl8kacijdh9n"; depends=[ade4 xtable]; }; FactoInvestigate = derive2 { name="FactoInvestigate"; version="1.0"; sha256="10yim7xvzizr383hygs4s2f59ipbl4sj2i85g55zw7j5crangql3"; depends=[FactoMineR rmarkdown rrcov]; }; - FactoMineR = derive2 { name="FactoMineR"; version="1.35"; sha256="1a8mnyjh3915h3n46p6pph7nv9chxj02pjsyjv2ic78xavz7dqdg"; depends=[car cluster ellipse flashClust knitr lattice leaps MASS scatterplot3d]; }; + FactoMineR = derive2 { name="FactoMineR"; version="1.36"; sha256="1pin3frnls7bbng3fvl92248mf9nnv6d8wwkdzgj66m4rbxc7611"; depends=[car cluster ellipse flashClust lattice leaps MASS scatterplot3d]; }; FactoRizationMachines = derive2 { name="FactoRizationMachines"; version="0.11"; sha256="0k9c7byyn14mqrsxa03d4pf4dlnm4zxryk3n15rr9w9mbmrhidcy"; depends=[Matrix Rcpp]; }; FactorsR = derive2 { name="FactorsR"; version="1.1"; sha256="06193gw4q9yvhmgzlv8w2xi9f418cjkn9jx72l41426wapjhygdy"; depends=[]; }; Factoshiny = derive2 { name="Factoshiny"; version="1.0.5"; sha256="1jqk80raqf3kxympkqfayzwwc61yipzh4cbklrb9kmay5ryg4gj9"; depends=[colourpicker FactoMineR shiny]; }; @@ -1001,7 +1049,7 @@ in with self; { FastPCS = derive2 { name="FastPCS"; version="0.1.2"; sha256="1lqb6g65vna2p7kc2y4kc5piy3280nlxl41bdkxkng2icmq14l58"; depends=[matrixStats Rcpp RcppEigen]; }; FastRCS = derive2 { name="FastRCS"; version="0.0.7"; sha256="1pszpmb5qki4cchd1pc0j6s4sfflaikbfrbisf6c2j9p8ssxxfgk"; depends=[matrixStats Rcpp RcppEigen]; }; FastRWeb = derive2 { name="FastRWeb"; version="1.1-1"; sha256="0xh3710kvnc60pz9rl5m3ym2cxf0mag9gi29y7j3fl4dh2k7zf74"; depends=[base64enc Cairo]; }; - FatTailsR = derive2 { name="FatTailsR"; version="1.7-0"; sha256="0mywkrq929a0v20a1zaa9zc5l9k2kw5y1zz458iff3i56pzrcrsj"; depends=[minpack_lm timeSeries]; }; + FatTailsR = derive2 { name="FatTailsR"; version="1.7-5"; sha256="1l2anaf4kixidmvya64ni5b78bl9w2n6xf1lnf297lkdka8gxigw"; depends=[minpack_lm timeSeries]; }; FeaLect = derive2 { name="FeaLect"; version="1.10"; sha256="1r7rgcadrqjhxn2g2w16axygsck82fprxg7l14ai11bn4b7h4pmb"; depends=[lars rms]; }; FeatureHashing = derive2 { name="FeatureHashing"; version="0.9.1.1"; sha256="1y46bk2yddq0n8p1kj6fwi9q23lsblsrlgf7b630vcbvv8mpz5x2"; depends=[BH digest magrittr Matrix Rcpp]; }; FedData = derive2 { name="FedData"; version="2.4.5"; sha256="1ad5dffrp2rwl8sdbik40g8p0c1drb5fxkcysh3qzsd6wi1zc2ff"; depends=[curl data_table devtools doParallel dplyr foreach Hmisc igraph lubridate magrittr ncdf4 raster readr rgdal rgeos soilDB sp]; }; @@ -1018,20 +1066,22 @@ in with self; { FindAllRoots = derive2 { name="FindAllRoots"; version="1.0"; sha256="0n4wfm21qj5zn06jqnzxa0w9mfn18dqi6hk1jjqa56dxqw1k7vw0"; depends=[]; }; FindIt = derive2 { name="FindIt"; version="1.0"; sha256="00psd20j84vdjw2jyilkfb2z9kfs5c139rky8d8rpl8sz97szpf2"; depends=[arm ggplot2 glmnet lars Matrix quadprog]; }; FindMinIC = derive2 { name="FindMinIC"; version="1.6"; sha256="0vlr56nw32msvz8bljrw82nzrnazncs6nz7zisidffm2v3najkar"; depends=[nlme sets]; }; - FinePop = derive2 { name="FinePop"; version="1.3.0"; sha256="1ax07zcrgmbgpxcs8dyg91pnvqfix97vdiyy9zpc767q2286gpxq"; depends=[]; }; + FinePop = derive2 { name="FinePop"; version="1.4.0"; sha256="0bq6p95mpwbx38gly61n58jrqz6rymwdq6dwxghpx98f6isa83xh"; depends=[]; }; FisHiCal = derive2 { name="FisHiCal"; version="1.1"; sha256="1dds629jlja3vw2l010n1334yh3z10nijqksr0q98ckd2yrwg2rf"; depends=[igraph Rcpp RcppArmadillo]; }; + FishResp = derive2 { name="FishResp"; version="0.1.0"; sha256="12qxqf6i3390kad2cv7pk0nyh2jk5dgsk00pckzfkgsh7ivzhv0h"; depends=[chron lattice]; }; FisherEM = derive2 { name="FisherEM"; version="1.4"; sha256="1lhkyyk82i6alxyiqrvy5fx60f8vab0y62zmw5fjaq6h0vczqn3s"; depends=[elasticnet MASS]; }; FitAR = derive2 { name="FitAR"; version="1.94"; sha256="1mkk3kvfq4v0pdabnhbwrk31ji2mv2v6ns16xsvvr1qyg2fnx6hq"; depends=[bestglm lattice leaps ltsa]; }; FitARMA = derive2 { name="FitARMA"; version="1.6"; sha256="1r9mqrqkm4wh3nd6v9wmpj23gw21i4p89p6z4c7639kn4f590ldk"; depends=[FitAR]; }; FixSeqMTP = derive2 { name="FixSeqMTP"; version="0.1.2"; sha256="0v1cwq8gapgandm7wiw8p6av6qigydlpmwi6w02p1y7f0hf5ifnp"; depends=[]; }; FlexDir = derive2 { name="FlexDir"; version="1.0"; sha256="1gb5alv9jsnw0135g63cy757pxhdw6cgwfm8dpcm8dj9zqg10dkm"; depends=[]; }; FlexParamCurve = derive2 { name="FlexParamCurve"; version="1.5-3"; sha256="0766ghwbdd7r4yj5xf31hnknn775ziw1hhrn13wf8bibyd8blz70"; depends=[nlme]; }; - FlowScreen = derive2 { name="FlowScreen"; version="1.2.1"; sha256="0wdlw8wz10jb0ablfkpjmhkz31h7c19blpzifg1kknknvg8wmbkd"; depends=[changepoint evir zyp]; }; + FlowScreen = derive2 { name="FlowScreen"; version="1.2.2"; sha256="1djh9yx718js1s21c0brxv3bw8nbga3dyhvcbkfvx9vcf9mk2pki"; depends=[changepoint evir zyp]; }; Flury = derive2 { name="Flury"; version="0.1-3"; sha256="105fv9azjkd8bsb9b8ba3gpy3pjnyyyp753qhrd11byp3d0bbxy0"; depends=[]; }; ForIT = derive2 { name="ForIT"; version="1.0"; sha256="0mi2cw09mbc54s8qwcwxin2na1gfyi60cdssy2ncynma7alq3733"; depends=[]; }; ForImp = derive2 { name="ForImp"; version="1.0.3"; sha256="0ai4i6q233sdsi8xilpbkxjqdf4pxw93clkdkhcxal6q43rnf7vd"; depends=[homals mvtnorm sampling]; }; ForeCA = derive2 { name="ForeCA"; version="0.2.4"; sha256="1i19lmhl1kgfnd7zipjr6xp5ir9rvjy13sbq321jaf8ya60bjdd9"; depends=[ifultools MASS reshape2 sapa]; }; ForecastCombinations = derive2 { name="ForecastCombinations"; version="1.1"; sha256="07vzgm2jy992p1l9b8rsv2lbc8cbfzvql85n5ah4p4l3zjxdxgk9"; depends=[quadprog quantreg]; }; + ForecastFramework = derive2 { name="ForecastFramework"; version="0.9.0"; sha256="131h9f148wn89znzsnym43amlvf4s7jzg4f2p7ld9ns7727sf56q"; depends=[abind dplyr lubridate magrittr R6 reshape2]; }; ForestTools = derive2 { name="ForestTools"; version="0.1.4"; sha256="0czvslmhz5syvd8h5zz6wl3nfp2dpyx3wf9x1d1hkgfgxkkl6f1y"; depends=[APfun imager raster rgdal rgeos sp TileManager]; }; FormalSeries = derive2 { name="FormalSeries"; version="1.0"; sha256="09m4ifinasww0xfprs29xsrqhxxkw9zffb3919xnkkjkwp0nax4v"; depends=[]; }; Formula = derive2 { name="Formula"; version="1.2-1"; sha256="02in5325zzrqbhlygx6s0dinj6ymw845q70y56frqacv25ayzcax"; depends=[]; }; @@ -1044,7 +1094,7 @@ in with self; { Frames2 = derive2 { name="Frames2"; version="0.2.1"; sha256="0xbz19v5r1h15p8mf94vacw04h3kvmm88ayy4b1aqxrd925n63mw"; depends=[MASS nnet sampling]; }; FreeSortR = derive2 { name="FreeSortR"; version="1.2"; sha256="01h29p9qhlkd2qmmmw23wh9lrsggvp1h3r2laqi2lln7d7srcwbj"; depends=[ellipse smacof vegan]; }; FreqProf = derive2 { name="FreqProf"; version="0.0.1"; sha256="1yqn2435l2sghfcv5mma0rv9yqvpa69z8cqqsjlrlbih9gib82d4"; depends=[ggplot2 reshape2 shiny]; }; - FunChisq = derive2 { name="FunChisq"; version="2.4.0"; sha256="06nnqij3cki1mdks5r422ydyc1hswfv03686jx5g9fcgxbs907kh"; depends=[BH Rcpp]; }; + FunChisq = derive2 { name="FunChisq"; version="2.4.3"; sha256="1wy76ich0bibf4938m97iww8zilgycha8351ryc3fqid0v78xzvg"; depends=[BH Rcpp]; }; FunCluster = derive2 { name="FunCluster"; version="1.09"; sha256="0i73asn1w4s6ydf2ddn5wpr0mwbbxzgmaly1pslarzkx71wk03fz"; depends=[cluster Hmisc]; }; FuncMap = derive2 { name="FuncMap"; version="1.0.8"; sha256="04rfmdy1hzxqy16csj6cf3x2kj9lg1xxvvnn494xjdwjdkfkyl09"; depends=[mvbutils]; }; Funclustering = derive2 { name="Funclustering"; version="1.0.1"; sha256="0i6g98mfgdyc9hdzvviynrgqhkzicp8y6s0scqy3ifgk9h1k79dw"; depends=[fda Rcpp RcppEigen]; }; @@ -1052,7 +1102,7 @@ in with self; { FusedPCA = derive2 { name="FusedPCA"; version="0.2"; sha256="0z4kvm6mn11fmc8w62aky2binjdcgrw4ij5vg65sb55da9s8d2kd"; depends=[genlasso]; }; Fuzzy_p_value = derive2 { name="Fuzzy.p.value"; version="1.0"; sha256="1n2m6p03bfip2fxfg8v4k43zgv7lcwwgv4myw2rj46djfwl2l9i7"; depends=[FuzzyNumbers MASS]; }; FuzzyAHP = derive2 { name="FuzzyAHP"; version="0.9.0"; sha256="02c08rzmmdd2l84jlzb0vck9m08afm7j599n0g09hffflcrb3fz7"; depends=[MASS]; }; - FuzzyLP = derive2 { name="FuzzyLP"; version="0.1-3"; sha256="1c7yynrz0vfvan9mfin2vsrkhhi3sy8c5nya7l8hja0nh1a4bzki"; depends=[FuzzyNumbers ROI ROI_plugin_glpk]; }; + FuzzyLP = derive2 { name="FuzzyLP"; version="0.1-4"; sha256="1iqvbj1mv7ja2dhlcvg5spjyj3fxvk1yz9y264kks0bf11kl0ckn"; depends=[FuzzyNumbers ROI ROI_plugin_glpk]; }; FuzzyMCDM = derive2 { name="FuzzyMCDM"; version="1.1"; sha256="0ss0s65mm6j0nax4mb9g668d9n9cgl0l016mc3h9hbjxfpqrbkks"; depends=[RankAggreg]; }; FuzzyNumbers = derive2 { name="FuzzyNumbers"; version="0.4-1"; sha256="15i0chp43y8xfyzkjrbljmdvgjjx9w1l5ayhvavk9y85pwb147b8"; depends=[]; }; FuzzyNumbers_Ext_2 = derive2 { name="FuzzyNumbers.Ext.2"; version="1.0"; sha256="1mqpdii0lf1p19kmzw93bzqbfjx2jzbphd0aacyzzai72vzx6aj1"; depends=[FuzzyNumbers]; }; @@ -1067,14 +1117,14 @@ in with self; { GABi = derive2 { name="GABi"; version="0.1"; sha256="1zmiaqbd1jrpiz9hk16s8rggcpl3xyyhjkkdliymx2p42vy5b5mf"; depends=[hash]; }; GAD = derive2 { name="GAD"; version="1.1.1"; sha256="0lyrw0d7i7yn1wkqlbf3rg3dnijfwsjn3kdbsg19hmvwq6qpsak2"; depends=[matrixStats R_methodsS3]; }; GADAG = derive2 { name="GADAG"; version="0.99.0"; sha256="1ycg48idrq2yrk1fxs16yl5wwg3kbfki8xppmh311rrzf75c6z4g"; depends=[igraph MASS Rcpp RcppArmadillo]; }; - GADMTools = derive2 { name="GADMTools"; version="2.0-1"; sha256="1i0kl7wxi9vfr6rhry64b2yvjv47ap1m3bglmc2anrz2xmj3af7v"; depends=[classInt dplyr ggmap ggplot2 gridExtra jsonlite lattice maptools RColorBrewer rgdal rgeos scales sp stringr]; }; + GADMTools = derive2 { name="GADMTools"; version="2.1-1"; sha256="1xlr3qa6li3izms51mf3g35hj0gximvgibx6d821ikxzp6892mha"; depends=[classInt dplyr ggmap ggplot2 gridExtra jsonlite lattice maptools RColorBrewer rgdal rgeos scales sp stringr]; }; GAIPE = derive2 { name="GAIPE"; version="1.0"; sha256="04iarbwxrhn48bk329wxis7ifzndi67kpjx6dcakawkh3g2mzsfz"; depends=[]; }; GAMBoost = derive2 { name="GAMBoost"; version="1.2-3"; sha256="0450h9zf12r524lxk1lrv9imvvkk6fmyd3chnxp18nnvys7215pv"; depends=[Matrix]; }; GAMens = derive2 { name="GAMens"; version="1.2"; sha256="1x1q6a5p2lsx0gbfm976ps4braqaxa26ii6g3iag9ssafyhb0r1f"; depends=[caTools gam mlbench]; }; GANPA = derive2 { name="GANPA"; version="1.0"; sha256="0ia8djv46jm397nxjrm9yc5gacf1r4z0ckiliz57cbrqwh7z2wpa"; depends=[GANPAdata]; }; GANPAdata = derive2 { name="GANPAdata"; version="1.0"; sha256="0mhdadl7zgsacn59ym42magg3214k1xhabwn78fv7kgccszcgc86"; depends=[]; }; GAR = derive2 { name="GAR"; version="1.1"; sha256="12xgk87bndinx7ibaasn51a9fad3ymvpjmixa7l18pfy99l3pcll"; depends=[httr jsonlite]; }; - GAS = derive2 { name="GAS"; version="0.1.9"; sha256="125gfh561p02jlvk6sj465v50yiysnxz900c1xsmrhnvkfmgl7br"; depends=[MASS numDeriv Rcpp RcppArmadillo Rsolnp xts zoo]; }; + GAS = derive2 { name="GAS"; version="0.2.1"; sha256="138i62cjclhqnnwzqk4ry95yrpwabppw3lvx8asqkgxyqrc3wpx6"; depends=[MASS numDeriv Rcpp RcppArmadillo Rsolnp xts zoo]; }; GAabbreviate = derive2 { name="GAabbreviate"; version="1.3"; sha256="0cq6bg3w0ji44rsz1p4j17fk0jg8rafbjixwi3fjdndc3yd874r5"; depends=[GA psych]; }; GB2 = derive2 { name="GB2"; version="2.1"; sha256="06rcck97pdm1rsb02cy0jd9fknv0mz5jwk364gsaahdk56ddk18a"; depends=[cubature hypergeo laeken numDeriv survey]; }; GCAI_bias = derive2 { name="GCAI.bias"; version="1.0"; sha256="10092mwpmfbcga0n39a0i6g8xxch8xiwg15cckipw6yxjyx0sivc"; depends=[]; }; @@ -1086,12 +1136,12 @@ in with self; { GDELTtools = derive2 { name="GDELTtools"; version="1.2"; sha256="1rx6kjh7kmyycqapvbizcxkcfp09qvqv7k8f25v333sxkacpz6p5"; depends=[plyr TimeWarp]; }; GDINA = derive2 { name="GDINA"; version="1.4.2"; sha256="14686mkyxk7gjp0ivz1wkmry15qrf50fcwwza1j98791yjkqsbyf"; depends=[alabama data_table ggplot2 MASS nloptr numDeriv Rcpp RcppArmadillo Rsolnp]; }; GEEaSPU = derive2 { name="GEEaSPU"; version="1.0.2"; sha256="02pwjqd94kranc1f69bx9rzk27kchavhvhl9fygjhrr40nwq3pbg"; depends=[gee Rcpp RcppArmadillo]; }; - GEEmediate = derive2 { name="GEEmediate"; version="1.0.0"; sha256="0fs5gamfpv5z4p92x76gy55zmf0pmh5cdhgnp9dnh58x0d9mij5y"; depends=[gee]; }; + GEEmediate = derive2 { name="GEEmediate"; version="1.1.1"; sha256="1akgl4j38x4qf3z9d6z7cgjd7x9f0k3lrzyrzgykqhrzmbh68z2m"; depends=[gee]; }; GENEAread = derive2 { name="GENEAread"; version="1.1.1"; sha256="0c3d76yl8dqclk8zhhgrd6bv6b599vkpbyg3hjspb6npdw6zs6k8"; depends=[bitops]; }; GENLIB = derive2 { name="GENLIB"; version="1.0.4"; sha256="1gl8qsgm9iy57rlajgc47lfxah52jsg7lpj131a6813kj0c639l7"; depends=[bootstrap doParallel foreach kinship2 lattice Matrix quadprog Rcpp]; }; GEOmap = derive2 { name="GEOmap"; version="2.4-0"; sha256="0jhzsp5f427r652mnaw3zg0vv13jaz11bfbbxppmxvya6k2jimyg"; depends=[fields MBA RPMG splancs]; }; GERGM = derive2 { name="GERGM"; version="0.11.2"; sha256="0vvvbb7y5lqa60n7w14gm8r7gwgah593w63162amjxmdk9jir9bi"; depends=[BH coda ggplot2 igraph matrixcalc plyr Rcpp RcppArmadillo RcppParallel scales slackr stringr vegan]; }; - GESE = derive2 { name="GESE"; version="2.0.0"; sha256="04gd9xplwk5kknwikn5c8wa01bbc10ijfj08gpycf0x0q54szf8y"; depends=[kinship2]; }; + GESE = derive2 { name="GESE"; version="2.0.1"; sha256="0h3s2sbnv5wilr2mj6bnl2892p16pxrs341gg6jql1a540p669sk"; depends=[kinship2]; }; GESTr = derive2 { name="GESTr"; version="0.1"; sha256="1q12l2vcq6bcyybnknrmfbm6rpzcmxgq2vyj33xwhkmm9g2ii9k6"; depends=[gtools mclust]; }; GEVStableGarch = derive2 { name="GEVStableGarch"; version="1.1"; sha256="1iypv0k4cbvsdyglgvf7y52sqvl5qcin627pjqwq42kisqynm8d7"; depends=[fExtremes fGarch Rsolnp skewt stabledist timeDate timeSeries]; }; GEVcdn = derive2 { name="GEVcdn"; version="1.1.5"; sha256="0nqym5jqgshx6ad4k4nwain6lnhx5y7s3b10f2xmcn93287p3rji"; depends=[VGAM]; }; @@ -1100,13 +1150,13 @@ in with self; { GFA = derive2 { name="GFA"; version="1.0.1"; sha256="073mwbrvvacrvqw4mwm13wd4rh3wlvwxkakal0k9xwxi5q9kl2rs"; depends=[]; }; GFD = derive2 { name="GFD"; version="0.2.2"; sha256="1llz22cqp26336ybfkmn98v80zl09hpjx34f9c5bf39lc6w1645h"; depends=[magic MASS Matrix plotrix plyr]; }; GGEBiplotGUI = derive2 { name="GGEBiplotGUI"; version="1.0-9"; sha256="0nd0ky3m1avy82z48g7hcysq0y0agxjxdn0g624dkm2w99avxw3j"; depends=[rgl tkrplot]; }; - GGIR = derive2 { name="GGIR"; version="1.4"; sha256="0vg7kpz8cx12jc06z8hjgss6n20z9h262z4rki4mnmllv2hmjqx2"; depends=[data_table]; }; + GGIR = derive2 { name="GGIR"; version="1.5-9"; sha256="1dgmpi48qdsmxclg45n8hb66rgpsb58c9asg07gq3kva526hz3zk"; depends=[data_table Rcpp]; }; GGMridge = derive2 { name="GGMridge"; version="1.1"; sha256="0zbfvvp7l836m118m8nmdvw1w7xq6d3b7qirskjsq1dkk23j41hs"; depends=[MASS mvtnorm]; }; GGMselect = derive2 { name="GGMselect"; version="0.1-12"; sha256="1vjzmnnvnckr8s0badqm3l15arsa31fwg4wq6c2wx3g0hi1nzxxs"; depends=[gtools lars mvtnorm]; }; - GGally = derive2 { name="GGally"; version="1.3.0"; sha256="12ddab0nd0f9c7bb6cx3c22mliyvc8xsxv26aqz3cvfbla8crp3b"; depends=[ggplot2 gtable plyr progress RColorBrewer reshape]; }; + GGally = derive2 { name="GGally"; version="1.3.1"; sha256="18vpmx7p1v2yq3h53xgr6f1n5crlsla8na2d3x46l40mhal4s0kr"; depends=[ggplot2 gtable plyr progress RColorBrewer reshape]; }; GHQp = derive2 { name="GHQp"; version="1.0"; sha256="0qpcpwv7rz67qhz1p5k2im02jvs7l8z9sa6ypz13hig5fzm8j9bp"; depends=[statmod]; }; GHap = derive2 { name="GHap"; version="1.2.2"; sha256="1qwv4llcixklr9d6lq4ljzbs8al80xnvqkcajnh8dbf3axmlmr5b"; depends=[bigmemory lme4 Matrix]; }; - GIGrvg = derive2 { name="GIGrvg"; version="0.4"; sha256="0sflklyzl2l5bcjhz7n75aww76ih93sq5mbgdc4v1p0vqhrbbg47"; depends=[]; }; + GIGrvg = derive2 { name="GIGrvg"; version="0.5"; sha256="0mx4n4kf34343yiww80fw5yy0x624xsj71n8fr4dm0a2338pxq8v"; depends=[]; }; GISTools = derive2 { name="GISTools"; version="0.7-4"; sha256="06alb5d2k4qj344i9cpgm3lz9m68rkmjqfx5k2hzn7z458xjrlxs"; depends=[maptools MASS RColorBrewer rgeos sp]; }; GK2011 = derive2 { name="GK2011"; version="0.1.3"; sha256="13vafhbgcsj485f12qv962y07v3hil3pla51vkl2b030amzy86jv"; depends=[]; }; GLDEX = derive2 { name="GLDEX"; version="2.0.0.5"; sha256="0mr8qhccp8dndp43v8ym22f4djrjr8qcxbv61lwabk2462llwln6"; depends=[cluster]; }; @@ -1129,8 +1179,9 @@ in with self; { GPC = derive2 { name="GPC"; version="0.1"; sha256="1naqy5g6a0z65wssfic5s7cw9v0zjckk526nian3l98ci22sz0j7"; depends=[ks lars orthopolynom randtoolbox]; }; GPCSIV = derive2 { name="GPCSIV"; version="0.1.0"; sha256="118l792mwd54xsi3g8afg3vc6wds8j6fyaz3mwmq04mlcyblym4l"; depends=[scatterplot3d sqldf]; }; GPFDA = derive2 { name="GPFDA"; version="2.2"; sha256="1xqk03g8b8hi1vdqh6a9wml8ln0ad6lmy14z8k8c4wdc5kbzdr0b"; depends=[fda fda_usc MASS spam]; }; + GPGame = derive2 { name="GPGame"; version="1.0.0"; sha256="1ln3smlhr0hz5nkbdfhrpvz6cn0jz21w8p0d3xlcv4szlmkx8lx6"; depends=[DiceDesign DiceKriging emoa GPareto KrigInv MASS mnormt mvtnorm Rcpp]; }; GPLTR = derive2 { name="GPLTR"; version="1.2"; sha256="0b4s090jlp2qpqqr0b1ifwyf2fal156y7vg9mjkw53y623ms5pix"; depends=[rpart]; }; - GPareto = derive2 { name="GPareto"; version="1.0.3"; sha256="1krvnmyn0yw65fn92lsxw0y3pxzpkx6b5dsgvrm47gyaphpynk4s"; depends=[DiceDesign DiceKriging emoa KrigInv ks MASS pbivnorm pso randtoolbox Rcpp rgenoud]; }; + GPareto = derive2 { name="GPareto"; version="1.1.0"; sha256="0y4jskrbsv7apc5blchnzgd2mfphvrpc03qgbgyvnzpc0yq18vmh"; depends=[DiceDesign DiceKriging emoa KrigInv ks MASS pbivnorm pso randtoolbox Rcpp rgenoud]; }; GPfit = derive2 { name="GPfit"; version="1.0-0"; sha256="0g0g343ncqsqh88qq9qrf4xv5n3sa980kqbvklcx534dmn6a7n2i"; depends=[lattice lhs]; }; GPoM = derive2 { name="GPoM"; version="1.0"; sha256="14h9g2rg5yzw68hg2a3s2lp19ilq7dl1k3cjnd9k516b5gdm2izl"; depends=[deSolve rgl]; }; GPrank = derive2 { name="GPrank"; version="0.1.2"; sha256="0z9xhydnq04p872zl7glxhndmijjihfgffl6bijc9a0rs95zaacd"; depends=[gptk matrixStats RColorBrewer tigreBrowserWriter]; }; @@ -1145,16 +1196,17 @@ in with self; { GSAQ = derive2 { name="GSAQ"; version="1.0"; sha256="1p1rab2dlh4h9bfg464nhx708p7kc4q01ifccdh5756lq1qh2kzv"; depends=[]; }; GSAgm = derive2 { name="GSAgm"; version="1.0"; sha256="18bhk67rpss6gg1ncaj0nrz0wbfxv7kvy1cxria083vi60z0vwbb"; depends=[edgeR survival]; }; GSE = derive2 { name="GSE"; version="4.1"; sha256="00pvpramk7n3195i3vkmp982igyc1b0xzjqs7xdsvzsnfv7kpcbh"; depends=[cellWise ggplot2 MASS Rcpp RcppArmadillo robustbase rrcov]; }; - GSED = derive2 { name="GSED"; version="1.3"; sha256="003n4mqch9kb7d0jpna3f8yg1ajbn6abrpiz4r8slhl3nps09yn4"; depends=[memoise rootSolve survival]; }; - GSIF = derive2 { name="GSIF"; version="0.5-3"; sha256="1cvdgdnsddl1z6qmxwdglvrf3p8ph8cf3ablnxspn4k70cpiwq3c"; depends=[aqp dismo gstat plotKML plyr raster rgdal RSAGA scales sp]; }; + GSED = derive2 { name="GSED"; version="1.5"; sha256="0r1fgwk1v11bwq83a64cgmxh5snw3mnaq4mlgi0h4n5f1yjgg5wj"; depends=[memoise rootSolve survival]; }; + GSIF = derive2 { name="GSIF"; version="0.5-4"; sha256="1vh3dffi5hakk32rwaabw9k34wigd0n5bhzcyqhadl6fxjsaz6b6"; depends=[aqp dismo gstat plotKML plyr raster rgdal RSAGA scales sp]; }; GSM = derive2 { name="GSM"; version="1.3.2"; sha256="04xjs9w4gaszwzxmsr7657ry2ywa9pvpwpczpvinxi8vpj347jbb"; depends=[gtools]; }; GSMX = derive2 { name="GSMX"; version="0.1"; sha256="1bw249b3a58d9q8cj91w9syyghf6sy8xqnx2jawp83qp8lfbix5x"; depends=[MASS psych]; }; - GSODR = derive2 { name="GSODR"; version="1.0.2.1"; sha256="08hgm3yafmy0jy2d8g2l30c8mw9rq36pbv5vp5cgv4inwsgazl43"; depends=[curl data_table dplyr fields plyr purrr R_utils readr rgdal sp]; }; + GSODR = derive2 { name="GSODR"; version="1.0.3"; sha256="1jhh7vwi1kgjcprvjm7iawz8k53fafymm0bdli513pn73xk9q9ax"; depends=[curl data_table dplyr fields magrittr purrr R_utils readr rgdal sp]; }; GSSE = derive2 { name="GSSE"; version="0.1"; sha256="034mmxa6kjq5kgikhb5q75viagz5ck9irrjbxm26zq9099qxm13b"; depends=[Iso zoo]; }; GSparO = derive2 { name="GSparO"; version="1.0"; sha256="0xna2crxqwy8fj0s79rxbdcaz9x912rp1vdwqv1557fsnmfv2yf0"; depends=[ggplot2 ThreeWay]; }; GUIDE = derive2 { name="GUIDE"; version="1.2.3.1"; sha256="02chn2mzh6smmiv8rp00cq5rff18bqszazbk8svmvvlgn0a25pj4"; depends=[rpanel tkrplot]; }; GUILDS = derive2 { name="GUILDS"; version="1.3"; sha256="0zl6x0vn93ybps63fqazvd93f2zwdq0rqqrp7d6n5rnamx99mm8d"; depends=[pracma Rcpp]; }; GUIProfiler = derive2 { name="GUIProfiler"; version="2.0.1"; sha256="10m4d7f2rhw6cmkrnw3jh4iqlkfphf4v7mpfwzw17laq0ncmsx5r"; depends=[graph MASS Nozzle_R1 proftools Rgraphviz rstudioapi]; }; + GUIgems = derive2 { name="GUIgems"; version="0.1"; sha256="0lmx8hw0496vk437p32l933cdb4vpi94f4kz58x20jj07c20maz6"; depends=[ggplot2 igraph MASS msm plyr rpanel stringr]; }; GUTS = derive2 { name="GUTS"; version="1.0.0"; sha256="0s64swhs7wpknvycca7qj36kj910anrh9qrbpyfjl9lw8cqa2058"; depends=[Rcpp]; }; GUniFrac = derive2 { name="GUniFrac"; version="1.0"; sha256="0xr68yv3h2lwn7sxy8l5p9g1z3q9hihg9jamsyl70jj9b2ic80jn"; depends=[ape vegan]; }; GWAF = derive2 { name="GWAF"; version="2.2"; sha256="11lk1dy24y1d0biihy2aypdvlx569lw1pfjs51m54rhgpwzkw6yd"; depends=[coxme geepack lme4]; }; @@ -1162,7 +1214,7 @@ in with self; { GWG = derive2 { name="GWG"; version="1.0"; sha256="1va0cd229dhhi1lmrkpwapcm96hrdmxilrmba02xnl7ikhisw0my"; depends=[]; }; GWLelast = derive2 { name="GWLelast"; version="1.1"; sha256="0c3mcvmvxvgibja6rb8j2mhmmjny825wgvi1dw0pz8pq1kg1q0ay"; depends=[doParallel foreach geosphere glmnet sp spgwr]; }; GWRM = derive2 { name="GWRM"; version="2.1.0.2"; sha256="1i8f2a43vn7zjsfb108ckjhi23m93mbm3lc7w7w6grp4ny98xr6g"; depends=[doParallel foreach]; }; - GWmodel = derive2 { name="GWmodel"; version="2.0-3"; sha256="0sbxhslqj86lbbwj20sqavaypgqp1d5g29h74lwh5dz87ymhs244"; depends=[maptools Rcpp RcppArmadillo robustbase sp]; }; + GWmodel = derive2 { name="GWmodel"; version="2.0-4"; sha256="1q4z715yi5rasmcxv1acy14sf18knk11cznqi481kxc4mhxl2ay2"; depends=[maptools Rcpp RcppArmadillo robustbase sp]; }; GWsignif = derive2 { name="GWsignif"; version="1.2"; sha256="0bss5s3ijnlckz44p7jj49bn2r8nwqckpzwzcv0vci915q8jfsj2"; depends=[]; }; GaDiFPT = derive2 { name="GaDiFPT"; version="1.0"; sha256="15fnj1w30h0zdj032f3js0bbb1qlyk4b54a4aclykwzicqdgalkg"; depends=[]; }; GameTheory = derive2 { name="GameTheory"; version="2.5"; sha256="05isd08z7k52nvic52gnlmnqvvrxxipcn2njfiz3kp105wvdw1rp"; depends=[combinat gtools ineq kappalab lpSolveAPI]; }; @@ -1185,20 +1237,21 @@ in with self; { GeneFeST = derive2 { name="GeneFeST"; version="1.0.1"; sha256="0qgzjzhwf3nigfi09maywg9zkjxiicwiwiyqfcdk9gsvmp6mr4qn"; depends=[BASIX]; }; GeneNet = derive2 { name="GeneNet"; version="1.2.13"; sha256="0w52apk0nnr8nsskf26ff7ana8xiksr8wqmkjxzwhzgg7fncm61p"; depends=[corpcor fdrtool longitudinal]; }; GeneReg = derive2 { name="GeneReg"; version="1.1.2"; sha256="081qc66mb17dwk886x9l2z4imklxnfs02yqql0ri9c47bpsga7wp"; depends=[igraph]; }; - Geneland = derive2 { name="Geneland"; version="4.0.6"; sha256="0xm5k0ihmg8j0cx2as1h8lgm1g0vrfdbpb0nacmdqdhafaj03iyz"; depends=[fields RandomFields]; }; GeneralOaxaca = derive2 { name="GeneralOaxaca"; version="1.0"; sha256="19j5c5xr6mdb6pmih94wbjas4yh0dmsqfggg8clvdxkpwk0h338v"; depends=[boot]; }; GeneralizedHyperbolic = derive2 { name="GeneralizedHyperbolic"; version="0.8-1"; sha256="0rx07z5npawvsah2lhhkryzpj19sg0sl0w410gmff985ksdn285m"; depends=[DistributionUtils RUnit]; }; + GeneralizedUmatrix = derive2 { name="GeneralizedUmatrix"; version="0.9.4"; sha256="12ixcg9msfxa6pmv0dx5zczy5vgqpk6hsqdhsf22nycmavnzgzgd"; depends=[Rcpp RcppArmadillo]; }; GeneticSubsetter = derive2 { name="GeneticSubsetter"; version="0.8"; sha256="0bd4snv3dwabc7mknmd2rjmffj67xq535x0bycajhd83d1jhjars"; depends=[]; }; - GenomicMating = derive2 { name="GenomicMating"; version="1.0"; sha256="16ky71vnrnarvws1bhgq8ymgdqmb8gnfs9cil29cgm88kp0ra36b"; depends=[Rcpp RcppArmadillo]; }; + GenomicMating = derive2 { name="GenomicMating"; version="1.2"; sha256="0kli32vsjighgl6hvrn2g3hwxdfysxh0ci3kiysddn2h4gqc44lz"; depends=[Rcpp RcppArmadillo]; }; GenomicTools = derive2 { name="GenomicTools"; version="0.2.4"; sha256="1r1d36ik0xrpznz19jrw4m7xf3xsqhx9vwsnal8k030k6vjip82d"; depends=[circlize data_table gMWT Rcpp RcppArmadillo snpStats stringr]; }; GeoBoxplot = derive2 { name="GeoBoxplot"; version="1.0"; sha256="164dh49ac3fx38fdglv32lmz92ca8jdd98cbhz6mxsk8r0jcladw"; depends=[]; }; GeoDE = derive2 { name="GeoDE"; version="1.0"; sha256="0wawkzj0344pprm8g884d7by8v74iw96b109rgm7anal48fl30im"; depends=[MASS Matrix]; }; GeoGenetix = derive2 { name="GeoGenetix"; version="0.0.2"; sha256="0rrc8rdf6whpd830s2g9ybz82jcd0il9kkfrjh3xza3b86fasdvg"; depends=[RandomFields]; }; GeoLight = derive2 { name="GeoLight"; version="2.0.0"; sha256="1i49hyj3f5rcw0s6j2csnfwc6mnp5zn44vxjnk05wdkpw6dpvx5i"; depends=[changepoint fields maps MASS]; }; + GeoRange = derive2 { name="GeoRange"; version="0.1.0"; sha256="0krj9570wkhdvpaqkq3nf0maglqd44mpwn4v1bymvgpk1i1wf5p3"; depends=[moments proj4 raster sp velociraptr]; }; GeoXp = derive2 { name="GeoXp"; version="1.6.2"; sha256="18wdmdwb79ipdjdii068dz9f55b5ldxn95g5q6jcxsqwp0wldvw8"; depends=[KernSmooth quantreg rgeos rgl robustbase spdep splancs]; }; GeomComb = derive2 { name="GeomComb"; version="1.0"; sha256="05xb6m2ciszxd13yhqdkildh9nsq19ss8885ngj6ynvbchqkii7r"; depends=[forecast ForecastCombinations ggplot2 Matrix mtsdi psych]; }; GerminaR = derive2 { name="GerminaR"; version="1.1"; sha256="1ijx2bd0fpki3pqm9grksc60f43qg9y5412mwd847xqqjpc1mxm4"; depends=[agricolae assertthat dplyr DT ggplot2 gsheet gtools magrittr readxl shiny shinydashboard tidyr]; }; - GetHFData = derive2 { name="GetHFData"; version="1.2.4"; sha256="0bhrxxrmhmvpks81n9xxzcwgp370ym7sxz6x7cnv50gzyd1yz9sm"; depends=[curl dplyr lubridate RCurl readr stringr]; }; + GetHFData = derive2 { name="GetHFData"; version="1.3"; sha256="036lv3gvrcj6b47dc1shhihgcjc3nnl4fnqjk3qphp7q02lfh0g7"; depends=[curl dplyr lubridate RCurl readr stringr]; }; GetR = derive2 { name="GetR"; version="0.1"; sha256="1b2wirhz4nhvmf863czwb8z8b42ilsyjjrg9rc4nd9b7nz50bmjg"; depends=[party]; }; GetTDData = derive2 { name="GetTDData"; version="1.2.5"; sha256="0ghi9iram9d67vs12hkw362qnvmk1lk72pjgmx118i4yxh5gvvw3"; depends=[curl RCurl readxl stringi stringr]; }; GetoptLong = derive2 { name="GetoptLong"; version="0.1.6"; sha256="1d98gcvlvp9nz5lbnzr0kkpc2hbkx74hlhrnybqhg1gdwc3g09pm"; depends=[GlobalOptions rjson]; }; @@ -1211,7 +1264,7 @@ in with self; { Giza = derive2 { name="Giza"; version="1.0"; sha256="13nkm8mk1v7s85kmp6psvnr1v97vi0gid8rsqyq3x6046pyl5z6v"; depends=[lattice reshape]; }; GlobalDeviance = derive2 { name="GlobalDeviance"; version="0.4"; sha256="0s318arq2kmn8fh0rd5hd1h9wmadr9q8yw8ramsjzvdc41bxqq1a"; depends=[snowfall]; }; GlobalFit = derive2 { name="GlobalFit"; version="1.2"; sha256="01s51nxcsl8xxn6khbv5jsvpwblwf0iamvr477a1rraqqqj94zx0"; depends=[sybil]; }; - GlobalOptions = derive2 { name="GlobalOptions"; version="0.0.11"; sha256="15zayfijpbp1xqzykbhkw97qm70kcvjzqh6sz71rb91jdv5zi01x"; depends=[]; }; + GlobalOptions = derive2 { name="GlobalOptions"; version="0.0.12"; sha256="1abpc03cfvazbwj2sx6qgngs5pgpzysvxkana20hyvb4n7ws77f0"; depends=[]; }; Gmedian = derive2 { name="Gmedian"; version="1.2.3"; sha256="0b2ijr9zlsp1287da3h9qm5cm17xk8zm8cdcj6d4kz0ivgg444py"; depends=[Rcpp RcppArmadillo robustbase RSpectra]; }; Gmisc = derive2 { name="Gmisc"; version="1.4.1"; sha256="1xdgmvzixc03qz34l57gy85w711iimmfqn6w20rr5b67m5m63drz"; depends=[abind checkmate forestplot Hmisc htmlTable knitr lattice magrittr Rcpp rmarkdown XML]; }; GoFKernel = derive2 { name="GoFKernel"; version="2.1-0"; sha256="17jd1dqwpki4mmzk695g25vvfwvkp4k7jhvw06dmdmn5j09hw373"; depends=[KernSmooth]; }; @@ -1241,6 +1294,7 @@ in with self; { HARtools = derive2 { name="HARtools"; version="0.0.5"; sha256="10a92jsk1ccgxi5g6byrs4fbj5l2kih7vhib0jg6spdqi6rhqla1"; depends=[assertthat htmltools htmlwidgets jsonlite magrittr]; }; HBSTM = derive2 { name="HBSTM"; version="1.0.1"; sha256="0bx7dxcfj46k4kqpqb39w4qkm4hvr1ka8d8rws445vkyl31kr0q6"; depends=[fBasics maps MASS]; }; HBglm = derive2 { name="HBglm"; version="0.1"; sha256="1sral7lh5qw5mn31n8459pk52frgw1bjq0z5ckpsnbc4qf3xxcjn"; depends=[bayesm Formula MfUSampler sns]; }; + HDCI = derive2 { name="HDCI"; version="1.0-2"; sha256="0wxbv54kbygymhh4r7052vnbj603c1kya01ykvmqzzkjyyfzidkz"; depends=[doParallel foreach glmnet iterators lattice Matrix mvtnorm slam]; }; HDDesign = derive2 { name="HDDesign"; version="1.1"; sha256="1jim4h9bwn8r637va7m81kwwsfwyzs9pzn5a9i7c8xz8b1x191bj"; depends=[]; }; HDGLM = derive2 { name="HDGLM"; version="0.1"; sha256="0a5lnh3780lsczj8339sp97c5y64a2gsdf77i56fvpxpphq0dnf8"; depends=[]; }; HDInterval = derive2 { name="HDInterval"; version="0.1.3"; sha256="1zjddw8s6xc2gsz6285g3dzzarnhb77sra1dbxghgn2nrgn2y0i5"; depends=[]; }; @@ -1251,11 +1305,11 @@ in with self; { HDtest = derive2 { name="HDtest"; version="0.1"; sha256="0vlwpx9l6r0izfcf9fgna72w39w64b95s3q527mapjb6a3676avg"; depends=[checkmate doParallel expm foreach MASS mvtnorm]; }; HDtweedie = derive2 { name="HDtweedie"; version="1.1"; sha256="14awd7sws0464f68f5xwnv1xvr0xflvx2z2zzcfj1csvk3af0zzj"; depends=[]; }; HEAT = derive2 { name="HEAT"; version="1.2"; sha256="1qifqd06ifl0f5l44mkxapnkwhpm0b82yq6dhfw4f8yhb27wd0z2"; depends=[]; }; - HGNChelper = derive2 { name="HGNChelper"; version="0.3.4"; sha256="09wwhi8qwmzcwsivnms9zjl4xmbbg0dnx5aj9a2fqaa06m4kd6pk"; depends=[]; }; + HGNChelper = derive2 { name="HGNChelper"; version="0.3.5"; sha256="0b2q99z22gafkicfkaxpzl79j2axrz60r9ch1smjivpk8sa22hyq"; depends=[]; }; HH = derive2 { name="HH"; version="3.1-34"; sha256="1srr195ha8n4va30impm12p2kamkl36whl8g10pl80hwgg20pbqk"; depends=[abind colorspace gridExtra Hmisc lattice latticeExtra leaps multcomp RColorBrewer reshape2 Rmpfr shiny vcd]; }; HHG = derive2 { name="HHG"; version="2.0"; sha256="1y6w62ivbhqpl6zgwpxq9r2w5nlc70zj8f7rnnhck162p6hyp778"; depends=[]; }; HI = derive2 { name="HI"; version="0.4"; sha256="0i7y4zcdr6wcjy43lz9h8glzpdv0pz7livr95xb1j4p8zafykday"; depends=[]; }; - HIBPwned = derive2 { name="HIBPwned"; version="0.1.3"; sha256="121rs767h9c7ngkbnbfv8zl7jjzimw68z9gwbz0dc0z8w3h3mq5y"; depends=[httr jsonlite urltools]; }; + HIBPwned = derive2 { name="HIBPwned"; version="0.1.6"; sha256="0ym62n1rmi8pjj37cxbrdmih7530nhmy77gxb8yylppjf3rikci4"; depends=[httr jsonlite ratelimitr urltools]; }; HIV_LifeTables = derive2 { name="HIV.LifeTables"; version="0.1"; sha256="0qa5n9w5d5l1kr4827a34581q380xmpyzmmhhl300z1jwr0j94df"; depends=[]; }; HIest = derive2 { name="HIest"; version="2.0"; sha256="0ik55kxhzjyg6z6072iz9nfaj7x1nvf91l1kysgvkjccr6jf3y86"; depends=[nnet]; }; HK80 = derive2 { name="HK80"; version="0.0.2"; sha256="0c8scpzl5xgqm9rlsvh5nl3bz42i5pzvb873j9bn3bi15gcknbny"; depends=[]; }; @@ -1274,15 +1328,16 @@ in with self; { HRM = derive2 { name="HRM"; version="0.5.1"; sha256="0ng9p9x6ka4cdi53vbzy298y9ahdjr037y5wyzlmmhm2cy182wby"; depends=[ggplot2 MASS matrixcalc plyr reshape2]; }; HRQoL = derive2 { name="HRQoL"; version="1.0"; sha256="1gr9rhr8gdnh7bw2v3r0xc3yhmzrx2gzgsd8wd5mmsp81ph0h5lz"; depends=[car fmsb Matrix matrixcalc numDeriv RColorBrewer rootSolve]; }; HSAR = derive2 { name="HSAR"; version="0.4.0"; sha256="1k40hh546hrdm2yh64l51sky17mnmkzckb7l3bnkpw495rsk73g2"; depends=[Rcpp RcppArmadillo spdep]; }; - HSAUR = derive2 { name="HSAUR"; version="1.3-7"; sha256="16qmsyin8b7x9q3xdx74kw6db6zjinhxprp6pfnl6ddwxhz3jzzf"; depends=[]; }; - HSAUR2 = derive2 { name="HSAUR2"; version="1.1-15"; sha256="0vsmx201dwfgdwm9kz6nl2z5v0x3fpkbf5qmj39zb174rfz4bvhf"; depends=[]; }; - HSAUR3 = derive2 { name="HSAUR3"; version="1.0-6"; sha256="1mn9nawi2nv6qmzm5h3259sb4k0ywc281rfnwjcv8wv88i11qiwd"; depends=[]; }; + HSAUR = derive2 { name="HSAUR"; version="1.3-8"; sha256="0sypgdpk5iy5gw1l047w0q8lb4b8j77ws7vl2kjpiz8cyxwfdx66"; depends=[]; }; + HSAUR2 = derive2 { name="HSAUR2"; version="1.1-16"; sha256="0g107rrnan9cbrd628s71wxbvbd4rmk9s1kr3cl1xkbff1cc9zmz"; depends=[]; }; + HSAUR3 = derive2 { name="HSAUR3"; version="1.0-7"; sha256="1jf756qp7ncmnpzdndhsdn994l85y6gxfgk9pkcbq4dcpfwn2hsl"; depends=[]; }; HSROC = derive2 { name="HSROC"; version="2.1.8"; sha256="056g6iygrddmpmg5nnilqrlw2xavmcc9q07z942vc2nivw06h346"; depends=[coda lattice MASS MCMCpack]; }; HSSVD = derive2 { name="HSSVD"; version="1.2"; sha256="1k7ga397grl0r4p0ipjgw5xlafb2528rpww67bw7mmy01w87a1cc"; depends=[bcv]; }; HTMLUtils = derive2 { name="HTMLUtils"; version="0.1.7"; sha256="05y505jazzahnd6jsp3plqz8hd75991hhhcpcdn8093rinb1f8l1"; depends=[R2HTML]; }; HTSCluster = derive2 { name="HTSCluster"; version="2.0.8"; sha256="0wnbfh6hdx8692jilgmv8sys1zm6fqc6mim7vvjhyqlmpm8gm0kg"; depends=[capushe edgeR plotrix]; }; - HTSSIP = derive2 { name="HTSSIP"; version="1.0.3"; sha256="09cid6zma00adxf03p0iydfpq9xrds72a174aa7dbwgvsbzqh4p0"; depends=[coenocliner DESeq2 dplyr ggplot2 lazyeval magrittr phyloseq plyr stringr tidyr]; }; + HTSSIP = derive2 { name="HTSSIP"; version="1.1.1"; sha256="1jfclid88kygqc8ygcpm6hih3w43h8pp2wqh1zzc7xq3wnin46a7"; depends=[coenocliner DESeq2 dplyr ggplot2 lazyeval magrittr phyloseq plyr stringr tidyr]; }; HUM = derive2 { name="HUM"; version="1.0"; sha256="1bq74l88jvscmq9ihv5wn06w2wng073ybvqb2bdx2dmiqlpv6jw2"; depends=[gtools Rcpp rgl]; }; + HURDAT = derive2 { name="HURDAT"; version="0.1.0"; sha256="074c5spfsg4f3hg9f316wz72m2j3kvycl8hb4j7i7z62wswgi420"; depends=[dplyr lubridate magrittr purrr readr stringr tibble tidyr]; }; HW_pval = derive2 { name="HW.pval"; version="1.0"; sha256="14nmyqw2d9cmn64789yc54fmiqanh6n1dizp7vj94h7b0jwq63yy"; depends=[]; }; HWEBayes = derive2 { name="HWEBayes"; version="1.4"; sha256="1rbffx6pn031a278ps9aqxcaq8yi73s5kf60za143ysbfxv9dphw"; depends=[MCMCpack mvtnorm]; }; HWEintrinsic = derive2 { name="HWEintrinsic"; version="1.2.2"; sha256="035r5bi7m66g351cmrfmf4cj5qqm4fn5pgy3lzsp3gyp2dv0rkg5"; depends=[]; }; @@ -1294,33 +1349,34 @@ in with self; { HapEstXXR = derive2 { name="HapEstXXR"; version="0.1-8"; sha256="00p8pziy8q6vki7brpd57c7ckc9zw41c90h47yp9vb3ndanfqavp"; depends=[survival]; }; Haplin = derive2 { name="Haplin"; version="6.2.0"; sha256="1r1qmald48xl1cxk2ynvh8p15958x52dlp3bdb303q2v8w66nfjm"; depends=[DatABEL GenABEL MASS mgcv snow SuppDists]; }; HaploSim = derive2 { name="HaploSim"; version="1.8.4"; sha256="0794f76hc9qvjmay7c61cmzycqafljs0g0hliq9xfrw4f23gq3sa"; depends=[]; }; - HardyWeinberg = derive2 { name="HardyWeinberg"; version="1.5.6"; sha256="1zpba8l8fjc7ncrw0virfv1s9zaa4xsyn63jiay8ivik98siqhkb"; depends=[mice]; }; + HardyWeinberg = derive2 { name="HardyWeinberg"; version="1.5.8"; sha256="0xbcchmzii0jv0ygr91n72r39j1axraxd2i607b56v4yd5d8sy4k"; depends=[mice Rcpp]; }; HarmonicRegression = derive2 { name="HarmonicRegression"; version="1.0"; sha256="0inz3l610wl0ibqjyrhfbmwmcfzcmcfhixai4lpkbfsyx93z2i4d"; depends=[]; }; Harvest_Tree = derive2 { name="Harvest.Tree"; version="1.1"; sha256="021zmppy7p2iakaxirfjdb5jzakg1ijma9d25ly2ni0nx0p1mh6z"; depends=[rpart]; }; HelpersMG = derive2 { name="HelpersMG"; version="1.9"; sha256="10icxks0b2sq7s2g7m4vs8857mlw5hkpnmphy7dfd1r8cbf7y7sh"; depends=[coda]; }; HeritSeq = derive2 { name="HeritSeq"; version="1.0.0"; sha256="0ibb2nkjk1d59gc1ljihihsjai3jp4jsbbariv05h1z26pgpc9p3"; depends=[cplm DESeq2 lme4 MASS pbapply SummarizedExperiment tweedie]; }; + HiCblock = derive2 { name="HiCblock"; version="1.0"; sha256="09k0iiqg8acw2v36j89cjca5jdsfdnbj3z00ynfgaxlgphbigrl1"; depends=[GenomeInfoDb GenomicRanges glmnet HiTC IRanges MASS Matrix rtracklayer S4Vectors]; }; HiCfeat = derive2 { name="HiCfeat"; version="1.2"; sha256="01b8isvn4my41n3608k80d38vgd3waq7rxsx1v4p0rl1f3pxn7dn"; depends=[GenomeInfoDb GenomicRanges glmnet IRanges Matrix rtracklayer]; }; - HiCglmi = derive2 { name="HiCglmi"; version="1.0"; sha256="01v7g9h86xb4i8gc2rsyyx952mqafyapydhyyik098s1war4hkf9"; depends=[GenomeInfoDb GenomicRanges glmnet HiTC IRanges MASS Matrix rtracklayer S4Vectors]; }; + HiCglmi = derive2 { name="HiCglmi"; version="1.1"; sha256="1q47kayga6g4vczh92a63a4ni5hvmrc7477wsjkhp846j3wswm5j"; depends=[GenomeInfoDb GenomicRanges glmnet HiTC IRanges MASS Matrix rtracklayer S4Vectors]; }; HiClimR = derive2 { name="HiClimR"; version="1.2.3"; sha256="1yv01pyfmgq306f3yravwf6sm79m0m93gpya95k85rxqdjl3c2hx"; depends=[]; }; HiCseg = derive2 { name="HiCseg"; version="1.1"; sha256="19581k3g71wrznyqrp4hmspqyzcbcfbc48xgjlq13zmqii45hcn6"; depends=[]; }; HiDimDA = derive2 { name="HiDimDA"; version="0.2-4"; sha256="0gxkxzys9mcy33xvsim8klaqmb2xwvy5bvgkn9r400j4qfjd3cgg"; depends=[]; }; HiDimMaxStable = derive2 { name="HiDimMaxStable"; version="0.1.1"; sha256="0gscdjm48yyf8h3bn6xjbjlfc1hwbbh5j6v64c0z3d04h9q35c24"; depends=[copula maxLik mnormpow mnormt partitions VGAM]; }; HiLMM = derive2 { name="HiLMM"; version="1.1"; sha256="09135cwi6kqrvzdlivm86q1dqn6cbbi6nspdm0c2s700jl49pl5z"; depends=[]; }; HiPLARM = derive2 { name="HiPLARM"; version="0.1"; sha256="0af68gfmc89nn1chmqay6ix0zygcp1hmylj02i7l6rx6vb06qw6w"; depends=[Matrix]; }; - HiddenMarkov = derive2 { name="HiddenMarkov"; version="1.8-7"; sha256="03fs51l3xxks0dqhl6w5m34djbpkly92bvbm23y3wj3zrxz3d2ml"; depends=[]; }; + HiddenMarkov = derive2 { name="HiddenMarkov"; version="1.8-8"; sha256="13db9qxcky91nck49w6iz98yx3c5rb70dc993gdmnwhzzrl92lfp"; depends=[]; }; HierO = derive2 { name="HierO"; version="0.2"; sha256="1lqj5grjly4kzxl7wb192aagz2kdvpnjdan2kcg5yxwvg1xcvwv1"; depends=[bitops RCurl rneos tcltk2 XML]; }; HighDimOut = derive2 { name="HighDimOut"; version="1.0.0"; sha256="0r7mazwq4fsz547d3nyavmqya7144lg3fkl5f7amrp48l9h85vx2"; depends=[DMwR FNN foreach ggplot2 plyr proxy]; }; HistDAWass = derive2 { name="HistDAWass"; version="0.1.6"; sha256="0i43zki95m47nm3yy7m7s66nvpmx6vl3df2bxkpyihc2xsqrsf3l"; depends=[class colorspace FactoMineR ggplot2 histogram]; }; HistData = derive2 { name="HistData"; version="0.8-1"; sha256="018v8wr95fssc5hzfwzk7x8pax2s41m22a7lvcpy0chy0nvh7dqh"; depends=[]; }; HistogramTools = derive2 { name="HistogramTools"; version="0.3.2"; sha256="1wkv6ypn006d8j6bpbhc1knw0bky4y8r7jp87482yd19q5ljsgv0"; depends=[ash Hmisc stringr]; }; HiveR = derive2 { name="HiveR"; version="0.2.55"; sha256="14hdnpiw0ccmzb0lj9gwn92hzwwmlpgrxv7mj8kwp89n7kqccvl7"; depends=[jpeg plyr png RColorBrewer]; }; - Hmisc = derive2 { name="Hmisc"; version="4.0-2"; sha256="1lg9k0kj803wsm3h0a991q9l2lrgsqryzfv2z79b88kjbfapqpqr"; depends=[acepack base64enc cluster data_table foreign Formula ggplot2 gridExtra gtable htmlTable htmltools lattice latticeExtra nnet rpart survival viridis]; }; + Hmisc = derive2 { name="Hmisc"; version="4.0-3"; sha256="1a7i7azag6pldgala85d8hh7wnx1shamyiriy4jfc65nxrr2lq8w"; depends=[acepack base64enc cluster data_table foreign Formula ggplot2 gridExtra gtable htmlTable htmltools lattice latticeExtra nnet rpart survival viridis]; }; HoRM = derive2 { name="HoRM"; version="0.1.1"; sha256="0l0gcp1bagm7zbjg7hw2748aqjn9592531d0w5vjap0jgalaig32"; depends=[ggplot2 MASS orthopolynom quantmod rsm]; }; Holidays = derive2 { name="Holidays"; version="1.0-7"; sha256="1srfbhlrf0pd6gzhp4hbic555lb7camk084rn1qz2g7fjvyijqiq"; depends=[TimeWarp]; }; Homeric = derive2 { name="Homeric"; version="0.1-3"; sha256="1vcs8fj39zpz45p7gph0mnx65hgr35na0b79i8llyw7i1h7zqzxr"; depends=[]; }; HomoPolymer = derive2 { name="HomoPolymer"; version="1.0"; sha256="1bxc33dx9y9rr9aii4vn9d1j9v5pd4c0xayfdldz8d9m2010xr4a"; depends=[deSolve MenuCollection RGtk2]; }; HotDeckImputation = derive2 { name="HotDeckImputation"; version="1.1.0"; sha256="1mqfn6yw5846ynrcgzka0m6ikfppa5civjkhj42rhp2v2xk25li7"; depends=[Rglpk]; }; - Hotelling = derive2 { name="Hotelling"; version="1.0-2"; sha256="0dzsqnn4c4av23qjnmacwc78i0xg355p1xwfmgipr04ivym0mqn0"; depends=[corpcor]; }; + Hotelling = derive2 { name="Hotelling"; version="1.0-3"; sha256="14sry3m14czy84mjpvimqbz446320ypb8cf442dmnxazd121fc84"; depends=[corpcor]; }; HyPhy = derive2 { name="HyPhy"; version="1.0"; sha256="0994ymv7sswbp8qw3pay34s926cflw2hq2gnchw7rknybvlsrinq"; depends=[ape R_utils]; }; HybridMC = derive2 { name="HybridMC"; version="0.2"; sha256="1wgzfyk0scwq9s2sdmc91fj7r4d7zlgwgnj6mdiia8w88ja8kzqy"; depends=[coda]; }; HydeNet = derive2 { name="HydeNet"; version="0.10.5"; sha256="00h7lj347nag5m5nfyv1hgaml77kqlcxrl704mq6791fcjdchgp1"; depends=[checkmate DiagrammeR dplyr graph gRbase magrittr nnet pixiedust plyr rjags stringr]; }; @@ -1329,10 +1385,11 @@ in with self; { IAPWS95 = derive2 { name="IAPWS95"; version="1.0.0"; sha256="1rw6i3a653m11fyza42jhbqi6607fiqgmq15qfn5bqhq8sdgmn9p"; depends=[ggplot2 pander Rcpp]; }; IASD = derive2 { name="IASD"; version="1.1"; sha256="1slhd42k639mbyxccl7n69p7ng2qx6pqag8wz3kdwn479spkavzn"; depends=[]; }; IAT = derive2 { name="IAT"; version="0.3"; sha256="110rn2q09gspfd4msyh30dllxdxdraffkr18h1nm72brzhmx9cfi"; depends=[dplyr ggplot2 lazyeval]; }; + IATScore = derive2 { name="IATScore"; version="0.1.0"; sha256="1dlqazsg4vvflrqls1scmq3f6840d3dsplglfj3x0i8fh87q9ja0"; depends=[]; }; IATscores = derive2 { name="IATscores"; version="0.1-2"; sha256="0grl5m4ccwaxvhg1bziy3vv5jffkvr24z268ws5m4ia20haif0dm"; depends=[dplyr nem qgraph reshape2 stringr]; }; IBDLabels = derive2 { name="IBDLabels"; version="1.1"; sha256="1m9fd058yjxva6hin7i72i2nl285wfm0jkdn5xcng27yqlijyrm9"; depends=[]; }; IBDhaploRtools = derive2 { name="IBDhaploRtools"; version="1.8"; sha256="1754239pdil6b383mpzyi8zb9l9hzg15dwgn5246v97g1y3mlp5r"; depends=[]; }; - IBDsim = derive2 { name="IBDsim"; version="0.9-6"; sha256="19dq85qcvcjpfj7lh9h5ld6wm9xrz6zyl2nkpfvh1icwbcqncbxx"; depends=[paramlink]; }; + IBDsim = derive2 { name="IBDsim"; version="0.9-7"; sha256="1wq0w9d4kwvq1hc5l0m8wrqfhnncapmnrh29x9vvafv50ym7yb3l"; depends=[paramlink]; }; IBHM = derive2 { name="IBHM"; version="1.1-11"; sha256="1m0zxlybcak2v5c4spgaa39ngb2hryak4xd875jryk1dcnk9c702"; depends=[cmaes DEoptim Rcpp]; }; IBrokers = derive2 { name="IBrokers"; version="0.9-12"; sha256="0mhh4kgwrncrcysvnvah6xc7fhx5ywjzn258cs9xj9kzns0jblk6"; depends=[xts zoo]; }; IC2 = derive2 { name="IC2"; version="1.0-1"; sha256="03jjb62msxjxdg9l3zd1ns0d2w37hkxy5pnjgaywxw3vfk4zwfj9"; depends=[]; }; @@ -1352,19 +1409,19 @@ in with self; { ICSOutlier = derive2 { name="ICSOutlier"; version="0.2-0"; sha256="1dxbh3qhirr7f2bv68g1xlya5fprm230fdgxhccrzdc0wh0ijh3i"; depends=[ICS moments mvtnorm]; }; ICV = derive2 { name="ICV"; version="1.0"; sha256="1na87i39jy5d8ibldqcqz3a072ihkgcl0k629sxch9hk6v6j5lly"; depends=[]; }; ICsurv = derive2 { name="ICsurv"; version="1.0"; sha256="1mbndpy3x5731c9y955wscy76jrxlgv33bf6ldqp65cwyvdgxl86"; depends=[MASS matrixcalc]; }; - ICtest = derive2 { name="ICtest"; version="0.2"; sha256="0pd16cafhx7cfwasbdli0kin83wayn7hil8allpacv9yiinj2bq3"; depends=[GGally ggplot2 ICS ICSNP JADE png Rcpp RcppArmadillo survey]; }; + ICtest = derive2 { name="ICtest"; version="0.3"; sha256="0g4h6gkz6zp28a1hvrvm89wckx6sg5fqzy0flb97a6lh9xpmb83g"; depends=[GGally ggplot2 ICS ICSNP JADE png Rcpp RcppArmadillo survey]; }; IDPSurvival = derive2 { name="IDPSurvival"; version="1.2"; sha256="0hifs8vw3rxlb5vlxs1433pcv2dh7p0mxpgb2n03d98f20vkdwfw"; depends=[gtools Rsolnp survival]; }; IDPmisc = derive2 { name="IDPmisc"; version="1.1.17"; sha256="0nbwdyg9javjjfvljwbp2jl0c6414c11zb2pirmm5pmimaq9vv0q"; depends=[lattice]; }; IDSpatialStats = derive2 { name="IDSpatialStats"; version="0.2.2"; sha256="0pfvdy82i5w6zrda2022m1v22dv2qsgcj1y7f8hqmaqvqgczizfk"; depends=[]; }; IDTurtle = derive2 { name="IDTurtle"; version="1.2"; sha256="15r806vk5lmvyclsynzq9qr8pgwwkxal1j6xcq6408i8kq1hk3fb"; depends=[]; }; - IDmining = derive2 { name="IDmining"; version="1.0.0"; sha256="112m9dpzq6dl055wf1hhnxqr0rfvm1dv75mbj60fdwlf5q4sgsia"; depends=[dplyr]; }; + IDmining = derive2 { name="IDmining"; version="1.0.1"; sha256="1cwq79kdfgsaklczbb2zgjsbxys7g6p2knlxsykxf3zw788m3ra1"; depends=[data_table]; }; IFP = derive2 { name="IFP"; version="0.2.1"; sha256="06zyadcr8p6q0c5h9n29yl02ixysdj6lfbn9hfir0bk9hyv9yfyr"; depends=[coda haplo_stats]; }; IGM_MEA = derive2 { name="IGM.MEA"; version="0.3.5"; sha256="09k5di7bqlqi2m3jn39ahnf7x96wx1h06bw0ah6pdszwd97yy33i"; depends=[emdist ggplot2 gridExtra gtools lattice plyr reshape2]; }; IHSEP = derive2 { name="IHSEP"; version="0.1"; sha256="1djc5509b5iyi6y0i36h77l6sq1h0w721v2isxqldcqk3gb0bx11"; depends=[lpint Rcpp]; }; ILS = derive2 { name="ILS"; version="0.1.0"; sha256="18phs1q28mpwvwnzn0hgjxy978f7n4c3p94jxjp0sy3as67hqphp"; depends=[depthTools fda_usc MASS multcomp]; }; IM = derive2 { name="IM"; version="1.0"; sha256="1f1vr5zfqnanc5xmmlfkjkvxwbyyysi3mcvkg95p8r687a7zl0cx"; depends=[bmp jpeg png]; }; IMFData = derive2 { name="IMFData"; version="0.2.0"; sha256="1mlxpsbyvh1zi8ivdblbd58zfv5hflnknbasz5z8xk9911czrn6p"; depends=[httr jsonlite plyr]; }; - IMIFA = derive2 { name="IMIFA"; version="1.1.0"; sha256="0fxnyzh0403k97ka6ngwsbw9qnf0gnkq33xsb47vrlfx3558g57a"; depends=[abind corpcor e1071 gclus matrixcalc matrixStats mclust MCMCpack mvnfast plotrix Rfast slam viridis]; }; + IMIFA = derive2 { name="IMIFA"; version="1.3.0"; sha256="0ym9chn3af10i8n6jcyrwkz9ijmwc7dfd9a4mcxmjhqvy5lxgs4m"; depends=[abind e1071 matrixStats mclust mvnfast plotrix Rfast slam viridis]; }; IMIS = derive2 { name="IMIS"; version="0.1"; sha256="09zb48vdj0i3vf8vxrs07xwb9ji27vp2fyvmg6jfq631licsryc2"; depends=[mvtnorm]; }; IMP = derive2 { name="IMP"; version="1.1"; sha256="0ilvgz2bngffyx6ifqqx1snsn6mmq7rx3wg44093yrviaw39qdfv"; depends=[dplyr ggplot2 shiny tidyr]; }; IMPACT = derive2 { name="IMPACT"; version="0.1.0"; sha256="17m2gqwaqam8wv7214x4hp93imgfzilgm42zx5z21ipypiq6rqfy"; depends=[]; }; @@ -1372,14 +1429,16 @@ in with self; { IMak = derive2 { name="IMak"; version="1.1.2"; sha256="19si4hhvi8kddkp2kr1yw2bcw1qkk0i42saklvwk751gdmyzl9p3"; depends=[]; }; INLABMA = derive2 { name="INLABMA"; version="0.1-8"; sha256="13r89r14xpihfqddwzkhxg4jgxyl59826x2insrall3mj2yffj90"; depends=[Matrix sp spdep]; }; INSPIRE = derive2 { name="INSPIRE"; version="1.5"; sha256="0938l50yxnb5q628mp874ayx9ybvcjddis20y1hzm5cmlsg0hqhg"; depends=[missMDA]; }; + IPEC = derive2 { name="IPEC"; version="0.0.9"; sha256="02nzh8yq6nshnljxlkqyvd9spnqbcxfdlcr2zl33syhgqjsaz34h"; depends=[MASS numDeriv]; }; + IPMRF = derive2 { name="IPMRF"; version="1.0"; sha256="13zgz6g48nkrgqfzm24863hp57pah82s5rsglr19cnlcx30ry2a9"; depends=[party randomForest]; }; IPMpack = derive2 { name="IPMpack"; version="2.1"; sha256="08b79g5a9maxnxladvc2x2dgcmm427i8p6hhgda3mw2h5qmch2q3"; depends=[MASS Matrix nlme]; }; IPSUR = derive2 { name="IPSUR"; version="1.5"; sha256="0brh3dx7m1rilvr1ig6vbi7p13bfbblgvs8fc114f08d90fczwnq"; depends=[]; }; IPWsurvival = derive2 { name="IPWsurvival"; version="0.5"; sha256="0lmw0ifj8cds8lzyjkkv0i0zim23p0a3pawlhmhdm3nfvwawb853"; depends=[survival]; }; IPtoCountry = derive2 { name="IPtoCountry"; version="0.0.1"; sha256="1b10z93mc31cr1c5wxp9xz9cr3jm4n4g5kav09dyallpgw60rskp"; depends=[data_table devtools dtables ggplot2 install_load maps scales]; }; IQCC = derive2 { name="IQCC"; version="0.6"; sha256="0gsnkdl4cfxzq6pm9g4i1g23mxg108j3is4x69id1xn2plf92m04"; depends=[MASS micEcon miscTools qcc]; }; IRATER = derive2 { name="IRATER"; version="0.0.1"; sha256="0jxdvjmnmangbqy3ibb5qrj9jz3wrzs0wa1r2gjk4v8vsbk0ipcf"; depends=[coda lattice plyr R2admb]; }; - IRISMustangMetrics = derive2 { name="IRISMustangMetrics"; version="2.0.4"; sha256="0in50k366yjqgpgzh73bfb8v6cqdrr68b8xvsa1jmi2f438j3nrx"; depends=[dplyr IRISSeismic pracma RCurl seismicRoll signal stringr XML]; }; - IRISSeismic = derive2 { name="IRISSeismic"; version="1.4.3"; sha256="0ba0pcjxhw93wdhz513j7a595bj5jfi50xagb85znxh5bi0lsxp4"; depends=[pracma RCurl seismicRoll signal stringr XML]; }; + IRISMustangMetrics = derive2 { name="IRISMustangMetrics"; version="2.0.8"; sha256="0imsssija6v91il3dw5ibzm09xyjbabp2xy9jp4ixj6x8295i5xg"; depends=[dplyr IRISSeismic pracma RCurl seismicRoll signal stringr XML]; }; + IRISSeismic = derive2 { name="IRISSeismic"; version="1.4.5"; sha256="0ybnp87a08rfchxmcirifl3znh389yj89dp0qr88kg78zgcqyr4y"; depends=[pracma RCurl seismicRoll signal stringr XML]; }; IRTShiny = derive2 { name="IRTShiny"; version="1.2"; sha256="094ax94y6k5z4vlxfla2w19f57q0z32nwwd5npjbgmnkhvfhhl9v"; depends=[beeswarm CTT ltm psych shiny shinyAce]; }; IRTpp = derive2 { name="IRTpp"; version="0.2.6.1"; sha256="10shzyiawk65pikawvhg58kx6fpvs1dazqmfjf3rfvly1lc0px1q"; depends=[FactoMineR MASS mvtnorm numDeriv Rcpp]; }; IRdisplay = derive2 { name="IRdisplay"; version="0.4.4"; sha256="19l4flvik8zw2pany8dpjbrh0bji6bag6pmclgwqnq80532hnfp8"; depends=[repr]; }; @@ -1391,22 +1450,23 @@ in with self; { ISOweek = derive2 { name="ISOweek"; version="0.6-2"; sha256="1f1h8pgjaa14cvaj8ldl87b4vslxwvyfj46m0hkylwp73sv3g2mm"; depends=[stringr]; }; ISR3 = derive2 { name="ISR3"; version="0.98"; sha256="0mmpdl9ndlj9i0k3zl7ja0g7y9pm67igw925ld5qnz7a36plygxs"; depends=[]; }; ISwR = derive2 { name="ISwR"; version="2.0-7"; sha256="1rd1wrvl8wlc8ya5lndk74gnfvj9wp29z8617v3kbf32gqhby7ng"; depends=[]; }; - ITEMAN = derive2 { name="ITEMAN"; version="1.0"; sha256="06blkqxdvdfynp8vl02rqbg7ya62bq1izlqjda1p8zpr689jinzk"; depends=[car ggplot2 polycor]; }; ITGM = derive2 { name="ITGM"; version="0.4"; sha256="0vsf3hnqfz029n1skm54s9ynd8alqag963bircqg0psgl9x6jhvi"; depends=[data_table Fgmutils gsubfn plyr sqldf]; }; IUPS = derive2 { name="IUPS"; version="1.0"; sha256="01pv03ink668fi2vxqybli0kgva13gxhqfdxkwz6qk5rnpzwvf5w"; depends=[boot Matching R2jags]; }; IalsaSynthesis = derive2 { name="IalsaSynthesis"; version="0.1.6"; sha256="15iwywvzhgiyigl8f488b7ra89rz0a7ymfsdgdlqfls3fmld7b4a"; depends=[testit]; }; Iboot = derive2 { name="Iboot"; version="0.1-1"; sha256="1fahh86kgv2axj2qg14n87v888sc0kb567s6zr3fh5zv361phwkq"; depends=[]; }; - IgorR = derive2 { name="IgorR"; version="0.8"; sha256="1khm7mbs497ybaw428ziwlxxygg1vcn5kx77w2cwm4mg8w95f4na"; depends=[bitops]; }; + IceCast = derive2 { name="IceCast"; version="1.1.0"; sha256="1xw7fapp72kxdg9vynwmgz3nl6hah135d78hys8zikn6gsnkmzhj"; depends=[maptools MASS ncdf4 raster rgeos sp]; }; + IgorR = derive2 { name="IgorR"; version="0.8.1"; sha256="1lkiz3gxj8i1xbr5jp69z21rpk7kz3a68h29inp1qa7zi7gikmgx"; depends=[bitops]; }; + ImaginR = derive2 { name="ImaginR"; version="0.1.7"; sha256="12ypfrqw6xym84i1axd3h0qd2md96rc0glas3rgzpdhdyw4lbfmn"; depends=[imager jpeg]; }; Imap = derive2 { name="Imap"; version="1.32"; sha256="0b4w0mw9ljw6zxwvi0qzb08yq9n169lzgkdcwizrd07x9k9xjxs7"; depends=[]; }; ImpactIV = derive2 { name="ImpactIV"; version="1.0"; sha256="1bb6gw1h15hscr71hy779k2x5ywzx63ylim3hby02d7fnnj46p58"; depends=[nnet]; }; ImportExport = derive2 { name="ImportExport"; version="1.1"; sha256="12i9mwspk59zicn1mn21xrs90c8dqxm1q7alqbzscgkpf3xbjrnn"; depends=[chron gdata haven Hmisc RODBC xlsx]; }; - ImputeRobust = derive2 { name="ImputeRobust"; version="1.1-1"; sha256="1rc22p1wy9y20swv40z9f1yjswhzyifymbgrdlf1ycxm9dzn4nyk"; depends=[extremevalues gamlss gamlss_dist lattice mice purrr]; }; + ImputeRobust = derive2 { name="ImputeRobust"; version="1.1-2"; sha256="0jd7j4i55bbcgvm5km2mk07c6vgjnrlbij0vlfw833ag979zzsla"; depends=[extremevalues gamlss gamlss_dist lattice mice purrr]; }; InPosition = derive2 { name="InPosition"; version="0.12.7"; sha256="1f7xb2kxikmja4cq7s1aiwhdq27zc6hghjbliqqpm8ci8860lb8p"; depends=[ExPosition prettyGraphs]; }; InSilicoVA = derive2 { name="InSilicoVA"; version="1.1.4"; sha256="16978c1bdxbp3xxrcnx8yyar1dd292a5i43qhcymdp7nnprd6gc7"; depends=[coda ggplot2 rJava]; }; IncucyteDRC = derive2 { name="IncucyteDRC"; version="0.5.4"; sha256="1k7jqcyx5n4my5rbyfa693ganbk91xganyagq8x8szli9h1491ii"; depends=[cowplot dplyr drc DT ggplot2 magrittr shiny tidyr XML]; }; IndTestPP = derive2 { name="IndTestPP"; version="1.0"; sha256="1ywl35k2syv46pz6ap5sjkynapqj04aq197czspqky0pvrq7ldr1"; depends=[]; }; IndependenceTests = derive2 { name="IndependenceTests"; version="0.2"; sha256="04qfh2mg9xkfnvp6k7w1ip4rb663p3pzww9lyprcjvr3hcac7gqa"; depends=[xtable]; }; - IndianTaxCalc = derive2 { name="IndianTaxCalc"; version="1.0.1"; sha256="0phl0p6k4jsznvg7wn2vr4id5y5p0x81s7mj4sss9pjz49kj0laj"; depends=[]; }; + IndianTaxCalc = derive2 { name="IndianTaxCalc"; version="1.0.2"; sha256="1fxw884wj9n8drk2xz3rgr4f7b4fckh5firrf5gdz6d1nk9hdvc1"; depends=[]; }; InfDim = derive2 { name="InfDim"; version="1.0"; sha256="0rh3ch0m015xjkxy08vf9pc6q7azjc6sgicd2j6cwh611pqq39wq"; depends=[]; }; InferenceSMR = derive2 { name="InferenceSMR"; version="1.0"; sha256="13d3v8kyk6br33659jgql6j1nqmnd8zszqrwfw2x3khkiqzgdmhk"; depends=[survival]; }; InfiniumPurify = derive2 { name="InfiniumPurify"; version="1.3.1"; sha256="0yqah4rwpishas0xyv5a7cn4v18brj33cd7f494g21b9brggafq1"; depends=[matrixStats]; }; @@ -1421,19 +1481,19 @@ in with self; { IntNMF = derive2 { name="IntNMF"; version="1.1"; sha256="0bw6ycf7zrbfh8dfpgva1a51nazkvwlq7pxdhpp1j1mhabwm2nq2"; depends=[cluster InterSIM MASS mclust NMF]; }; IntegrateBs = derive2 { name="IntegrateBs"; version="0.1.0"; sha256="1pkx4wpahd1sabzx55law3710x3vbh9yi6kii8gs2xfq3cb1llmq"; depends=[]; }; IntegratedJM = derive2 { name="IntegratedJM"; version="1.5"; sha256="0vw2k8f0smb2vbn10rqp5alhra8q5d87c0zjs2xjc8w6i72fy2q8"; depends=[Biobase ggplot2 nlme]; }; - IntegratedMRF = derive2 { name="IntegratedMRF"; version="1.1.5"; sha256="0f2jsf6lh1nrrfqdgq72jqan94f81cr2pckfcjn86c933gjlq4bm"; depends=[bootstrap caTools ggplot2 limSolve Rcpp]; }; + IntegratedMRF = derive2 { name="IntegratedMRF"; version="1.1.8"; sha256="0y3hagjx3pzhqyqm3pydl3s3f1g9d5yb2w3ybxll11913p3gll3i"; depends=[bootstrap caTools ggplot2 limSolve MultivariateRandomForest Rcpp]; }; InterSIM = derive2 { name="InterSIM"; version="2.1"; sha256="092fw918qq8pahyxxznabkdfrb8700bpkkq96zj8ihpkx2ngkxln"; depends=[MASS NMF]; }; - InterVA4 = derive2 { name="InterVA4"; version="1.7.3"; sha256="1ql9mdl9q7n7kj4c6wfgjfi87bp7n30knbxg9way7ifgr2yqn8bb"; depends=[]; }; + InterVA4 = derive2 { name="InterVA4"; version="1.7.4"; sha256="0mlcn8mlrwgb54iclvadjwgpgav3zfm1y513bn2gypafq7x3bk81"; depends=[]; }; Interact = derive2 { name="Interact"; version="1.1"; sha256="1g9zhafdpr7j410bi8p03d8x9f8m3n329x8v01yk15f65fp7pl1d"; depends=[]; }; InteractiveIGraph = derive2 { name="InteractiveIGraph"; version="1.0.6.1"; sha256="0srxlp77xqq0vw2phfv7zcnqswi2i5nzkpqbpa5limqx00jd12zy"; depends=[igraph]; }; Interatrix = derive2 { name="Interatrix"; version="1.1.1"; sha256="1ljxgiia0y8wv1rlm5brd0yvs1r7r5wyrs6nykmwrwwya4k34mpz"; depends=[MASS tkrplot]; }; InterfaceqPCR = derive2 { name="InterfaceqPCR"; version="1.0"; sha256="12nmkv6qnzh2dnbhk1656dla6mrznh24gqblmn4xai7wg4p92fbx"; depends=[plyr reshape2 tkrplot xlsx]; }; Interpol = derive2 { name="Interpol"; version="1.3.1"; sha256="1598lnnrcxihxysdljphqxig15fd8z7linw9byjmqypwcpk6r5jn"; depends=[]; }; Interpol_T = derive2 { name="Interpol.T"; version="2.1.1"; sha256="1fbsl1ypkc65y6c0p32gpi2a2aal8jg02mclz7ri57hf4c1k09gz"; depends=[chron date]; }; - InterpretMSSpectrum = derive2 { name="InterpretMSSpectrum"; version="0.83"; sha256="1iwhgfb7z9pbnwzn626v0w0ycfjlhpaiv1yzm062samvr0lqiyrh"; depends=[enviPat plyr Rdisop]; }; + InterpretMSSpectrum = derive2 { name="InterpretMSSpectrum"; version="1.0"; sha256="0b73xxkpz2rj0i2g5bqj8zsybcz0850f4vhdiryqn9933zi347ap"; depends=[DBI doParallel enviPat foreach plyr Rdisop RSQLite]; }; InvariantCausalPrediction = derive2 { name="InvariantCausalPrediction"; version="0.6-1"; sha256="16qlskxszpi24qsdl821n72pzdvmf1gg7lnlwyhyzhzzkh9az1pd"; depends=[glmnet mboost]; }; InvasionCorrection = derive2 { name="InvasionCorrection"; version="0.1"; sha256="1wwx2kssjysl1lraac36pvxq34vg8qm0vwi861rs1iipfc35i84j"; depends=[lattice]; }; - Inventorymodel = derive2 { name="Inventorymodel"; version="1.0.3"; sha256="11hfyxlnqzk9fpjbisbgdyx99svm0sak0x0r4xrlrxw66f0gwllf"; depends=[e1071 GameTheoryAllocation]; }; + Inventorymodel = derive2 { name="Inventorymodel"; version="1.0.4"; sha256="1mlvdfhyr27sgap7jgccy79gg7dksplp2jirijn9i289mqvy12c9"; depends=[e1071 GameTheoryAllocation]; }; InventorymodelPackage = derive2 { name="InventorymodelPackage"; version="1.0.2"; sha256="1w35idsagl9v93ci3qmal3xbf11sy6h1k7xnv25c59ivfnpjpkva"; depends=[e1071]; }; IrishDirectorates = derive2 { name="IrishDirectorates"; version="0.1.0"; sha256="0741093vq1cqs9zh95fc6kwpd4a4r4yxvmcnp7f7j5xxyqy1h3xz"; depends=[]; }; IsingFit = derive2 { name="IsingFit"; version="0.3.1"; sha256="1prdzzp15klkdy72379bjksdgxr15nk16pqm35w95341cddxchc7"; depends=[glmnet Matrix qgraph]; }; @@ -1442,7 +1502,7 @@ in with self; { IsoCI = derive2 { name="IsoCI"; version="1.1"; sha256="0r7ksfic6p2v95c953s4gbzzclk4ldxysm8szb8xba1w0nx2izil"; depends=[KernSmooth]; }; IsoGene = derive2 { name="IsoGene"; version="1.0-24"; sha256="0flm0mszankvl3aizwsazyhvz2xkr4gfqiqywpc0r1swqj19610r"; depends=[affy Biobase ff Iso xtable]; }; IsoSpecR = derive2 { name="IsoSpecR"; version="1.0.3"; sha256="1cnkzc29k0inz6kdn77l0ymzjgf1hid8jza7nla4ym2s0gidgdyf"; depends=[Rcpp]; }; - IsoplotR = derive2 { name="IsoplotR"; version="0.11"; sha256="0nk3xs84mk4fkwlrxnrd5hn9h4ysdpn41m8j0sjmfcw4s5ar36fd"; depends=[MASS]; }; + IsoplotR = derive2 { name="IsoplotR"; version="0.14"; sha256="0k7isq6ady85vwzyh6zg1z6jbkf86pxmcfw14gvyzqhjwzc9jh5p"; depends=[MASS]; }; IsoriX = derive2 { name="IsoriX"; version="0.5"; sha256="177z16afx0ws1y99phhb3wpy5qpf9w1964rh0dxqrwr7xas20jlq"; depends=[latticeExtra numDeriv proxy raster rasterVis sp spaMM]; }; IsotopeR = derive2 { name="IsotopeR"; version="0.5.4"; sha256="0xgha5alh5y5qfz00rl73q4xlamnmrwij7kckljmy6zgrlrdnl6x"; depends=[colorspace ellipse fgui plotrix runjags]; }; JADE = derive2 { name="JADE"; version="2.0-0"; sha256="15bcq6r2iargxkb0pdbqkwrrn2rs7hc3y5fxjm5mb377513sdz5j"; depends=[clue]; }; @@ -1452,15 +1512,15 @@ in with self; { JGEE = derive2 { name="JGEE"; version="1.1"; sha256="078348n623hlyc3n9yh67vv5acsnxapmbwybvrb1i7kawmqw5msi"; depends=[gee MASS]; }; JGL = derive2 { name="JGL"; version="2.3"; sha256="1351iq547ln06nklrgx192dqlfnn03hkwj3hrliqzfbmsls098qc"; depends=[igraph]; }; JGR = derive2 { name="JGR"; version="1.7-16"; sha256="0iv659mjsv7apzpzvmq23w514h6yq50hi70ym7jrv948qrzh64pg"; depends=[iplots JavaGD rJava]; }; - JM = derive2 { name="JM"; version="1.4-5"; sha256="1v3aiz5882kwg8iagmb309i212ndksi6l8bgdnq6j77lixc3a87b"; depends=[MASS nlme survival]; }; + JM = derive2 { name="JM"; version="1.4-7"; sha256="1ajdmabifzg4jp74ghas5wf3vp4x2vnc6sh811n44a1ni727sb2n"; depends=[MASS nlme survival]; }; JMbayes = derive2 { name="JMbayes"; version="0.8-0"; sha256="1kay6na8mb7k2r4alpzm2lb8phjqr3a05qfpv4ydd16rbjrlfbph"; depends=[MASS nlme survival]; }; JMdesign = derive2 { name="JMdesign"; version="1.1"; sha256="0w5nzhp82g0k7j5704fif16sf95rpckd76jjz9fbd71pp2d80vlh"; depends=[]; }; JOP = derive2 { name="JOP"; version="3.6"; sha256="1kpb1dy2vm4jgzd3h0qgdw53nfp2qi74hgq5l5inxx4aayncclk7"; depends=[dglm Rsolnp]; }; - JOUSBoost = derive2 { name="JOUSBoost"; version="1.0.0"; sha256="1m4h0jsmnk1sr8h94s7kndmsl6l8rlq65fh17slbadppfgyb1nfd"; depends=[Rcpp rpart]; }; + JOUSBoost = derive2 { name="JOUSBoost"; version="2.0.0"; sha256="1nrsbcdfn196209niqmq0lxwakwma9sp33ydnj3dap0yikswci8x"; depends=[doParallel foreach Rcpp rpart]; }; JPEN = derive2 { name="JPEN"; version="1.0"; sha256="12rvp5bmlkwyr1gg336k655hp09gym0d2wwry70c1rz30x1sf2zs"; depends=[mvtnorm]; }; JPSurv = derive2 { name="JPSurv"; version="1.0.1"; sha256="11hfji0nyfmw1d7y2cijpp7ivlv5s9k8g771kmgwy14wflkyf7g2"; depends=[]; }; JRF = derive2 { name="JRF"; version="0.1-4"; sha256="1xpvscn9iawwa0vfh3kfwzdni436bf42nvm18b8abh033ljvqpij"; depends=[]; }; - JSM = derive2 { name="JSM"; version="0.1.0"; sha256="075zkh732cfrnjmd90pa84yxm8vg230b5r1m1j2b27xxrgng1lgv"; depends=[nlme Rcpp RcppEigen statmod survival]; }; + JSM = derive2 { name="JSM"; version="0.1.1"; sha256="0ggqf55fn1zjn3d5nmizi4ywj5h6qfisp76ld95527xw2lkrv011"; depends=[nlme Rcpp RcppEigen statmod survival]; }; JWileymisc = derive2 { name="JWileymisc"; version="0.2.1"; sha256="0cli204f1b5hj3qz62fycww12a6dv7xxxszkxgrxirw6mpdf858c"; depends=[cowplot data_table devtools foreach ggplot2 Hmisc lavaan MASS mgcv mice multcompView plyr]; }; JacobiEigen = derive2 { name="JacobiEigen"; version="0.2-2"; sha256="1q6wqxlhslip14544px1aq446m77a8s0chvhpc19im014w4g930v"; depends=[Rcpp]; }; JavaGD = derive2 { name="JavaGD"; version="0.6-1"; sha256="13n6xzbbjgd0bpwv2xgm3dlscg87wh32q6fcq50kk6byp6yv05sc"; depends=[]; }; @@ -1472,22 +1532,26 @@ in with self; { JointModel = derive2 { name="JointModel"; version="1.0"; sha256="1zgs5c7saqyqxvxmhw5sxy5w67abq344aid6igw1da05bfy2az6h"; depends=[lme4 statmod survival]; }; JointRegBC = derive2 { name="JointRegBC"; version="0.1.1"; sha256="0w7ygs3pvlqkkb2x20kv20kda3gz7cn6zgrkg30nhjxp318d76ab"; depends=[MASS nlme survival]; }; Julia = derive2 { name="Julia"; version="1.1"; sha256="0i1n150d89pkds7qyr0xycz6h07zikb2y07d5fcpaqs4446a8prg"; depends=[]; }; + JumpTest = derive2 { name="JumpTest"; version="0.0.1"; sha256="1d5zmjwmajzdg5d1ws40zchx9wiaav01fby1v3irym2mx30jgbqn"; depends=[MASS Rcpp RcppEigen]; }; KANT = derive2 { name="KANT"; version="2.0"; sha256="169j72pmdkcj6hv8qgmc02aps0ppvvl1vnr1hzrb1gsf7zj7bs3y"; depends=[affy Biobase]; }; KATforDCEMRI = derive2 { name="KATforDCEMRI"; version="0.740"; sha256="1k8fihd9m26k14rvc5d5x0d9xc3mh8d49hs64p55np1acqfhg2sy"; depends=[locfit matlab R_matlab]; }; - KENDL = derive2 { name="KENDL"; version="1.0"; sha256="1w5d23l3fyxa0rf7nwnp4y8p4lxpf14kl0avpz6kwaxrizw3zgmk"; depends=[]; }; + KENDL = derive2 { name="KENDL"; version="1.1"; sha256="05vsh3x0li964a485q3n19c7fahcprvg1bnrvffagkxf8w1iz153"; depends=[]; }; KERE = derive2 { name="KERE"; version="1.0.0"; sha256="1b16cb3ihcsp9jffmd45sd7ia4pibikmj62ad344wmq22q4fpliy"; depends=[]; }; - KFAS = derive2 { name="KFAS"; version="1.2.6"; sha256="0v03wx9rl73d880db680q1cnl8wcl6lkn4jfgk39kwlqb5348fb2"; depends=[]; }; + KFAS = derive2 { name="KFAS"; version="1.2.8"; sha256="15p459bs6q0j893zbkpak6dnflrmlm27203ldf8pjdfyfy1nvsva"; depends=[]; }; KFKSDS = derive2 { name="KFKSDS"; version="1.6"; sha256="1g11f936p554bfxlm4slxhfxki5vqkks1mrbqw4w83v2rcb50f8d"; depends=[]; }; KMDA = derive2 { name="KMDA"; version="1.0"; sha256="0x4kjjdd59wvgg699vrj99wqg3s1qbkbskis1c34xv9b8bzcv94j"; depends=[]; }; KMsurv = derive2 { name="KMsurv"; version="0.1-5"; sha256="0hi5vvk584rl70gbrr75w9hc775xmbxnaig0dd6hlpi4071pnqjm"; depends=[]; }; KODAMA = derive2 { name="KODAMA"; version="1.4"; sha256="0qzpgj6ljzd8n8vgmf53pmblsmypl86j7njd3pz0d370bxfchsqj"; depends=[Rcpp RcppArmadillo]; }; KOGMWU = derive2 { name="KOGMWU"; version="1.1"; sha256="0n07wrpmmvxflxpmhkp3gm40xz2w4j0l8dsljhmfiyxcf5y7kq2g"; depends=[pheatmap]; }; KRLS = derive2 { name="KRLS"; version="0.3-7"; sha256="0dx4b68xx3saqlkbpvvrhxjscl7jr5phwqvjywxsp4qxlr3ysl79"; depends=[]; }; + KRMM = derive2 { name="KRMM"; version="1.0"; sha256="0wxzhrrc4lx20nxjny7rcfw3bya7drn88zbrlzx9f531298xwbrk"; depends=[cvTools kernlab MASS robustbase]; }; KSD = derive2 { name="KSD"; version="1.0.0"; sha256="0wqmbr51yv7f87pnhph2nrj9y2d5jql2agizcaq6lax23lj6xfb7"; depends=[pryr]; }; + KSEAapp = derive2 { name="KSEAapp"; version="0.99.0"; sha256="1gfgpa2d32y6bzvf4ww70sm7niq34sqmyrhi0phlqxshqq9xviqc"; depends=[gplots]; }; KScorrect = derive2 { name="KScorrect"; version="1.2.0"; sha256="1rymzllm97z22xwsn5wbn02c0xp0kfdp73mk9jrk81hfdpd15p4i"; depends=[MASS mclust]; }; KTensorGraphs = derive2 { name="KTensorGraphs"; version="0.1"; sha256="1hsndxslqgca0ay4q277zjwnwz8bzwfkzz915dgqvjd2v4afrvzx"; depends=[]; }; - KappaGUI = derive2 { name="KappaGUI"; version="1.2"; sha256="014d3lshq3avrncd8ydjpn59zalq46v29jrlz3g76wzr96xf5ckr"; depends=[irr]; }; + KappaGUI = derive2 { name="KappaGUI"; version="1.2.1"; sha256="1nr9jyl43fc8w10jp0xbgjx8vdkjnl4irqwjgw4fil19fc6p7g3p"; depends=[irr]; }; KappaV = derive2 { name="KappaV"; version="0.3"; sha256="13mmfb8ijpgvzfj20andqb662950lp9g25k5b26r5ba65p7nhva7"; depends=[maptools PresenceAbsence rgeos sp]; }; + KarsTS = derive2 { name="KarsTS"; version="1.1"; sha256="0dg0w7n2ga22wkbg0sxdx93zyksvvpwx1f87ki55mvk9i5kb2a5k"; depends=[BaylorEdPsych circular forecast mgcv missForest MVN nonlinearTseries rgl stinepack stlplus tcltk2 tkrplot tseries tseriesChaos zoo]; }; Kendall = derive2 { name="Kendall"; version="2.2"; sha256="0z2yr3x2nvdm81w2imb61hxwcbmg14kfb2bxgh3wmkmv3wfjwkwn"; depends=[boot]; }; KernSmooth = derive2 { name="KernSmooth"; version="2.23-15"; sha256="1xhha8kw10jv8pv8b61hb5in9qiw3r2a9kdji3qlm991s4zd4wlb"; depends=[]; }; KernSmoothIRT = derive2 { name="KernSmoothIRT"; version="6.1"; sha256="1hq4sykddh9sg24qrnccii89nqxmq7hnldhn8wl6y62aj0h1nrqm"; depends=[plotrix Rcpp rgl]; }; @@ -1502,9 +1566,10 @@ in with self; { KraljicMatrix = derive2 { name="KraljicMatrix"; version="0.1.1"; sha256="1r9gs7k12djg56bifrpxbkj1kbcqgdpyqnjw5829gsx8881j2z9d"; depends=[dplyr ggplot2 tibble]; }; KrigInv = derive2 { name="KrigInv"; version="1.3.1"; sha256="0fcfv2vl572l8qp1ilhjai6zrw15bf1z41qm7xlfspfbj611ga7k"; depends=[DiceKriging pbivnorm randtoolbox rgenoud]; }; L1pack = derive2 { name="L1pack"; version="0.38"; sha256="1my9fbqry1h3s1dwy8ia6rzkdp8map3n01vfwp0ddx4bw1mz2ffv"; depends=[]; }; + LAM = derive2 { name="LAM"; version="0.0-17"; sha256="1ip9gz4i5ap7z6rsg0yh7sv590bji2kq4pcpaz16jpjgy5802skg"; depends=[CDM coda Rcpp RcppArmadillo sirt]; }; LANDD = derive2 { name="LANDD"; version="1.1.0"; sha256="13szkww9nw8zywfrqd8mwgj9csgragm0bx8ia52rcpakpc3hv3hx"; depends=[BH doParallel fdrtool foreach GGally ggplot2 GOSemSim GOstats igraph intergraph Matrix modeest mvtnorm pROC Rcpp]; }; LARF = derive2 { name="LARF"; version="1.4"; sha256="1sqib7smgjacn07ishwls1nlbvcb6fpp1vhrjwf9g4xf9jk30i8h"; depends=[Formula]; }; - LBSPR = derive2 { name="LBSPR"; version="0.1.0"; sha256="1wiv0y2cbvxxcm9ywklp874d2v5412xw1p2v2rx90zlaq55ln7gv"; depends=[dplyr ggplot2 gridExtra plotrix RColorBrewer Rcpp tidyr]; }; + LBSPR = derive2 { name="LBSPR"; version="0.1.1"; sha256="0wwn64qbvf64i38gsd3q6p3n3rplb9b662hv3n2al54dis7kr9iv"; depends=[dplyr ggplot2 gridExtra plotrix RColorBrewer Rcpp shiny tidyr]; }; LCA = derive2 { name="LCA"; version="0.1"; sha256="14nhx2fs18558zljnw56mdz3qx30v394llhzswxhznjfiiqc9z5h"; depends=[]; }; LCAextend = derive2 { name="LCAextend"; version="1.2"; sha256="1y9azq9v42a3z5fq6gj8js89qblb2z93k4mg4jmw0wgkyv6mysfc"; depends=[boot kinship2 mvtnorm rms]; }; LCF = derive2 { name="LCF"; version="1.6-6"; sha256="1pcm1fdf0s2ygd425h2yi3j4r41zwi2bq2xsc20ymzq8lxq7d4rb"; depends=[quadprog]; }; @@ -1514,13 +1579,13 @@ in with self; { LDOD = derive2 { name="LDOD"; version="1.0"; sha256="0mf2sy01yv57mqicrz08a17m6crigklx6fmw9zpxv7g85qw1iq4v"; depends=[Rmpfr Rsolnp]; }; LDPD = derive2 { name="LDPD"; version="1.1.2"; sha256="1khdx8vwlpliyjc4sxcdiywbxl8lc9f5s3457vcip1j8dv537lbm"; depends=[MASS nleqslv]; }; LDRTools = derive2 { name="LDRTools"; version="0.2"; sha256="0k4j3l21n8b3nvhmfjhwhs3klw09a0dz6cl6gmi2yx7jr21ar6xc"; depends=[]; }; - LDcorSV = derive2 { name="LDcorSV"; version="1.3.1"; sha256="0i4npl90mkj8vry6ckq8bc4ydbl44vxichgsxyn80r6k9i71yl67"; depends=[MASS]; }; + LDcorSV = derive2 { name="LDcorSV"; version="1.3.2"; sha256="0lvk3xz400yd3w0cjdfi6hir1ym1mffd504vycwgck5fkzljpcvx"; depends=[]; }; LDheatmap = derive2 { name="LDheatmap"; version="0.99-2"; sha256="0n80l4wl9rs4ps8h2bjpar5nidq7bg05d6675wiwanx24q6fc0bs"; depends=[chopsticks genetics]; }; LDtests = derive2 { name="LDtests"; version="1.0"; sha256="1jwqr7zlp9hv7vw8xp80xvrwbdv796wjgr914v393wfa07j5wbd1"; depends=[]; }; LEANR = derive2 { name="LEANR"; version="1.4.9"; sha256="053xy13ys5hibafdnbkwqdk36hw7dhanp4frfacpfpn5f9nfh95r"; depends=[foreach igraph]; }; LEAP = derive2 { name="LEAP"; version="0.2"; sha256="1yrhanxvr7krvllqzv17qkc4wvmd7mgl57am8sn53773dbfipfc4"; depends=[]; }; LEAPFrOG = derive2 { name="LEAPFrOG"; version="1.0.7"; sha256="0z9ahkk4qzc45h1r806frv9cd84vvshvn5mr84gx7qdxljfkfq6h"; depends=[alabama MASS]; }; - LEGIT = derive2 { name="LEGIT"; version="1.0.4"; sha256="1va3y3mxjc41pridrk0lp0vb7ds4x93sv3i8h7h3dc9p58daw20j"; depends=[formula_tools pROC]; }; + LEGIT = derive2 { name="LEGIT"; version="1.1.1"; sha256="108bxw98z0hgm4nnxvn54c5npm48qsif7y91dqsjx69p6azckqmh"; depends=[doSNOW foreach formula_tools iterators pROC snow]; }; LFDR_MLE = derive2 { name="LFDR.MLE"; version="1.0"; sha256="11vy6gg2x98s1y8a5ns9vcd61gw8ax1lhn4lvicdjbd1lg18nm83"; depends=[]; }; LGEWIS = derive2 { name="LGEWIS"; version="0.2"; sha256="0aqvj6vphg33jfyfkj0zkdbp60a94jlc1vcsba2nyywc54qm9wjh"; depends=[CompQuadForm geeM pls SKAT]; }; LGRF = derive2 { name="LGRF"; version="1.0"; sha256="1kdx6y55aa9n6v43zfz6jk8amvvxbx79sqm1jx4ihgkpgcdglan7"; depends=[CompQuadForm geepack SKAT]; }; @@ -1528,15 +1593,15 @@ in with self; { LICurvature = derive2 { name="LICurvature"; version="0.1.1"; sha256="09hqar4kvksd816ya6jg349r0v6z2m2109hq6j4k1d2vchab4lni"; depends=[MASS]; }; LIHNPSD = derive2 { name="LIHNPSD"; version="0.2.1"; sha256="08ils29vvaq6abkgxbh028vwjw6l6h10cirbnwr65s458zvh4xqv"; depends=[BB Bolstad2 moments optimx Rmpfr sn]; }; LIM = derive2 { name="LIM"; version="1.4.6"; sha256="03x1gnm06bw1wrzc01110bjzd2mvjdzbc2mbrazh22jrmb32w5d8"; depends=[diagram limSolve]; }; - LINselect = derive2 { name="LINselect"; version="0.0-2"; sha256="0pkp7xc766nzg5p739zlnjd075k3zlf6zj364hmv95cqlaym9292"; depends=[elasticnet gtools MASS mvtnorm pls randomForest]; }; + LINselect = derive2 { name="LINselect"; version="1.1"; sha256="1dx97pnfwlv6w00qp8b2ah8jl1arfh39x1vzry8zrxgxisq407wq"; depends=[elasticnet gtools MASS mvtnorm pls randomForest]; }; LIStest = derive2 { name="LIStest"; version="2.1"; sha256="1gk253v3f1jcr4z5ps8nrqf1n7isjhbynxsi9jq729w7h725806a"; depends=[]; }; LLSR = derive2 { name="LLSR"; version="0.0.2.0"; sha256="0nxp1sfnhgf0iqfhwqvr7a0mvs3swsj2l0shcyrb3zliyd23g5ax"; depends=[digest ggtern rootSolve svDialogs XLConnect]; }; LMERConvenienceFunctions = derive2 { name="LMERConvenienceFunctions"; version="2.10"; sha256="08jz0i7sv7gn3bqckphbmnx0kc6yjnfvi06iyf7pcdzjaybxhj06"; depends=[fields LCFdata lme4 Matrix mgcv rgl]; }; - LMest = derive2 { name="LMest"; version="2.3"; sha256="0jgfdkzx8zhfjsmx828j1x1dmikqhdpgpqzr7nq8zyr4805l67xx"; depends=[MASS MultiLCIRT]; }; + LMest = derive2 { name="LMest"; version="2.4"; sha256="1ag3w0789qfr0ypbkcwy81j61mmf0nwriiw22w7gqjn1ripx94kv"; depends=[MASS MultiLCIRT]; }; LNIRT = derive2 { name="LNIRT"; version="0.2.0"; sha256="02gaqn2pixry6qgybwszsv60pk6hzdd51axchkq3ma3gb6biw4fv"; depends=[MASS]; }; LOGICOIL = derive2 { name="LOGICOIL"; version="0.99.0"; sha256="1wgg7kigzzk5ghjn3hkjf1bb8d6mvjfmkwq64phri5jpxd742ps9"; depends=[nnet]; }; LOGIT = derive2 { name="LOGIT"; version="1.3"; sha256="1nx9ycrys0p08xr1n7bqgn47k5wz1zbp6w5pwsqk5c6f6did2rs1"; depends=[caret e1071 ggplot2 MASS pROC reshape]; }; - LOST = derive2 { name="LOST"; version="1.2"; sha256="1ymdhd2iayqyf7kvvcc234bslxn1wdds54m1bi234g1f4ljj1qv8"; depends=[e1071 gdata MASS miscTools pcaMethods shapes]; }; + LOST = derive2 { name="LOST"; version="1.3"; sha256="01ymnczsnfml04hb6hbi041khkz2aki78qr3hriw7n3bzs5i7xim"; depends=[e1071 gdata MASS miscTools pcaMethods rgl shapes]; }; LPCM = derive2 { name="LPCM"; version="0.45-0"; sha256="15gpb59556s28npdsw1r821rld7b11y1m2m97m320n9k0z4vbk3i"; depends=[]; }; LPM = derive2 { name="LPM"; version="2.6"; sha256="0fr84l4qxr1ckjafw0i8g6fn74g8qavcs218g3wa03ckab0y98ps"; depends=[fracdiff MASS QRM]; }; LPR = derive2 { name="LPR"; version="1.0"; sha256="16kmfm6p7cwnzpd054ik0cy0ipif6zssdfyxyfm0cijz8z4z40x7"; depends=[doParallel foreach glmnet iterators lattice Matrix slam]; }; @@ -1561,8 +1626,9 @@ in with self; { LTRCtrees = derive2 { name="LTRCtrees"; version="0.5.0"; sha256="18awxiln2ilr0jjyvkv47a3xy7v8rjlaksklb4pcn1kdlvb1nqf0"; depends=[interval partykit rpart survival]; }; LVMMCOR = derive2 { name="LVMMCOR"; version="0.01.1"; sha256="1lq4hqcg0qkywdr4a22m1fr3m97749mm6n2jzdj9i7jrf0agc1fs"; depends=[MASS nlme]; }; LW1949 = derive2 { name="LW1949"; version="1.1.0"; sha256="147ymp7j98ihp1dcz3p5v9ar6h767phjdnga5q5vf1wwa2mxawg7"; depends=[MASS mgcv plotrix]; }; + LZeroSpikeInference = derive2 { name="LZeroSpikeInference"; version="1.0.1"; sha256="1inq88yqm1155shx81lsmjvc0snnid0ibim991g46yibf3jpcyzf"; depends=[]; }; LaF = derive2 { name="LaF"; version="0.6.3"; sha256="0mp1g8pikmkahxgshgs4a7iryxzzcxhxdzvdn60s6m9h1addvhww"; depends=[Rcpp]; }; - LabourMarketAreas = derive2 { name="LabourMarketAreas"; version="2.0"; sha256="0xqqq8glrq5c089riybviq3zv3la1pqhi2fcalrz3i9n2fc13nd1"; depends=[data_table maptools rgdal rgeos sp spdep]; }; + LabourMarketAreas = derive2 { name="LabourMarketAreas"; version="3.0"; sha256="0qf818dgyp1sgs6j5zqsj1wld5hychv1qxr6gdk3s0nbv72y7wsw"; depends=[data_table maptools rgdal rgeos sp spdep]; }; Lahman = derive2 { name="Lahman"; version="5.0-0"; sha256="03zfgsgf36lnsjlrqfh1npqnz52dhd6xyzs7k1sxygwy62lg03lx"; depends=[dplyr]; }; LakeMetabolizer = derive2 { name="LakeMetabolizer"; version="1.5.0"; sha256="06mvdrdyl0rh9rwd0jxww0sycadcp7cj08hq35q6vyzq0jkxn2xf"; depends=[plyr rLakeAnalyzer]; }; Lambda4 = derive2 { name="Lambda4"; version="3.0"; sha256="04ikkflfr0nmy1gr3gfldlh2v8mpl82k1wwnzp57d2kn75m9vbxz"; depends=[]; }; @@ -1572,13 +1638,13 @@ in with self; { LaplacesDemon = derive2 { name="LaplacesDemon"; version="16.0.1"; sha256="0yc6bv1mvs8ivrjgi49xz5bn4if24693rw148w5zxd11r3ryy8dy"; depends=[]; }; LassoBacktracking = derive2 { name="LassoBacktracking"; version="0.1.2"; sha256="1z1cnj6r6cq3b8xa9qck3ijfmzsr70r2p9m1ndakijb36pgwrzcs"; depends=[Matrix Rcpp]; }; Laterality = derive2 { name="Laterality"; version="0.9.3"; sha256="0pl5bfbkzhgxjjzzh99s6rh4jsq0pbcgc902i0z2lmmivgs5qmd6"; depends=[ade4]; }; - LatticeKrig = derive2 { name="LatticeKrig"; version="6.2"; sha256="1d3qphpydgrqkyk5y5pr6jjndaf9vnfcin447x4z0iczannhggbk"; depends=[fields spam]; }; - LeArEst = derive2 { name="LeArEst"; version="0.1.4"; sha256="0x4bwwrqkql9f01lgli3d9083ziihaj35afnz857ydrdx4ckhw4f"; depends=[conicfit jpeg opencpu]; }; + LatticeKrig = derive2 { name="LatticeKrig"; version="6.4"; sha256="02il7cks03kmbra3sf90kdfp0dzg4kfmy512hd542nzwwa8pivsm"; depends=[fields spam]; }; + LeArEst = derive2 { name="LeArEst"; version="0.1.5"; sha256="13rxch3f16yvcil255abdp2vc7v2ipy3xj38s7hmjikqfdmxpkw4"; depends=[conicfit jpeg opencpu]; }; LeLogicielR = derive2 { name="LeLogicielR"; version="1.2"; sha256="0h52pzrksi1mn55mnxbfi61hl7x61cnkhp450slfrk68f6kp30x6"; depends=[gdata IndependenceTests RColorBrewer xtable]; }; LeafAngle = derive2 { name="LeafAngle"; version="1.2-1"; sha256="0g3i5300f3rvjz7g7z8s5n8xdcsp41gf1vnr4g36m1likddfpxlx"; depends=[]; }; LeafArea = derive2 { name="LeafArea"; version="0.1.7"; sha256="0pn6hh9ipr609pi49ls8wxnx7v8q1wyp84i22zzwxyzwaap5nmj2"; depends=[]; }; LearnBayes = derive2 { name="LearnBayes"; version="2.15"; sha256="0cz2rgqy1cmdz2h1qbdvfqxmmdzmg2z1scdlxr7k385anha13ja5"; depends=[]; }; - LendingClub = derive2 { name="LendingClub"; version="1.0.2"; sha256="1k7jvlmjyp5n45lz20as6v93lvgap766qlxp1chvv83ranh6dw3d"; depends=[dplyr httr jsonlite]; }; + LendingClub = derive2 { name="LendingClub"; version="1.0.3"; sha256="0gnykp51nnchm79w0s3wx7q5790yzjp1fjgm12v4jjxzq30gjmcm"; depends=[dplyr httr jsonlite plyr]; }; LexisPlotR = derive2 { name="LexisPlotR"; version="0.3"; sha256="1qdgs6p11j0ign27bbnn32g65sw42982ijrig5cwqsdvxpdabjl8"; depends=[ggplot2]; }; LiblineaR = derive2 { name="LiblineaR"; version="2.10-8"; sha256="17ykazac7iv02bxl8xg948vhbdr32icdm1v4bk31zmslp4xsk08g"; depends=[]; }; LiblineaR_ACF = derive2 { name="LiblineaR.ACF"; version="1.94-2"; sha256="1ldkb63yhm1ki8i585wp5byx6y0kvclwy3ncacgcdqqk0p41cyi6"; depends=[]; }; @@ -1592,7 +1658,7 @@ in with self; { LindleyR = derive2 { name="LindleyR"; version="1.1.0"; sha256="163i604q683znp6q544hnv4vibygwvsxcfhh8m7iaqr42li3c0ak"; depends=[lamW]; }; LinearRegressionMDE = derive2 { name="LinearRegressionMDE"; version="1.0"; sha256="0nl29l10y5kpds1i4sv7jwizq61fmh5c0zpj8x64qfif4l6y4v0d"; depends=[]; }; LinearizedSVR = derive2 { name="LinearizedSVR"; version="1.3"; sha256="0h3xmlnd5x37r5hdhcz90z5n1hsbr2ci3m939i89p1x9644i2l5g"; depends=[expectreg kernlab LiblineaR]; }; - LinkageMapView = derive2 { name="LinkageMapView"; version="1.0.0"; sha256="0139bnlfj66w1npiv6dh4y4aln65nsfwf2qfzkxypigcyvxxyjwd"; depends=[plotrix]; }; + LinkageMapView = derive2 { name="LinkageMapView"; version="2.1.0"; sha256="1k2qrpxvy9ymkll63icbm2b9alfw0hg10rawigwbs2xv9n8vyb4p"; depends=[plotrix RColorBrewer]; }; LinkedMatrix = derive2 { name="LinkedMatrix"; version="1.2.0"; sha256="14q8n0zqm21fwfyfqvxdacxj6mdipgi2143d8xksifk5ihhdj64v"; depends=[]; }; Lmoments = derive2 { name="Lmoments"; version="1.2-3"; sha256="13p0r4w16jvjnyjmkhkp3dwdfr1gap2l0k4k5jy41m8nc5fvcx79"; depends=[]; }; LncFinder = derive2 { name="LncFinder"; version="1.0.0"; sha256="1ygbmazjm2jk0wrd13khpx8rkwd51cb50qxs2zdad0w09705mpsx"; depends=[caret e1071 seqinr]; }; @@ -1600,6 +1666,7 @@ in with self; { LncPath = derive2 { name="LncPath"; version="1.0"; sha256="1cihwlj5sv000qg2wa931yx4ca6nixgihjna4g3fh7nr5aiv6cfn"; depends=[igraph samr]; }; LncPriCNet = derive2 { name="LncPriCNet"; version="1.0"; sha256="19cw3x97xv42kc4jag7axnmpd0nfnwg7vnwcn2bgcmm5gapmfn1h"; depends=[]; }; LocFDRPois = derive2 { name="LocFDRPois"; version="1.0.0"; sha256="0zzdp9wgwr6wn3grimghpj4vq34x37c8bqg8acfzlzih8frqal3r"; depends=[dplyr ggplot2]; }; + LocalControl = derive2 { name="LocalControl"; version="1.0.1"; sha256="0bmqlhazblps8x9ndqh5k6lmd8020kh5wzgjnw5mq9v053p360sz"; depends=[cluster gss lattice Rcpp]; }; Lock5Data = derive2 { name="Lock5Data"; version="2.6"; sha256="0ckaac00ck5vyv0gv25l1zhgkm3char6ks1p4fl3vdl5gdyrc1pp"; depends=[]; }; Lock5withR = derive2 { name="Lock5withR"; version="1.2.2"; sha256="10x3i11pb4cig4pgfmw9984na5zjbg7d41y6crakiimf53ihx0c2"; depends=[]; }; LogConcDEAD = derive2 { name="LogConcDEAD"; version="1.5-9"; sha256="135vkp70q6gn75ds43aq08y13vrsgsgykssmnhrh6545i86vmhhi"; depends=[MASS mvtnorm]; }; @@ -1613,27 +1680,29 @@ in with self; { LotkasLaw = derive2 { name="LotkasLaw"; version="0.0.1.0"; sha256="11kq52yavicimp7ll7ljrs69a5fxf68ydb9md7v6b02iw5mwbmz7"; depends=[]; }; LowRankQP = derive2 { name="LowRankQP"; version="1.0.2"; sha256="0is7v4cy4w1g3wn4wa32iqv4awd1nwvfcb71b3yk5wj59lpm8gs3"; depends=[]; }; LumReader = derive2 { name="LumReader"; version="0.1.0"; sha256="1h2r3c9xkwlnaicn65085bdx7y86ha2fpd5mxirqax5lm6d8lirc"; depends=[gridExtra lattice plotly shiny]; }; - Luminescence = derive2 { name="Luminescence"; version="0.7.4"; sha256="11q444h0bk8il02rk3lhnh614zhzi9clc2wwimhmgbmlar0znbqh"; depends=[bbmle data_table httr magrittr matrixStats minpack_lm raster Rcpp RcppArmadillo readxl shape XML zoo]; }; + Luminescence = derive2 { name="Luminescence"; version="0.7.5"; sha256="07v78diyjvbymwidpa9f5bykaafczv0f88f6r926mk949sj1ici4"; depends=[bbmle data_table httr magrittr matrixStats minpack_lm raster Rcpp RcppArmadillo readxl shape XML zoo]; }; M3 = derive2 { name="M3"; version="0.3"; sha256="1l40alk166lshckqp72k5zmsgm7s5mgyzxlp11l64mgncjwkw2r3"; depends=[mapdata maps ncdf4 rgdal]; }; M4comp = derive2 { name="M4comp"; version="0.0.1"; sha256="1lxm6qcbdp7i00vxbikhyl7pdxnz4czar10kh9xm0qwy8sl8lxg2"; depends=[]; }; MADPop = derive2 { name="MADPop"; version="1.1"; sha256="1w2jbiki6d14y32p8a50b8g53m1iva2kgik14yg27z5hx1rwwq97"; depends=[BH Rcpp RcppEigen rstan StanHeaders]; }; - MAINT_Data = derive2 { name="MAINT.Data"; version="1.0.1"; sha256="0qddlp4yfqfmswgjnfqlj9zqn6jdy94rzw92g0rl83iia9diqsmp"; depends=[MASS miscTools pcaPP Rcpp RcppEigen robustbase rrcov sn]; }; + MAGNAMWAR = derive2 { name="MAGNAMWAR"; version="1.0.0"; sha256="1933dxjz0scw4arjlx606kr4b3czvl4i0blg4b212pycf8p7jyfb"; depends=[ape coxme doParallel dplyr foreach iterators lme4 multcomp plyr qqman seqinr survival]; }; + MAINT_Data = derive2 { name="MAINT.Data"; version="1.1.2"; sha256="1d552k2n110a6rvvf2ld8anravp3xgh17irj6kb0nxzcjy30vprg"; depends=[MASS miscTools pcaPP Rcpp RcppEigen robustbase rrcov sn]; }; MALDIquant = derive2 { name="MALDIquant"; version="1.16.2"; sha256="0z5srzsfgsgi4bssr4chls4ry6d18y2g9143znqmraylppwrrqzr"; depends=[]; }; MALDIquantForeign = derive2 { name="MALDIquantForeign"; version="0.10"; sha256="1h1lvmw3233wgy1wvpa6n5q5j6z27hg3k31rq4a7c53w8g1bsmi3"; depends=[base64enc digest MALDIquant readBrukerFlexData readMzXmlData XML]; }; MAMS = derive2 { name="MAMS"; version="1.01"; sha256="0vm1pnh5bcggsip4cpbfif2j2glvbsscpnpjsycbd2y0m05asccz"; depends=[mvtnorm]; }; MAMSE = derive2 { name="MAMSE"; version="0.2-1"; sha256="0spi7fqkxjiw5j0nf7ambcr8kpzdhjzh9y3dk23y1mrk2dgc5dkw"; depends=[]; }; MANCIE = derive2 { name="MANCIE"; version="1.4"; sha256="0940xl3z5bca6hcnj2bj341l79wajilxlxzmyz3dlgrz0b3bbdmm"; depends=[]; }; MANOVA_RM = derive2 { name="MANOVA.RM"; version="0.0.5"; sha256="1xh1nn2wipxyl8nj3vnpbyyww2np3pv12c78sf87kyl4q5c20v64"; depends=[ellipse magic MASS Matrix plotrix plyr]; }; - MAPA = derive2 { name="MAPA"; version="2.0.1"; sha256="013gp1wnw77nf1d9mvvw9zxs3dml9jvxd50nifx76bpkr00im940"; depends=[forecast RColorBrewer smooth]; }; + MAPA = derive2 { name="MAPA"; version="2.0.2"; sha256="1sk95zpsw6lhciyyq8jzz8mdj4gbnq5vk9z3hxbyl0v0g2rr1gqz"; depends=[forecast RColorBrewer smooth]; }; MAPLES = derive2 { name="MAPLES"; version="1.0"; sha256="0hzsh7z1k7qazpxjqbm9842zgdpl51irg7yfd119a7b2sd3a8li9"; depends=[mgcv]; }; MAR1 = derive2 { name="MAR1"; version="1.0"; sha256="1r6j890icl5h3m2876sakmwr3c65513xnsj68sy0y0q7xj3a039l"; depends=[bestglm leaps]; }; MARSS = derive2 { name="MARSS"; version="3.9"; sha256="0vn8axzz0nqdcl3w00waghz68z8pvfm764w11kxxigvjpw2plj31"; depends=[KFAS mvtnorm nlme]; }; - MASS = derive2 { name="MASS"; version="7.3-45"; sha256="0bhxx8kxfvnacia50hx5s0ax13wk8fqfgxh30p676h0hi4y45k43"; depends=[]; }; + MARX = derive2 { name="MARX"; version="0.1"; sha256="1yanv7q5l8ybw3mh0rvhxyqi2sp8w4b9vnas7lpqflc06j4nnv4p"; depends=[fBasics matlab stabledist tseries]; }; + MASS = derive2 { name="MASS"; version="7.3-47"; sha256="1gy6z7ly9wn86rfn9xrmqiqq1ijw3pkasrr2299kbzsgx2mwsi7d"; depends=[]; }; MASSTIMATE = derive2 { name="MASSTIMATE"; version="1.3"; sha256="0dsqinl6998jv63m6scljszpi0qb050gj5d4wnp0pcxfs9awi2gj"; depends=[]; }; MAT = derive2 { name="MAT"; version="2.2"; sha256="093axw2zp4i3f6s9621zwibcxrracp77xrc0q5q0m4yv3m35x908"; depends=[Rcpp RcppArmadillo]; }; MATA = derive2 { name="MATA"; version="0.3"; sha256="006mnc4wqh9vdigfzrzx4csgczi0idvlwb6r23w5mmsfbn0ysdm5"; depends=[]; }; MATTOOLS = derive2 { name="MATTOOLS"; version="1.1"; sha256="1nzrkm3a08rpsd9vplyf33rrkadlrd0ln70k95qxj98ndh2v97px"; depends=[]; }; - MAVE = derive2 { name="MAVE"; version="0.1.7"; sha256="10blz9axxnnjcdg796gr2y27f4mjb1b5daw23llzrclgg2fsykgf"; depends=[Rcpp RcppArmadillo]; }; + MAVE = derive2 { name="MAVE"; version="1.2.9"; sha256="0h54iaw0nlyddgl266sk2gkrq8ff1xn510bfw12csqk7xnydm18f"; depends=[mda Rcpp RcppArmadillo]; }; MAVIS = derive2 { name="MAVIS"; version="1.1.2"; sha256="1ankgazqf368jhj8csmyyvlys27d61s41fcxq3s324gz69xh25ll"; depends=[compute_es ggplot2 MAc MAd metafor quantreg SCMA SCRT shiny shinyAce shinyBS weightr]; }; MAVTgsa = derive2 { name="MAVTgsa"; version="1.3"; sha256="0rzal9nsi8y873cbf6hrdyzyxnpd4r1yr9fj66cn0s1c8g93ls0y"; depends=[corpcor foreach MASS multcomp randomForest]; }; MAc = derive2 { name="MAc"; version="1.1"; sha256="1lshi5rb8l2mpd302wskhlk5vz1wjidvbss9y69l63zjqdwjs7ch"; depends=[]; }; @@ -1642,8 +1711,8 @@ in with self; { MBA = derive2 { name="MBA"; version="0.0-9"; sha256="06kmrdkhwwvr3kd5w8ws6r528hhpvbhixyj98lv36kkwlx14x06g"; depends=[BH]; }; MBC = derive2 { name="MBC"; version="0.10-2"; sha256="0c40k3m9z9cqk3778hwyy0i56qnsvw1dwpa6p9v097fbpacfsrg2"; depends=[energy Matrix]; }; MBCluster_Seq = derive2 { name="MBCluster.Seq"; version="1.0"; sha256="0xbi2r0g0gzsy05qrq1ljr5f5s3glwxj204vk2f1lgwdx3fd116m"; depends=[]; }; - MBESS = derive2 { name="MBESS"; version="4.2.0"; sha256="02d7wpsh58jq79ph9xxx33ikzb4j05kdfmjy935gyx3i3mycapm1"; depends=[boot gsl lavaan MASS mnormt nlme OpenMx sem semTools]; }; - MBHdesign = derive2 { name="MBHdesign"; version="1.0.61"; sha256="1ahc3xwwgfn052m674l2cxjw87qgp788hzx30z56dihfpirvw45f"; depends=[class geometry mgcv mvtnorm randtoolbox]; }; + MBESS = derive2 { name="MBESS"; version="4.3.0"; sha256="055h4wppp4dyxa152hdg6as5ckxzvjjfb3k8n72w9jmmrk49vbbg"; depends=[boot gsl lavaan MASS mnormt nlme OpenMx sem semTools]; }; + MBHdesign = derive2 { name="MBHdesign"; version="1.0.63"; sha256="1dvcllx514n2djira132ranpwqlxc11an580kis2biw9aww6dskc"; depends=[class geometry mgcv mvtnorm randtoolbox]; }; MBI = derive2 { name="MBI"; version="1.0"; sha256="1lb0sjwa6x360n9a9pagz6yhxh37gxq1fk0f5c3i2sd56ny9jpns"; depends=[]; }; MBSGS = derive2 { name="MBSGS"; version="1.0.0"; sha256="1g13bjxmbnd7fwb3nv1s87ra7iwjkvid9pfwy7qxixy80pdrlfz5"; depends=[MASS MCMCpack mgcv mnormt truncnorm]; }; MBTAr = derive2 { name="MBTAr"; version="1.0.1"; sha256="0zak19pdk0wwkhl4kj1jbwx0qmqcgpmmqv3vk0wg8nwgf1l65idy"; depends=[jsonlite]; }; @@ -1658,7 +1727,7 @@ in with self; { MCMC_qpcr = derive2 { name="MCMC.qpcr"; version="1.2.3"; sha256="0b9n793spljmsb58jp41vnl9c753xqaw1g4wbi4ax348cvi09jk8"; depends=[coda ggplot2 MCMCglmm]; }; MCMC4Extremes = derive2 { name="MCMC4Extremes"; version="1.1"; sha256="06p6xdbja7vrdq4vnhybpkmyf4rkaihcmy9sc81sb0h2wa21vcq0"; depends=[evir]; }; MCMCglmm = derive2 { name="MCMCglmm"; version="2.24"; sha256="0s2x8kazn3g3x3z4ji95c5vmfj8awcjmx92c0alsj5ms1bqxsh7x"; depends=[ape coda corpcor cubature Matrix tensorA]; }; - MCMCpack = derive2 { name="MCMCpack"; version="1.3-9"; sha256="0wvv7qzrm1h5w4znz6dqypyxdj5ckpsljid1l9cs1xl9mnjfgpay"; depends=[coda lattice MASS mcmc quantreg]; }; + MCMCpack = derive2 { name="MCMCpack"; version="1.4-0"; sha256="0cz5djmf1xfv54sgwan0r6ln1mlnkpnqh2zhqkss2m3ys2v087yh"; depends=[coda lattice MASS mcmc quantreg]; }; MCMCprecision = derive2 { name="MCMCprecision"; version="0.3.6"; sha256="1gz01jqi4w0lnp4mkxa5ri09hkc4c2qwxifbmx50m75rhr0328hr"; depends=[combinat Matrix Rcpp RcppArmadillo RcppEigen RcppProgress]; }; MCMCvis = derive2 { name="MCMCvis"; version="0.7.1"; sha256="1hqkxqs1s0m1znqlf6bjx5nscqv8galnkxgp738pcvvw0mwn19pk"; depends=[coda rstan]; }; MCPAN = derive2 { name="MCPAN"; version="1.1-20"; sha256="0j36dhi3bf3q14bbcmrmipz2fcn6g9gsqidzm43i8x5r7hcvv2lh"; depends=[magic MCMCpack multcomp mvtnorm plyr]; }; @@ -1683,19 +1752,20 @@ in with self; { MF = derive2 { name="MF"; version="4.3.2"; sha256="1arnhyqf1cjvngygcpqk2g4d52949rhkjmclbaskyxcrvp62qln0"; depends=[]; }; MFAg = derive2 { name="MFAg"; version="1.4"; sha256="092zbl2pxbsvfyf3qssbid14194p0ax2zrw0gzpyqwzdpx0brrlb"; depends=[]; }; MFHD = derive2 { name="MFHD"; version="0.0.1"; sha256="0gb8y297y1x03wy46530psmlawyv4z5dydilk36qcmadlk1wx02k"; depends=[deldir depth depthTools fda_usc matrixStats]; }; - MFPCA = derive2 { name="MFPCA"; version="1.0-1"; sha256="0sw8svp0zgdl2yyvf3jq3c3kai6pnnn93cizgyjdc63y74k3n3pz"; depends=[abind foreach funData irlba Matrix mgcv plyr]; }; + MFPCA = derive2 { name="MFPCA"; version="1.1"; sha256="1nbm8j9g36jqbalja5zcgkiy03i0pmr75hiqnhigxyy4dnp0wj4a"; depends=[abind foreach funData irlba Matrix mgcv plyr]; }; MGGM = derive2 { name="MGGM"; version="1.0"; sha256="0j9wyshwxd7zqb60avb7dmfgnrzv2nyn983bw0g5997zixz0w6mp"; depends=[]; }; MGL = derive2 { name="MGL"; version="1.1"; sha256="03q453swnangxyc4nvjhzw2zpcy5vp1wpilap5rwymnf0c0xi4j7"; depends=[]; }; MGLM = derive2 { name="MGLM"; version="0.0.8"; sha256="1yzi679jm7x9qkz0d3az84clkjfc7wjnxkk6n6s6ia4bnw05d5v7"; depends=[]; }; MGRASTer = derive2 { name="MGRASTer"; version="0.9"; sha256="0jmf2900r56v60981sabflkhid3yrqd9xd7crb56vgfl1qkva9zp"; depends=[]; }; MGSDA = derive2 { name="MGSDA"; version="1.4"; sha256="0grwl740yvz2av5nkvmyyrr8ji5f39sjs1c5gxp6lp9p36i2wc32"; depends=[MASS]; }; MHTdiscrete = derive2 { name="MHTdiscrete"; version="0.1.3"; sha256="14qhrja5b2nxph3mda55y31jix41i6w884m9yl4c0f9g730ai7l6"; depends=[]; }; + MHTmult = derive2 { name="MHTmult"; version="0.1.0"; sha256="1y3vh2kab6nfkiz4nzdhrpy9h6drk1ibfd2h62hpr3y09z9a2yld"; depends=[]; }; MHTrajectoryR = derive2 { name="MHTrajectoryR"; version="1.0.1"; sha256="13idcjx7pjpwvr4c52938yqhhaj1gprb8hjhaim3jx4062wf9pla"; depends=[mgcv]; }; MHadaptive = derive2 { name="MHadaptive"; version="1.1-8"; sha256="1w3bm82v8ahxrf0vqn0pznv7dqn212drinkz8y5kr1flx423l9ws"; depends=[MASS]; }; MIAmaxent = derive2 { name="MIAmaxent"; version="0.4.0"; sha256="0i2bw9s9zm2bfi121aafaqf86zvimf4gzix50wdh2q96bn61bb2s"; depends=[dplyr e1071 raster]; }; MIDN = derive2 { name="MIDN"; version="1.0"; sha256="08i9zfmaywi5imp36ahjpirlkl55k01x543nz95i089w3sfrsz0g"; depends=[BiasedUrn]; }; - MIICD = derive2 { name="MIICD"; version="2.3"; sha256="08ygn2qqxzcnhs7rbd721i7h40l6n882xnmgi3li72vxyq64ndfa"; depends=[MASS mstate survival]; }; - MIIVsem = derive2 { name="MIIVsem"; version="0.4.8"; sha256="1l0n4zgjg8nzapjs65dlirlr13sgzmk2750rwjghxzdcinjbjsmb"; depends=[lavaan Matrix]; }; + MIICD = derive2 { name="MIICD"; version="2.4"; sha256="1xlvhyh3gg77cym10i8hrxm8r1jm4plvny2c4izic6w89snplyq6"; depends=[MASS mstate survival]; }; + MIIVsem = derive2 { name="MIIVsem"; version="0.5.2"; sha256="0i144v2qjqb26vjym1lh3hbikm882hrwx6kz2ajrica59gyryr37"; depends=[boot car lavaan Matrix numDeriv]; }; MILC = derive2 { name="MILC"; version="1.0"; sha256="14xsiw5al6kixwvf3ph0dlm8s13gsbqvzb92da6ng3x4iiyb1g0w"; depends=[]; }; MIPHENO = derive2 { name="MIPHENO"; version="1.2"; sha256="0hcaq66biv4izszdhqkgxgz91mgkjk1yrwq27fx07a2zmzj44sfv"; depends=[doBy gdata]; }; MIXFIM = derive2 { name="MIXFIM"; version="1.0"; sha256="0m4fnmdd8lsdxq629f87lzz1cdc1q0j3q9hqna85ncpflyfwlvg9"; depends=[ggplot2 mvtnorm rstan]; }; @@ -1719,7 +1789,7 @@ in with self; { MMS = derive2 { name="MMS"; version="3.00"; sha256="06909912v2hr52s8k0a0830lbmdh05dcd7k47vydhbwq3rzf3ahg"; depends=[glmnet Matrix mht]; }; MMWRweek = derive2 { name="MMWRweek"; version="0.1.1"; sha256="16dwmpj13rzxmd2x7xaakw2zq2aly7ajjbfnc39qvdzk6n2x37wn"; depends=[]; }; MNM = derive2 { name="MNM"; version="1.0-2"; sha256="10ikn53filbl5qnwp9d54ds2wmzjgxp5xkkp694q75r5crl4wv65"; depends=[ellipse ICS ICSNP SpatialNP]; }; - MNP = derive2 { name="MNP"; version="2.6-4"; sha256="068lssg565dw673dm8f5k6dbxl2vblnszg8wibzy3ijf96hp03cw"; depends=[MASS]; }; + MNP = derive2 { name="MNP"; version="3.0-2"; sha256="08q4qqhpgnmkw18kgzxsanp6qhwikx1wxcr6byr6zylqnqgx2id9"; depends=[MASS]; }; MNS = derive2 { name="MNS"; version="1.0"; sha256="0if46a6rw0f2d72wnykkaa5z5b1p2c0r43il6cbwbcnnb3zd8acb"; depends=[doParallel glmnet igraph MASS mvtnorm]; }; MOCCA = derive2 { name="MOCCA"; version="1.2"; sha256="04smpzn9x64w1vpw4szqa7dwnaak1ls6gpg7fgajs68mv5zivffa"; depends=[cclust clv]; }; MODIS = derive2 { name="MODIS"; version="1.0.0"; sha256="05p4lisdbpzvq42pvfc2hdqr5p16gkr85g4bcc5j4h4f4cva5drl"; depends=[bitops mapdata maps ptw raster RCurl rgdal rgeos sp XML]; }; @@ -1728,6 +1798,7 @@ in with self; { MODIStsp = derive2 { name="MODIStsp"; version="1.3.2"; sha256="1qsw7s1skkfadyap3w8z1rb9yjls154wp7a2fa2ifxm9164976b8"; depends=[bitops data_table gdalUtils gWidgets gWidgetsRGtk2 hash httr pacman plyr raster RCurl rgdal rgeos RJSONIO sp stringr XML xts]; }; MOEADr = derive2 { name="MOEADr"; version="0.2.1"; sha256="0m5nbr2xcy9nl808ydsn07w0p3pl2cd7dqfz9mk0z52mghvz390f"; depends=[assertthat FNN]; }; MOJOV = derive2 { name="MOJOV"; version="1.0.1"; sha256="11mcqxw83z4xx29s34v4rsbb3zvyhlb2lmvf97b77n455gsy5hab"; depends=[aod lattice saws survey]; }; + MOQA = derive2 { name="MOQA"; version="2.0.0"; sha256="17w4iwf38k0r2fiwqr420hkbbz1a3r89sqwnd2yn300zmaz64hpr"; depends=[gplots psych readr]; }; MOrder = derive2 { name="MOrder"; version="0.1"; sha256="1vhy20xyvfc18f04hvlb1jm2n0caaz8ysy13w2rra5i4kjdvz52i"; depends=[]; }; MPAgenomics = derive2 { name="MPAgenomics"; version="1.1.2"; sha256="1gwglzkip54si6i23y8s5hhkzrwmhvfyvsian9593ixy4kqlm2bz"; depends=[cghseg changepoint glmnet HDPenReg R_utils spikeslab]; }; MPCI = derive2 { name="MPCI"; version="1.0.7"; sha256="1l55q09lliv0y4q1hc0jgzls47wkmsfag6b4iq5y6wrllr5wq7sa"; depends=[]; }; @@ -1764,13 +1835,15 @@ in with self; { MTurkR = derive2 { name="MTurkR"; version="0.8.0"; sha256="0q498chr2s67ai7lfxi6kdficqbs5sxj9asyv69z2a37fmsr4va7"; depends=[base64enc curl digest XML]; }; MTurkRGUI = derive2 { name="MTurkRGUI"; version="0.1.5"; sha256="1rlgz80na0v1nx70cda1fzyswlb1lg5kcx64zl9dcqy6accsrpmp"; depends=[curl MTurkR XML]; }; MUCflights = derive2 { name="MUCflights"; version="0.0-3"; sha256="03ksvv5nyzlqiml1nz405r3yqb2cl35kpm1h61zcv2nqq8cxqshs"; depends=[geosphere NightDay RSQLite sp XML]; }; + MUS = derive2 { name="MUS"; version="0.1.4"; sha256="0h65gmxi65qax0qky7667p1jzi8y4pdncaa899d1nb0gvg9x0yh2"; depends=[]; }; MVA = derive2 { name="MVA"; version="1.0-6"; sha256="09j9frr6jshs6mapqk28bd5jkxnr1ghmmbv6f4zz0lrg81zjizl3"; depends=[HSAUR2]; }; MVB = derive2 { name="MVB"; version="1.1"; sha256="0an8b594rknlcz6zxjva6br8f34sgwdi2jil3xh1xzb5fa55dw0f"; depends=[Rcpp RcppArmadillo]; }; MVLM = derive2 { name="MVLM"; version="0.1.4"; sha256="1zcj405dc4jbiqw6p0fcbam8yc9d6yjpmrx5wjw5zjvig3iqb91k"; depends=[CompQuadForm]; }; MVN = derive2 { name="MVN"; version="4.0.2"; sha256="0k8fbhnw2lbjgafab4m6j7nkzclj1226fdiv8bmv5vcm6g82nb19"; depends=[MASS moments mvoutlier nortest plyr psych robustbase]; }; - MVR = derive2 { name="MVR"; version="1.31.0"; sha256="114qv235dmbmdlg2dssbgn0bj78r6khg58xswvv98d58kfypw581"; depends=[statmod]; }; + MVR = derive2 { name="MVR"; version="1.32.0"; sha256="18arp9xh9dflbmc5zxafy132mnz5xwc6kb9hv51njz602kms70qg"; depends=[statmod]; }; MVT = derive2 { name="MVT"; version="0.3"; sha256="0vinlv3d5daf8q7pd9xgs51nxz2njgdba5750vygmv883srlzi9d"; depends=[]; }; MVar_pt = derive2 { name="MVar.pt"; version="1.9.8"; sha256="0ysdrdjlljbscw92ylyq4m22zvj3b9yp9mpw4pdlnzwix9z0k2yx"; depends=[]; }; + MVisAGe = derive2 { name="MVisAGe"; version="0.1.0"; sha256="04p5kvi1nkwwi1apwd0ycnp139yl024qq419d887n3hc0rlrd4kb"; depends=[]; }; MWLasso = derive2 { name="MWLasso"; version="1.3.1"; sha256="11lyk46lmjcd60q0mixi41b8ybjgyp1xi18g3ag4450xyhw3r17s"; depends=[]; }; MWRidge = derive2 { name="MWRidge"; version="1.0.0"; sha256="17kvs9npr1ff24z3pv9x2qnfwyy6w3hc7hm60ynzbjlk2rr11xr9"; depends=[glmnet]; }; MXM = derive2 { name="MXM"; version="0.9.9"; sha256="1d6k941psi7d4ycsalvbi8n6xhahj235fgq75izjvnwxbs0j704b"; depends=[doParallel e1071 energy foreach lme4 MASS nnet ordinal quantreg relations Rfast speedglm survival visNetwork]; }; @@ -1792,15 +1865,14 @@ in with self; { MatchLinReg = derive2 { name="MatchLinReg"; version="0.7.0"; sha256="015s3xdaj56prq8lsdry3ibjkrb6gg0fwgzjh496gdx5axvpbk8g"; depends=[Hmisc Matching]; }; Matching = derive2 { name="Matching"; version="4.9-2"; sha256="0lv5b41l797c4bl2rzmdqzjnn47zpvvcv3md3xwxvvz5knxky5x4"; depends=[MASS]; }; MatchingFrontier = derive2 { name="MatchingFrontier"; version="1.0.0"; sha256="1djlkx7ph8p60n2m191xq9i01c2by4vpmjj25mbxy5izxm5123aa"; depends=[igraph MASS segmented]; }; - Matrix = derive2 { name="Matrix"; version="1.2-8"; sha256="1dyv42d7ranb85y8hvi57hbg5xnvhdzqn56wcq3qmhazqj3s3liw"; depends=[lattice]; }; + Matrix = derive2 { name="Matrix"; version="1.2-10"; sha256="0r3qjcz92xwgdzrfz444mqzwnja5sv9abaf252fh6k48qbyahahh"; depends=[lattice]; }; Matrix_utils = derive2 { name="Matrix.utils"; version="0.9.5"; sha256="057lms2xdp13wcglg8hg95blj60f5zhva26jlkm2z1vi11jiy728"; depends=[grr Matrix]; }; - MatrixCorrelation = derive2 { name="MatrixCorrelation"; version="0.9"; sha256="0yax7ali6g8i5qwgrhg1m6f8vi0c2rlyfjc2l9ar0kj5zg1dix86"; depends=[plotrix pracma progress Rcpp RcppArmadillo RSpectra]; }; + MatrixCorrelation = derive2 { name="MatrixCorrelation"; version="0.9.1"; sha256="1m14fh52l7zb9pyj2swisrz8dfw68k1p90rgg0g9zqkmx6fp5qls"; depends=[plotrix pracma progress Rcpp RcppArmadillo RSpectra]; }; MatrixEQTL = derive2 { name="MatrixEQTL"; version="2.1.1"; sha256="1bvfhzhvm1psgq51kpjcpp7bidaxcrxdigmv6abfi3jk5kyzn5ik"; depends=[]; }; MatrixLDA = derive2 { name="MatrixLDA"; version="0.1"; sha256="19q6wl8fc6jzn7544qnlpzfh9v0xlg9cr78l6k8kx6kzjnbnyh9z"; depends=[glasso plyr Rcpp RcppArmadillo]; }; MatrixModels = derive2 { name="MatrixModels"; version="0.4-1"; sha256="0cyfvhci2p1vr2x52ymkyqqs63x1qchn856dh2j94yb93r08x1zy"; depends=[Matrix]; }; MaxPro = derive2 { name="MaxPro"; version="3.1-2"; sha256="1y2g8a8yvzb24dj0z82nzfr6ylplb9sbi2dmj7f3pb4s3yr5zm8y"; depends=[nloptr]; }; - MaxSkew = derive2 { name="MaxSkew"; version="1.0"; sha256="1ylz51b9k6bi6xm1aarv7aff1n35bwb66nk1vzzkyqn9pylhmcmw"; depends=[]; }; - MaxentVariableSelection = derive2 { name="MaxentVariableSelection"; version="1.0-2"; sha256="0mk5h9bafy1ndi1h6vcjh285xfj38gjpiz6n8xcmp8zh6vi6gx70"; depends=[ggplot2 raster]; }; + MaxSkew = derive2 { name="MaxSkew"; version="1.1"; sha256="0x5x0jpvhp189jnmgh6d1h3ya0dicj5qfcrgr2fhp1v8jjhl125m"; depends=[]; }; MazamaSpatialUtils = derive2 { name="MazamaSpatialUtils"; version="0.4.9"; sha256="19j8mxlhwkr9safgs685kwz1b85z1mplihcjd1m7yc3sdpvmnsdd"; depends=[dplyr lubridate rgdal rgeos rvest sp stringr xml2]; }; McSpatial = derive2 { name="McSpatial"; version="2.0"; sha256="18nmdzhszqcb5z9g8r9whxgsa0w3g7fk7852sgbahzyw750k95n4"; depends=[lattice locfit maptools quantreg RANN SparseM]; }; Mcomp = derive2 { name="Mcomp"; version="2.6"; sha256="01m2kawkxs9k7va3bvv7bknl4y13rhy8zczc093f10msgy6nqncl"; depends=[forecast ggplot2]; }; @@ -1808,8 +1880,8 @@ in with self; { MedDietCalc = derive2 { name="MedDietCalc"; version="0.1.0"; sha256="1gggia97ww4kiqhh2lnsmadgdxvpr36mdx1yrbgarj0sp6ilrd3l"; depends=[]; }; MedOr = derive2 { name="MedOr"; version="0.1"; sha256="1rwc14s16lnzgb78ac2017hv9pss7zw7nw3y7vrvq1qx4fgiw6f8"; depends=[]; }; MediaK = derive2 { name="MediaK"; version="1.0"; sha256="19cmxl2wksw9kvjsfn1m4nkr5gpcx6bk0sqrabj1n0dla1l32v2a"; depends=[Rcpp RcppEigen]; }; - Mediana = derive2 { name="Mediana"; version="1.0.4"; sha256="0kk9gv2dzhg1y8s68aws327ysx33cy622djbfd5isbr7ikv2h80v"; depends=[doParallel doRNG foreach MASS mvtnorm ReporteRs survival]; }; - Meiosis = derive2 { name="Meiosis"; version="1.0.0"; sha256="0p8csgxpf898gk4kxnxhp1m0bl5kwqzhzj7l18072x2qi9cmb8gh"; depends=[BH Rcpp]; }; + Mediana = derive2 { name="Mediana"; version="1.0.5"; sha256="1hxla0678ilwkm27pxz97794hxz2qxhw557swskhvnybcxq80752"; depends=[doParallel doRNG foreach MASS mvtnorm ReporteRs survival]; }; + Meiosis = derive2 { name="Meiosis"; version="1.0.2"; sha256="1qjn3017xi6js75b9wq7vp6ail5dpbacraj1my3icaggdcbjc45g"; depends=[BH Rcpp]; }; MendelianRandomization = derive2 { name="MendelianRandomization"; version="0.2.0"; sha256="1rnsjrvshj41srbzrplfhqw5y68dab489rjn5bdhrk1lm0vz0zvc"; depends=[ggplot2 knitr plotly rmarkdown robustbase stargazer]; }; MenuCollection = derive2 { name="MenuCollection"; version="1.2"; sha256="0v3flicfnln9qld150yk3rfldvsr4dllhq80l02n1lq6px38nf2s"; depends=[gplots RGtk2 RGtk2Extras]; }; MergeGUI = derive2 { name="MergeGUI"; version="0.2-1"; sha256="1hx03qv5jyjjmqdvylc3kz5dl5qsdqwlirjbrnxrw7grkgkhygap"; depends=[cairoDevice ggplot2 gWidgetsRGtk2 rpart]; }; @@ -1829,7 +1901,7 @@ in with self; { MetaPath = derive2 { name="MetaPath"; version="1.0"; sha256="1vvpfv6yc4rd4apqfs2yzm97xxsv43ghwqnjq6w1xrc4pdx2p634"; depends=[Biobase genefilter GSEABase impute]; }; MetaQC = derive2 { name="MetaQC"; version="0.1.13"; sha256="11595ggjr46z6xiwmhiyx1sydaq68l18y7mgdwxsg81g03ck9x1r"; depends=[foreach iterators proto]; }; MetaSKAT = derive2 { name="MetaSKAT"; version="0.60"; sha256="13qffirv0lnj0bflzjpr2hd0d8j4bkakyfjvicp40f0v4v3cack2"; depends=[SKAT]; }; - MetaboList = derive2 { name="MetaboList"; version="1.1"; sha256="19vgf3y0r926dnpj1711607x5cjk8hmz2kzfgyhabq7mk2djdbbb"; depends=[enviPick]; }; + MetaboList = derive2 { name="MetaboList"; version="1.2"; sha256="15wkj29s1mxi1wzqzlh8lkr5jkw15dbc37h3hzsc0r72a3ddzf38"; depends=[enviPick]; }; MetaboQC = derive2 { name="MetaboQC"; version="1.0"; sha256="1hm0ndwda1ciyyg8igkpaalvvdyd7aq5wnl9gzza8fr1l9fxp4a2"; depends=[plyr]; }; MetabolAnalyze = derive2 { name="MetabolAnalyze"; version="1.3"; sha256="0cl76x6imx4a95wd74xx5s8i2vg8wq3inqgakvgzmkwxad6qhrqp"; depends=[ellipse gplots gtools mclust mvtnorm]; }; MetaheuristicFPA = derive2 { name="MetaheuristicFPA"; version="1.0"; sha256="096k866mgrdgj55rzvdj080z80hzlj0667mydpz7gjaqdfriw8jg"; depends=[Rcpp RcppArmadillo]; }; @@ -1840,8 +1912,8 @@ in with self; { Methplot = derive2 { name="Methplot"; version="1.0"; sha256="0aaqss9zfn55qi45jffxkksnkw510npjnkygafx49vl77bkagqh5"; depends=[ggplot2 reshape]; }; MethyBayes = derive2 { name="MethyBayes"; version="0.1.0"; sha256="1ibjmnfx3d2hw6gjcyig6kv4q7p26am2xvj14ksjv9kglw2q4g1b"; depends=[]; }; MethylCapSig = derive2 { name="MethylCapSig"; version="1.0.1"; sha256="16ch9aldr6a9jn42h387n7qvnzs0yx28f2yj6xq0kp476q7rf4ql"; depends=[geepack]; }; - Metrics = derive2 { name="Metrics"; version="0.1.1"; sha256="1yqhlsmhh9sl7qngl85b7qb980s54h13wwznpakyvvwlar64yqrw"; depends=[]; }; - MfUSampler = derive2 { name="MfUSampler"; version="1.0.2"; sha256="0b79wm02p4k67pi0zmcs7bqwsgrnf2pqf2mbb2kylmgsjd0nj1gq"; depends=[ars coda HI]; }; + Metrics = derive2 { name="Metrics"; version="0.1.2"; sha256="1q407lisi65qaxqlp3lfjfwz3m93csrmjip689ryck7559my9zxh"; depends=[]; }; + MfUSampler = derive2 { name="MfUSampler"; version="1.0.4"; sha256="0i5siq1jacxbfvakb97qnj3h7pk471rrx8ckwm0d8nl3j586s36y"; depends=[ars coda HI]; }; MiRAnorm = derive2 { name="MiRAnorm"; version="1.0.0"; sha256="154wv0j82xyc4y5cd2czh0q8kzhgrk6qsn0ahc1zn3fnrzc9fgz0"; depends=[ArgumentCheck cluster dendextend ggplot2 MASS npmv plyr reshape2]; }; MiRSEA = derive2 { name="MiRSEA"; version="1.1"; sha256="0jpl6ws5yx1qjzdnip9a37nmvx81az4cbsjm57x613qjpwmg6by3"; depends=[]; }; MiSPU = derive2 { name="MiSPU"; version="1.0"; sha256="1l6q0fm5z5i6gigr940h8kc5rka08psmhcprp8grmsxk3qy2kply"; depends=[ape aSPU cluster Rcpp RcppArmadillo vegan]; }; @@ -1854,13 +1926,14 @@ in with self; { Miney = derive2 { name="Miney"; version="0.1"; sha256="0sgln0653rgglinr8rns5s2az0lgyp9slmynyhhhs265grkhrfj0"; depends=[]; }; MissMech = derive2 { name="MissMech"; version="1.0.2"; sha256="1b7i1balfl1cqr3l4l4wxlahk2gmawzv9rhyibwzf0yp60cb1sv9"; depends=[]; }; MissingDataGUI = derive2 { name="MissingDataGUI"; version="0.2-5"; sha256="0drbm87ka17avg6fmswjilgnz9c3azwd0236s8yfms24k9k77vnd"; depends=[cairoDevice GGally ggplot2 gWidgetsRGtk2 reshape]; }; - MitISEM = derive2 { name="MitISEM"; version="1.0"; sha256="03305ds3rgr29z4idaxzsm83igiygna2sqd5vpixklngsrp8w341"; depends=[mvtnorm]; }; + MitISEM = derive2 { name="MitISEM"; version="1.1"; sha256="1h2nl8xa68c3zmknvn4mrszpi95dwjp8chpgzqfm246ccijzh0bl"; depends=[mvtnorm]; }; + MittagLeffleR = derive2 { name="MittagLeffleR"; version="0.1.0"; sha256="0fdfaq0my31zmh66ih2ws4wj77x26i2jzfql4lflzv441ngx0bv2"; depends=[stabledist]; }; MixAll = derive2 { name="MixAll"; version="1.2.0"; sha256="09wwisdwgvcsnvb9jdr0p0gyai5ab06yjyqhac1i7jg6wa2r8m3g"; depends=[Rcpp rtkore]; }; MixGHD = derive2 { name="MixGHD"; version="2.1"; sha256="0f3ppj18acvr35dbgqibmpd58cymq3baw3jdrl4ranlk0nj6h26r"; depends=[Bessel cluster e1071 ghyp MASS mixture mvtnorm numDeriv]; }; MixMAP = derive2 { name="MixMAP"; version="1.3.4"; sha256="0gxghym5ghbyxf589hda2fhv5l3x5jvm6i40x5xdwx4hadcn8k9a"; depends=[lme4]; }; MixRF = derive2 { name="MixRF"; version="1.0"; sha256="1av1wx7wmfc3z8a4bc6g3i3b807nc28n3s2rs3yh0rcwq1pfl0ir"; depends=[doParallel foreach lme4 randomForest]; }; MixSIAR = derive2 { name="MixSIAR"; version="3.1.7"; sha256="0myn50sdmp83bhzm66sa61xwxv3lka427mv1ynhqshaqrb5flj35"; depends=[coda compositions ggmcmc ggplot2 lattice MASS R2jags RColorBrewer reshape reshape2 rjags]; }; - MixSim = derive2 { name="MixSim"; version="1.1-2"; sha256="0p67x2q4rb7y5484gi4z8r3qxpav1hdmgw1wdxmiz363p6f8972v"; depends=[MASS]; }; + MixSim = derive2 { name="MixSim"; version="1.1-3"; sha256="1mrzbax2inpmhxz26zlybci6ks5q780f10vcy1za638dmkz16fnv"; depends=[MASS]; }; MixedDataImpute = derive2 { name="MixedDataImpute"; version="0.1"; sha256="123c9i3znv53ikfnga1z9gq5bdl4vyww89967255wg5dzb7w00cn"; depends=[BH gdata Rcpp RcppArmadillo]; }; MixedPoisson = derive2 { name="MixedPoisson"; version="2.0"; sha256="0g5mpzj0wda6g46q3cg5mm3x4dvpz9gdclzn2m17l62lzny2i10p"; depends=[gaussquad MASS Rmpfr]; }; MixedTS = derive2 { name="MixedTS"; version="1.0.4"; sha256="0gwcg115idbcm5llgzqsygvqgshq8dywawxkaddsmw4sbbhj4555"; depends=[MASS]; }; @@ -1878,10 +1951,9 @@ in with self; { MonoInc = derive2 { name="MonoInc"; version="1.1"; sha256="14rykw3bfj0vznz0rw4vsg1k4vanfv9cy867vspw966ncl4bw70h"; depends=[compare doParallel foreach iterators sitar]; }; MonoPhy = derive2 { name="MonoPhy"; version="1.2"; sha256="0997kg8hfwgsc9s155z0wrf7rrhn3vf6681j9psjl3hsspg08z2r"; depends=[ape phangorn phytools RColorBrewer taxize]; }; MonoPoly = derive2 { name="MonoPoly"; version="0.3-8"; sha256="1dd2m4c726j94cxwsma33sc166c9656m7sl2b29bg6i0bmpvpmd2"; depends=[quadprog]; }; - MonteCarlo = derive2 { name="MonteCarlo"; version="1.0.1"; sha256="0y76fg7s9i3s5iqrmirb797swg03y9akvn3ixg4gxm68diswsl8n"; depends=[abind codetools rlecuyer snow snowfall]; }; - Morpho = derive2 { name="Morpho"; version="2.5"; sha256="0gy34ksl5ykfvjpnlk5z6jc9npxdp5vbxfc7yvsbcaciy8x1qc1m"; depends=[colorRamps doParallel foreach MASS Matrix Rcpp RcppArmadillo rgl Rvcg]; }; + MonteCarlo = derive2 { name="MonteCarlo"; version="1.0.2"; sha256="1lb5cvly7v45kn24m8pyfw036b8j7lq4my0igaj859r74ky3knw9"; depends=[abind codetools rlecuyer snow snowfall]; }; + Morpho = derive2 { name="Morpho"; version="2.5.1"; sha256="1cxxsg7j0fq9drxkl6xlaw7j2cajzx9khcs9f3mb9l2ixd42hqnp"; depends=[colorRamps doParallel foreach MASS Matrix Rcpp RcppArmadillo rgl Rvcg]; }; MorseGen = derive2 { name="MorseGen"; version="1.2"; sha256="1kq35n00ky70zmxb20g4mwx0hn8c5g1hw3csmd5n6892mbrri8s9"; depends=[]; }; - MortHump = derive2 { name="MortHump"; version="0.1"; sha256="0wks6kis1fa7vgcmwhaq57zrlk5m0c5rgkfipz64phky02c7v4c2"; depends=[demography HMDHFDplus Matrix minpack_lm MortalitySmooth RColorBrewer WeightedCluster]; }; MortalitySmooth = derive2 { name="MortalitySmooth"; version="2.3.4"; sha256="1clx8gb8jqvxcmfgv0b8jyvh39yrmcmwr472j9g3ymm95m4hr8fq"; depends=[lattice svcm]; }; MotilityLab = derive2 { name="MotilityLab"; version="0.2-5"; sha256="080j548sp1c4yqqd7p7zgr70j1xyrw3fgjj1f521sgh84x5h2hbc"; depends=[ellipse]; }; MplusAutomation = derive2 { name="MplusAutomation"; version="0.6-4"; sha256="151d2iq9v8d584ascpkjp9wjldc7n25wma14nn2wgcxwdh2nglpi"; depends=[boot coda gsubfn lattice pander plyr texreg xtable]; }; @@ -1893,20 +1965,24 @@ in with self; { MultAlloc = derive2 { name="MultAlloc"; version="1.2"; sha256="0c3sqfaa08s8mk4yz77kh6q6v9ic5xp52g9prfw1k2kv4nw1k2qd"; depends=[Rglpk]; }; MultEq = derive2 { name="MultEq"; version="2.3"; sha256="0fshv7i97q8j7vzkxrv6f20kpqr1kp9v6pbw50g86h37l0jghj7r"; depends=[]; }; MultNonParam = derive2 { name="MultNonParam"; version="1.2.5"; sha256="12jfpqs77qxzy7vj6adx9im3qmzqvgwk4bnxmr26k3z48css242l"; depends=[]; }; + MultiABEL = derive2 { name="MultiABEL"; version="1.1-6"; sha256="09lwpfpa2x812m7hmy7dxsz4ysv486xfk08r7ag8lbw3ym034vvl"; depends=[data_table svMisc]; }; MultiBD = derive2 { name="MultiBD"; version="0.2.0"; sha256="1qjfr8hx8sr5m8370yzi09r8jnh3i6907wzj3v4h83vmjh81db71"; depends=[BH Rcpp RcppParallel]; }; MultiCNVDetect = derive2 { name="MultiCNVDetect"; version="0.1-1"; sha256="0mfisblw3skm4y8phfg4wa0rdchl01wccarsq79hv63y78pfhh13"; depends=[]; }; MultiGHQuad = derive2 { name="MultiGHQuad"; version="1.2.0"; sha256="00prkn5awxrh365j1jz312har1x4p8v52a0sqfy00pqr44ncmqqq"; depends=[fastGHQuad Matrix mvtnorm]; }; - MultiLCIRT = derive2 { name="MultiLCIRT"; version="2.10"; sha256="0p0m6kbpx761l54fblnxccjadrjgv50lg24adppnrda4dbai60v9"; depends=[limSolve MASS]; }; + MultiLCIRT = derive2 { name="MultiLCIRT"; version="2.11"; sha256="1qls0qp5fz377h50lvpzq3vkw49i3nvizli98gss50nqci8ssqm4"; depends=[limSolve MASS]; }; MultiMeta = derive2 { name="MultiMeta"; version="0.1"; sha256="0gj0wk39fqd21xjcah20jk16jlfrcjarspbjk5xv74c9k4p5gmak"; depends=[expm ggplot2 gtable mvtnorm reshape2]; }; MultiOrd = derive2 { name="MultiOrd"; version="2.2"; sha256="0j7zl6a2yxiixxjrhwrp5z4wdi04fqc8qfq2hp0q02k28dzjg1g1"; depends=[corpcor Matrix mvtnorm psych]; }; - MultiPhen = derive2 { name="MultiPhen"; version="2.0.1"; sha256="1gvsivx8qz5yl4rc4db8sg2llg8s4bgkg22aanvr01h649a08m16"; depends=[abind epitools gplots HardyWeinberg MASS meta RColorBrewer]; }; + MultiPhen = derive2 { name="MultiPhen"; version="2.0.2"; sha256="095avrxxi5q5nwi5kd6drz9az5fjq668my7z658mjdf3fl58csjm"; depends=[abind epitools gplots HardyWeinberg MASS meta RColorBrewer]; }; + MultiRNG = derive2 { name="MultiRNG"; version="1.0"; sha256="1h6yq39fjl7yg91z9kg9qhq36371xq85fzjip4fw8hnblwhns5n9"; depends=[]; }; MultiRR = derive2 { name="MultiRR"; version="1.1"; sha256="1jrhx3nlqwsv3i6r8fs142llw88qad41rsh0sj1pv1gb928zpvl3"; depends=[lme4 MASS]; }; MultiSV = derive2 { name="MultiSV"; version="0.0-67"; sha256="0924lvkx12aqjxxz8bwqdi4h9xc2acf8aynllx0m45ip5r4gh1g2"; depends=[nlme reshape]; }; + MultiSkew = derive2 { name="MultiSkew"; version="1.1.1"; sha256="1s0k3z1vgdz1cxad007p246ghwx282w06inhrjjscbwliz1vg5ib"; depends=[MaxSkew]; }; MultiVarSel = derive2 { name="MultiVarSel"; version="1.0"; sha256="0r1l7h2rm7vlvnrsq0khjdd5cb236g9xq1fb1vr15038kf0lmkij"; depends=[ggplot2 glmnet Matrix]; }; MultinomialCI = derive2 { name="MultinomialCI"; version="1.0"; sha256="0ryi14d102kvxawls04hcw50n79jkcn29ill77lkfvj6nlzj8i5q"; depends=[]; }; MultisiteMediation = derive2 { name="MultisiteMediation"; version="0.0.1"; sha256="0x13q2kckw7c7bl35vdxyhhr7ij62wf0qbkxa40fi6aq2gjh89m6"; depends=[lme4 Matrix statmod]; }; - MultivariateRandomForest = derive2 { name="MultivariateRandomForest"; version="1.1.2"; sha256="1xp1bdkp87kvgsg4q5b91r712l6sdvmlcvaychi72pvgv33a8x11"; depends=[bootstrap Rcpp]; }; + MultivariateRandomForest = derive2 { name="MultivariateRandomForest"; version="1.1.5"; sha256="0mww4x1hqraiyvmw2f9s6h180kplmj36hb7zfg7xlkmgdf4apk8d"; depends=[bootstrap Rcpp]; }; MvBinary = derive2 { name="MvBinary"; version="1.1"; sha256="1lrrxvphxv4gmlazx67q4bck9373nqylqgkwcjzwb52291a3zyiv"; depends=[mgcv]; }; + My_stepwise = derive2 { name="My.stepwise"; version="0.1.0"; sha256="10wka6kzk8krwdsyjfnn78dfqflq4zg3vjkk0i2ywjm5vap6aqa5"; depends=[car lmtest survival]; }; Myrrix = derive2 { name="Myrrix"; version="1.1"; sha256="15w1dic6p983g2gajbm4pws743z68y0k2hxrdwx6ppnzn9rk07rs"; depends=[Myrrixjars rJava]; }; Myrrixjars = derive2 { name="Myrrixjars"; version="1.0-1"; sha256="0dy82l0903pl4c31hbllscfmxrv3bd5my5b2kv5d3x5zq0x99df0"; depends=[rJava]; }; NADA = derive2 { name="NADA"; version="1.6-1"; sha256="1jjlm6rljk4nv6b7l2w3xnj31j61wq30sp5pnna8wav6gyjqjfmb"; depends=[survival]; }; @@ -1914,9 +1990,11 @@ in with self; { NAM = derive2 { name="NAM"; version="1.5.1"; sha256="0k3dkkrisqx71srma4lwkyk1rayhyjr0h91lzx3l2yal9r12flpc"; depends=[randomForest Rcpp]; }; NAPPA = derive2 { name="NAPPA"; version="2.0.1"; sha256="0nn4wgl8bs7sy7v56xfif7i9az6kdz9xw7m98z1gnvl2g7damvn3"; depends=[NanoStringNorm plyr]; }; NB = derive2 { name="NB"; version="0.9"; sha256="1gh42z7lp6g09fsfmikxqzyvqp2874cx3a6vr96w43jfwmgi2diq"; depends=[]; }; + NB_MClust = derive2 { name="NB.MClust"; version="1.1.1"; sha256="0hzmrszxgx3pylf9pjjwk2ryjhwz7naxxkhcqpnfjv337vv5dg0i"; depends=[MASS]; }; NBDdirichlet = derive2 { name="NBDdirichlet"; version="1.3"; sha256="1657mqwn5i1b0g0gva387zl02vpymn98f71b0p7i7xv033mqnpqw"; depends=[]; }; NBPSeq = derive2 { name="NBPSeq"; version="0.3.0"; sha256="0l4ylxhs2k9ww21jjqs67fygk92avdchhx2y1ixzl7yr2yh1y9by"; depends=[qvalue]; }; NCA = derive2 { name="NCA"; version="2.0"; sha256="08951mmmpziljclwzmbni1s5a62wr9s80iyfsr07gkdz4sx3cvqf"; depends=[gplots KernSmooth quantreg sfa]; }; + NCSampling = derive2 { name="NCSampling"; version="1.0"; sha256="0bv93xffnzvbip86b3pg7apxzh3410mxff77q119m0z7f6vm3fam"; depends=[lattice randomForest yaImpute]; }; NCmisc = derive2 { name="NCmisc"; version="1.1.5"; sha256="1dq38ac97l8b6ys3yxqnndbrp8fa8zfw0lr4nq2421sn91769w22"; depends=[proftools]; }; NEArender = derive2 { name="NEArender"; version="1.4"; sha256="1zdqil28j6jc6317dkpz5i1qj7b4i3lin4800n1kf14zg9nxjdyg"; depends=[MASS RColorBrewer ROCR]; }; NEff = derive2 { name="NEff"; version="1.1"; sha256="16ys1fi28kbzg3am9vz1c5pc9x0ac47pl6za04h63lspk99yplzk"; depends=[bit msm]; }; @@ -1926,7 +2004,7 @@ in with self; { NHEMOtree = derive2 { name="NHEMOtree"; version="1.0"; sha256="0ycprj2rz2fy6a7ps0bsr27iphmbfxi9pbvl8rcr6p8yagfb84mb"; depends=[emoa partykit rpart sets]; }; NHLData = derive2 { name="NHLData"; version="1.0.0"; sha256="0dfqalccbkmqrn3h1z6s78l818c8sqn7d6yc8mg872ygmszryci7"; depends=[]; }; NHMM = derive2 { name="NHMM"; version="3.7"; sha256="0h6m01y42yswjgx3cfj4xwj0wq9nw0gzjz7vf9prm3vag3wnfs2q"; depends=[BayesLogit MASS MCMCpack msm Rcpp]; }; - NHMSAR = derive2 { name="NHMSAR"; version="1.4"; sha256="12szfj9lssx2x3ng99q34f2knn4b7588dz8b307fhqj4r0f8iqh3"; depends=[caTools glasso lars ncvreg SIS ucminf]; }; + NHMSAR = derive2 { name="NHMSAR"; version="1.5"; sha256="1s94icc99b9vaaypxy5q4pnid1kqmh4xx4p7yb52i9zizpw9sr90"; depends=[caTools glasso lars ncvreg SIS ucminf]; }; NHPoisson = derive2 { name="NHPoisson"; version="3.1"; sha256="1gr682kxgw227yqw9w0iw9lrijsz5iszhnfk0mdhi6m1w9s28kcn"; depends=[car]; }; NIPTeR = derive2 { name="NIPTeR"; version="1.0.2"; sha256="0ll6amqyw33a93xiccihidrnbaqlx1q7kqcd4wks7cvqawd8pgv1"; depends=[Rsamtools S4Vectors sets]; }; NISTnls = derive2 { name="NISTnls"; version="0.9-13"; sha256="03a1c8a5dr5l5x4wbclnsh3vmx3dy7migfdzdx7d7p3s7hj3ibif"; depends=[]; }; @@ -1939,7 +2017,7 @@ in with self; { NMI = derive2 { name="NMI"; version="2.0"; sha256="1rxphy9rhy9zhdiz48dvl9m26x6k681lnyn39lqxs0a6jhrxg7y3"; depends=[]; }; NMOF = derive2 { name="NMOF"; version="0.40-0"; sha256="1zxbhpcl82v0wvp4dfpavwckvfyd2a9f4pbghk4mgqi0vhl8fgpz"; depends=[]; }; NNLM = derive2 { name="NNLM"; version="0.4.1"; sha256="1wi2rbj56v49hsnhwdyyjwfk4hb84sagfq6mpjis4ccq65hxkvfv"; depends=[Rcpp RcppArmadillo RcppProgress]; }; - NNS = derive2 { name="NNS"; version="0.3.1"; sha256="15aczifs0dbqixaqg7w97cxc17hvphgzdg56zzzfjdwr4y9g2jrk"; depends=[data_table rgl stringr]; }; + NNS = derive2 { name="NNS"; version="0.3.4"; sha256="1bxnpssl98bvf19yb69s42m0hm6n1vi6sncc4kq0d79b34f8ryrd"; depends=[data_table rgl stringr]; }; NNTbiomarker = derive2 { name="NNTbiomarker"; version="0.29.11"; sha256="0sqlf7vzhpmq2g98c2qlrcqn3ba4ycfxbczgcjiqqhqsvgkpacc1"; depends=[magrittr mvbutils shiny stringr xtable]; }; NORMA = derive2 { name="NORMA"; version="0.1"; sha256="193q6dwn8v7k8xq0amjpvb3v6mn7c6agqa487gvjj78dy1qz720a"; depends=[rootSolve]; }; NORMT3 = derive2 { name="NORMT3"; version="1.0-3"; sha256="041s0qwmksy3c7j45n4hhqhq3rv2hncm2fi5srjpwf9fcj5wxypg"; depends=[]; }; @@ -1951,6 +2029,7 @@ in with self; { NPCirc = derive2 { name="NPCirc"; version="2.0.1"; sha256="1pyckjvf4vzns9hxnhnk7cm4abllmdj3f142pvjhnilyqwndqgyc"; depends=[circular misc3d movMF plotrix rgl shape]; }; NPHMC = derive2 { name="NPHMC"; version="2.2"; sha256="000x9y00gfkaj5lf00a55b9qx15x05yp3g3nmp8slyzsnfv66p5d"; depends=[smcure survival]; }; NPMLEcmprsk = derive2 { name="NPMLEcmprsk"; version="2.1"; sha256="1v15ylgflbdr03pgh55fan1l6mymd1d5n6h9jhbcqahjlcsxkwq3"; depends=[]; }; + NPMOD = derive2 { name="NPMOD"; version="0.1.0"; sha256="1m3rfgyxdbyr0m5vznav5qk70ch45wz3dc8wccxjcxrcfkn8i18k"; depends=[BSDA clinfun gWidgets nortest pspearman readxl rlang RVAideMemoire]; }; NPMPM = derive2 { name="NPMPM"; version="1.0"; sha256="14rjj48vfj4wv1na5v181jby016afx4ak1fs0f3g1fif4kbgbdx0"; depends=[]; }; NPMVCP = derive2 { name="NPMVCP"; version="1.1"; sha256="13jpm46abwziq8859jhl6hg1znk3ws1q7g4vlr2jyri3qa6h22dd"; depends=[]; }; NPS = derive2 { name="NPS"; version="1.1"; sha256="02idja149a2sj97sks4lhsaflpifyxi6n0rjlcq9993f84szfgsi"; depends=[]; }; @@ -1960,7 +2039,7 @@ in with self; { NSM3 = derive2 { name="NSM3"; version="1.9"; sha256="0ianzczznigkbialzdm43w9wkgnsx24393v7hnxcvxqczzhl795h"; depends=[agricolae ash binom BSDA coin combinat epitools fANCOVA gtools Hmisc km_ci MASS metafor nortest np partitions quantreg Rfit SemiPar SuppDists survival waveslim]; }; NSUM = derive2 { name="NSUM"; version="1.0"; sha256="1as4g3v7qlk9wxlpwhg293980jq9gy6qay77bbcrjf481gvkkbp6"; depends=[MASS MCMCpack]; }; NScluster = derive2 { name="NScluster"; version="1.1.1"; sha256="1w63abh4q0wgv3x7inl2xyp9qgr9m223r2p7nfiqnxk9y259kh04"; depends=[]; }; - NUCOMBog = derive2 { name="NUCOMBog"; version="1.0.2.1"; sha256="0vv2ksmwg7hn6h4p5k32kisnxcpqhc8adlw0559jlmqfq9gqaa3k"; depends=[snowfall]; }; + NUCOMBog = derive2 { name="NUCOMBog"; version="1.0.4"; sha256="00zdwm722v625dyya323jlipicpmfxvzxxf072x3fn4b97xc8h8n"; depends=[snowfall]; }; NanoStringNorm = derive2 { name="NanoStringNorm"; version="1.1.21"; sha256="1rbmhk5kags3mm4znakfp1c7axdpv4gmh2h0sydvyc2dm1vds5k4"; depends=[gdata vsn]; }; NbClust = derive2 { name="NbClust"; version="3.0"; sha256="1vwb48zy6ln1ddpqmfngii1i80n8qmqyxnzdp6gbaq96lakl3w3c"; depends=[]; }; NeatMap = derive2 { name="NeatMap"; version="0.3.6.2"; sha256="186y06zrh87q6vixl2da2d6apvcj1zkk79c95k081zj5awmryr9b"; depends=[ggplot2 rgl]; }; @@ -1977,20 +2056,20 @@ in with self; { NetSim = derive2 { name="NetSim"; version="0.9"; sha256="07h4qwz64k8zj8c2mx23cbnhg4rqrb4nfh20xw98kspz7cisdg6d"; depends=[Rcpp]; }; NetSwan = derive2 { name="NetSwan"; version="0.1"; sha256="1mwdy3ahagiifj2bd1ajrafvnxzi74a1x1d3i2laf1hqpz3fbgld"; depends=[igraph]; }; NetWeaver = derive2 { name="NetWeaver"; version="0.0.2"; sha256="0wsmz7db8q2fycz6rfbbfs67ccj857y9zs4d80k1gnqazgj5whkn"; depends=[]; }; - NetworkChange = derive2 { name="NetworkChange"; version="0.1"; sha256="1820zw6gwf3qy7c1qwi32ww08by1amwajrqqw5zsgkh935xrx1sz"; depends=[abind ggplot2 LaplacesDemon MASS MCMCpack mvtnorm RColorBrewer Rmpfr]; }; + NetworkChange = derive2 { name="NetworkChange"; version="0.2"; sha256="1awy3bym0l72jr17x0pm1mhrv0fh2s42813rff10b3jjgis193gq"; depends=[abind ggplot2 LaplacesDemon MASS MCMCpack mvtnorm RColorBrewer Rmpfr]; }; NetworkComparisonTest = derive2 { name="NetworkComparisonTest"; version="2.0.1"; sha256="09fqlnpdibf9jr5mw2pzmwi66f6cjz8rmm8jay0cv2bami7jhy2a"; depends=[IsingFit IsingSampler qgraph reshape2]; }; - NetworkInference = derive2 { name="NetworkInference"; version="1.0.0"; sha256="1x0p20v5imh3ixypdnnjqsvk83lxr8v0i2irvmzxwaq5m0j1pfzc"; depends=[assertthat checkmate ggplot2 ggrepel Rcpp]; }; + NetworkInference = derive2 { name="NetworkInference"; version="1.1.0"; sha256="1ilw4achdpb7xkvr23750vj6qlf0k6wv42x77h6ygvkqsb9mzqhz"; depends=[assertthat checkmate ggplot2 ggrepel Rcpp]; }; NetworkRiskMeasures = derive2 { name="NetworkRiskMeasures"; version="0.1.2"; sha256="0c10nahybjd1n0yr78ynbsdnkfa0p7kz6dx3rbwxwsp3x4mrcd6y"; depends=[dplyr expm ggplot2 Matrix]; }; NeuralNetTools = derive2 { name="NeuralNetTools"; version="1.5.0"; sha256="04r0716vlv54cjybxspq61ahb12f2i8krhils5layr436k7slm07"; depends=[ggplot2 nnet reshape2 scales tidyr]; }; Newdistns = derive2 { name="Newdistns"; version="2.1"; sha256="1b5njkzj8b0wrvvfv904di0933k9d320gadmfm5zl6pzdp34bh1i"; depends=[AdequacyModel]; }; NightDay = derive2 { name="NightDay"; version="1.0.1"; sha256="0vkpr2jwhgghiiiaiglaj1b9pz25fcsl628c9nsp9zyl67982wz1"; depends=[maps]; }; Nippon = derive2 { name="Nippon"; version="0.6.3-1"; sha256="0l7h2fxg87cgkb18b998fb954nfqsgchyikdfz1ysc7kjzpwdacp"; depends=[maptools sp]; }; - NlcOptim = derive2 { name="NlcOptim"; version="0.4"; sha256="0842qqn2wdhxzcj5l4ywxrm8qcavrgvkll6ns2d2lbniiczijpnw"; depends=[MASS]; }; + NlcOptim = derive2 { name="NlcOptim"; version="0.5"; sha256="0chrf9ac3x1a0b86lf6wjzdsjcv5n08rav88b7xf4c31lflf1rd1"; depends=[MASS quadprog]; }; NlsyLinks = derive2 { name="NlsyLinks"; version="2.0.6"; sha256="1kdqifwjkkk4x1ixg3ca6lbqx79ab907nnzwxca5iw721mbk5njg"; depends=[lavaan]; }; NoiseFiltersR = derive2 { name="NoiseFiltersR"; version="0.1.0"; sha256="0y90si8f5hsi273g10hw700r72la30hwqlwg59gaq76wqlkm8j0p"; depends=[caret e1071 kknn MASS nnet randomForest rJava rpart RWeka]; }; NominalLogisticBiplot = derive2 { name="NominalLogisticBiplot"; version="0.2"; sha256="0m9442d9i78x57gdwyl3ckwp1m6j27cam774zkb358dw5nmwxbmz"; depends=[gmodels MASS mirt]; }; NonCompart = derive2 { name="NonCompart"; version="0.3.0"; sha256="0c6sdsigfmkan1q728n6v3s2lyg0y24cdbl7xdjfgdwsvg67kbdb"; depends=[]; }; - NonpModelCheck = derive2 { name="NonpModelCheck"; version="2.0"; sha256="0i87v666i0fc1c4rwxl6zmal7dp4ph7l7ki5vck9wykm28qr6q5y"; depends=[dr]; }; + NonpModelCheck = derive2 { name="NonpModelCheck"; version="3.0"; sha256="13qk2wbgpdf763q5xg29p2hxwqpml23pcgxrzmx12vnapnqfh71k"; depends=[dr]; }; NormPsy = derive2 { name="NormPsy"; version="1.0.5"; sha256="0zhv6p9ffm2g02nr302j3qc6mrk5n4xxznircgbp4jx7hcj7cf1m"; depends=[lcmm]; }; NormalGamma = derive2 { name="NormalGamma"; version="1.1"; sha256="0r3hhfscif0sx9v8f450yf119gpvf3ilpb8n3ziy4v4qf2jlcfnk"; depends=[histogram optimx]; }; NormalLaplace = derive2 { name="NormalLaplace"; version="0.2-0"; sha256="11z568zhb7jw9ghp6wlyf26ijm25crc5pqhzw71qgvva42nsmmwn"; depends=[DistributionUtils GeneralizedHyperbolic]; }; @@ -2021,7 +2100,7 @@ in with self; { OSMscale = derive2 { name="OSMscale"; version="0.5.1"; sha256="0rjhyhh1iafgd9h1pbd2clyg2sh0gg7y1aqmiislqyn6h6jrvgqn"; depends=[berryFunctions OpenStreetMap sp]; }; OTE = derive2 { name="OTE"; version="1.0"; sha256="18w483syhs523yfib9sibzmj16bypqxk4sc4771kfr1958h3igai"; depends=[randomForest]; }; OTRselect = derive2 { name="OTRselect"; version="1.0"; sha256="1bh14228yz552ngywjf1qyh1isqj4cgiy7n7d4zg8dpqwxr04ykp"; depends=[lars survival]; }; - OTUtable = derive2 { name="OTUtable"; version="1.1.0"; sha256="1q1vr5jkzmx2ha119af8hxml23l7lla32ap7g7nzlrdmbnbhzv80"; depends=[]; }; + OTUtable = derive2 { name="OTUtable"; version="1.1.1"; sha256="0mjjfndc67gzkqskcq4sxpr8fwx3lm3wjgapgg64rbj5x4i1w4rp"; depends=[]; }; OUwie = derive2 { name="OUwie"; version="1.50"; sha256="1gzgwax9kmcr6rl6nv10xn536nbkjhmg6sqax58xxinc00ykdx75"; depends=[ape corHMM corpcor expm lattice nloptr numDeriv paleotree phangorn phytools Rmpfr]; }; Oarray = derive2 { name="Oarray"; version="1.4-5"; sha256="1w66vqxvqyrp2h6acnbg3xy7cp6j2dgvzmqqk564kvivbn40vyy4"; depends=[]; }; OasisR = derive2 { name="OasisR"; version="2.0.1"; sha256="0knkq33yf0b5flbkmc5ng4ys4x840rzkfrr26jcp7ri3bqg87lqv"; depends=[birk rgdal rgeos spdep]; }; @@ -2030,18 +2109,20 @@ in with self; { OjaNP = derive2 { name="OjaNP"; version="0.9-9"; sha256="12a7zfrk3rdvfby5qa511w3nk5jpnsd5gg2z46b5s97rxb3qq7za"; depends=[ICS ICSNP Rcpp]; }; OligoSpecificitySystem = derive2 { name="OligoSpecificitySystem"; version="1.3"; sha256="17mspf1ph2ybv046zckykfdcbrsiz40hrs6ib5mpwkfnrvsp1w7l"; depends=[tkrplot]; }; OmicKriging = derive2 { name="OmicKriging"; version="1.4.0"; sha256="08frr38yf5d0l3zwkbq9465xrbyzsn8sx9icqc3yvfnxrkhrpzig"; depends=[doParallel foreach irlba ROCR]; }; + OmicsPLS = derive2 { name="OmicsPLS"; version="1.0.1"; sha256="0bvlk1zl7jbniwjmbhxc6wbqqk5da9bvh5l6q6xkp7n8707h06h5"; depends=[ggplot2]; }; Oncotree = derive2 { name="Oncotree"; version="0.3.3"; sha256="147rc9ci66lxbb91ys2ig40sgmldi15p604yysrd4ccbxpbk2zwf"; depends=[boot]; }; OneArmPhaseTwoStudy = derive2 { name="OneArmPhaseTwoStudy"; version="0.1.6"; sha256="0whd5vwaqhvv5qmryzh7nh5skc4lv740ziha7vxfpb91ph0mgrz8"; depends=[Rcpp]; }; - OneR = derive2 { name="OneR"; version="2.1"; sha256="1f9gr9bdwnlxlr0mv10f05pk9fznlgkdy0j5gcyfc1643826chfr"; depends=[]; }; + OneR = derive2 { name="OneR"; version="2.2"; sha256="1k7rzhcwq5b2yi4zfsc1r0yb6w65gxj9835d2a1dclallja3zav2"; depends=[]; }; OneTwoSamples = derive2 { name="OneTwoSamples"; version="1.0-3"; sha256="0019rc2f4jmbm6sinkvalvjqwi822x78aiin88kg8qbbb5ml8l89"; depends=[]; }; OpasnetUtils = derive2 { name="OpasnetUtils"; version="1.2.0"; sha256="1ckagq14w9923a4x7pk9mfzqcfayi00apwd2kvqzgd0s6355r1q7"; depends=[digest ggplot2 httpRequest plyr RCurl reshape2 rgdal rjson sp triangle xtable]; }; OpenCL = derive2 { name="OpenCL"; version="0.1-3"; sha256="0f7vis0jcp0nh808xbzc73vj7kdcjb0qqzzsh3gvgamzbjfslch8"; depends=[]; }; - OpenImageR = derive2 { name="OpenImageR"; version="1.0.5"; sha256="152vmms1phaqqipl6xgmi24pzf26a0m28kj26snjyhz4cg8sqhai"; depends=[jpeg png Rcpp RcppArmadillo shiny tiff]; }; - OpenML = derive2 { name="OpenML"; version="1.3"; sha256="0gp8d6prkjwjwbk3wp59z7l2y9950pcz1kn2vab37990axw64gyd"; depends=[backports BBmisc checkmate curl data_table digest httr jsonlite memoise mlr ParamHelpers stringi XML]; }; + OpenImageR = derive2 { name="OpenImageR"; version="1.0.6"; sha256="0mp79l2yaix4pagvjv41z01arpw2qpx1mzib82vklsbb7g85k1z2"; depends=[jpeg png Rcpp RcppArmadillo shiny tiff]; }; + OpenML = derive2 { name="OpenML"; version="1.4"; sha256="03xfqy52ml1dqwc5awy2ra0jw2bsr2r86j8qfd7v518w8487jh3f"; depends=[backports BBmisc checkmate curl data_table digest httr jsonlite memoise mlr ParamHelpers stringi XML]; }; OpenMPController = derive2 { name="OpenMPController"; version="0.1-2"; sha256="1cpsbjmqql0fsjc1xv323pfkhfr9vrcv5g4j3p1qc5zn4z9pq7r6"; depends=[]; }; - OpenMx = derive2 { name="OpenMx"; version="2.7.10"; sha256="1q08c1pjy2q3kjfb62qx13g0sxkp2pkxs7x8vikb740ck52vfcrh"; depends=[BH digest MASS Matrix Rcpp RcppEigen rpf StanHeaders]; }; + OpenMx = derive2 { name="OpenMx"; version="2.7.12"; sha256="0b4impl2wy17dmhv5xzh701gzy9yfrb94a30k9bpih3kvf02yvbc"; depends=[BH digest MASS Matrix Rcpp RcppEigen rpf StanHeaders]; }; OpenRepGrid = derive2 { name="OpenRepGrid"; version="0.1.10"; sha256="0ikw8l9hffcaa094y6pnvyc3ly5jb02djaakz668ba15a0yw0wmb"; depends=[abind colorspace GPArotation plyr psych pvclust rgl stringr XML]; }; OpenStreetMap = derive2 { name="OpenStreetMap"; version="0.3.3"; sha256="099vdyq0vw9xl5v7zggdb8yd4zl7x8imvvbj5j2f5hrspgg131pz"; depends=[ggplot2 raster rgdal rJava sp]; }; + Opportunistic = derive2 { name="Opportunistic"; version="1.2"; sha256="0kaj11ziij1v65l972x4kbr7vzkx4dwa27ymabiip4dg57a976wr"; depends=[]; }; OptGS = derive2 { name="OptGS"; version="1.1.1"; sha256="1acwwjng5ri5vganv7b5pagp7524ifr0q8h1pbfb5g6z3x6w08kh"; depends=[]; }; OptHedging = derive2 { name="OptHedging"; version="1.0"; sha256="0g7qaf5abvbcqv2h1dciwn3gwpz084ryqjjk0yabdm4ym0y38ddm"; depends=[]; }; OptInterim = derive2 { name="OptInterim"; version="3.0.1"; sha256="1ks24yv5jjhlvscwjppad27iass59da1mls99hlif0li9mvkbvyk"; depends=[clinfun mvtnorm]; }; @@ -2063,9 +2144,9 @@ in with self; { OutrankingTools = derive2 { name="OutrankingTools"; version="1.0"; sha256="0z7pslkkinn7flc4xwjg0bsfswf8ad4jv9rmglaj3fmjcx9b6wgj"; depends=[igraph]; }; OxyBS = derive2 { name="OxyBS"; version="1.5"; sha256="11l3gm0jvw993jb13f6kpv77m6z0d1jswscma2v28qzkw053r3dc"; depends=[]; }; P2C2M = derive2 { name="P2C2M"; version="0.7.6"; sha256="07ycl22v03b2xdaw4v0l6layqhab431ma38qywzm96hkl3ywvl49"; depends=[ape ggplot2 rPython stringr]; }; - PAC = derive2 { name="PAC"; version="1.0.7"; sha256="0khrhn7f6sps8qyivn7vs60vycfhvzllwcgfszk1fvnwgahg5918"; depends=[dplyr igraph infotheo parmigene Rcpp]; }; + PAC = derive2 { name="PAC"; version="1.0.8"; sha256="1prsvlvhv46izvxlrfrw2hg5rily5qpkmjb6vg2wcvikb4yyyzwd"; depends=[dplyr igraph infotheo parmigene Rcpp]; }; PACBO = derive2 { name="PACBO"; version="0.1.0"; sha256="1v3j5bgvf0wh8s4d2yyz0fkc3acdwjlicwnbh1r241b1742x79cb"; depends=[mnormt]; }; - PAFit = derive2 { name="PAFit"; version="0.9.9.0"; sha256="0m8q3rahi41zp75b8g9nbyq1ldbx0hkfknn1pchgc2vxppn973cr"; depends=[magicaxis MASS RColorBrewer Rcpp VGAM]; }; + PAFit = derive2 { name="PAFit"; version="1.0.0.0"; sha256="0xlil8hq0dffvycfljgwa6p8mhjawsz2vkmb8zw2kcy37xs8a7c2"; depends=[igraph magicaxis MASS network networkDynamic plyr RColorBrewer Rcpp VGAM]; }; PAGI = derive2 { name="PAGI"; version="1.0"; sha256="01j1dz5ihqslpwp9yidmhw86l112l7rfkswmf03vss872mpvyp3f"; depends=[igraph]; }; PAGWAS = derive2 { name="PAGWAS"; version="2.0"; sha256="0bz47ivd32kx1amgqllqbxyyvj773q7wasgk924hmibabiixa8nx"; depends=[foreach lars mnormt]; }; PANDA = derive2 { name="PANDA"; version="0.9.9"; sha256="1sf3c49v4mb3mz2imqlqdbh1iab7bc2pxpi8bmgj2jld133555ip"; depends=[cluster GO_db]; }; @@ -2078,13 +2159,13 @@ in with self; { PATHChange = derive2 { name="PATHChange"; version="1.0"; sha256="1pmxhaych01cywx9bb5z0p5lbxcma7x6nlprivpx3gnpg7m9srpg"; depends=[rlist stringr VennDiagram]; }; PAWL = derive2 { name="PAWL"; version="0.5"; sha256="1sx4g4qycba2j1fm0bvhz3hk6ghhdc37rz5zi1njqxrpmbnkqg04"; depends=[foreach ggplot2 mvtnorm reshape]; }; PAactivPAL = derive2 { name="PAactivPAL"; version="2.0"; sha256="1mjfxq0a9fql8bg5c6l5w1knjqq29cb4l10ppxnym9gnsjrk0kw1"; depends=[]; }; - PBD = derive2 { name="PBD"; version="1.2"; sha256="0pxm9pdmylg95v5pyppvyl64zx5vgypx5fksj18zvws6vpb60xab"; depends=[ade4 ape DDD deSolve phytools]; }; + PBD = derive2 { name="PBD"; version="1.4"; sha256="1n8gq8ms6gszr469hblipbgalc5m7gfiknpsbqywxml62sr4wbsb"; depends=[ade4 ape DDD deSolve phytools]; }; PBIBD = derive2 { name="PBIBD"; version="1.2"; sha256="1dbrd6qwczwk41zmh9ck9cgzqpry9kycygyk0ls8kc92p45cz3dh"; depends=[]; }; PBImisc = derive2 { name="PBImisc"; version="1.0"; sha256="18gjp66q6l0w6vsgm6d5sjgpa906z1gyyp6yf58lq5vyg1bnfmcl"; depends=[lme4 Matrix]; }; PBNPA = derive2 { name="PBNPA"; version="0.0.1"; sha256="1a43kk7di5bqifa68lhrxx3p9vvfn0rr5nifx60c2y7j7cp63fk8"; depends=[metaRNASeq]; }; PBSadmb = derive2 { name="PBSadmb"; version="0.68.104"; sha256="01akimdsp0bkvz3a5d75yyy3ph0mff85n8qsnr59fla5b5cm4qlj"; depends=[PBSmodelling]; }; PBSddesolve = derive2 { name="PBSddesolve"; version="1.12.2"; sha256="12pl95mcak88524s8zvk9dzib2g40fwaz6iz7igx9wg6vib9d1sj"; depends=[]; }; - PBSmapping = derive2 { name="PBSmapping"; version="2.69.76"; sha256="1fci7mx5m3jqy92nqfaw5w5yd5rw6f0bk5kya1v0mmvf7j715kar"; depends=[]; }; + PBSmapping = derive2 { name="PBSmapping"; version="2.70.4"; sha256="09kzydgghgmhnna24gpq1hjgw7w9i1lm6nwkj358jsik6fjph73r"; depends=[]; }; PBSmodelling = derive2 { name="PBSmodelling"; version="2.67.266"; sha256="0ych9k20x0m71gkdrpwv5jnx6pfsk45wwsaaamy32cmnhd3y14sq"; depends=[XML]; }; PCA4TS = derive2 { name="PCA4TS"; version="0.1"; sha256="1qi9nlaf5181afrdvddh10a9vxyhry102n3dhai86im8yz4if9y6"; depends=[tseries]; }; PCADSC = derive2 { name="PCADSC"; version="0.8.0"; sha256="0pwkmmnsw3c6ch2k5wdc8ig71994pdp79v3a5aa9n9aq55a8c2ir"; depends=[ggplot2 Matrix pander reshape2]; }; @@ -2097,7 +2178,7 @@ in with self; { PCPS = derive2 { name="PCPS"; version="1.0.3"; sha256="1ys3xp1nripy5zkq25byak9k6yf5rdbfnww8j13yc469428ip8q0"; depends=[ape phylobase picante SYNCSA vegan]; }; PCS = derive2 { name="PCS"; version="1.2"; sha256="0488h6s1yz6fwiqf88z2vgckn6i0kwls8cazmpw3wspnaqvl2n4s"; depends=[multtest statmod]; }; PCSinR = derive2 { name="PCSinR"; version="0.1.0"; sha256="1z8yjryw3c43vc6fxcwiindmyq6r63pc1zr3aybwmys6mv697bb4"; depends=[]; }; - PCovR = derive2 { name="PCovR"; version="2.6"; sha256="0b1bbf6namll2afxh61qz4xz4ipzipdnfhbcqlragmyj9pisaf45"; depends=[GPArotation MASS Matrix ThreeWay]; }; + PCovR = derive2 { name="PCovR"; version="2.7"; sha256="00920h0qlw81vwh46inmvm4mdv0dfd8xvqvrj7l038hhmjb7qsjz"; depends=[GPArotation MASS Matrix ThreeWay]; }; PDM = derive2 { name="PDM"; version="0.1"; sha256="1pbdy13ji9c6krgh2r1qgrzmf4hdmrdzylsr71n3hh5jq4n9xg8x"; depends=[jpeg]; }; PDQutils = derive2 { name="PDQutils"; version="0.1.6"; sha256="0mmfi0ifwbkjm0274sddpwkj27cvdkwngnka8vdmfm4b2nn7vgsp"; depends=[moments orthopolynom]; }; PDSCE = derive2 { name="PDSCE"; version="1.2"; sha256="17lc6d8ly6jbvjijpzg45dvqrzrh5s1sp415nycazgpbg9ypwr2h"; depends=[]; }; @@ -2105,10 +2186,10 @@ in with self; { PEIP = derive2 { name="PEIP"; version="2.0-1"; sha256="0zfvp3ngc4320sh6r6y746zxigr2wqgaqasnlkv3hxhzpzxq08lj"; depends=[bvls Matrix pracma RSEIS]; }; PEMM = derive2 { name="PEMM"; version="1.0"; sha256="18dd9hsbdrnhrrff7gpdqrw2jv44j8lg0v3lkcdpbd4pppcaq84h"; depends=[]; }; PET = derive2 { name="PET"; version="0.4.9"; sha256="1ijg6mfh3xrc1gjh6a4nq64psk9yh16yc8nfp7c9837xbjigqq7f"; depends=[adimpro]; }; - PGEE = derive2 { name="PGEE"; version="1.4"; sha256="1hzqx1a3zgg07dqw7yyykvlaxjqpr04ch48bmnl4byy6izfghy8m"; depends=[MASS mvtnorm]; }; + PGEE = derive2 { name="PGEE"; version="1.5"; sha256="1qcxbqnbpplnfjy83nm9fj9y4abzgbxnsggzx7ix3vb9qs18cdwh"; depends=[MASS mvtnorm]; }; PGICA = derive2 { name="PGICA"; version="1.0"; sha256="0qxa5hw2s3mndjvk8lb82pcbyj1kbdclx4j4xa8jq0lcj180abi9"; depends=[fastICA]; }; PGM2 = derive2 { name="PGM2"; version="1.0-1"; sha256="03282pcq7gw47awc2mxjsbz6w3zpqjhqd7fzg8la4p00cd0vvmr4"; depends=[]; }; - PHENIX = derive2 { name="PHENIX"; version="1.3"; sha256="1b9sxy2slfzls2snif738sjw34k3hs2i55g1yb1kbx06702q47ak"; depends=[ppcor SuppDists]; }; + PHENIX = derive2 { name="PHENIX"; version="1.3.1"; sha256="1gd9ycrwawi81al4f5v559km1112giwqnwvvk8ynj4kdb5bqpyq4"; depends=[ppcor SuppDists]; }; PHYLOGR = derive2 { name="PHYLOGR"; version="1.0.8"; sha256="17lmjfbwf8j68zzzhdvppyjacdsmy4zmcfj0pcjsw5j6m361hvh6"; depends=[]; }; PHeval = derive2 { name="PHeval"; version="0.5.3"; sha256="1zq4ks6w5vrhy1f170fv16zgrgi1lfxmkpfkg75sjin7asw4i7a9"; depends=[survival]; }; PIGE = derive2 { name="PIGE"; version="0.9"; sha256="1x8ml25mm69dvlszm9p2ycph92nxcsgd52ydj7ha0dwrrpcv2law"; depends=[ARTP snowfall survival xtable]; }; @@ -2128,28 +2209,32 @@ in with self; { PMA = derive2 { name="PMA"; version="1.0.9"; sha256="11qwgw4sgzl3xhrm468bsza83h3mfn89157nfwnrassl7qr42xkq"; depends=[impute plyr]; }; PMCMR = derive2 { name="PMCMR"; version="4.1"; sha256="0mfms8wvdwcakkgsnrb2wawp07hvlr7s6cvl54kxv7f5fqllw5kc"; depends=[]; }; POET = derive2 { name="POET"; version="2.0"; sha256="0w3jhj45sxisyrpcsazbrbcsz7rmraw71jjm0zixbcgc4klb98ar"; depends=[]; }; + POMaSPU = derive2 { name="POMaSPU"; version="1.0.0"; sha256="0jz3jgzdykv0xvfw3ix0hbs32as6dp7p5v8bj5nddknx10d0siya"; depends=[MASS matrixStats Rcpp RcppArmadillo]; }; POT = derive2 { name="POT"; version="1.1-6"; sha256="08av53rnishk3mhwrb6ydbgc3n9nwi87jlx5vmag3vpiidhn1laj"; depends=[]; }; - POUMM = derive2 { name="POUMM"; version="1.2.2"; sha256="0j44qlwx602iy7n6xj40v7gg5dsfrn4zqmkb89bji8fjixpnyhaa"; depends=[ape coda data_table foreach GGally ggplot2 gsl Matrix Rcpp RcppArmadillo]; }; - PP = derive2 { name="PP"; version="0.5.3"; sha256="17y1v2536n7ap0kvllwkmndmdjf4wgwl171c053ph45krv37mscf"; depends=[Rcpp]; }; + POUMM = derive2 { name="POUMM"; version="1.3.0"; sha256="0ylpmlfp50lhxwii96cxg3mpixribfr83wgy5p8nh3vhyyca04cn"; depends=[adaptMCMC ape coda data_table foreach GGally ggplot2 gsl Matrix Rcpp RcppArmadillo]; }; + PP = derive2 { name="PP"; version="0.6.1"; sha256="10innn1nhc4zqimd0gww7k3k30jkfkkj89zkddcjqa2sqq5gs3xr"; depends=[Rcpp]; }; PPtree = derive2 { name="PPtree"; version="2.3.0"; sha256="002qjdx52r2h90wzrf2r3kz8fv3nwx08qbp909whn6r4pbdl532v"; depends=[MASS penalizedLDA]; }; PPtreeViz = derive2 { name="PPtreeViz"; version="2.0.1"; sha256="02073yxdwns9mnnjvw13ydw1s3vrxl53szcd9jy8ibj78vnm57r3"; depends=[ggplot2 gridExtra partykit Rcpp RcppArmadillo]; }; PRIMME = derive2 { name="PRIMME"; version="2.1-0"; sha256="1sjgy923ppp28qhkvhgv2xmx7b7aqd17g60af1my44ygdsd8c1kw"; depends=[Matrix Rcpp]; }; - PRIMsrc = derive2 { name="PRIMsrc"; version="0.6.3"; sha256="18vk968dz9508bnnyhq2wz7py72ld42c0ah22a7d8n3nwx26ldbd"; depends=[glmnet Hmisc MASS survival]; }; + PRIMsrc = derive2 { name="PRIMsrc"; version="0.7.1"; sha256="10cfld73hb0cw4kkxyi5qj9mqm1fyg9ybw546r52v132j85vw7xh"; depends=[glmnet Hmisc quantreg superpc survival]; }; PRISMA = derive2 { name="PRISMA"; version="0.2-6"; sha256="1yzcx4js0xaxp1mp7ginhfz8jji49rkw3x15a9mlmpz260gkfs98"; depends=[ggplot2 gplots Matrix]; }; PRISMAstatement = derive2 { name="PRISMAstatement"; version="1.0.1"; sha256="1qk9cljk52m8rcasck8cl7gwzhcsx0p58jn31izy2j027w0rns7j"; depends=[DiagrammeR]; }; PROFANCY = derive2 { name="PROFANCY"; version="1.0"; sha256="11a0fpsv1hy0djv36x2i2hv2j50ryy0x7g7nn7vv76m1sl6q6r4b"; depends=[igraph lattice Matrix]; }; PROTOLIDAR = derive2 { name="PROTOLIDAR"; version="0.1"; sha256="0bz3071b0wlcvh40vl3dyiiixk5avsj6kjjnvlvx264i5g08rij4"; depends=[]; }; - PRROC = derive2 { name="PRROC"; version="1.1"; sha256="1v35z9inzb6x42fil8z7kfcrnfif93cj8974mfbqhhx0f9vi476a"; depends=[]; }; + PROreg = derive2 { name="PROreg"; version="1.0"; sha256="0c2vgzbdi29rlrnrb971dqrl7rlb9y3rw8nj5rjgwsjqxv607ssj"; depends=[car fmsb Matrix matrixcalc numDeriv RColorBrewer rootSolve]; }; + PROscorer = derive2 { name="PROscorer"; version="0.0.1"; sha256="0mgj0mi0vzdk0agimsx4k9i4bss0j5lqiayzhldr1hrqrx2a4f3d"; depends=[PROscorerTools]; }; + PROscorerTools = derive2 { name="PROscorerTools"; version="0.0.1"; sha256="1vliffkfqdn5l96bncfgayv19i20kmawlxi8q853wamj6npdpv5r"; depends=[]; }; + PRROC = derive2 { name="PRROC"; version="1.3"; sha256="03hvh92lq4i4w4mla9bvwrwb4626f4hvlxgdn57hamp70960vjyc"; depends=[]; }; PReMiuM = derive2 { name="PReMiuM"; version="3.1.4"; sha256="0x13bada1spf4wk8bwy9rdpjcfzd4s7ypfx88slpmg87gw4qc7s2"; depends=[ald BH cluster gamlss_dist ggplot2 plotrix Rcpp RcppEigen]; }; PResiduals = derive2 { name="PResiduals"; version="0.2-4"; sha256="1a4sbdz0p8mqhcvpd1zkkinihvkqj1jw8m510k1yifmb4aav7xiw"; depends=[Formula MASS rms SparseM]; }; PSAboot = derive2 { name="PSAboot"; version="1.1.4"; sha256="1zfqpq0ibgazwppbxbmqvkvh9j5421xmj9132zghxki0xdy655ss"; depends=[ggplot2 ggthemes Matching MatchIt modeltools party PSAgraphics psych reshape2 rpart TriMatch]; }; PSAgraphics = derive2 { name="PSAgraphics"; version="2.1.1"; sha256="05c0k94dxddyrhsnhnd4jcv6fxbbv9vdkss2hvlf3m3xc6jbwvh9"; depends=[rpart]; }; - PSCBS = derive2 { name="PSCBS"; version="0.62.0"; sha256="15r3rpqd4fpnssbbpkw0vxmgl3akid5r8n20nvr50bfzrl0w8j7f"; depends=[DNAcopy future listenv matrixStats R_cache R_methodsS3 R_oo R_utils]; }; - PSF = derive2 { name="PSF"; version="0.3"; sha256="0x2w0prcnyy82zvr0g2h18rc67r8wzvax3h9psk9dd4il8s4xfpw"; depends=[cluster data_table forecast knitr]; }; + PSCBS = derive2 { name="PSCBS"; version="0.63.0"; sha256="0pgha1rvb9nfxkr8fxc17zgws781qwmrl01rss7bd0sf2n2lw2k2"; depends=[aroma_light DNAcopy future listenv matrixStats R_cache R_methodsS3 R_oo R_utils]; }; + PSF = derive2 { name="PSF"; version="0.4"; sha256="1hjry8vjqr6zk2i2ppf3fcpsr4v4jm1705qv6i1iz2agl6g2rcnp"; depends=[cluster data_table forecast knitr]; }; PST = derive2 { name="PST"; version="0.94"; sha256="0f28zrnlficbi9iil6wbh51k9mghpkz63hw05lpmlpx1yl5nd0a6"; depends=[RColorBrewer TraMineR]; }; PTAk = derive2 { name="PTAk"; version="1.2-12"; sha256="1phxh2qbzsj2ia2dr6z30lhi765lk1m8lbk57sdgvm14fmi9v5nk"; depends=[tensor]; }; - PTE = derive2 { name="PTE"; version="1.0"; sha256="10if2hh69yysi2y82m7is74hmzw2xpxijgb8bhy1d4g9n9lqidfs"; depends=[doParallel]; }; - PTXQC = derive2 { name="PTXQC"; version="0.82.3"; sha256="1nhdqdv6nsgm3y9d5j5r1142h8vkw6k7frg1rv71z49bf4zw2l4j"; depends=[data_table ggdendro ggplot2 gridExtra gtable plyr proto RColorBrewer reshape2 rmarkdown seqinr yaml]; }; + PTE = derive2 { name="PTE"; version="1.5"; sha256="1wx90b34yrc2rwg6yh2hiivirp1c1357h276jzjc0kzchkkxv4g2"; depends=[doParallel foreach survival]; }; + PTXQC = derive2 { name="PTXQC"; version="0.82.6"; sha256="0afq7yk1sj8jfqgrnzidarw1j46dh9lpbvifhgjj5qprqpbaffqr"; depends=[data_table ggdendro ggplot2 gridExtra gtable plyr proto RColorBrewer reshape2 rmarkdown seqinr yaml]; }; PVAClone = derive2 { name="PVAClone"; version="0.1-6"; sha256="0fj5p3z2cwnyshrr4rq88wpij2xax5p4aq0x4p342kadx9d6x2ga"; depends=[coda dclone dcmle]; }; PWD = derive2 { name="PWD"; version="1.0"; sha256="0ksr3biaqd4p5a4lv28i4cwk1fn9822ndq2161mgvc1c344p06fj"; depends=[Rcpp RcppArmadillo]; }; PWEALL = derive2 { name="PWEALL"; version="1.1.0"; sha256="0k66wzyvy89zfnsyrgbj5vr4w6c008lw2jlfkrm11l01vvgy7wgf"; depends=[survival]; }; @@ -2158,7 +2243,8 @@ in with self; { Pade = derive2 { name="Pade"; version="0.1-4"; sha256="1kx5qpxd3x43bmyhk8g2af44hz3prhnrzrm571kfjmak63kym741"; depends=[]; }; PairViz = derive2 { name="PairViz"; version="1.2.1"; sha256="0mjp5p6n5azbhrm2hvb9xyqjfhd49pw9ia8k70749yc96ws1qqc7"; depends=[graph gtools TSP]; }; PairedData = derive2 { name="PairedData"; version="1.0.1"; sha256="025h5wjsh9c78bg6gmg6p6kvv2s6d5x7fzn3mp42mlybq0ry78p0"; depends=[ggplot2 gld lattice MASS mvtnorm]; }; - PanJen = derive2 { name="PanJen"; version="1.3"; sha256="1n7qw3vwppv1dfpp5z2ybcy9gg73kk0zbzmdi4f5y1fri2d1sli4"; depends=[Formula lasso2 mgcv RColorBrewer]; }; + PairwiseD = derive2 { name="PairwiseD"; version="0.9.62"; sha256="19qjms99gf7s39nwwgj56n8426d0gw80dipz165sk3km4zb2mcwv"; depends=[openxlsx xlsx]; }; + PanJen = derive2 { name="PanJen"; version="1.4"; sha256="1b5nsacy4bfda4kbvabddkj2mkl709kbbgwgws2p2sj3zxjv554i"; depends=[mgcv]; }; PanelCount = derive2 { name="PanelCount"; version="1.0.9"; sha256="1b6c83qypjc3ylvhh24xm4pjk8w34s24v0i9ddlmg92f1518hlkj"; depends=[Rcpp RcppArmadillo statmod]; }; Paneldata = derive2 { name="Paneldata"; version="1.0"; sha256="00hk340x5d4mnpl3k0hy1nypgj55as2j7y2pgzfk3fpn3zls5zib"; depends=[]; }; ParDNAcopy = derive2 { name="ParDNAcopy"; version="2.0"; sha256="017xwznhfibi8kp0ifww02c0qcq0vxs06rjww4kcp2bvdmld8kc4"; depends=[DNAcopy]; }; @@ -2173,6 +2259,9 @@ in with self; { PatternClass = derive2 { name="PatternClass"; version="1.7.1"; sha256="11r4p4s2pm0c4fmnpijzz5srhpai444mbx5nszhkssfsp9rh7cm9"; depends=[SDMTools]; }; PdPDB = derive2 { name="PdPDB"; version="1.0"; sha256="1rnphdklyzznpzf57gwlnr498612d54kl5jkqnza6h8if7nqr4kd"; depends=[plyr]; }; Peacock_test = derive2 { name="Peacock.test"; version="1.0"; sha256="0ypvwywipyh8lm8xkazsfjgjpvvyi2g8kid63qff11372p33m6xs"; depends=[]; }; + PeakError = derive2 { name="PeakError"; version="2017.06.19"; sha256="1d4v7s478zjz42dm6ps4nnqqyyqv84dgmzn1bp1a4qwnfv9vmfg7"; depends=[]; }; + PeakSegDP = derive2 { name="PeakSegDP"; version="2017.06.20"; sha256="0zr0hn4zn3pbql6aamlx3yialqhdbzp069diprlnri7n1rqy7h2r"; depends=[]; }; + PeakSegOptimal = derive2 { name="PeakSegOptimal"; version="2017.06.20"; sha256="0f1xlx3mq1m6dgvc1fpdzvsxl5z0asq19yyh5cxrq98igbl51xyj"; depends=[penaltyLearning]; }; Peaks = derive2 { name="Peaks"; version="0.2"; sha256="0a173p5cdm1jnm7bwsvjpxh4dccy593g02c4qjwky1cgzy5rvin2"; depends=[]; }; PearsonDS = derive2 { name="PearsonDS"; version="1.0"; sha256="1fnlkadq53vl0gn3b066kvxh1s3pljkpxlpfbyp8jcyp8gxm6i8n"; depends=[]; }; PearsonICA = derive2 { name="PearsonICA"; version="1.2-4"; sha256="0jkbqha1nb9pf72ffki47wymsdmd50smkdhvpzvanv4y2rmqfhvg"; depends=[]; }; @@ -2181,9 +2270,9 @@ in with self; { PenCoxFrail = derive2 { name="PenCoxFrail"; version="1.0.1"; sha256="0snjf8jxzyf30xj3wx9p6g073dqw592l1j1c6yxfg8y4kgzhzwq7"; depends=[Matrix Rcpp RcppArmadillo survival]; }; PepPrep = derive2 { name="PepPrep"; version="1.1.0"; sha256="1s2xn05xry50l9kf1mj6yd1dpc7yp6g3d00960hswvhznb0a4l84"; depends=[biomaRt stringr]; }; PepSAVIms = derive2 { name="PepSAVIms"; version="0.9.1"; sha256="0m4jrq6wcjy0k80gvrnm9f7kvi1ifx9182xfq0psyaxpj0ggvzij"; depends=[elasticnet]; }; - Peptides = derive2 { name="Peptides"; version="2.0.0"; sha256="0m0xhimi5pjc8nd0n9x83zwciaa14yjixfmwnnaxrmq0b7abgs0b"; depends=[]; }; + Peptides = derive2 { name="Peptides"; version="2.2"; sha256="0fdc8xd0c6x1m1r3bj9098m6g5ay15ig53z0wib2lvxlcnh2xpjs"; depends=[Rcpp]; }; PerFit = derive2 { name="PerFit"; version="1.4.1"; sha256="0mzd9yrgsswxlhljlk8nxi0dhy3k4a9jax9w9c9s29j4m7z9jf01"; depends=[fda Hmisc irtoys ltm MASS Matrix mirt]; }; - PerMallows = derive2 { name="PerMallows"; version="1.12"; sha256="0f886q0vgplrprzwrjcjh4g92i1nzkzpzp4qhr4n9kkz8rrxf125"; depends=[Rcpp]; }; + PerMallows = derive2 { name="PerMallows"; version="1.13"; sha256="0ny2vc8f0npixaw1kp2d93xr4g46nsg8jjwvi6afv9xjvaz0i6wy"; depends=[Rcpp]; }; Perc = derive2 { name="Perc"; version="0.1.2"; sha256="0p6l4b536jjz4lmgsdrxqsh77lx4vkb6hbyd6vhbc102m5x3b1yc"; depends=[]; }; PerfMeas = derive2 { name="PerfMeas"; version="1.2.1"; sha256="1x7ancmb41zd1js24rx94plgbssyc71z2bvpic6mg34xjkwdjw93"; depends=[graph limma RBGL]; }; PerformanceAnalytics = derive2 { name="PerformanceAnalytics"; version="1.4.3541"; sha256="1czchsccsbdfjw743j6rm101q2q01pggyl8zmlva213pwm86zb3v"; depends=[xts zoo]; }; @@ -2193,11 +2282,12 @@ in with self; { PhViD = derive2 { name="PhViD"; version="1.0.8"; sha256="038pw24sb8ja8pbbmj05rww6413i2ljybb2dxwgrpffv22aqawmc"; depends=[LBE MCMCpack]; }; PharmPow = derive2 { name="PharmPow"; version="1.0"; sha256="0gabkd8p4zsig9p697lyk8m2jxb5abjk81rpzd5ih1yk1qanhsn5"; depends=[scatterplot3d]; }; PhaseType = derive2 { name="PhaseType"; version="0.1.3"; sha256="092dqyqfaxj8qpwxcjb5cayhnq597rfjz1xb93ps4nrczycqs0l6"; depends=[coda ggplot2 reshape]; }; + PhenotypeSimulator = derive2 { name="PhenotypeSimulator"; version="0.1.2"; sha256="01ngkwbnyv0zqbjn75lfhncg829kixq3l4dg1570nz5g42n9azky"; depends=[mvtnorm optparse plyr R_utils Rcpp snpStats]; }; Phxnlme = derive2 { name="Phxnlme"; version="1.0.0"; sha256="0h9mi8p95rp1s8xsdv38j9fpy2cy9zvjnldjmnj0n469kimp2782"; depends=[ggplot2 gridExtra lattice manipulate testthat]; }; PhyInformR = derive2 { name="PhyInformR"; version="1.0"; sha256="10d720ww909b1xmdrms554pnn0757nzppnrniar4n157mh0qw7ms"; depends=[ape doParallel foreach geiger ggplot2 gplots gridExtra hexbin iterators PBSmodelling phytools RColorBrewer]; }; PhySortR = derive2 { name="PhySortR"; version="1.0.7"; sha256="1xpxkd2bf3xdsfwa0bzkppr6y7p6v7s4iy0x0m8fiwj93n9jh0pz"; depends=[ape phytools]; }; PhyloMeasures = derive2 { name="PhyloMeasures"; version="2.1"; sha256="01axs78s10y1bkx8dbs9vvnphdzik7hpibkwyib1x9mznmyg90hr"; depends=[ape]; }; - PhylogeneticEM = derive2 { name="PhylogeneticEM"; version="1.0.0"; sha256="0xrvrfq28a9ivdrbc5s05bpxk4vsij1qqyv01md5c687bl45pj7a"; depends=[ape capushe foreach gglasso glmnet LINselect MASS Matrix plyr Rcpp RcppArmadillo robustbase]; }; + PhylogeneticEM = derive2 { name="PhylogeneticEM"; version="1.0.1"; sha256="197js49vybrdby0wrpncfis2zi2hfhc24dmk14563gl7gg7v8iwx"; depends=[ape capushe foreach gglasso glmnet LINselect MASS Matrix plyr Rcpp RcppArmadillo robustbase]; }; PhysActBedRest = derive2 { name="PhysActBedRest"; version="1.0"; sha256="0gmqh700cf6aiagb45iyyf85pgp3b86fx7fbv9lrsm4mda0r8h75"; depends=[chron lubridate stringr]; }; PhysicalActivity = derive2 { name="PhysicalActivity"; version="0.1-1"; sha256="1aqyip7psf3pdrxkpidfldkk9naihvnc7s3n6w6vvr9h1l5mpmvc"; depends=[]; }; Pijavski = derive2 { name="Pijavski"; version="1.0"; sha256="1027lmmk17br9zxah980j6l3k2p92065bwigw6gpy9g0g5jjl4f1"; depends=[Rcpp]; }; @@ -2220,7 +2310,7 @@ in with self; { PoissonSeq = derive2 { name="PoissonSeq"; version="1.1.2"; sha256="1hhx0gv06cp6hm6h36mqy411qn9x15y45crpzbyf8crfs85c6gbg"; depends=[combinat]; }; PolyPatEx = derive2 { name="PolyPatEx"; version="0.9.2"; sha256="1z1hwvsw7b6cz5xfy35a5ldrzb3fhp3swiyz56v1zqblpsaz8n9g"; depends=[gtools]; }; PolyTrend = derive2 { name="PolyTrend"; version="1.2"; sha256="17n6phkzgaqrlzs8x1l5smnij1gxfklr0zj9pqfy5n8xqnpwssm5"; depends=[]; }; - Polychrome = derive2 { name="Polychrome"; version="0.8.2"; sha256="1ab7vzvrql7j8d1z5ki7dl5s03b5c9vphx5wd6v8cv1nadxfyqgc"; depends=[colorspace rgl]; }; + Polychrome = derive2 { name="Polychrome"; version="0.9.3"; sha256="1baf231skpmy673d3nxkw2r8ai38a1npwpa42ssijz476kmy0ii2"; depends=[colorspace rgl]; }; PolynomF = derive2 { name="PolynomF"; version="0.94"; sha256="006ds50ivq91v2jyhgpm5rfaipxbzsnljrki6fjplcw07g0frz71"; depends=[]; }; Pomic = derive2 { name="Pomic"; version="1.0.3"; sha256="16c0z50zlr9vb1g3j7zdgm2nx595mbwmr4hry184fvkv2hrkk4xc"; depends=[]; }; PopED = derive2 { name="PopED"; version="0.3.2"; sha256="1lvzqpij4dqbw144ya25bhlx96mwaxz932r0bl3jsx1si9ijb8xz"; depends=[codetools dplyr ggplot2 MASS mvtnorm]; }; @@ -2232,19 +2322,21 @@ in with self; { PortfolioAnalytics = derive2 { name="PortfolioAnalytics"; version="1.0.3636"; sha256="0xva3ff8lz05f1jvx8hgn8rpgr658fjhf3xyh9ga1r7dii13ld50"; depends=[foreach PerformanceAnalytics xts zoo]; }; PortfolioEffectEstim = derive2 { name="PortfolioEffectEstim"; version="1.4"; sha256="1sfgkwyn7vfy3rqb1cglywiv5xmyxhzvj38vgrvfq5jf3hvzsg21"; depends=[PortfolioEffectHFT rJava]; }; PortfolioEffectHFT = derive2 { name="PortfolioEffectHFT"; version="1.8"; sha256="0y4x0d91j6g52136d921hfs5swzf85gkxafxfkf3c15dl5ns120v"; depends=[ggplot2 rJava zoo]; }; + PortfolioOptim = derive2 { name="PortfolioOptim"; version="1.0.3"; sha256="1s9msqjxqxqafhncc3hi5prhzl5cj0incd5rc9fxc23l5l4n9xjx"; depends=[Rglpk]; }; PottsUtils = derive2 { name="PottsUtils"; version="0.3-2"; sha256="05ds0a7jq63zxr3jh66a0df0idzhis76qv6inydsjk2majadj3zv"; depends=[miscF]; }; - PoweR = derive2 { name="PoweR"; version="1.0.5"; sha256="0zr2p2hyxdh194n3s0g71q9zyvl67czp0wc39zl3fivfk3zkf98r"; depends=[Rcpp RcppArmadillo]; }; + PoweR = derive2 { name="PoweR"; version="1.0.6"; sha256="0p2v07wp1hqmmbf7b3mh0v4n5hbbcms9xkdhjzdfxkkbafxybc24"; depends=[Rcpp RcppArmadillo]; }; Power2Stage = derive2 { name="Power2Stage"; version="0.4-5"; sha256="0wjry83dkrnl6bblb0688hx5ihwwkya05dwb9nrnv39033ksd0a9"; depends=[mvtnorm PowerTOST]; }; - PowerTOST = derive2 { name="PowerTOST"; version="1.4-4"; sha256="0dy2zwq2f1g9j295ppc3mwdxabh88kkkw81l0cq8qsvz886iz1mf"; depends=[cubature mvtnorm]; }; + PowerNormal = derive2 { name="PowerNormal"; version="1.1.0"; sha256="1zwm8lwix2bnimp3srl0cv1j8fi8asf956f35dmp9y047lsn3a9i"; depends=[]; }; + PowerTOST = derive2 { name="PowerTOST"; version="1.4-5"; sha256="1jlf12cifgs06s1yr7pcvs3h9zxvzbz7f6x74pkypi7rzydnpxqs"; depends=[cubature mvtnorm TeachingDemos]; }; PowerUpR = derive2 { name="PowerUpR"; version="0.1.3"; sha256="1znhkyxl8qrs288zf0cr6sxgq6ir029fmilda0k73scc6k1jxz7f"; depends=[nloptr]; }; PracTools = derive2 { name="PracTools"; version="0.4"; sha256="1klknzbpgjyvrws6d7gwrdmglc16xag3pa3i8rk0zg62wvyb4l1v"; depends=[]; }; PreKnitPostHTMLRender = derive2 { name="PreKnitPostHTMLRender"; version="0.1.0"; sha256="1749cd734f4bf0n4068s2m617k6as8h9bwp44mm3la2xy3vjf5g1"; depends=[knitr rmarkdown XML]; }; - PredPsych = derive2 { name="PredPsych"; version="0.1"; sha256="1nhaainpp9qr30l6g74vl2qcdy64amrn08m4fsjz3ahbvr908mkj"; depends=[caret e1071 ggplot2 MASS mclust party plyr randomForest rpart]; }; + PredPsych = derive2 { name="PredPsych"; version="0.2"; sha256="1fppjwh1g2irxafaaid2y7ln1psii7kx369jbnl63kadmpd36q7p"; depends=[caret e1071 ggplot2 MASS mclust party plyr randomForest rpart statmod]; }; PredictABEL = derive2 { name="PredictABEL"; version="1.2-2"; sha256="08c7j2in1wlas6nmy44s08cq86h5fizqbhsnq312dllqdzmb2h9s"; depends=[epitools Hmisc PBSmodelling ROCR]; }; PredictTestbench = derive2 { name="PredictTestbench"; version="1.1.3"; sha256="14np4zvr0labhqxzsv07iqzldfxmnsfk91qpfqz7vyiq0vwcymp4"; depends=[forecast ggplot2 imputeTestbench PSF reshape2]; }; PredictiveRegression = derive2 { name="PredictiveRegression"; version="0.1-4"; sha256="15vkisj3q4hinc3d537s8inhj3wk62q67qhy050xmp9j563ainmd"; depends=[]; }; PresenceAbsence = derive2 { name="PresenceAbsence"; version="1.1.9"; sha256="17qn4ggkr5aqml45nkihj1j35y479ywkm1xcfkb2g8ky66jb0c0s"; depends=[]; }; - PrevMap = derive2 { name="PrevMap"; version="1.4"; sha256="1yvq2lpylwkhhbz3ys06a6fyfcwcc9zq58ihgh3yhs6f79jcfv2m"; depends=[geoR Matrix maxLik numDeriv pdist raster splancs truncnorm]; }; + PrevMap = derive2 { name="PrevMap"; version="1.4.1"; sha256="1hmvfk5zpflwncaiy2rr0jr2gr2gk66na6ks82b6dfgk8xdc8xmk"; depends=[geoR Matrix maxLik numDeriv pdist raster splancs truncnorm]; }; PrivateLR = derive2 { name="PrivateLR"; version="1.2-21"; sha256="1jwq8f0dnngj8sfbmcmxy34nkkq6yjw0mq3w1f8rasz67v3bwzp3"; depends=[]; }; ProDenICA = derive2 { name="ProDenICA"; version="1.0"; sha256="04gnsnd0xzw3bfbssdp06bar0lk305ry2c97pmwxgiz3ay88dfsj"; depends=[gam]; }; ProFit = derive2 { name="ProFit"; version="1.0.2"; sha256="0wqm5c3syrpkbb7rwkfgfbva52a0bjbl8fl8rxi624vc4rwicr87"; depends=[fftw FITSio LaplacesDemon magicaxis R2Cuba RColorBrewer Rcpp]; }; @@ -2268,7 +2360,7 @@ in with self; { PsumtSim = derive2 { name="PsumtSim"; version="0.4"; sha256="0079kb1bgsxs4cwmn33rbbk2jgq39rdjfgz9k9hc64iyzz0i6na3"; depends=[boot EffectsRelBaseline]; }; PtProcess = derive2 { name="PtProcess"; version="3.3-12"; sha256="14d39xxgkqnqq79v9sp6g9csj2rp6pix2hzg9acjdmw1xyadn71h"; depends=[]; }; PubBias = derive2 { name="PubBias"; version="1.0"; sha256="0dr5dhfx57knrs05pbx9ngg4k2937n8gjzsgd0jfqd8dfxhy051k"; depends=[R_utils rmeta]; }; - PubMedWordcloud = derive2 { name="PubMedWordcloud"; version="0.3.3"; sha256="1d9k5ilrxz9brv08nl2iqpalqjf4g0bv49qxywq970g66jyxjjij"; depends=[RColorBrewer RCurl stringr tm wordcloud XML]; }; + PubMedWordcloud = derive2 { name="PubMedWordcloud"; version="0.3.4"; sha256="04gc0vypmdrls967idhvzkwbm374awr2wkg6dsbkizjahf2n3v0p"; depends=[RColorBrewer RCurl stringr tm wordcloud XML]; }; PurBayes = derive2 { name="PurBayes"; version="1.3"; sha256="0nbm4cyrwfbwwbjbjkylr86cshaqbvbif6dkp4fag8kbcgyyx5qh"; depends=[rjags]; }; PwrGSD = derive2 { name="PwrGSD"; version="2.000"; sha256="0qxvws9mfrnqw5s24qhqk6cbffjm13z7awyxdmnilazghpiq1p7s"; depends=[survival]; }; PythonInR = derive2 { name="PythonInR"; version="0.1-3"; sha256="0p4h30wqsz8czz6r4xjg5q79190hq242x9fsaw7v5433px1gmr44"; depends=[pack R6]; }; @@ -2285,7 +2377,8 @@ in with self; { QFRM = derive2 { name="QFRM"; version="1.0.1"; sha256="1k79sq9il4326q7ivwdwlzw7drjv4pwqra3fr8kyyqcpmxh9296h"; depends=[]; }; QGglmm = derive2 { name="QGglmm"; version="0.5.1"; sha256="1112w9dwbr9smxa869w4833iw1vclscr1zbjn2f0xklnpn3nb40d"; depends=[mvtnorm R2Cuba]; }; QICD = derive2 { name="QICD"; version="1.2.0"; sha256="0ppyl978y7md2n9m4kwhbrgdr5i3df0yw124x84f53w4acipgz5q"; depends=[]; }; - QNB = derive2 { name="QNB"; version="1.1.7"; sha256="1xakzwsaf5297nxx5a193ji0dn30rw3yly4rhdjqabgrh3fgzv92"; depends=[locfit]; }; + QNB = derive2 { name="QNB"; version="1.1.8"; sha256="1czky811x79a54sq6p7vfpci6hvj49flvbyd20wk9fpsw1rrska7"; depends=[locfit]; }; + QPBoot = derive2 { name="QPBoot"; version="0.2"; sha256="1nxmxayfq2xcjzix080mkc8y52wl3vs0rcwdl8lmhwfawjb4pap5"; depends=[abind quantspec rugarch]; }; QPot = derive2 { name="QPot"; version="1.1"; sha256="1ivkk5wdd1lp6v4hwmpr9g230kd7zgmj0vnv5fw0svwpb8zzz14x"; depends=[MASS]; }; QQperm = derive2 { name="QQperm"; version="1.0.1"; sha256="06xhv54zgnx8i22j23a0dqxhh7my416idpkkwq93qd1rdzgamzc8"; depends=[]; }; QRAGadget = derive2 { name="QRAGadget"; version="0.1.0"; sha256="0vmhbpfbbpbcs6s9zjam893yl54spbx4x4698c504g96hcc19kkp"; depends=[htmlwidgets leaflet magrittr miniUI raster scales shiny sp]; }; @@ -2296,19 +2389,18 @@ in with self; { QTLRel = derive2 { name="QTLRel"; version="0.2-15"; sha256="15wli0mpcmp7vc4jwp393w0qfm5g5n8dj724j38s711ir98w660b"; depends=[gdata lattice]; }; QUIC = derive2 { name="QUIC"; version="1.1"; sha256="021bp9xbaih60qmss015ycblbv6d1dvb1z89y93zpqqnc2qhpv3c"; depends=[]; }; QVM = derive2 { name="QVM"; version="0.1.1"; sha256="0dnr4h4084n505vrxfrx3czrkqdbna8s4fxpwr5czfilbfbxhpar"; depends=[gWidgets IMPACT ltm multilevel mvtnorm nlme pander psych]; }; - QZ = derive2 { name="QZ"; version="0.1-5"; sha256="1z531yhlmm7a4m63p84q9nsnsrsiwfqrq505xg6crfygkb5kircc"; depends=[]; }; - QoLR = derive2 { name="QoLR"; version="1.0.2"; sha256="1vvs5a4yl1isy0kqxzr2kcfg3y6bg3n2gsy7a2qgch92vjffd18a"; depends=[survival zoo]; }; + QZ = derive2 { name="QZ"; version="0.1-6"; sha256="1vgqwv3rbnmz2sgbmbivgnxcwy5dzgk6ivqskdnqkil4f10zflmi"; depends=[Matrix]; }; + QoLR = derive2 { name="QoLR"; version="1.0.3"; sha256="1z3wicybqsyczgjjd84g95bjxw80l5y8b68ayp300bm5jd4f2pha"; depends=[survival zoo]; }; Qtools = derive2 { name="Qtools"; version="1.2"; sha256="0432ip73aldblq3yyig8d47a56j12fs30fpz8sxvfj186ssawych"; depends=[boot MASS mice quantreg]; }; QuACN = derive2 { name="QuACN"; version="1.8.0"; sha256="1597blp8gqc5djvbgpfzi8wamvy0x50wh5amxj9cy99qa0jlglxi"; depends=[combinat graph igraph RBGL]; }; QualInt = derive2 { name="QualInt"; version="1.0.0"; sha256="1ms96m3nz54848gm9kdcydnk5kn2i8p1rgl2dwn7cqcqblfvsr4j"; depends=[ggplot2 survival]; }; Quandl = derive2 { name="Quandl"; version="2.8.0"; sha256="0n1c4343ki8nia7qrq2m9zb7b05qr3yjwvk1ji7m44sa613w6y5l"; depends=[httr jsonlite xts zoo]; }; QuantPsyc = derive2 { name="QuantPsyc"; version="1.5"; sha256="1i9bh88r8zxndzjqsj14qw64gnvm5a9kvhjhzk3qsrvl3qzjgh93"; depends=[boot MASS]; }; - QuantTools = derive2 { name="QuantTools"; version="0.5.4"; sha256="01xn9ksb2v3glqpxhdizp8b0786azkm8kv6xxdqk3q7ysm44lac1"; depends=[data_table fasttime Rcpp RCurl readxl]; }; + QuantTools = derive2 { name="QuantTools"; version="0.5.5"; sha256="1jkfnjndbr0hhrsl9cg7llc4y9v3g6s01i034wz22lkhvg3jszy4"; depends=[data_table fasttime R6 Rcpp RCurl readxl]; }; QuantifQuantile = derive2 { name="QuantifQuantile"; version="2.2"; sha256="01bdz8a6nhjil6n2z62x5g41v3d6md5v16g0ladsl5zc8raivqdq"; depends=[rgl]; }; QuantileGradeR = derive2 { name="QuantileGradeR"; version="0.1.1"; sha256="1zwc6bg636gk8zll7wpznd3pzl611hcj2fmzp8b9505rra13p0g2"; depends=[]; }; QuantumClone = derive2 { name="QuantumClone"; version="1.0.0.4"; sha256="1dqibl4rnf1qbk44srh8ndka0ni7a463hlpf7sdpgx2b57414jkd"; depends=[DEoptim doParallel foreach fpc ggplot2 gridExtra NbClust optimx]; }; QuasiSeq = derive2 { name="QuasiSeq"; version="1.0-8"; sha256="113pxmvwwn331g5dcv2zwsvvi5jgc1v41f38sw9gms06i8x3a7q6"; depends=[edgeR mgcv pracma]; }; - Quor = derive2 { name="Quor"; version="0.1"; sha256="1ncl4pj472m881fqndcm6jzn4jkwbnzpc639c9vy5mxa4z569i1g"; depends=[combinat]; }; R_cache = derive2 { name="R.cache"; version="0.12.0"; sha256="006x52w9r8phw5hgqmyp0bz8z42vn8p5yibibnzi1sfa1xlw8iyx"; depends=[digest R_methodsS3 R_oo R_utils]; }; R_devices = derive2 { name="R.devices"; version="2.15.1"; sha256="09gmzb87n1ybqwyp4jdpih3w3s7nqkr4hd1qhcqr57kp2pj9jp9x"; depends=[base64enc R_methodsS3 R_oo R_utils]; }; R_filesets = derive2 { name="R.filesets"; version="2.11.0"; sha256="0hjmd86zqsd9v17ma9r734pk9b0k53ayb52w5mm19d9hnl3wnv08"; depends=[digest future R_cache R_methodsS3 R_oo R_utils]; }; @@ -2325,7 +2417,7 @@ in with self; { R2G2 = derive2 { name="R2G2"; version="1.0-2"; sha256="05d5vybvsi4pyr099916nk1l8sqszs9gaj2vhsx1jxxks8981na7"; depends=[]; }; R2GUESS = derive2 { name="R2GUESS"; version="1.7"; sha256="07w54r5r9v7pa8aklmwbwdcc57j3a3b46b1a7mwmzcl11mcfwdph"; depends=[fields MCMCpack mixOmics mvtnorm snowfall]; }; R2HTML = derive2 { name="R2HTML"; version="2.3.2"; sha256="00kxny7hajs9r2kw63qk7d03ggdxx2j1g8vbrmzp806y8aczvik9"; depends=[]; }; - R2MLwiN = derive2 { name="R2MLwiN"; version="0.8-3"; sha256="1xxwj59f6mfl48jmwn8n5i6b86kkw8kaxpvirkh74gqan861hrpb"; depends=[coda digest doParallel foreach foreign lattice Matrix memisc rbugs texreg]; }; + R2MLwiN = derive2 { name="R2MLwiN"; version="0.8-4"; sha256="0ycjqkxjgqlhyn82zadlsqwcc5r2sm5wh3y4pl3xkppmwm131f0s"; depends=[coda digest doParallel foreach foreign lattice Matrix memisc rbugs texreg]; }; R2OpenBUGS = derive2 { name="R2OpenBUGS"; version="3.2-3.2"; sha256="1cxr93g0fkdv3lqdh63l2gcp7qn3q42pm1r6nzf35550k9ahkhnv"; depends=[boot coda]; }; R2STATS = derive2 { name="R2STATS"; version="0.68-38"; sha256="1v8mvkvs4fjch0dpjidr51jk6ynnw82zhhylyccyrad9f775j2if"; depends=[cairoDevice gWidgets gWidgetsRGtk2 lattice latticeExtra lme4 MASS Matrix proto RGtk2Extras statmod]; }; R2SWF = derive2 { name="R2SWF"; version="0.9-1"; sha256="0xhq4dyi1mj4n38zylgi6d17d5wp402wm3kic05vgssg4pyfda2d"; depends=[sysfonts]; }; @@ -2336,7 +2428,7 @@ in with self; { R330 = derive2 { name="R330"; version="1.0"; sha256="01sprsg7kph62abhymm8zfqr9bd6dhihrfxzgr4pzi5wj3h80bjm"; depends=[lattice leaps rgl s20x]; }; R4CouchDB = derive2 { name="R4CouchDB"; version="0.7.5"; sha256="1wd1yqbs8m4zqvdm6x7mrcyk5b5pr4azm3r49nrilg8fnr2bk9rz"; depends=[bitops RCurl RJSONIO]; }; R4dfp = derive2 { name="R4dfp"; version="0.2-4"; sha256="02crzjphlq4hi2crh9lh8l0acmc1rgb3wr1x8sn56cwhq4xzqzcb"; depends=[]; }; - R6 = derive2 { name="R6"; version="2.2.0"; sha256="1ir51pb0y6yj05qaxsflk4a6hv8n73cwlb0qajcskbrz632dsyvx"; depends=[]; }; + R6 = derive2 { name="R6"; version="2.2.2"; sha256="13xfdr19ca7ymisidsanm6w7hsk3qmy5l8c0mlz3nk48f7s5cxq8"; depends=[]; }; R6Frame = derive2 { name="R6Frame"; version="0.1.0"; sha256="0ib0van2qk0p89qmii8naj1jx56i6j7srvydzm41pyq2xdg0bmga"; depends=[data_table lazyeval R6]; }; RAC = derive2 { name="RAC"; version="1.1.1"; sha256="0ybyjjpw8f4wbdhkhbnjg8wy82ibxsywyjrsi406l2knnkx0mvmg"; depends=[matrixStats plotrix rstudioapi]; }; RAD = derive2 { name="RAD"; version="0.3"; sha256="0nmgsaykxavq2bskq5x0jvsxzsf4w2gqc0z80a59376li4vs9lpj"; depends=[MASS mvtnorm]; }; @@ -2344,10 +2436,10 @@ in with self; { RADanalysis = derive2 { name="RADanalysis"; version="0.5.5"; sha256="1py07p24i1pky8wwyy8ajmkg6h2n7nbpxp1w6lrkiyl0p2kgjm20"; depends=[scales sfsmisc]; }; RAHRS = derive2 { name="RAHRS"; version="1.0.2"; sha256="0s7vkmyc3yh62m2xbsvajgvi9xdw5x4irnp7rcllhqa7z9nj50c9"; depends=[pracma RSpincalc]; }; RAM = derive2 { name="RAM"; version="1.2.1.3"; sha256="1p6rqqbp5q3pqy9m6npml52nkfh8pd4kc245kb22qjslbvl3rrkn"; depends=[ade4 ape data_table FD ggmap ggplot2 gplots gridExtra labdsv lattice MASS permute phangorn phytools plyr RColorBrewer reshape reshape2 RgoogleMaps scales vegan VennDiagram]; }; - RAMP = derive2 { name="RAMP"; version="1.9"; sha256="0fy74cj1hjlwsdpayv0mkh7cn829bd1c7z9mgng304vh5ga02nh2"; depends=[]; }; + RAMP = derive2 { name="RAMP"; version="2.0.1"; sha256="1n8h58j6v1xs6adrr4w4ha7pn1q2fh14dyg7zgpp2smv0j2b33dr"; depends=[]; }; RAMpath = derive2 { name="RAMpath"; version="0.4"; sha256="0blixfmgiq22hd356hrp4vbhfkkgh0a58143nhirjx3sav9pxc1v"; depends=[ellipse lavaan MASS]; }; RANKS = derive2 { name="RANKS"; version="1.0"; sha256="1lvaya9jlqrr9klqznw4fz5h5x0sw191ci74hpymb4gzhhxcbp27"; depends=[graph limma NetPreProc PerfMeas RBGL]; }; - RANN = derive2 { name="RANN"; version="2.5"; sha256="007cgqg9bybg2zlljbv5m6cmlm3r6i251018rpgjcn0xnm9sjsj7"; depends=[]; }; + RANN = derive2 { name="RANN"; version="2.5.1"; sha256="0il5i99vbcagnxvb15af5n37g04a4q1x96bz73zh3jhki9fpw9vm"; depends=[]; }; RANN_L1 = derive2 { name="RANN.L1"; version="2.5"; sha256="0sjf92hdw9jczvq1wl5syckhvik7wv0k9vrrgw4nnnsabc25v9pf"; depends=[]; }; RAP = derive2 { name="RAP"; version="1.1"; sha256="18dclijs72p6gxawpg8hk7n512ah4by5jfg2jnrp8mz79ajmdgir"; depends=[]; }; RAPIDR = derive2 { name="RAPIDR"; version="0.1.1"; sha256="14cnw4jjs5anb55zlg1yj6qc9yr51rsamigq2q7h8ypj2ggnna1d"; depends=[Biostrings data_table GenomicAlignments GenomicRanges PropCIs Rsamtools]; }; @@ -2358,9 +2450,9 @@ in with self; { RArcInfo = derive2 { name="RArcInfo"; version="0.4-12"; sha256="1j1c27g2gmnxwslff4l0zivi48qxvpshmi7s9wd21cf5id0y4za4"; depends=[RColorBrewer]; }; RAtmosphere = derive2 { name="RAtmosphere"; version="1.1"; sha256="0mk43bq28hlrjwaycsxca458k8xf00q58czgc17d8yx3kz17a5i0"; depends=[]; }; RBMRB = derive2 { name="RBMRB"; version="2.0.4"; sha256="0l6w3j4dykxd5r3h3qj7hsz77657bhif7qk020hvmcg17jszr9a2"; depends=[data_table ggplot2 httr plotly rjson]; }; - RBPcurve = derive2 { name="RBPcurve"; version="1.1"; sha256="0g243h4zpjigayf7kryfpdvshycaxz12ifqilyk3ylz91kk61nmb"; depends=[BBmisc checkmate mlr shape TeachingDemos]; }; + RBPcurve = derive2 { name="RBPcurve"; version="1.2"; sha256="0zkfvnhm780vid4qqdrx9mnc6jxxrmrnq47pqvk35rm3m4l96782"; depends=[BBmisc checkmate mlr shape TeachingDemos]; }; RCA = derive2 { name="RCA"; version="2.0"; sha256="0pidb5czrf0dc3ywy6cwm5akgsc62pvf94kfyxibzmd1favykx1h"; depends=[gplots igraph]; }; - RCALI = derive2 { name="RCALI"; version="0.2-17"; sha256="1bic7dwxkvgxl3a26glxm6h6gmq4xad70dbrnrnb2d6n5v1dnniw"; depends=[splancs]; }; + RCALI = derive2 { name="RCALI"; version="0.2-18"; sha256="1d9pgkkghkzciawlzlggqk6qp9bh0akwgh1hc47akcnjvqlvxjd2"; depends=[splancs]; }; RCEIM = derive2 { name="RCEIM"; version="0.3"; sha256="1kil5r88b6lf8vxmswz0wn0hhjxjm8jmlcl5kxjwl6fwjyy2z120"; depends=[]; }; RCMIP5 = derive2 { name="RCMIP5"; version="1.2.0"; sha256="0bwp1ln0y48g2d0bj9b47y0rlwffzv0pi6gjfzv4sg5anhswc9x7"; depends=[abind assertthat digest dplyr Matrix]; }; RCPmod = derive2 { name="RCPmod"; version="2.154"; sha256="0x4jk5xv3z3nyi99rv9fh2akhyk4s1736fzsxynqxfm6br3k8mc6"; depends=[fishMod glmnet gtools MASS]; }; @@ -2374,7 +2466,7 @@ in with self; { RCriteo = derive2 { name="RCriteo"; version="1.0.2"; sha256="1vyhnblw9zr5h6c25lf76p9vn95k8vr0hpq1sjkccdwl9yvsyhfy"; depends=[httr plyr RCurl XML]; }; RCurl = derive2 { name="RCurl"; version="1.95-4.8"; sha256="1yrbm8sypizy18qxkl6534fk2gf2ijxhahw6qldk9v5v3cjl68p7"; depends=[bitops]; }; RDIDQ = derive2 { name="RDIDQ"; version="1.0"; sha256="09gincmxv20srh4h82ld1ifwncaibic9b30i56zhy0w35353pxm2"; depends=[]; }; - RDML = derive2 { name="RDML"; version="0.9-5"; sha256="08q1ixwnxx4j2nwdynswbdy6jw2r97c5a0zlwhaxr888c7hcv6ff"; depends=[checkmate data_table lubridate pipeR R6 readxl rlist stringr xml2]; }; + RDML = derive2 { name="RDML"; version="0.9-6"; sha256="1qapzdfym49vwsxgcaxlkz0blqg95r50vdwd6w60zpxina4p0bs9"; depends=[checkmate data_table lubridate pipeR R6 readxl rlist stringr xml2]; }; RDS = derive2 { name="RDS"; version="0.7-8"; sha256="0lxnb6zd5lphs9d42pfdzx607w7iz1mpj3z8pb2ri3s4h011g1vn"; depends=[ggplot2 gridExtra igraph reshape2 scales]; }; RDSTK = derive2 { name="RDSTK"; version="1.1"; sha256="07vfhsyah8vpvgfxfnmp5py1pxf4vvfzy8jk7zp1x2gl6dz2g7hq"; depends=[plyr RCurl rjson]; }; RDStreeboot = derive2 { name="RDStreeboot"; version="1.0"; sha256="10ry8rna450j389cplvyvgwljxa8lli7licwdin64b1kyzy2cdn7"; depends=[]; }; @@ -2382,10 +2474,10 @@ in with self; { RDieHarder = derive2 { name="RDieHarder"; version="0.1.3"; sha256="0wls7b0qfbi6hsq9xdywi4mdhim5b6mrzhvyrm9dxp9z1k7imz6m"; depends=[]; }; RDocumentation = derive2 { name="RDocumentation"; version="0.8.0"; sha256="0k733c6b2ggwqry13ynnm9bmnrlf1sszya061wx2w52d3x378r2g"; depends=[githubinstall httr proto rjson]; }; RDota2 = derive2 { name="RDota2"; version="0.1.6"; sha256="0fjsgg4dmzw2xwrf8jxq0f2d7f78bf67bl3ms5qcjk9kskfnymag"; depends=[httr jsonlite]; }; - REAT = derive2 { name="REAT"; version="1.3.1"; sha256="076afs9zlskcb1c4sva7pmflzjzwqgb4315y0xnzcd3n5a9riz9s"; depends=[]; }; - REBayes = derive2 { name="REBayes"; version="0.73"; sha256="0fv9ij71r36s6qsd0jrzcdirskvmr1bmxp1gbfvy77qm4dzxg00g"; depends=[Matrix reliaR Rmosek]; }; + REAT = derive2 { name="REAT"; version="1.3.2"; sha256="1vp103jwq6zf3w6bn3xvbh4zcgsdrwiycp23ab8mj42axk8pw5li"; depends=[]; }; + REBayes = derive2 { name="REBayes"; version="0.85"; sha256="0r8fd43qrwfg38sg2xchl4p2lhyfwbaqbr0xs2zln720s6zcwgi6"; depends=[Matrix reliaR Rmosek]; }; RECA = derive2 { name="RECA"; version="1.3"; sha256="1v9ff2inxwpq91pjl6g9bpl9nmlyryp030g6abydikkhkcq3n74b"; depends=[]; }; - REDCapR = derive2 { name="REDCapR"; version="0.9.7"; sha256="0b2dbmmjd4bmr48inv1gwc9353p4rhf8891mb5rs4cdqsl13dic4"; depends=[data_table dplyr httr readr]; }; + REDCapR = derive2 { name="REDCapR"; version="0.9.8"; sha256="14psw0sxlyig4nf968n997djwf80hgy5ia2g0bp8rdpn8lrj01g6"; depends=[data_table dplyr httr magrittr readr tibble tidyr]; }; REEMtree = derive2 { name="REEMtree"; version="0.90.3"; sha256="01sp36p12ky8vgsz6aik80w4abs70idr9sn4627lf94r92wwwsbc"; depends=[nlme rpart]; }; REGENT = derive2 { name="REGENT"; version="1.0.6"; sha256="1f2sjqkhw3rbmwbcmx7l7imj696kblisi8y3fz77xygbcbxa6rmq"; depends=[]; }; REPPlab = derive2 { name="REPPlab"; version="0.9.4"; sha256="1pf8zrjdzziyq2lw31p1ij7cn4j7pf659ygxv8wpfnmcmpaqbc45"; depends=[lattice LDRTools rJava]; }; @@ -2408,34 +2500,38 @@ in with self; { RFormatter = derive2 { name="RFormatter"; version="0.1.1"; sha256="0jmzdc2cl4vvffsyfwp493fiygh9xinhv970qxp1667rw8wlap8l"; depends=[formatR]; }; RFreak = derive2 { name="RFreak"; version="0.3-0"; sha256="1dmllxb6yjkfkn34f07j2g7w5m63b5d10lh9xsmxyfk23b8l3x0x"; depends=[rJava]; }; RGA = derive2 { name="RGA"; version="0.4.2"; sha256="0pjizgvrh0gbjlyxlb3v93nhigg8rpq3mziv1qlp6r0s5y7cmpi9"; depends=[httr jsonlite lubridate plyr]; }; - RGBM = derive2 { name="RGBM"; version="1.0-6"; sha256="03ax6l6qn8z31185dzhs6rcapbjnirp4nsc0mcf6qndhrqi4fxd6"; depends=[doParallel foreach plyr]; }; - RGCCA = derive2 { name="RGCCA"; version="2.1"; sha256="1xpni9aj37zhpjr6k6gc82dihmzjdxjqy5dyz7lcvscgbwvbw0vl"; depends=[MASS]; }; + RGBM = derive2 { name="RGBM"; version="1.0-7"; sha256="1amyf43jmm1zh04kj7w98v4iim5zw8zq0p851xjb9lvdkwhvpdfy"; depends=[doParallel foreach plyr]; }; + RGCCA = derive2 { name="RGCCA"; version="2.1.2"; sha256="0zcxakqnmih0243y5b6r9nmcfanzxd6q344pd5bca5pnm3y43wr0"; depends=[Deriv MASS]; }; RGENERATE = derive2 { name="RGENERATE"; version="1.3.5"; sha256="12dq04xpl06zhkzwqx3zy0bkpvb5phbdj2inxsyczf6d4dk209mb"; depends=[RMAWGEN]; }; RGENERATEPREC = derive2 { name="RGENERATEPREC"; version="1.2"; sha256="1w28yfzk3ilbz1r9fsc76cigyrnzzhsfm3a81ff8g26za7cb8vjp"; depends=[blockmatrix copula Matrix RGENERATE RMAWGEN stringr]; }; RGIFT = derive2 { name="RGIFT"; version="0.1-5"; sha256="1745fs4bq0ss39fiwljspvrmnkgbbpc1fjvhvcrsmp2iizq12sgn"; depends=[]; }; RGenetics = derive2 { name="RGenetics"; version="0.1"; sha256="0x5sspd67hh08qm62whlnnd838m0np29q3bfzgwp6j85lhil3jrx"; depends=[]; }; RGoogleAnalytics = derive2 { name="RGoogleAnalytics"; version="0.1.1"; sha256="1049fyxl00izw92rm508p90asjp0agmv38b00yfbmasfzsp1r00s"; depends=[httr lubridate]; }; RGoogleAnalyticsPremium = derive2 { name="RGoogleAnalyticsPremium"; version="0.1.1"; sha256="0d22pdd5kvnrspikfb66ny07pgx96rvykr0zi78rwn6g1symdb4q"; depends=[httr jsonlite lubridate]; }; - RGoogleFit = derive2 { name="RGoogleFit"; version="0.2.0"; sha256="1yxp2dflq4hihn8mknjxhsrf3dy4dr4bs4qkzi2zxm2mh9mn0lsl"; depends=[bit64 httr jsonlite RCurl]; }; + RGoogleFit = derive2 { name="RGoogleFit"; version="0.3.1"; sha256="0g4r5vb9zv6mqym1mh028ic9hkmlpklrhq4ks5sys7y60ps893k1"; depends=[bit64 httr jsonlite RCurl]; }; + RGraphM = derive2 { name="RGraphM"; version="0.1.6"; sha256="0gb25ax7idp8p24j6a481lm1v5jvhx6abqcib4ipw0bz1giilzy7"; depends=[Rcpp RcppGSL]; }; RGraphics = derive2 { name="RGraphics"; version="2.0-14"; sha256="0bv95g17pvpq3nji0akphdaznh9k85hf5z78qypxwfqr76brxd05"; depends=[ggplot2 lattice]; }; - RGtk2 = derive2 { name="RGtk2"; version="2.20.31"; sha256="1ilnlmsk9fis61pc5bn9sf7z4b7vc7f0a0zcy77kk4bns6iqjvyp"; depends=[]; }; + RGtk2 = derive2 { name="RGtk2"; version="2.20.33"; sha256="0d5r0lrkk1ixhln94pm6d5d88bqs0h8p2sdczb7r7ah007ffmhic"; depends=[]; }; RGtk2Extras = derive2 { name="RGtk2Extras"; version="0.6.1"; sha256="19gjz2bk9dix06wrmlnq02yj1ly8pzhvr0riz9b08vbzlsv9gnk2"; depends=[RGtk2]; }; RH2 = derive2 { name="RH2"; version="0.2.3"; sha256="1qbxy600fc8k2xl70liggdgg03ga6a8yad001banqzdmh508wcxl"; depends=[chron rJava RJDBC]; }; + RHMS = derive2 { name="RHMS"; version="1.1"; sha256="1hhf8hlx3c95zkvg3k8vzgi8fbh0ziwy1k02w3m1sa45nfm068dn"; depends=[Hmisc pso]; }; + RHPCBenchmark = derive2 { name="RHPCBenchmark"; version="0.1.0"; sha256="1f94d8z15ybqgc2pccsi1m6563xf26ygri6f4pwxkqjmxkxnk34y"; depends=[cluster Matrix mvtnorm]; }; RHRV = derive2 { name="RHRV"; version="4.2.3"; sha256="09rcf9da04195myh4mwva3hqcd483k0wwcn84jgbkj8a5z1zxqc6"; depends=[lomb nonlinearTseries tkrplot waveslim]; }; RHT = derive2 { name="RHT"; version="1.0"; sha256="1gxf8nhj3y92h8al7l3fxa45wc568kb3cykrbdjlsy2zjacf7fcc"; depends=[]; }; RI2by2 = derive2 { name="RI2by2"; version="1.3"; sha256="0smc0fb9anq5ih9zx2slfbqyx02njm0hc7g22gpfggskmxf2l509"; depends=[gtools Rcpp]; }; - RIA = derive2 { name="RIA"; version="1.0.0"; sha256="0dwrp0w612i79ybxzffb7m34jgrcz8jzz2q7v6c34wayjm7j9kpc"; depends=[oro_dicom]; }; + RIA = derive2 { name="RIA"; version="1.1.0"; sha256="0wfwbszaw30za0lhv3ldf99f580iw6sxxv9lxwcaccha1y6b4kfx"; depends=[oro_dicom]; }; RIFS = derive2 { name="RIFS"; version="0.1-5"; sha256="0705dhirh7bhy2yf3b1mpk3m7lggg4pwy640lvaspwaxkd6zac5w"; depends=[]; }; - RISmed = derive2 { name="RISmed"; version="2.1.6"; sha256="0gwdx2xg3n4n82cvhj61yvdlmd35ag85dglwfcwhbplk7zh4cjps"; depends=[]; }; + RISmed = derive2 { name="RISmed"; version="2.1.7"; sha256="08dmkkxsmwp9b4h2g1bbx03cijn793fsnzkmbima8x9d42vxnm1l"; depends=[]; }; RImageJROI = derive2 { name="RImageJROI"; version="0.1.1"; sha256="0a4sa60klbpl31qxxvjjbksdhvs3vwm9na1v7014v93fzxy6bjas"; depends=[spatstat]; }; RImagePalette = derive2 { name="RImagePalette"; version="0.1.1"; sha256="054w8xzsn330qg7piq6ajhji9na2swkkdis2567cy3q099npfl5v"; depends=[ggplot2]; }; RImpala = derive2 { name="RImpala"; version="0.1.6"; sha256="03f4cq4bcrydpy78ypir7smj7abrcfynz0zzlgwgc60vh7vl79lz"; depends=[rJava]; }; RInSp = derive2 { name="RInSp"; version="1.2"; sha256="0zg46qw44wx17ydcz592gl4k9qq08dycmsshxxqkjf92r3g3l6wm"; depends=[]; }; - RInside = derive2 { name="RInside"; version="0.2.13"; sha256="0cfhljdai9kkw5m01mjaya0s02g4g1cy1g4i0qpjkhgqyihsh7dy"; depends=[Rcpp]; }; + RInside = derive2 { name="RInside"; version="0.2.14"; sha256="1ks9hs78s2vgdp9nfpzwifkqnh3vnaqwand51yh9r1zyjc4k9rcd"; depends=[Rcpp]; }; RItools = derive2 { name="RItools"; version="0.1-15"; sha256="0f7g0w8bnbxryll48rnn7blgskgcdqqx9xv4fqmwcbkbasjz37va"; depends=[abind SparseM survival svd xtable]; }; RJDBC = derive2 { name="RJDBC"; version="0.2-5"; sha256="0cdqil9g4w5mfpwq85pdq4vpd662nmw4hr7qkq6510gk4l375ab2"; depends=[DBI rJava]; }; RJSDMX = derive2 { name="RJSDMX"; version="1.7"; sha256="13qd1ynxyyxsz11aiiqv47wlbygs5z3vsyw53fbcrcq4r34y4zx4"; depends=[rJava zoo]; }; RJSONIO = derive2 { name="RJSONIO"; version="1.3-0"; sha256="1dwgyiy19sixhy6yclqcaaxswbmpq7digyjjxhy1qv0wfsvk94qi"; depends=[]; }; + RJSplot = derive2 { name="RJSplot"; version="2.1"; sha256="1wrm9kkr6j0czh1fsjakqi8a2wf4xjh0z2qhhy1j4bhr1c35kd2p"; depends=[]; }; RJaCGH = derive2 { name="RJaCGH"; version="2.0.4"; sha256="1a8nd0w73dvxpamzi2addwr6q3rxhnnpa1girnlwbd1j1dll0bz6"; depends=[]; }; RJafroc = derive2 { name="RJafroc"; version="0.1.1"; sha256="1630f8nmpid5pax8gqxych8bqf8a1avgrk7yqisk3lf1yx3h68rq"; depends=[ggplot2 shiny stringr xlsx]; }; RKEA = derive2 { name="RKEA"; version="0.0-6"; sha256="1dncplg83b4zznh1zh90wr8jv5259cy93imrry86c5kqdijmhrrp"; depends=[rJava RKEAjars tm]; }; @@ -2446,9 +2542,10 @@ in with self; { RKlout = derive2 { name="RKlout"; version="1.0"; sha256="17mx099393b1m9dl3l5xjcpzmb9n3cpjghb90m9nidccxkhacmqf"; depends=[RCurl]; }; RLRsim = derive2 { name="RLRsim"; version="3.1-3"; sha256="1r0xqay3jfg435dh9fqc6yy73wjffp658da194rx63vpfhshgz8w"; depends=[lme4 mgcv nlme Rcpp]; }; RLT = derive2 { name="RLT"; version="3.1.0"; sha256="1aaavv6krp75wz0jp2xrm15ymq5f6sdaiz90c9ayy5q1kc7d82dk"; depends=[]; }; + RLeafAngle = derive2 { name="RLeafAngle"; version="1.0"; sha256="1anks22hn6qpac556p99kilkhc80h572dvcyz3wj1nqffdrhgrh3"; depends=[]; }; RLogicalOps = derive2 { name="RLogicalOps"; version="0.1"; sha256="1qyn80x3x3bb5wgzyzw6pxs8a6q26yq1fkmkz7f5wywsnrj8hzfj"; depends=[rstackdeque stringr]; }; RLumModel = derive2 { name="RLumModel"; version="0.2.1"; sha256="1v2a2rrk9x0s3f62jg1v919ilia4r8h3n732rid3hbpmpky1iha0"; depends=[deSolve Luminescence Rcpp RcppArmadillo]; }; - RLumShiny = derive2 { name="RLumShiny"; version="0.1.1"; sha256="0wrn1lmwzigaq1w3a04mrz6ikgw2whr36718ckixphm5kcqlcnjr"; depends=[googleVis Luminescence shiny]; }; + RLumShiny = derive2 { name="RLumShiny"; version="0.2.0"; sha256="0gchhgpdr9fb29apqni9yg72rh3hvvk7ap0869fp459hnygfcl7q"; depends=[data_table googleVis Luminescence readxl rhandsontable shiny shinydashboard]; }; RM_weights = derive2 { name="RM.weights"; version="1.0"; sha256="0757p4174j913k8xh90zg6fpxh25b9415zap1i7ym9ab78kn0k3i"; depends=[Hmisc psychotools]; }; RM2 = derive2 { name="RM2"; version="0.0"; sha256="1v57nhwg8jrpv4zi22fhrphw0p0haynq13pg9k992sb0c72dx70a"; depends=[msm]; }; RMAWGEN = derive2 { name="RMAWGEN"; version="1.3.3"; sha256="0spc0vszbxfpfp3kqdj0gnb90nvn50qwalq3mw8151b8h1swmf3l"; depends=[chron date vars]; }; @@ -2465,7 +2562,8 @@ in with self; { RMixpanel = derive2 { name="RMixpanel"; version="0.6-2"; sha256="09z00ryyk3jx1s7p2d1rzvg84qhybv58d1n3cvjcmj07bv1h2dj1"; depends=[jsonlite RCurl uuid]; }; RMongo = derive2 { name="RMongo"; version="0.0.25"; sha256="1anybw64bcipwsjc880ywzj0mxkgcj6q0aszdad6zd4zlbm444pc"; depends=[rJava]; }; RMySQL = derive2 { name="RMySQL"; version="0.10.11"; sha256="127a0f7hp0msiqqdjfpk3pz862rb4agrd71bdic2idwbs0w5wh6s"; depends=[DBI]; }; - RNAseqNet = derive2 { name="RNAseqNet"; version="0.1.0"; sha256="0qv90hczj1f2mqfzwv3fkmjhhfr8vqvdv30fpq0wgjpc799pv214"; depends=[ggplot2 glmnet hot_deck igraph PoiClaClu]; }; + RNAseqNet = derive2 { name="RNAseqNet"; version="0.1.1"; sha256="145wp9wz2ir1ni36zrp53qzpdh4vz5j0f9h27w1vljrll6v0mwck"; depends=[ggplot2 glmnet hot_deck igraph PoiClaClu]; }; + RNAstructureModuleMiner = derive2 { name="RNAstructureModuleMiner"; version="0.1.0"; sha256="026r1h4z1jdfww0ay9iixa77ax6b19pgp589bbn77xg1vwjjlbsk"; depends=[RRNA]; }; RNCBIEUtilsLibs = derive2 { name="RNCBIEUtilsLibs"; version="0.9"; sha256="1h1ywx8wxy6n2rbpmjbqw4c0djz29pbncisd0mlbshj1fw226jba"; depends=[rJava]; }; RNCEP = derive2 { name="RNCEP"; version="1.0.8"; sha256="0nkx33997c5rgc3ch5a2bb6rrw5xw1y71rliygw5k1ldi335rsm7"; depends=[abind fields fossil maps RColorBrewer sp tgp]; }; RND = derive2 { name="RND"; version="1.2"; sha256="1rl5apgw43c841z0lapi9z2jn979dvqh4x1qkqx1ad77zcq87c85"; depends=[]; }; @@ -2475,10 +2573,10 @@ in with self; { RNeXML = derive2 { name="RNeXML"; version="2.0.7"; sha256="1q6ifqkypdj4hmm0f4mhwq8pidg4ba52c7k68527dk9rsrmiyjr6"; depends=[ape dplyr httr lazyeval plyr reshape2 stringr taxize tidyr uuid XML]; }; RNeo4j = derive2 { name="RNeo4j"; version="1.6.4"; sha256="197ykvcfw1160ir6m568a4ksszyv5vlis2r0aygi155iz04j0bwm"; depends=[httr jsonlite rstudioapi]; }; RNetCDF = derive2 { name="RNetCDF"; version="1.8-2"; sha256="0pn45z1bj777nkfglvwwhpji8vz39sd51yszfa5g6rqxiw1a7y5d"; depends=[]; }; - RNetLogo = derive2 { name="RNetLogo"; version="1.0-3"; sha256="0aanp982c5xy4w4jsdcb9bmk1vyns055ad39hp206zaw3wj6vj3d"; depends=[igraph rJava]; }; + RNetLogo = derive2 { name="RNetLogo"; version="1.0-4"; sha256="1z7jp454k197c0zbkn64zmf25wadkiznv3w2csgiz917cbx6xcn1"; depends=[igraph rJava]; }; RNewsflow = derive2 { name="RNewsflow"; version="1.0.1"; sha256="1vxzcsiapnq8101iq4w73m9k8cq2khgcsxak71x72n295r7qpsd6"; depends=[data_table igraph Matrix plyr scales slam tm wordcloud]; }; - RNifti = derive2 { name="RNifti"; version="0.5.0"; sha256="1rshryjx5chnpf9a83nysjr5f9lam8fpdmggxndwa7m4s4zjvvi4"; depends=[Rcpp]; }; - RNiftyReg = derive2 { name="RNiftyReg"; version="2.5.0"; sha256="10ksakp62d1qhl1r8lk0k9f6ng9wfli3lhyd14bxigv625429isa"; depends=[ore Rcpp RcppEigen RNifti]; }; + RNifti = derive2 { name="RNifti"; version="0.7.0"; sha256="1c2diwcd6rsscw3nhvkv745rcrj5xpwf3rcsxy99nsmdgwl3zbk5"; depends=[Rcpp]; }; + RNiftyReg = derive2 { name="RNiftyReg"; version="2.6.0"; sha256="0a820m1f4j8d6xwpkmk1n6g73zycrygrxzs3c4fx09kfsbc0v0rk"; depends=[ore Rcpp RcppEigen RNifti]; }; ROAuth = derive2 { name="ROAuth"; version="0.9.6"; sha256="0vhsp8qybrl94898m2znqs7hmlnlbsh8sm0q093dwdb2lzrqww4m"; depends=[digest RCurl]; }; ROC632 = derive2 { name="ROC632"; version="0.6"; sha256="0vgv4rclvb79mfj1phs2hmxhwchpc5rj43hvsj6bp7wv8cahfg5g"; depends=[penalized survival survivalROC]; }; ROCR = derive2 { name="ROCR"; version="1.0-7"; sha256="1jay8cm7lgq56i967vm5c2hgaxqkphfpip0gn941li3yhh7p3vz7"; depends=[gplots]; }; @@ -2489,43 +2587,49 @@ in with self; { RODBCDBI = derive2 { name="RODBCDBI"; version="0.1.1"; sha256="0jkcc1lm8drsx1pkfj5h6rlbr98cgpvbf9ndzdwr048f3s8gd26i"; depends=[DBI RODBC]; }; RODBCext = derive2 { name="RODBCext"; version="0.3.0"; sha256="1w9n40ilwnxa4zcz57icyw2d7b37p8icvqaby1dn0w5vgskgrd12"; depends=[RODBC]; }; RODM = derive2 { name="RODM"; version="1.1"; sha256="0cyi2y3lsw77gqxmawla5jlm4vnhsagh3ykdgb6izxslc4j2fszx"; depends=[RODBC]; }; - ROI = derive2 { name="ROI"; version="0.2-1"; sha256="1g1qhrr62a74a8h73b75zxa5msbq5gv4cp1gmm0ihrjzzfzinvap"; depends=[registry slam]; }; + ROI = derive2 { name="ROI"; version="0.2-6"; sha256="0ajr9yclp0wjrjmway6wnj4pgczgphgnk4yxnvmqxia6s923bzap"; depends=[registry slam]; }; + ROI_models_miplib = derive2 { name="ROI.models.miplib"; version="0.0-1"; sha256="1viqr0dqza9386m9xmfdm5riaczp4izf3bd2jk70cmdgypjj6mzg"; depends=[R_utils Rglpk ROI]; }; ROI_models_netlib = derive2 { name="ROI.models.netlib"; version="1.0"; sha256="13ai7zkd00a03vyzfy1sm64cx8328xzwz5v8yw0shkdz5rchaq2d"; depends=[ROI]; }; - ROI_plugin_clp = derive2 { name="ROI.plugin.clp"; version="0.1"; sha256="14i3a8kw4zq2rcmhm6ha53ihqbmql2ydh5syzp9cdrfm0yp6n97w"; depends=[clpAPI Matrix ROI slam]; }; - ROI_plugin_cplex = derive2 { name="ROI.plugin.cplex"; version="0.2-1"; sha256="0ik4mmpd5x5233pdp88w8g605fg6lh4yvzlb9ndqxfnmv2nchgwl"; depends=[Rcplex ROI slam]; }; - ROI_plugin_ecos = derive2 { name="ROI.plugin.ecos"; version="0.2-4"; sha256="0lzxz9zs68y2pkkkfa8vgi4jiswbbh128idddfz3hqak5j1gg3rh"; depends=[ECOSolveR Matrix ROI slam]; }; - ROI_plugin_glpk = derive2 { name="ROI.plugin.glpk"; version="0.2-1"; sha256="01y66ir5s8spv4l8qz974wfkslxkqznzlc8padgrqm8vd9wli8k2"; depends=[Rglpk ROI]; }; - ROI_plugin_ipop = derive2 { name="ROI.plugin.ipop"; version="0.2-1"; sha256="1v6imxx9215f7hlqzscppyl7n9f9811rx58dia0h5ydfnhv4alxd"; depends=[kernlab ROI slam]; }; - ROI_plugin_lpsolve = derive2 { name="ROI.plugin.lpsolve"; version="0.0-1"; sha256="0k0308sgkac7z0d01sc9xcrd9pxjfb78gns4rp9mrxkz4k9yvm3h"; depends=[lpSolveAPI ROI]; }; - ROI_plugin_nloptr = derive2 { name="ROI.plugin.nloptr"; version="0.2-4"; sha256="1fyzpbljhkc15gmmsvr37hsmfr7fp7ffp9xylsnvy4zxlw060knp"; depends=[nloptr ROI]; }; - ROI_plugin_quadprog = derive2 { name="ROI.plugin.quadprog"; version="0.2-1"; sha256="0cb23xb56j0qn3v7zgqni1697s8bg256zr7dqm00i65f4zivws0j"; depends=[quadprog ROI slam]; }; - ROI_plugin_scs = derive2 { name="ROI.plugin.scs"; version="0.2-3"; sha256="1z039cnv75nk81b4qp1zwy09gvksaxlnxwgdg30mgzjd2mxcp5cf"; depends=[Matrix ROI scs slam]; }; - ROI_plugin_symphony = derive2 { name="ROI.plugin.symphony"; version="0.2-1"; sha256="0qvyindwcqiafq8k4m9plipdn5qrpycjk6mv90nmw644pnmip77l"; depends=[ROI Rsymphony slam]; }; + ROI_plugin_alabama = derive2 { name="ROI.plugin.alabama"; version="0.2-5"; sha256="0hd5v0n9pa3a02hhlknj4xa2h1y4p8132i6wky7v5h2gls6prqwl"; depends=[alabama ROI]; }; + ROI_plugin_clp = derive2 { name="ROI.plugin.clp"; version="0.3"; sha256="1wkik3142w9abphgyl3zp40by26wzw75lx7s9ad9ppkhyzwmmsn8"; depends=[clpAPI Matrix ROI slam]; }; + ROI_plugin_cplex = derive2 { name="ROI.plugin.cplex"; version="0.2-5"; sha256="028w9hzj1ynrsqslb89dxkkivdsi1c4cvvhgvmjz0rnxy9qxz57j"; depends=[Rcplex ROI slam]; }; + ROI_plugin_ecos = derive2 { name="ROI.plugin.ecos"; version="0.2-5"; sha256="1h2pcxjhwfvrrjrmjf4wl87pfhdbwirjwblpcyvj1hrhcks56y4y"; depends=[ECOSolveR Matrix ROI slam]; }; + ROI_plugin_glpk = derive2 { name="ROI.plugin.glpk"; version="0.2-5"; sha256="1n9n5rzbhcwc0gzbdqadk41d6j8ysyzsjld87y9l06c3dchiwkz8"; depends=[Rglpk ROI]; }; + ROI_plugin_ipop = derive2 { name="ROI.plugin.ipop"; version="0.2-5"; sha256="0xampxba8s9kigxv4xj6nb8a7a02w1aj4ansj99z8m7qg0bg2ivv"; depends=[kernlab ROI slam]; }; + ROI_plugin_lpsolve = derive2 { name="ROI.plugin.lpsolve"; version="0.2-5"; sha256="0b0j8di9r4acz1pa871d54knryavais5cx8b674hxn4b4xr2zkjl"; depends=[lpSolveAPI ROI]; }; + ROI_plugin_msbinlp = derive2 { name="ROI.plugin.msbinlp"; version="0.2-5"; sha256="1b5k0pma7mqc0ma7zjycwni7gwrrfhsh3ac9rqsnsx9sn5ika7c4"; depends=[ROI slam]; }; + ROI_plugin_nloptr = derive2 { name="ROI.plugin.nloptr"; version="0.2-5"; sha256="18c5iyrz5ns54fl9lfw69966f1akcw3b7l774vxv2gdybh15r08b"; depends=[nloptr ROI]; }; + ROI_plugin_optimx = derive2 { name="ROI.plugin.optimx"; version="0.2-5"; sha256="0v2d2a6lzwvjlqk85zizwzgldyhzwr2d76gma8vrwz00rvjc6cy7"; depends=[optimx ROI]; }; + ROI_plugin_quadprog = derive2 { name="ROI.plugin.quadprog"; version="0.2-5"; sha256="1c4fd16kgg60gfs52xc64ii4kzl8fb8qz3rpy69d08avb4q6grir"; depends=[quadprog ROI slam]; }; + ROI_plugin_scs = derive2 { name="ROI.plugin.scs"; version="0.2-5"; sha256="105v813w57p4mbrjpavl3ihswv4a6mpp6v4mhv0khn8i5mfm6xjj"; depends=[Matrix ROI scs slam]; }; + ROI_plugin_symphony = derive2 { name="ROI.plugin.symphony"; version="0.2-5"; sha256="1kpa82g33i2fdcnkpcqdpslj14ilrl7cp0fq1jmp4vj8ddz1s9g5"; depends=[ROI Rsymphony slam]; }; ROMIplot = derive2 { name="ROMIplot"; version="1.0"; sha256="1njbsvnz7wrsv9l1p70p1ygmckaibz5i6jmvb0sfalp5jdcgl85n"; depends=[MortalitySmooth RCurl]; }; ROSE = derive2 { name="ROSE"; version="0.0-3"; sha256="12b9grh3rgaa07blbnxy8nvy5gvpd45m43bfqb3m4k3d0655jpk2"; depends=[]; }; RObsDat = derive2 { name="RObsDat"; version="16.03"; sha256="06d4svg4crgscn3wyg1fi8v46wlhlrgdrbfiv8ak4a5k5z0gws94"; depends=[DBI e1071 sp spacetime vwr xts zoo]; }; + ROpenDota = derive2 { name="ROpenDota"; version="0.1.1"; sha256="0d9a8c008bgzcd1hqly2h010f25xgs2s430hk90yq7vvqr3lmxl7"; depends=[jsonlite RCurl]; }; ROpenFIGI = derive2 { name="ROpenFIGI"; version="0.2.8"; sha256="0fvd25vsqkgi3jv4s2lnfag5qksyzyb48d7rhfw6z8piz37n4xaj"; depends=[httr jsonlite]; }; ROpenWeatherMap = derive2 { name="ROpenWeatherMap"; version="1.1"; sha256="0h1yw93v06bx8svhghh1fsrf837qax9896klh64b06djpgg9ngb9"; depends=[httr jsonlite RCurl]; }; - ROptEst = derive2 { name="ROptEst"; version="1.0"; sha256="1hq21rc9ydkgxv54a0zfrlncy4798rjvfmyqx2p88j0swaipy6wp"; depends=[distr distrEx distrMod RandVar RobAStBase startupmsg]; }; + ROptEst = derive2 { name="ROptEst"; version="1.0.1"; sha256="0160xs3bmk1bdan7gkibc50qfzxlmi413grvs0bib74xlr0x2kgj"; depends=[distr distrEx distrMod RandVar RobAStBase startupmsg]; }; ROptEstOld = derive2 { name="ROptEstOld"; version="0.9.2"; sha256="0blf34xff9pjfy983xm7a27xqkh9173nk64ysas6f0g4h31gh8ax"; depends=[distr distrEx evd RandVar]; }; ROptRegTS = derive2 { name="ROptRegTS"; version="0.9.1"; sha256="1a8pbn63wh2w2n409yzbwvarvhphcn82rdqjh407ch3k3x6jz3r5"; depends=[distr distrEx RandVar ROptEstOld]; }; ROptimizely = derive2 { name="ROptimizely"; version="0.2.0"; sha256="059zfn6y687h989wryvpqwgnp9njrrr4ys0gf1ql4pw85b2c50dy"; depends=[httr jsonlite]; }; ROracle = derive2 { name="ROracle"; version="1.3-1"; sha256="07zqzwaq5iqkjcmns2ahl1l71xjlznialb3dbyl4lwsh3p3fhf2n"; depends=[DBI]; }; RPANDA = derive2 { name="RPANDA"; version="1.3"; sha256="0rah5l5nfjs65zxgsgsy3q3vaph6qkr7p41x3arfhjsyma96p0zn"; depends=[ape BioGeoBEARS cluster corpcor deSolve fpc igraph mvMORPH mvtnorm phytools picante pspline pvclust TESS]; }; RPCLR = derive2 { name="RPCLR"; version="1.0"; sha256="03kpyszsjb656lfwx2yszv0a9ygxs1x1dla6mpkhcnqw00684fab"; depends=[MASS survival]; }; + RPEXE_RPEXT = derive2 { name="RPEXE.RPEXT"; version="0.0.1"; sha256="0m5ml8ywxrf66mjz6m3xp1lajd7wdq9g7xsaln8n7ykq7h5615fc"; depends=[]; }; RPEnsemble = derive2 { name="RPEnsemble"; version="0.3"; sha256="052c9cnsrjxbk2yxj08psy3nw0mq3mdr75fhnxpz64n4cqzxbr2q"; depends=[class distr MASS]; }; RPMG = derive2 { name="RPMG"; version="2.2-1"; sha256="03gqam7lp6ycrwm30gdwh2irqkcviwzk74ysyxff7b23ng4jkz1j"; depends=[]; }; RPMM = derive2 { name="RPMM"; version="1.25"; sha256="1j48dh434wfhfzka0l21w6f73qlwfm70r9gdddhn504i2d5m4jph"; depends=[cluster]; }; RPPairwiseDesign = derive2 { name="RPPairwiseDesign"; version="1.0"; sha256="0k2vh698rhs5a0b5vhyvrnnwqnagdzs591zx6hn9vbmm8rm4y1dm"; depends=[]; }; - RPPanalyzer = derive2 { name="RPPanalyzer"; version="1.4.3"; sha256="0qgvr671zir8d1q5rzdy0gkljsfr7bz1aj47xpkbbpkjr5hqgihj"; depends=[Biobase gam ggplot2 gplots Hmisc lattice limma quantreg]; }; - RPostgreSQL = derive2 { name="RPostgreSQL"; version="0.4-1"; sha256="0ydz206ir797rv435if3653fnnyihgmhr5d0n4zhlrs1m1zy74k2"; depends=[DBI]; }; + RPPanalyzer = derive2 { name="RPPanalyzer"; version="1.4.4"; sha256="0gi3zknxgxxmxjmb238vd64yqg02fv4qdirn2xf5badlqzwv3r71"; depends=[Biobase gam ggplot2 gplots Hmisc lattice limma quantreg]; }; + RPostgreSQL = derive2 { name="RPostgreSQL"; version="0.6-2"; sha256="1mdhw5821v2h7hpa53v10wz53k4i90r0vb6a3dia5gq8f9j1h088"; depends=[DBI]; }; RPresto = derive2 { name="RPresto"; version="1.2.1"; sha256="1lka1p4wh1vl9bpg2q4yv72jcd6jjp09330mw68ph27jqhfzinmm"; depends=[DBI httr jsonlite RCurl stringi]; }; RProtoBuf = derive2 { name="RProtoBuf"; version="0.4.9"; sha256="0jar93xxm9sa4a4mqc93868hmk2l0hpbh7x707ilmkzjq47fi81r"; depends=[Rcpp RCurl]; }; RPtests = derive2 { name="RPtests"; version="0.1.4"; sha256="1r30pslbjq3dip41la81jlin2vhxdmayg902x9ryjy554awfgh7j"; depends=[glmnet randomForest Rcpp]; }; RPublica = derive2 { name="RPublica"; version="0.1.3"; sha256="1w2pn1g44a00ls8kkzj53a739pq6vzp38px2k0yh10rlzimmb21l"; depends=[curl httr jsonlite]; }; RPushbullet = derive2 { name="RPushbullet"; version="0.3.1"; sha256="15cb1zlfnjaf5z4dqx3xrkbkja152ah7jhs21qhvfl20qz4cyh7r"; depends=[curl jsonlite]; }; RQDA = derive2 { name="RQDA"; version="0.2-8"; sha256="103mb69x70z1i7z66b2if6zycr5iwcz1p3g8vvz0npmxncr4las9"; depends=[DBI gWidgets gWidgetsRGtk2 igraph RGtk2 RSQLite]; }; - RQGIS = derive2 { name="RQGIS"; version="0.2.0"; sha256="1c160nd33qncp7cjzx6dw3b1scx90czak8wqgf73jn903zynn2m4"; depends=[raster RCurl rgdal sp XML]; }; + RQGIS = derive2 { name="RQGIS"; version="1.0.1"; sha256="0i6qp1f87b54cmprn1d3kb9jv38n0pblb9i1xs9v4n508bfcdwmn"; depends=[raster RCurl readr reticulate rgdal sf sp stringr XML]; }; RQuantLib = derive2 { name="RQuantLib"; version="0.4.3"; sha256="1c0ilkrgkyf5x31c51rkszm4bnscyv7hy101dlk0cqkjril7mp7m"; depends=[Rcpp zoo]; }; RRF = derive2 { name="RRF"; version="1.7"; sha256="1nxwqb0ybia8cglqlrbwnm9xzab6ayrn5f3j3l0kqszq1rvkfw95"; depends=[]; }; RRNA = derive2 { name="RRNA"; version="1.0"; sha256="14rcqh95ygybci8hb8ays8ikb22g3850s9f3sgx3r4f0ky52dcba"; depends=[]; }; @@ -2538,8 +2642,8 @@ in with self; { RSAGA = derive2 { name="RSAGA"; version="0.94-5"; sha256="0lbvy1p6wcxnn70149wcpmfy2ijk6g37ka452dxm0w0zpg0zga1w"; depends=[gstat plyr shapefiles]; }; RSAP = derive2 { name="RSAP"; version="0.9"; sha256="1sxirfabhpmfm0yiiazc9h1db70hqwva2is1dql6sjfanpl8qanl"; depends=[reshape yaml]; }; RSAgeo = derive2 { name="RSAgeo"; version="1.2"; sha256="1lgxcf5sd7aqk213s70mvi0kc4prm1w97m4wf3xjnvs7yc7mb5yz"; depends=[]; }; - RSCABS = derive2 { name="RSCABS"; version="0.9.01"; sha256="1zx2272381i24hdpb1dks3l7szds9i0rl119ljxh9f61z4fbkrhp"; depends=[gWidgets gWidgetsRGtk2 R2HTML RGtk2]; }; - RSDA = derive2 { name="RSDA"; version="1.3"; sha256="0f2f6bn11p43sv8zmvqpf5w1rdisf7b2dvllhiy3pg9f6r1mc85k"; depends=[abind FactoMineR ggplot2 glmnet princurve RJSONIO scales scatterplot3d sqldf XML]; }; + RSCABS = derive2 { name="RSCABS"; version="0.9.2"; sha256="13l4ql40ahm06yi5a9zys62h5452fchkkhlhqh9gzh3pbpyjawgc"; depends=[gWidgets gWidgetsRGtk2 R2HTML RGtk2]; }; + RSDA = derive2 { name="RSDA"; version="2.0"; sha256="0lxab3ig3r01d8insjqk7h8a4yq6kr01frz53jbalxxd3n5wzdm5"; depends=[abind dplyr FactoMineR ggplot2 glmnet lazyeval nloptr princurve RJSONIO scales scatterplot3d sqldf stringr tidyr XML xtable]; }; RSEIS = derive2 { name="RSEIS"; version="3.7-4"; sha256="0yz1lgq79chvcz70a82pyiy7s9z0af22pcnbkw629plzrxlpfppx"; depends=[RPMG Rwave]; }; RSGHB = derive2 { name="RSGHB"; version="1.1.2"; sha256="0b2v17p3a3sy8jc4vy0nq65sdkxyf0b8sf5f78yvdcn5knydah6c"; depends=[]; }; RSIP = derive2 { name="RSIP"; version="1.0.0"; sha256="1yddqbnz0av69l53y83m7rnznc42qz66fc3qrispzaajs7p9n8d7"; depends=[ncdf4 raster rasterVis rgdal sp]; }; @@ -2548,7 +2652,8 @@ in with self; { RSNNS = derive2 { name="RSNNS"; version="0.4-9"; sha256="08f2yyyc42jxqwyhvwakjkyillkc23chnk2b3bfzyxnb4pphbdfl"; depends=[Rcpp]; }; RSNPset = derive2 { name="RSNPset"; version="0.5.2"; sha256="11w2r1gfnzhqa5pwgy8nfs9s6lmln3cwkxxkid8fdg4b3ndwfl46"; depends=[doRNG fastmatch foreach qvalue Rcpp RcppEigen]; }; RSPS = derive2 { name="RSPS"; version="1.0"; sha256="0ynxhgnxsf27qm8r5d9lyd59zksnc3kvx35hy25vff8j3bg7fqgi"; depends=[gridExtra lattice plyr]; }; - RSQLite = derive2 { name="RSQLite"; version="1.1-2"; sha256="0mg9yhdvny3vjn72agai5ghqxd3vk8cd4x1lsc0gzc2b2dm2w0p4"; depends=[BH DBI memoise plogr Rcpp]; }; + RSQLServer = derive2 { name="RSQLServer"; version="0.3.0"; sha256="1p3qds1ni8dm7cb45n4z5ppn3vsjk8mmqlvw76d301qfp3ja5zll"; depends=[assertthat DBI dbplyr dplyr purrr rJava yaml]; }; + RSQLite = derive2 { name="RSQLite"; version="2.0"; sha256="1xpg1i1jkzkzv44k512k90c2vvl960pl2d4a3spwcha6yclyc3vz"; depends=[BH bit64 blob DBI memoise pkgconfig plogr Rcpp]; }; RSSL = derive2 { name="RSSL"; version="0.6.1"; sha256="03f0i0v0nygkcci42h4bh7jngxz15wsd78cn2zkzbrqadz1c61r5"; depends=[cluster dplyr ggplot2 kernlab MASS Matrix quadprog Rcpp RcppArmadillo reshape2 scales tidyr]; }; RSSOP = derive2 { name="RSSOP"; version="1.1"; sha256="119xrxpaf68qdb2kj2pbaja6im2nbxsgibb1bnlpnc3fcxkmqcsf"; depends=[]; }; RSVGTipsDevice = derive2 { name="RSVGTipsDevice"; version="1.0-7"; sha256="0jdr8l0hp4kzsvlgs8j1m74sr98z4v2lmiqinmc238m406nhppab"; depends=[]; }; @@ -2557,11 +2662,11 @@ in with self; { RSclient = derive2 { name="RSclient"; version="0.7-3"; sha256="07mbw6mcin9ivsg313ycw2pi901x9vjpmi6q7sms1hml4yq50k6h"; depends=[]; }; RSeed = derive2 { name="RSeed"; version="0.1.60"; sha256="0rvb6w4z5c2wcdgx5w6vv7c8il8d0096pgv3fyvw21ag25z605jc"; depends=[graph RBGL sybil]; }; RSelenium = derive2 { name="RSelenium"; version="1.7.1"; sha256="04ghck76jh7w6kgzdszkzjwj9fhyngq13mf9iybavxph5wcy7xgq"; depends=[binman caTools httr openssl wdman XML]; }; - RSentiment = derive2 { name="RSentiment"; version="2.1.2"; sha256="1vs32ir1ss41y7zpaa014ip2rnl6090l4aff7n4rzg6r36pys3kp"; depends=[NLP openNLP plyr stringr]; }; + RSentiment = derive2 { name="RSentiment"; version="2.1.4"; sha256="199j82s31k5z5rkk1vr5jcir3330zxmnnsgm7k2bpdm4awf7l6j7"; depends=[NLP openNLP plyr stringr]; }; RSiena = derive2 { name="RSiena"; version="1.1-232"; sha256="0qp3bqq5p19bg47m37s2dw8m4q91hnkc2zxwhsgb076q0xvvv9xq"; depends=[Matrix]; }; RSiteCatalyst = derive2 { name="RSiteCatalyst"; version="1.4.12"; sha256="0yxqna3vgjqpgbk6391dd3j5lvfa0n5xnjkq3i2i9i0pwzdr2knh"; depends=[base64enc digest httr jsonlite plyr stringr]; }; - RSmartlyIO = derive2 { name="RSmartlyIO"; version="0.1.1"; sha256="1xxs5q25v3i0qf829xl8n90n2fx1anfgfrzvwzff4dm252y7b2gw"; depends=[RCurl]; }; - RSocrata = derive2 { name="RSocrata"; version="1.7.2-12"; sha256="0vbac4ah2bwnd2lwaslhkkg0wlxaw2gn5ijp5rkf2q1pl3pk88ls"; depends=[httr jsonlite mime plyr]; }; + RSmartlyIO = derive2 { name="RSmartlyIO"; version="0.1.2"; sha256="0phkk79ng4r54w3d4ajl505gs8svlzdf1g6q50lhraq2cbllbvgx"; depends=[RCurl]; }; + RSocrata = derive2 { name="RSocrata"; version="1.7.3-2"; sha256="17c5g8k5r60h6cgs2383fhi09lnm3kjm3pll4ma66ypjfbffzdpn"; depends=[httr jsonlite mime plyr]; }; RSpectra = derive2 { name="RSpectra"; version="0.12-0"; sha256="0aa33mhzj03gznpza5l5qj94s45imfhrgx52bsa8rq00f93fgaf0"; depends=[Matrix Rcpp RcppEigen]; }; RSpincalc = derive2 { name="RSpincalc"; version="1.0.2"; sha256="09fjwfz1bzpbca1bpzxj18ki8wh9mrr5h6k75sc97cyhlixqd37s"; depends=[]; }; RStata = derive2 { name="RStata"; version="1.1.1"; sha256="1wx6cz4567xkfplybmbwmw25snhlaxn48yi620cv6p5xqv458yp7"; depends=[foreign]; }; @@ -2574,12 +2679,13 @@ in with self; { RTConnect = derive2 { name="RTConnect"; version="0.1.4"; sha256="1000jmmqzyhl6vh1ii75jdh88s9inaz52gvfwcin2k2zr7bi91ba"; depends=[]; }; RTDE = derive2 { name="RTDE"; version="0.2-0"; sha256="1dj7dsj4256z9m70y2fpcgprxpqbgqxz0dqwn0jl80sj2325f66s"; depends=[]; }; RTOMO = derive2 { name="RTOMO"; version="1.1-5"; sha256="0wnxmzad2q5cpnqmglqh92clsk2c8fngd3gzh8f91alpj6nz69jp"; depends=[GEOmap RPMG RSEIS splancs]; }; + RTaxometrics = derive2 { name="RTaxometrics"; version="2.1"; sha256="1l9byf8my5xx2rk8y2dk0j6gid3z2iz69iwv898v4d2ck0i5j4vp"; depends=[]; }; RTextTools = derive2 { name="RTextTools"; version="1.4.2"; sha256="1j3zfywq8xgax51mbizxz704i3ys4vzp8hyi5kkjzq6g2lw7ywq2"; depends=[caTools e1071 glmnet ipred maxent nnet randomForest SparseM tau tm tree]; }; RTextureMetrics = derive2 { name="RTextureMetrics"; version="1.1"; sha256="0d0mvpmcpd62cvqlajrqp32lnvpflyf9bqvdzly2v8v1kb8274fc"; depends=[]; }; RTransProb = derive2 { name="RTransProb"; version="0.1.0"; sha256="0q5fyf176pzjjdpyc5wpakpfnp48ckcpcparf6n99js2xgxc725g"; depends=[chron e1071 expm matrixStats nnet pracma zoo]; }; RTriangle = derive2 { name="RTriangle"; version="1.6-0.8"; sha256="0mngwi7ybcg6lsk3f7faljwnzsfvyxln4jd2s2hiirr303ml4wzg"; depends=[]; }; RUnit = derive2 { name="RUnit"; version="0.4.31"; sha256="1jqr871jkll2xmk7wk5hv1z3a36hyn2ibgivw7bwk4b346940xlx"; depends=[]; }; - RVAideMemoire = derive2 { name="RVAideMemoire"; version="0.9-64"; sha256="1rsgf4aynvsah31xnxvjm3z4fcjg4sfa0k9ilszvn92l6jgx5k2g"; depends=[ade4 boot car cramer dunn_test FactoMineR lme4 MASS mixOmics multcompView nnet pls pspearman vegan]; }; + RVAideMemoire = derive2 { name="RVAideMemoire"; version="0.9-65"; sha256="0f3m05ada4iw83n289vxfygfa1jvaah1sibcyg1d2z9ycxf78c1q"; depends=[ade4 boot car cramer dunn_test FactoMineR lme4 MASS mixOmics multcompView nnet pls pspearman vegan]; }; RVFam = derive2 { name="RVFam"; version="1.1"; sha256="0gw8rgq11zndnqmay6y3y5rmmljvwhxzm2pqa90vs5413dnchq92"; depends=[coxme kinship2 lme4 MASS Matrix survival]; }; RVPedigree = derive2 { name="RVPedigree"; version="0.0.3"; sha256="0v47bcdlcd0ydw4vffy1g9lj1azvyqwz4400nmlqshf9vqyhf9qq"; depends=[CompQuadForm doParallel foreach kinship2 ks Matrix snpStats]; }; RVideoPoker = derive2 { name="RVideoPoker"; version="0.3"; sha256="06s4dlw0pw8rcq5b31xxqdpdk396rf27mai2vpvmn585vbm1ib7a"; depends=[pixmap rpanel tkrplot]; }; @@ -2589,7 +2695,7 @@ in with self; { RVtests = derive2 { name="RVtests"; version="1.2"; sha256="0k7w6ml981zvr5bix197qw4kaf7rz5jqnwqlxf7aryxbm39gk16c"; depends=[glmnet pls spls]; }; RWBP = derive2 { name="RWBP"; version="1.0"; sha256="104vr2cdk185hh4zn3vmqvb14p1q8ifk11wdgvk7fli1m1zxxwdd"; depends=[igraph lsa RANN SnowballC]; }; RWebLogo = derive2 { name="RWebLogo"; version="1.0.3"; sha256="1n65mlnr163ywjnyyngnigbj0wpgkr38c3nx8hw5r8mwjnf3d617"; depends=[findpython]; }; - RWeka = derive2 { name="RWeka"; version="0.4-33"; sha256="1y05rl19q85slq20awm7zivscgbkn7rfghjxgcwndhk8fab75kcg"; depends=[rJava RWekajars]; }; + RWeka = derive2 { name="RWeka"; version="0.4-34"; sha256="1qvsm5v0rb4ridin82q03fhyi217sssagsc6gpiniz9b21kkmqkw"; depends=[rJava RWekajars]; }; RWekajars = derive2 { name="RWekajars"; version="3.9.1-3"; sha256="1jcp53qvj3wfaii8j18yvr4kx32hckqs2w6bzzmhx0py40zz1d01"; depends=[rJava]; }; RWiener = derive2 { name="RWiener"; version="1.3-1"; sha256="0w12xvc18l002m8q6ad3laa667xzqjbcfqf0vvcmicgw2j3bbq6h"; depends=[]; }; RWildbook = derive2 { name="RWildbook"; version="0.9.2"; sha256="1bzdj55v7g2vlffpdsxpl8gv4k1xxd3xl7h1whvq6q5x76lprw0g"; depends=[data_table jsonlite marked]; }; @@ -2605,8 +2711,9 @@ in with self; { Radviz = derive2 { name="Radviz"; version="0.7.0"; sha256="0x1b3s3i3f775m7ragvzpdswljry8adbkjb6aq35aqasnkvvnysq"; depends=[gridBase hexbin KernSmooth MASS]; }; Ramble = derive2 { name="Ramble"; version="0.1.1"; sha256="0225za85i5nvf8l89i5bz7nxsxykd3v9fp1wgihmncca6n8vhgpl"; depends=[]; }; Rambo = derive2 { name="Rambo"; version="1.1"; sha256="1yc04xsfkc54y19g5iwambgnlc49ixjjvfrafsgis2zh5w6rjwv8"; depends=[sna]; }; + RandMeta = derive2 { name="RandMeta"; version="0.1.0"; sha256="0bh3rkdfmwqym47q8f90pw3mmx7q8jyp4rz16ggqrmk1b5bdyqjb"; depends=[]; }; RandPro = derive2 { name="RandPro"; version="0.1.0"; sha256="10zb8xhcb54jscfnpz734c7kh43pgi3bb61yasi6rvlqd83g1zdn"; depends=[]; }; - RandVar = derive2 { name="RandVar"; version="1.0"; sha256="0iqq1hh1gl2kzgyfxp6bs31pmj5ic4y6wqwm7iaj20gk2wv923jg"; depends=[distr distrEx startupmsg]; }; + RandVar = derive2 { name="RandVar"; version="1.0.1"; sha256="0vj0p46xmj4129m6r5zg85fnvb5kx1ardwwk55nqypkxd0v58a4j"; depends=[distr distrEx startupmsg]; }; RandomFields = derive2 { name="RandomFields"; version="3.1.50"; sha256="0j7852wvclglp820y2x5r19gsr6ciygbbpl5qvwj1khnlz1hfsid"; depends=[RandomFieldsUtils sp]; }; RandomFieldsUtils = derive2 { name="RandomFieldsUtils"; version="0.3.25"; sha256="0nxk7jhr61l9h76hf96f7ypakl4wip144c0gzr6rqsja6m75rjz3"; depends=[]; }; RankAggreg = derive2 { name="RankAggreg"; version="0.5"; sha256="1c5ckk2pfkdxs3l24wgai2xg817wv218fzp7w1r3rcshxf0dcz2i"; depends=[gtools]; }; @@ -2621,13 +2728,14 @@ in with self; { Rbent = derive2 { name="Rbent"; version="0.1.0"; sha256="0xkb57dhhfd3342rv0xwbhbhn4zp5fbfch84fbh0sickm09l9vrj"; depends=[Rfit]; }; RbioRXN = derive2 { name="RbioRXN"; version="1.5.1"; sha256="0lc43wm986y3xbdh1xihn7w583cql9kvj6rb018pn06ghz153i0d"; depends=[ChemmineR data_table fmcsR gdata KEGGREST plyr RCurl stringr]; }; Rbitcoin = derive2 { name="Rbitcoin"; version="0.9.2"; sha256="0ndq4kg1jq6h0jxwhpdp8sw1n5shg53lwa1x0bi7rifmy0gnh66f"; depends=[data_table digest RCurl RJSONIO]; }; - Rblpapi = derive2 { name="Rblpapi"; version="0.3.5"; sha256="1ykwk3iv4ji8pmcm7kgppqg6sh5gw51n6sv039sfzapw6357i5vq"; depends=[BH Rcpp]; }; - Rborist = derive2 { name="Rborist"; version="0.1-3"; sha256="034mn30in3y8pmwks3xp8qadgzfjslp01py8jwm4zqsb3icxcvi5"; depends=[Rcpp RcppArmadillo]; }; + Rblpapi = derive2 { name="Rblpapi"; version="0.3.6"; sha256="1n25dyggqlvgqjfq30022i5ydpzmli2bcw08kaidgp23l7f90ghh"; depends=[BH Rcpp]; }; + Rborist = derive2 { name="Rborist"; version="0.1-7"; sha256="018ialp0czrwp057llxclk76bs76l0acjp11jq0s1h1byafdmz6a"; depends=[Rcpp RcppArmadillo]; }; Rcapture = derive2 { name="Rcapture"; version="1.4-2"; sha256="1nsxy5vpfv7fj03i6l5pgzjm0cldwqxxycnvqkfkshbryjcyl0ps"; depends=[]; }; RcellData = derive2 { name="RcellData"; version="1.3-2"; sha256="1zzkgpj2pc42xzz5pspyj981a04gjpna4br3lxna255366ijgz4l"; depends=[]; }; Rcereal = derive2 { name="Rcereal"; version="1.2.1"; sha256="0nl4p0wqpni16z62610sqcxsz1x6kannl2s1zakpmjkk80pyxlk6"; depends=[]; }; + RcextTools = derive2 { name="RcextTools"; version="0.1.0"; sha256="1pr22bb6vy6fzlmn27nm9m491v32s9dc3pvghdzy4xccq4hqa58q"; depends=[data_table igraph sqldf]; }; Rcgmin = derive2 { name="Rcgmin"; version="2013-2.21"; sha256="02igq7bdlxwa7ysfiyvqfhcvgm866lrp2z3060z5lmnp6afa0958"; depends=[numDeriv]; }; - RchivalTag = derive2 { name="RchivalTag"; version="0.0.3"; sha256="06n3zvgq6baahm3idfm64byyrv2k70w21yd0yrvfnf731dfhy94g"; depends=[akima mapdata maps maptools ncdf4 oceanmap PBSmapping plyr raster rgeos sp]; }; + RchivalTag = derive2 { name="RchivalTag"; version="0.0.5"; sha256="03zjw60kjgqfyaaic097fzi72l7sw6cg1236lj3awfqw9z6dfb56"; depends=[akima mapdata maps maptools ncdf4 oceanmap PBSmapping plyr raster rgeos sp]; }; Rchoice = derive2 { name="Rchoice"; version="0.3-1"; sha256="1mx50270vbhvng4vdcc6w94f3l890vjl41y07bqkv40n93fxvffw"; depends=[Formula maxLik msm plm plotrix]; }; Rclusterpp = derive2 { name="Rclusterpp"; version="0.2.3"; sha256="02s5gmmmd0l98wd1y884pjl3h289dyd9p9s7dh7yl2zaslqs2094"; depends=[Rcpp RcppEigen]; }; Rcmdr = derive2 { name="Rcmdr"; version="2.3-2"; sha256="07p22b6kbx2md6h911jzgiin2rds76aizn9d7nd6l4lxp8a76c09"; depends=[abind car RcmdrMisc relimp tcltk2]; }; @@ -2656,7 +2764,7 @@ in with self; { RcmdrPlugin_SLC = derive2 { name="RcmdrPlugin.SLC"; version="0.2"; sha256="1nwpzmgfla1y05dxf81w0wmvvmvcq5jn5k8phlq30920ia7ybs8g"; depends=[Rcmdr SLC]; }; RcmdrPlugin_SM = derive2 { name="RcmdrPlugin.SM"; version="0.3.1"; sha256="10sjh2x02kb6yaxbvd9ihc6777j4iv6wi6k42gyl3k7i2c39fyn3"; depends=[car colorspace Rcmdr RColorBrewer vcd]; }; RcmdrPlugin_TeachingDemos = derive2 { name="RcmdrPlugin.TeachingDemos"; version="1.1-0"; sha256="0fgl1v1g74ca14pf3mmbv26j09v7jy6ddyap5qavgiy9s8qrwrh8"; depends=[Rcmdr rgl TeachingDemos tkrplot]; }; - RcmdrPlugin_UCA = derive2 { name="RcmdrPlugin.UCA"; version="3.1-2"; sha256="1zhfa376409hyz375qvjf55my47dps2x8mlqn5a4pdcasmz90brp"; depends=[car randtests Rcmdr tseries]; }; + RcmdrPlugin_UCA = derive2 { name="RcmdrPlugin.UCA"; version="4.1-1"; sha256="0qlkqb3s4g417l9cfjq1hhi8y528lb3ibswkdk2bfsghn38yrmr4"; depends=[car randtests Rcmdr TeachingDemos tseries]; }; RcmdrPlugin_coin = derive2 { name="RcmdrPlugin.coin"; version="1.0-22"; sha256="0qmdjnjmgq52wgl4llg69q9x7hvwd73mz3swv0sv88v8zqg7xj93"; depends=[coin multcomp Rcmdr survival]; }; RcmdrPlugin_depthTools = derive2 { name="RcmdrPlugin.depthTools"; version="1.3"; sha256="09mjn5jn4rdj1lh515vr3xlnk615flg13kcwbpk0an2si4xkgm9h"; depends=[depthTools Rcmdr]; }; RcmdrPlugin_doex = derive2 { name="RcmdrPlugin.doex"; version="0.2.0"; sha256="0l3c8vwifyl8a7qkfaqxm7cws2cg1g501qa93w5svcgp03yf98mj"; depends=[multcomp Rcmdr]; }; @@ -2673,23 +2781,22 @@ in with self; { RcmdrPlugin_steepness = derive2 { name="RcmdrPlugin.steepness"; version="0.3-2"; sha256="1na98sl42896y7yklaj07sn88lj6p6ik7gwy9ffaxzicqaa8plgf"; depends=[Rcmdr steepness]; }; RcmdrPlugin_survival = derive2 { name="RcmdrPlugin.survival"; version="1.1-1"; sha256="0hgf52pk81wii2jfw69csapm4gw7xrp1cm08b9n2d29chgw0gww6"; depends=[date Rcmdr survival]; }; RcmdrPlugin_temis = derive2 { name="RcmdrPlugin.temis"; version="0.7.8"; sha256="0sgh2nqmlxsa6nzwdcdpad1q1mwwm6nb4xqpx4wj5afyisq2fbwr"; depends=[ca lattice latticeExtra NLP R2HTML Rcmdr RColorBrewer slam stringi tcltk2 tm zoo]; }; - Rcoclust = derive2 { name="Rcoclust"; version="0.1.1"; sha256="1f4li4pr1cl0nnq21rbk1qksn44zl2p65w9zs6k9k4mb050cyjqy"; depends=[]; }; Rcolombos = derive2 { name="Rcolombos"; version="2.0.2"; sha256="0l92icjqqm5fxafqwd09lnmv5x6kvjdg8cphlm37q86nslwr5rkk"; depends=[httr]; }; Rcplex = derive2 { name="Rcplex"; version="0.3-3"; sha256="0abmrqphrpdlc831hwbwx15z4vdgn385kxhnqlbb9v0sjmfyszsl"; depends=[slam]; }; - Rcpp = derive2 { name="Rcpp"; version="0.12.10"; sha256="108p485agxwgmnl9p54vsyy94w96lcimlk08v71ddm77gfl13y2f"; depends=[]; }; + Rcpp = derive2 { name="Rcpp"; version="0.12.11"; sha256="0zwwhlfqbr6kkr0l2lmjfhpc1ndxi58inviw7s7zjp5lbcksx35x"; depends=[]; }; Rcpp11 = derive2 { name="Rcpp11"; version="3.1.2.0"; sha256="1x6n1z7kizagr5ymvbwqb7nyn3lca4d4m0ks33zhcn9gay6g0fac"; depends=[]; }; RcppAPT = derive2 { name="RcppAPT"; version="0.0.3"; sha256="0q1iwhf1rafzr6d7pjbxs0ii0anbfrzrl1kpz1ka5yvjw39s3kr8"; depends=[Rcpp]; }; RcppAnnoy = derive2 { name="RcppAnnoy"; version="0.0.8"; sha256="14hw9nrqwcqx2xwam03wfxk07qg648gp0cnk76c4knpr6pmad9sx"; depends=[Rcpp]; }; - RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.7.800.2.0"; sha256="025lh504nw7ir1f2xsqnvfkq9rg0rb2xzfn3a2s0b2a9snqdzzwr"; depends=[Rcpp]; }; + RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.7.900.2.0"; sha256="01qsff2p1fp5i9lq7rsykrskgr6smz24ddspbl5ad9a8rkmczwyv"; depends=[Rcpp]; }; RcppBDT = derive2 { name="RcppBDT"; version="0.2.3"; sha256="0gnj4gz754l80df7w3d5qn7a57z9kq494n00wp6f7vr8aqgq8wi1"; depends=[BH Rcpp]; }; RcppBlaze = derive2 { name="RcppBlaze"; version="0.1.1"; sha256="0r6mzsm2gq77i8cylcvgg7hn0399d3v11wlf89v559vslkv2b2m0"; depends=[BH Matrix Rcpp]; }; - RcppCCTZ = derive2 { name="RcppCCTZ"; version="0.2.1"; sha256="0895cc1rzppniakvrl1r6k4c3vm45ppihv3vwvf5x062ag34yqsd"; depends=[Rcpp]; }; + RcppCCTZ = derive2 { name="RcppCCTZ"; version="0.2.3"; sha256="0cb04filbr0mymcg891lc0dw2b3fnjmhn8z50xcilb3v72ccrvqg"; depends=[Rcpp]; }; RcppCNPy = derive2 { name="RcppCNPy"; version="0.2.6"; sha256="0j2sj1yzpqmw6krjfyjklw4pmkdqdsnyvlfqbic0w1h8gs1mq6yb"; depends=[Rcpp]; }; RcppClassic = derive2 { name="RcppClassic"; version="0.9.6"; sha256="1xhjama6f1iy7nagnx1y1pkqffrq8iyplllcar24vxr0zirgi1xi"; depends=[Rcpp]; }; RcppClassicExamples = derive2 { name="RcppClassicExamples"; version="0.1.1"; sha256="0shs12y3gj5p7gharjik48dqk0fy4k2jx7h22ppvgbs8z85qjrb8"; depends=[Rcpp RcppClassic]; }; RcppDE = derive2 { name="RcppDE"; version="0.1.5"; sha256="1zgz8h7d7jjml9hm164y9wrsgcb1fymp3ipxp235fmk44lbrwpcw"; depends=[Rcpp RcppArmadillo]; }; RcppDL = derive2 { name="RcppDL"; version="0.0.5"; sha256="1gii00bna6k9byaax7gsx42dv1jjnkrp4clbmdq59ybq3vkvw8z2"; depends=[Rcpp]; }; - RcppEigen = derive2 { name="RcppEigen"; version="0.3.2.9.1"; sha256="1ih940yjbc530cmpl6kx1jic7pz2ps1w5vrvy32qizh6m5s3lk7x"; depends=[Matrix Rcpp]; }; + RcppEigen = derive2 { name="RcppEigen"; version="0.3.3.3.0"; sha256="0zz9v0f8nnlvhhqv91lkyfblvjnmav84l89mr6vmbqjc2hzqd3n8"; depends=[Matrix Rcpp]; }; RcppExamples = derive2 { name="RcppExamples"; version="0.1.8"; sha256="15iw2vx6ygb03siq743418whhqvfrxk2i4nqn7p9yg1m3jwafxna"; depends=[Rcpp]; }; RcppFaddeeva = derive2 { name="RcppFaddeeva"; version="0.1.0"; sha256="1rah18sdfmbcxy83i7vc9scrwyr34kn9xljkv9pa31js68gn2jrl"; depends=[knitr Rcpp]; }; RcppGSL = derive2 { name="RcppGSL"; version="0.3.2"; sha256="0fg13va124shkyy6g1fwblld1r4vdgxscab64kszyjivkjsb2lw1"; depends=[Rcpp]; }; @@ -2697,6 +2804,7 @@ in with self; { RcppHMM = derive2 { name="RcppHMM"; version="1.0.1"; sha256="10ssg2558s6cw6f6adzpw76qcsizbllc70y1s8vbhb2xkc26d1cn"; depends=[Rcpp]; }; RcppHoney = derive2 { name="RcppHoney"; version="0.1.6"; sha256="1llbs6x4qcvgnlmnd391s1j9lqvybnnq3d4gjwyyc8vy2i5jr28c"; depends=[Rcpp]; }; RcppMLPACK = derive2 { name="RcppMLPACK"; version="1.0.10-6"; sha256="0vjx6azp3sny6nv5k1cs6vk61hmbllqw8mgvi7zn15p7ilmhsyyi"; depends=[BH Rcpp RcppArmadillo]; }; + RcppMsgPack = derive2 { name="RcppMsgPack"; version="0.1.1"; sha256="05kk3yd52zk9hn1jzii4hbrxcy3ak0rr189pqjcyrsfqrxxq87nw"; depends=[Rcpp]; }; RcppNumerical = derive2 { name="RcppNumerical"; version="0.3-1"; sha256="1b88iz0f13w148jrmd3qdkagycs7w3yr82y4zgn123kp17y7vvny"; depends=[Rcpp RcppEigen]; }; RcppOctave = derive2 { name="RcppOctave"; version="0.18.1"; sha256="1b2mwnsx799a86hdpkqy6l1m048g8hqz57l70siybkxnlaib3z0f"; depends=[digest pkgmaker Rcpp stringr]; }; RcppParallel = derive2 { name="RcppParallel"; version="4.3.20"; sha256="1hc325hj214s61694iy4j3ly5zkya25h92hki29n3562qiirpb0g"; depends=[BH]; }; @@ -2707,20 +2815,25 @@ in with self; { RcppSMC = derive2 { name="RcppSMC"; version="0.1.5"; sha256="0vzibl1ck0cxl9nzx2829ikxvp2bcndq7h0agzr53i089168rr8s"; depends=[Rcpp]; }; RcppShark = derive2 { name="RcppShark"; version="3.1.1"; sha256="0dy6zksxcsbzjyz0f147rk2amwjsrjdcyl6jn767pw9ij9vdzh6r"; depends=[BH checkmate Rcpp]; }; RcppStreams = derive2 { name="RcppStreams"; version="0.1.1"; sha256="0sa0ndnfm89f8lh3ba6jf3gxaan1g97dhlzbmpkwqj22frgggqjw"; depends=[BH Rcpp]; }; - RcppTOML = derive2 { name="RcppTOML"; version="0.1.2"; sha256="05fm396frx5zlrxy7kddnwj0wv29jk33x8s01bqfjc1yhaxv17vx"; depends=[Rcpp]; }; + RcppTOML = derive2 { name="RcppTOML"; version="0.1.3"; sha256="0krw4104m8drgyf53aq22kl5q0abrd0y4j1fvrwsj1dkbkybas05"; depends=[Rcpp]; }; RcppXts = derive2 { name="RcppXts"; version="0.0.4"; sha256="143rhz97qh8sbr6p2fqzxz4cgigwprbqrizxpkjxyhq8347g8p4i"; depends=[Rcpp xts]; }; RcppZiggurat = derive2 { name="RcppZiggurat"; version="0.1.3"; sha256="0s82haf96krr356lcf978f229np6w0aihm2qxcnlm0w3i02gzh3x"; depends=[Rcpp RcppGSL]; }; + Rcrawler = derive2 { name="Rcrawler"; version="0.1.1"; sha256="1kg0zp93sq359mkb45shxb6clr1xvfvbn09zcg8439k47sq8mm5k"; depends=[data_table doParallel foreach httr rJava xml2]; }; + Rcriticor = derive2 { name="Rcriticor"; version="1.1"; sha256="0imhzf55w3fvfhrpjppkaxndb56bmpqnkibkq9li9g9i7zda2q8w"; depends=[]; }; Rcsdp = derive2 { name="Rcsdp"; version="0.1.55"; sha256="1sskjf2vv5alnwirz676d8yphzk2a69wkghhkpxb8my1rjlfdgaw"; depends=[]; }; Rcssplot = derive2 { name="Rcssplot"; version="0.2.0.0"; sha256="0pv1yzpsc68bahfxh5h79xmh798a22nk6i88gj1s81sp7l5fbqlm"; depends=[]; }; + Rd2md = derive2 { name="Rd2md"; version="0.0.2"; sha256="07j1nnsk5nyl8kvgvh9f684g6bhc01jiq1fcmq2pnpx57jdzfbpi"; depends=[knitr]; }; Rd2roxygen = derive2 { name="Rd2roxygen"; version="1.6.2"; sha256="1hkqy97mh68yzkh4bawjrgf1rlhkh3jz2ky84rg3wgz1mkvrrsx2"; depends=[formatR roxygen2]; }; Rdice = derive2 { name="Rdice"; version="1.0.0"; sha256="1xibvm690808p2g3jch7rh1825yrpgln2hjfclgxjwn822qvs4xr"; depends=[data_table]; }; Rdistance = derive2 { name="Rdistance"; version="1.3.2"; sha256="1ajmr58lgc74727jiydfrh4j6ra7vq8hp8nm3l2s3g2mc8n1mqk5"; depends=[]; }; Rdpack = derive2 { name="Rdpack"; version="0.4-20"; sha256="1b1vikh8py4lvf6w90919y8f5aq9xyhv2pprfyzfx0671k99cz6z"; depends=[bibtex gbRd]; }; + Rdrools = derive2 { name="Rdrools"; version="1.0.1"; sha256="0yrk4z4i75vq9v3d2bic4r7rf56r3m6lzkjm6vkqp0p8s5qfpwaz"; depends=[Rdroolsjars rJava]; }; + Rdroolsjars = derive2 { name="Rdroolsjars"; version="1.0.1"; sha256="1l9bc1bwpj10irr973hzkhr04i1f3g998n8hcl2k2i9kgv1naqmz"; depends=[rJava]; }; Rdsdp = derive2 { name="Rdsdp"; version="1.0.4-2"; sha256="05bk6yqvhzvyfzga1dz34w68nlwl2dc8bvhh3ghd07a61fsnkg4x"; depends=[]; }; Rdsm = derive2 { name="Rdsm"; version="2.1.1"; sha256="07fc6c2hv0vvg15va552y54cla1mrqsd75w3zh02vc7yd226l4rj"; depends=[bigmemory]; }; Rdtq = derive2 { name="Rdtq"; version="0.1"; sha256="114pyf95nl132014ygn84xi41c2zf1ii2wfgd1acwnnmfzvdw24s"; depends=[Matrix Rcpp]; }; ReCiPa = derive2 { name="ReCiPa"; version="3.0"; sha256="019vlvgxnqqlwghxygfqggzp2b4x2pqzdrbhaa703zdhm58k0n1g"; depends=[]; }; - ReIns = derive2 { name="ReIns"; version="1.0.3"; sha256="16cgcacdnvfg6cbhfjh3g3dj22bdbbn7yllj1afq04lbjbplaydw"; depends=[doParallel foreach Rcpp survival]; }; + ReIns = derive2 { name="ReIns"; version="1.0.4"; sha256="1dyj95grwwb2nd0xa3631h3ahqi9zw08jr406aq8hq51wd4aq054"; depends=[doParallel foreach Rcpp survival]; }; ReacTran = derive2 { name="ReacTran"; version="1.4.2"; sha256="1yc0k3wgg4yb6cqmjkyl25sfkbfcfxi5ria106w5jyx7dr5lfvdi"; depends=[deSolve rootSolve shape]; }; RealVAMS = derive2 { name="RealVAMS"; version="0.3-3"; sha256="1isjk6mzhlhmvz8sv5wlh3w6s53yk3f41xxji4j3hwbaw5q9a73m"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; }; Rearrangement = derive2 { name="Rearrangement"; version="2.1"; sha256="0q253nj62rl65vjsq6503r80qa2j35wac8lv7ydp9w260p28z923"; depends=[quantreg]; }; @@ -2732,7 +2845,8 @@ in with self; { RefManageR = derive2 { name="RefManageR"; version="0.13.1"; sha256="1yw3fbiis1gl7ih66b4vjr299xy3w164irmmdfsqr79n9h3p5kv7"; depends=[bibtex httr lubridate plyr RCurl RJSONIO stringr XML]; }; RegClust = derive2 { name="RegClust"; version="1.0"; sha256="1d9w74phw4fgafglc18j7dpmln96fvxnf1kdc9zddgj90p8yfx63"; depends=[]; }; RegressionFactory = derive2 { name="RegressionFactory"; version="0.7.2"; sha256="1g23paq42xiiqavikbrflwmr8ikls9z97v1xpgg16pb88svdyayc"; depends=[]; }; - ReinforcementLearning = derive2 { name="ReinforcementLearning"; version="1.0.0"; sha256="171zd62zsnahnx9chb51diqw739i4rd4jv80q1mzhxzszzp286jj"; depends=[data_table ggplot2 hash]; }; + RegularizedSCA = derive2 { name="RegularizedSCA"; version="0.4.2"; sha256="11j6g13als34bh6fdbdda4hh6xcy8b7j748kjlpwxhh7kjm7n1p5"; depends=[ggplot2 gtools psych RGCCA]; }; + ReinforcementLearning = derive2 { name="ReinforcementLearning"; version="1.0.1"; sha256="12qah22gq9360mw7z2bpcaqyqan10qqbnzyqmkafbkb5jq6fnfx9"; depends=[data_table ggplot2 hash]; }; RelValAnalysis = derive2 { name="RelValAnalysis"; version="1.0"; sha256="1jl1gfj44gfkmc1yp6g5wwn4miydwpvxwrg76rnkv9454zrc5pvp"; depends=[zoo]; }; Relatedness = derive2 { name="Relatedness"; version="1.4"; sha256="0ahd053sbqwjq93l8m2gq7fqqc9vvgnndz4j8pmgswwcah8h77c8"; depends=[]; }; Reliability = derive2 { name="Reliability"; version="0.0-2"; sha256="12zsicgbjqih3grbs62pw37x8wlkmnyc7g0yz6bqnfb4ym2yb7fg"; depends=[]; }; @@ -2749,14 +2863,14 @@ in with self; { ResourceSelection = derive2 { name="ResourceSelection"; version="0.3-2"; sha256="08b1aa3183k1y30dwabnd6x353mdp2sn5b908cpv84bs3fdzlrdp"; depends=[MASS Matrix pbapply]; }; RevEcoR = derive2 { name="RevEcoR"; version="0.99.3"; sha256="1nym263ynjdir5kxv35jnmki9mshlplq0sk3xnjd4ac6f1cfbfqj"; depends=[gtools igraph magrittr Matrix plyr purrr stringr XML]; }; Rexperigen = derive2 { name="Rexperigen"; version="0.2.1"; sha256="158ksnd1gvzq7ii0ys2v0wrfnr001hni0i8m77p1fn1arixgmqdw"; depends=[digest jsonlite RCurl]; }; - Rfacebook = derive2 { name="Rfacebook"; version="0.6.11"; sha256="1si21in7ykv4532xsz12v9nwzfj142bnbf14qc74fbp1p087k6c0"; depends=[httpuv httr rjson]; }; - Rfast = derive2 { name="Rfast"; version="1.7.5"; sha256="09nxyv2cb7z79nkcnb5wm58930yfhk6ndvznlqfg6xlihx0yjyq6"; depends=[Rcpp RcppArmadillo RcppZiggurat]; }; + Rfacebook = derive2 { name="Rfacebook"; version="0.6.15"; sha256="0hp2mbm0hnyasizszvh5x9hv7z2q633zck1a1gvk36nbxb1shx7c"; depends=[httpuv httr rjson]; }; + Rfast = derive2 { name="Rfast"; version="1.8.1"; sha256="1d430izm7kc4ppihwpqydc4bwpky7rr8625yr275q0pfj5p2iswq"; depends=[Rcpp RcppArmadillo RcppZiggurat]; }; Rfit = derive2 { name="Rfit"; version="0.23.0"; sha256="1gxxipbh7mskrqwrpk1gf1dn8mp3l1v4hgmzii44bppffnxs7slp"; depends=[]; }; Rfmtool = derive2 { name="Rfmtool"; version="1.2"; sha256="1q359574fspwxy1lmlzfqk0cg3qih8jzh3rk74qr22jw0sp7bcyw"; depends=[]; }; Rga4gh = derive2 { name="Rga4gh"; version="0.1.1"; sha256="0h5y722blkkwn6ask6vjnhl22v9l6511chdm50ig6xcs5dvjam2m"; depends=[httr jsonlite]; }; - Rgb = derive2 { name="Rgb"; version="1.5.0"; sha256="03m74ri3lg5q8215wlwbv08l90vhjxq3al36vpkpkys9fc1c9sbz"; depends=[]; }; - Rgbp = derive2 { name="Rgbp"; version="1.1.1"; sha256="14xban9d182fhss9ppr13scih7hrbjd9s231avi4gkg79cz87s0s"; depends=[mnormt sn]; }; - Rglpk = derive2 { name="Rglpk"; version="0.6-2"; sha256="1dzcc9dwdvrs1g9mgk5z9qdxn3iq04s91ak881z3wrqvxhp42cgr"; depends=[slam]; }; + Rgb = derive2 { name="Rgb"; version="1.5.1"; sha256="136mhxwnw7jkfnmb5gxjr2xfnly79xfp6a6f9c8lj7s6wrgkl02a"; depends=[]; }; + Rgbp = derive2 { name="Rgbp"; version="1.1.2"; sha256="1g5v22zjgykzcg5jk7fi03xfn3jzz1yf38izjzhx2433d97hasr7"; depends=[mnormt sn]; }; + Rglpk = derive2 { name="Rglpk"; version="0.6-3"; sha256="03v4cav465dkznm7d3bwwpx3qprhq25sp1rb5ncx2lka6inr1vzd"; depends=[slam]; }; Rgnuplot = derive2 { name="Rgnuplot"; version="1.0.3"; sha256="0mwpq6ibfv014fgdfsh3wf8yy82nzva6cgb3zifn3k9lnr3h2fj7"; depends=[]; }; RgoogleMaps = derive2 { name="RgoogleMaps"; version="1.4.1"; sha256="0fsmlnhl4kw2j4972kfanzw9njhnzk695gsyw8g6yppsmz2clcaq"; depends=[png]; }; Rhpc = derive2 { name="Rhpc"; version="0.15-244"; sha256="1y83sshzsmsnm1m341x0ymmyz87dc5cjkbnr0v975p292rjqz3pd"; depends=[]; }; @@ -2764,19 +2878,20 @@ in with self; { RidgeFusion = derive2 { name="RidgeFusion"; version="1.0-3"; sha256="10llmrsfpcqrkcbw7zj44kvfy7ywn9rk49n7zplilz8h94zzcmjv"; depends=[mvtnorm]; }; Ridit = derive2 { name="Ridit"; version="1.1"; sha256="02cni6hzf1bsns7vi8vklnhc0pfb5vwqhjnnfnjnnaxpzpsbvdfn"; depends=[]; }; Rip46 = derive2 { name="Rip46"; version="1.0.2"; sha256="0wfp6fm5mgmjqjkn0c5hvjd95yn4zcv0s8xc5294qf5jqxp8b1w7"; depends=[Rcpp]; }; + Risk = derive2 { name="Risk"; version="1.0"; sha256="1i42xcc699syj108mvgklwb30wkf9c9jrg5rmd2ypnqk9mnyg2fg"; depends=[]; }; RiskPortfolios = derive2 { name="RiskPortfolios"; version="2.1.1"; sha256="1kn0vb4nhm3bxlmk5y2nl5m7a7hdvz3nz0yp8rdigpl6b2dp79w1"; depends=[MASS nloptr quadprog]; }; Ritc = derive2 { name="Ritc"; version="1.0.2"; sha256="03smhxjhjfkc9pxhlgg54b6v2jznpmnws8373qpvn9a9ky5bcq2l"; depends=[minpack_lm]; }; Rivivc = derive2 { name="Rivivc"; version="0.9"; sha256="0gl3040pp9nqm4g2ympnx80z64zfnn1hfsxka8ynd2cqhjn3b5i1"; depends=[signal]; }; Rjpstatdb = derive2 { name="Rjpstatdb"; version="0.1"; sha256="0iwgsp3mblp7bsx88wfpqn09y1xrkingfkm3z9jsi2bwrnrjc2iv"; depends=[RCurl XML]; }; Rknots = derive2 { name="Rknots"; version="1.3.2"; sha256="1krhma8hy3l5lbm6d8rxjlj9jw1zrd16h4wy4p1clfa5vlhh3bwi"; depends=[bio3d rgl rSymPy]; }; Rlab = derive2 { name="Rlab"; version="2.15.1"; sha256="1pb0pj84i1s4ckdmcglqxa8brhjha4y4rfm9x0na15n7d9lzi9ag"; depends=[]; }; - Rlabkey = derive2 { name="Rlabkey"; version="2.1.134"; sha256="1jdm3rpln4mjgs1hhl8074mnnfj376sfk7p0cz1pfd9ii0fidc88"; depends=[Rcpp RCurl rjson]; }; - Rlda = derive2 { name="Rlda"; version="0.1.0"; sha256="1gv3zfw1cmd44d1d4p6d3jp0l860jncblivq77w4m1papa24hhz0"; depends=[gtools Rcpp RcppArmadillo RcppProgress]; }; + Rlabkey = derive2 { name="Rlabkey"; version="2.1.135"; sha256="1gmwi30gl78psg5a34w0l5957vs7mb8pplgcwh7d5dszp92jw2xc"; depends=[Rcpp RCurl rjson]; }; + Rlda = derive2 { name="Rlda"; version="0.2.0"; sha256="10b2lzyybh4qbd95xy86cv75x51ar82agf15i8hp8qhw29gzfwi0"; depends=[doParallel foreach gtools Rcpp RcppArmadillo RcppProgress]; }; Rlibeemd = derive2 { name="Rlibeemd"; version="1.3.7"; sha256="0k2snw8a6h4dvbpl97fklvvbbqma4g9r0ksvh5ndyk4vqwyxy1na"; depends=[Rcpp]; }; Rlinkedin = derive2 { name="Rlinkedin"; version="0.2"; sha256="15sbiis1d0s466nqk1adjhflb01sb9kn25f4y6sagkdggvyz6b56"; depends=[httpuv httr XML]; }; Rlof = derive2 { name="Rlof"; version="1.1.1"; sha256="1px6ax2mr2agbhv41akccrjdrvp8a9lmhymp0cn8fjrib0ig8vql"; depends=[doParallel foreach]; }; Rmalschains = derive2 { name="Rmalschains"; version="0.2-3"; sha256="1gh0f385s1nq12mk6a5l3nj1gd2mc6jzd66lisnxbcip25s4b8pb"; depends=[Rcpp]; }; - RmarineHeatWaves = derive2 { name="RmarineHeatWaves"; version="0.15.1"; sha256="1r8hyvm680fcw0qq1k5i3wachy6xnl86vvaf3vz5hrq789x4xkh5"; depends=[dplyr ggplot2 lazyeval lubridate magrittr plyr raster tidyr zoo]; }; + RmarineHeatWaves = derive2 { name="RmarineHeatWaves"; version="0.15.7"; sha256="0dmmvvz7cpn378mji9hfmzr5xz99s3z0sd5anmidb6qzppkcxhks"; depends=[dplyr ggplot2 lazyeval lubridate magrittr plyr raster tidyr zoo]; }; Rmisc = derive2 { name="Rmisc"; version="1.5"; sha256="1ijjhfy3v91fspid77rrkc5dkcb2lav37wc3f4k5lwrn24wzy5y8"; depends=[lattice plyr]; }; Rmixmod = derive2 { name="Rmixmod"; version="2.1.1"; sha256="1m5yab7wq343bzg8xszbrlif3cd4d1x7xcqh82czkxbfni1gz7j7"; depends=[Rcpp]; }; RmixmodCombi = derive2 { name="RmixmodCombi"; version="1.0"; sha256="0cwcyclq143938wby0aj265xyib6gbca1br3x09ijliaj3pjgdqi"; depends=[Rcpp Rmixmod]; }; @@ -2786,7 +2901,7 @@ in with self; { RnavGraph = derive2 { name="RnavGraph"; version="0.1.8"; sha256="1fwzfy41gdr1aw1wg6dw04mxwwpp5s9x2inxyq3bc9s8bm1rlxih"; depends=[graph rgl scagnostics]; }; RnavGraphImageData = derive2 { name="RnavGraphImageData"; version="0.0.3"; sha256="1mrh0p2ckczw4xr1kfmcf0ri2h2fhp7fmf8sn2h1capmm12i1q8f"; depends=[]; }; RndTexExams = derive2 { name="RndTexExams"; version="1.4"; sha256="18zmdfq234k4bjj5rz6zjlkiyndbj5v2irjfl3w66vz38lk8sf6v"; depends=[CopyDetect data_table stringi stringr]; }; - RobAStBase = derive2 { name="RobAStBase"; version="1.0"; sha256="0s8hgvgqm6hf1nbhq1kj239f7zpchvzhds8281nfzlm5qzphylqj"; depends=[distr distrEx distrMod RandVar rrcov startupmsg]; }; + RobAStBase = derive2 { name="RobAStBase"; version="1.0.1"; sha256="17vfi0ia3z3s6x7frjk1alcgb0h73gwxy2n11kfl0k8w2fxgk49l"; depends=[distr distrEx distrMod RandVar rrcov startupmsg]; }; RobAStRDA = derive2 { name="RobAStRDA"; version="1.0.2"; sha256="1lyp2y38jnwv8ggrv9pdzprpf2gs62w1mpzwcqcbrmy7fzjsym0b"; depends=[]; }; RobLox = derive2 { name="RobLox"; version="1.0"; sha256="0y193xai0mfwpm6zhxgy21h4yrlqrpvwx84bj4xnr8ql87wznh7q"; depends=[Biobase distr distrMod lattice RandVar RColorBrewer RobAStBase]; }; RobLoxBioC = derive2 { name="RobLoxBioC"; version="0.9"; sha256="0ia7vn8x8whyp8kl7mpwd6fd0yv0y3pb1mppnh2329x7xdvcs5j4"; depends=[affy beadarray Biobase BiocGenerics distr lattice RColorBrewer RobLox]; }; @@ -2794,18 +2909,17 @@ in with self; { RobRSVD = derive2 { name="RobRSVD"; version="1.0"; sha256="07z5fw8j5lq7nyxgkvb9i4iwb5inddz2ib4m2bjx6q4c1ricpqz9"; depends=[]; }; RobRex = derive2 { name="RobRex"; version="0.9"; sha256="0ii539mjq462n1lbnyv3whl8b1agvhvlz31wwyz911gb40isl639"; depends=[ROptRegTS]; }; RobustAFT = derive2 { name="RobustAFT"; version="1.4-1"; sha256="180gmlinrpnk4ghl1xickbjkdqr7vb6qzmy6701xpji5k8g9il60"; depends=[robustbase survival]; }; - RobustEM = derive2 { name="RobustEM"; version="1.0"; sha256="1li9r3bk7zhpxljgqvr2zila8nb05nasvlzqlswwgi9443i740zi"; depends=[doParallel e1071 ellipse foreach ggplot2 mvtnorm]; }; RobustGaSP = derive2 { name="RobustGaSP"; version="0.5.3"; sha256="1kzi5mvz78gxwrg1z822pkqzmqwvw73x2gh2yfsaxcwy2d7nr2mx"; depends=[Rcpp RcppEigen]; }; RobustRankAggreg = derive2 { name="RobustRankAggreg"; version="1.1"; sha256="1pslqyr1lji1zvcrwyax4zg2s81p1jnhfldz8mdfhsp5y7v8iar3"; depends=[]; }; RockFab = derive2 { name="RockFab"; version="1.2"; sha256="1b5mhfll5vmqwl4pblmclyx9604vn07jyza02rm0jcsx915ms8sc"; depends=[EBImage rgl]; }; Rodam = derive2 { name="Rodam"; version="0.1.2"; sha256="0fxsjzillr2v3sxbph13q3wrly6dx6m8rm276qzfvx1md044z14y"; depends=[RCurl]; }; Rook = derive2 { name="Rook"; version="1.1-1"; sha256="00s9a0kr9rwxvlq433daxjk4ji8m0w60hjdprf502msw9kxfrx00"; depends=[brew]; }; - RootsExtremaInflections = derive2 { name="RootsExtremaInflections"; version="1.0"; sha256="1vcbjxx1yfla71fmmf5w8dqp0vqw93dxsjsvz0vj28bfqmkmh554"; depends=[]; }; + RootsExtremaInflections = derive2 { name="RootsExtremaInflections"; version="1.1"; sha256="11wybhw180r4zaqwfs301zwzfzprwwl4hiyhjj78l3mnxgdnmwz7"; depends=[doParallel foreach iterators]; }; Rothermel = derive2 { name="Rothermel"; version="1.2"; sha256="0zrz2ck3q0vg0wpa4528rjlrfnvlyiy0x1gr5z1aax1by7mdj82s"; depends=[ftsa GA]; }; RoughSetKnowledgeReduction = derive2 { name="RoughSetKnowledgeReduction"; version="0.1"; sha256="0zn6y2rp78vay9zwijpzhjpyq1gmcsa13m9fcsxkd1p2c8g5rbmf"; depends=[]; }; RoughSets = derive2 { name="RoughSets"; version="1.3-0"; sha256="08yz19ngipqpzfam6ivwsfnbg8ps2wwyi6djprmd7kfj0n43ab62"; depends=[Rcpp]; }; Rpdb = derive2 { name="Rpdb"; version="2.2"; sha256="0gf6qab05a3ky8skbbjiadizi1gs4pcw3zp25qj5gn82lb6382pd"; depends=[rgl]; }; - RpeakChrom = derive2 { name="RpeakChrom"; version="0.1.0"; sha256="0l7lgscj2lsbm2k1lmzwc15k533hkqz5yhyzz6m2ngg6qf8fhsy3"; depends=[ggplot2 minpack_lm pracma ptw]; }; + RpeakChrom = derive2 { name="RpeakChrom"; version="1.1.0"; sha256="1r8f6knpz83arz2kabizx5yyh1myg0h310qlwh8rmy88cdxi1ps9"; depends=[ggplot2 minpack_lm pracma ptw]; }; Rphylip = derive2 { name="Rphylip"; version="0.1-23"; sha256="0kpqmik4bhr74ib8yvaavr10z4v4w3li5vibdhz7lvz35jfirg9r"; depends=[ape]; }; Rphylopars = derive2 { name="Rphylopars"; version="0.2.9"; sha256="19y0j5vh82sa9jigylxhv0s0hgjyhx3xq4blvk55jhpj8v7iyiky"; depends=[ape doBy geiger MASS Matrix mvnmle phylolm phytools Rcpp RcppArmadillo]; }; Rpoppler = derive2 { name="Rpoppler"; version="0.1-0"; sha256="19nvv45ahp0c241p1xzlq0sq5qarqg66jw5f1anhqnfi2hi91hcm"; depends=[]; }; @@ -2817,7 +2931,7 @@ in with self; { Rserve = derive2 { name="Rserve"; version="1.7-3"; sha256="09rha4p86vak7ss721mwp5bm5ig09xam8zlqv63n9wf36v3kdmpn"; depends=[]; }; RsimMosaic = derive2 { name="RsimMosaic"; version="1.0.3"; sha256="0jlzrs9xxlpazvq3iw8znk0bd00bzlry7bgxsxq7xl23akizj0ji"; depends=[fields jpeg RANN]; }; Rsolnp = derive2 { name="Rsolnp"; version="1.16"; sha256="0w7nkj6igr0gi7r7jg950lsx7dj6aipgxi6vbjsf5f5yc9h7fhii"; depends=[truncnorm]; }; - Rsomoclu = derive2 { name="Rsomoclu"; version="1.7.2"; sha256="0b063b9jwnn7mansm5mbgqcfk8p596inf7l3r6fafvsjw5844b6l"; depends=[class kohonen Rcpp]; }; + Rsomoclu = derive2 { name="Rsomoclu"; version="1.7.4"; sha256="1a2x85r2q5h6951frq5d0kvvxyiw18riq9xbswg5g1yhs093yrrs"; depends=[kohonen Rcpp]; }; Rssa = derive2 { name="Rssa"; version="0.14"; sha256="0r51jw7fl0nxmly05dj85chw804vf8gmrkfs6yi59zh7fq7jsis6"; depends=[forecast lattice svd]; }; Rsurrogate = derive2 { name="Rsurrogate"; version="2.0"; sha256="1pjyhlxqi8mcbywa7qa1vxgxr5jca0nc9vm1bx53vr231wgnb7gf"; depends=[survival]; }; Rsymphony = derive2 { name="Rsymphony"; version="0.1-26"; sha256="0v51sjhggvl8i3ysslqcc4x84874nagxq2v68izs4hpvcpzn7268"; depends=[]; }; @@ -2840,13 +2954,14 @@ in with self; { Rwinsteps = derive2 { name="Rwinsteps"; version="1.0-1"; sha256="0kzngkan9vydibnr3xm4pyz4v6kz0r4h19f0ngqpri07fkhdsxzd"; depends=[]; }; RxCEcolInf = derive2 { name="RxCEcolInf"; version="0.1-3"; sha256="04d6ffl4qs2vjbk0ibvyq17i2l26qnvxr72s6p3f8q4px33rh4kh"; depends=[lattice MASS MCMCpack mvtnorm]; }; RxODE = derive2 { name="RxODE"; version="0.5-6"; sha256="06y4cdkx93ldhdbs5iaiad7hzlbnsjnimmnmvcnfv4gbicxjq9c5"; depends=[]; }; - RxnSim = derive2 { name="RxnSim"; version="1.0.1"; sha256="17agz3kw7pj4mpl25y1n8l9lqfj63wn70rqpdkcpnx7j6s6933vx"; depends=[data_table fingerprint rcdk rJava]; }; + RxnSim = derive2 { name="RxnSim"; version="1.0.2"; sha256="0sky3x2gpgw8zbgqkf77w3v66i7bgssyqbradf4dl5f66d0kx4cg"; depends=[data_table fingerprint rcdk rJava]; }; Ryacas = derive2 { name="Ryacas"; version="0.3-1"; sha256="13qvd5gpdrjgzf6isk3529khd02852y3ajmpp5vl8vn9k1jxp86v"; depends=[Rcpp XML]; }; Rz = derive2 { name="Rz"; version="0.9-1"; sha256="1cpsmfxijrfx06ydpjzbaak7gkad4jjk1ph9453l9zly1cwzgspj"; depends=[foreign formatR ggplot2 memisc psych RGtk2]; }; S2sls = derive2 { name="S2sls"; version="0.1"; sha256="0qq1rff2cdgrm5rj69jxgrl71i0wmzyn424fdvcg02zdv9ggqhd3"; depends=[spanel]; }; SACCR = derive2 { name="SACCR"; version="2.1"; sha256="184mw9q25b06zar4ii3na7c4x28ly922d5csfqkw9b07mdp81k3h"; depends=[data_tree jsonlite Trading]; }; SACOBRA = derive2 { name="SACOBRA"; version="0.7"; sha256="12aj4ghs3i3ks749z0l95ipv8gi33xgggkyjf21zvnzmb1dgphys"; depends=[testit]; }; SADEG = derive2 { name="SADEG"; version="1.0.0"; sha256="02ilykbdanx1isbd80c43hqpzkckq6dg40y0rklcnck6v96qky3n"; depends=[]; }; + SADISA = derive2 { name="SADISA"; version="1.0"; sha256="0v68k6pwcr2hfsffkcrvpgfwciwir2jsg3q1kvr0ka5iiizpliz3"; depends=[DDD pracma subplex]; }; SAENET = derive2 { name="SAENET"; version="1.1"; sha256="13mfmmjqbkdr6j48smdlqvb83dkb34kx3i16gx0gmmafk3avdaxx"; depends=[autoencoder neuralnet]; }; SAFD = derive2 { name="SAFD"; version="1.0-1"; sha256="1h9hw66irq2c1ciz502r5h8h9hx32jwhrp9dwl91qlknlj6s1bxr"; depends=[]; }; SAGA = derive2 { name="SAGA"; version="2.0.0"; sha256="022q8hagc38mfakh02cyvf49as2rps1my9iy2xcg8qhrr2czzmy8"; depends=[plotrix viridis]; }; @@ -2865,6 +2980,7 @@ in with self; { SAVE = derive2 { name="SAVE"; version="1.0"; sha256="1m9rrga8x00hlvn0c1jcz6yz14pdm6h3dq14905mq49sw63c7zll"; depends=[coda DiceKriging]; }; SBRect = derive2 { name="SBRect"; version="0.26"; sha256="16g0ciy9q9irypsl8x36i0lavl41j3af13r2si0by8q6wj56pxi4"; depends=[rJava]; }; SBSA = derive2 { name="SBSA"; version="0.2.3"; sha256="1v23lzzziyjlvgn5p2n1qcq2zv9hsyz2w15lbnfi5wvinxhlg8sc"; depends=[Rcpp RcppArmadillo]; }; + SCAT = derive2 { name="SCAT"; version="0.3.0"; sha256="1zgf4lwzgs0w3ynf6grs212mmmxihqz8cpwk65g08nna5mxzxq06"; depends=[]; }; SCBmeanfd = derive2 { name="SCBmeanfd"; version="1.2.2"; sha256="045498q71zqgcg8p3665vwd99a8ybf21y0sa7y8316zw66wb1caz"; depends=[boot KernSmooth]; }; SCEPtER = derive2 { name="SCEPtER"; version="0.2-1"; sha256="19sphwcsj2z05dvpmz7vgxykzyghkfn79jwqvk6d66daman679mv"; depends=[MASS]; }; SCEPtERbinary = derive2 { name="SCEPtERbinary"; version="0.1-1"; sha256="0rab0widfndx94dn1nchhs06q0d57vq2n3xy79p130l9rgp9v489"; depends=[MASS SCEPtER]; }; @@ -2872,9 +2988,9 @@ in with self; { SCI = derive2 { name="SCI"; version="1.0-2"; sha256="1jvzkdv15ifgf6a3zjfzzcgw2y2vg0wp7yhiamiaqp8xkm142w49"; depends=[fitdistrplus lmomco]; }; SCMA = derive2 { name="SCMA"; version="1.2"; sha256="0z4f8p1d0ry35g5a13blc8w73vid7nwdn2w9d3i0nfb05fj7i5qf"; depends=[]; }; SCORER2 = derive2 { name="SCORER2"; version="0.99.0"; sha256="1a28wga69ip9s98ch2dqgl0qkwa3w6frmaqcvhclc360ik813mxq"; depends=[]; }; - SCRSELECT = derive2 { name="SCRSELECT"; version="1.1-2"; sha256="18vdiijcj4k34k3yvcxj4gv3f15lhyazyf1z8iyic2yrj6xbhnq0"; depends=[mvtnorm]; }; - SCRT = derive2 { name="SCRT"; version="1.2"; sha256="0ihrvhpapyiyf31hqbj1yj4kwlbjnv3zqra4f57fm39jyr444jf3"; depends=[]; }; - SCVA = derive2 { name="SCVA"; version="1.2"; sha256="0kn0v85n4lxl631sa279cfrs6q28a3hw278dcmkqbjz3qqyna1dk"; depends=[]; }; + SCRSELECT = derive2 { name="SCRSELECT"; version="1.2-2"; sha256="0cq4hhxcwpxz9v0jk18aza29v7gdppgr1va0mglzkvd4hmwwrz19"; depends=[mvtnorm]; }; + SCRT = derive2 { name="SCRT"; version="1.2.1"; sha256="09d9ghviskg1ifjgqcgdlcp1p3w09bpkixvbxqr4354rq31kwf21"; depends=[]; }; + SCVA = derive2 { name="SCVA"; version="1.2.1"; sha256="1ixy4ybw3c9w6q8csjv27r5f9x6988zrbr2a3yybhyw8xmkszc4v"; depends=[]; }; SCperf = derive2 { name="SCperf"; version="1.0"; sha256="1v9l7d9lil2gy5bw6i7bzc24808m063xaw2spl005j0a9rh4ag41"; depends=[]; }; SDD = derive2 { name="SDD"; version="1.2"; sha256="0wzgm1hgjv5s00bpd7j387qbvn5zvyrrd5fr2rgyll4cw9p4sd33"; depends=[Hmisc rgl rpanel sm tseries]; }; SDDE = derive2 { name="SDDE"; version="1.0.1"; sha256="14vql1bypn409w9xcx1jdzff6apiagcz2wng3y24h3mk7yjv9bzy"; depends=[doParallel foreach igraph iterators]; }; @@ -2886,30 +3002,32 @@ in with self; { SEAsic = derive2 { name="SEAsic"; version="0.1"; sha256="1mg01sag6n1qldjvmvbasac86s7sbhi4k99kdkav2hdh6n9jg467"; depends=[]; }; SECP = derive2 { name="SECP"; version="0.1-4"; sha256="0a4j0ggrbs0jzcph70hc4f5alln4kdn2mrkp3jbh321a6494kwl1"; depends=[SPSL]; }; SEER2R = derive2 { name="SEER2R"; version="1.0"; sha256="0lk0kkp8sv3nl19zwqd7449mmjxsj3pqpzdmqf70qf8xh2pqyvzd"; depends=[]; }; - SEERaBomb = derive2 { name="SEERaBomb"; version="2016.2"; sha256="0fbgw1xyadqdl8bpf0hydrxjh43z4b0hjdk304fg6igg2v186fp5"; depends=[DBI dplyr ggplot2 LaF mgcv plyr Rcpp reshape2 rgl RSQLite scales XLConnect]; }; + SEERaBomb = derive2 { name="SEERaBomb"; version="2017.1"; sha256="14i0ppcwc10n68ydg5w0wf2x4krj49h5hncg1nz20szl6x8qfdzb"; depends=[DBI dplyr ggplot2 LaF mgcv plyr Rcpp reshape2 rgl RSQLite scales XLConnect]; }; SEL = derive2 { name="SEL"; version="1.0-2"; sha256="1nrk0fx6ff330abq8askvp0790xnfv00m3sraqcr32hciw6ks421"; depends=[lattice quadprog]; }; SEMID = derive2 { name="SEMID"; version="0.2"; sha256="1897yjshcbidnrhr575sicsmhzyhjbagv0dp9g3nsv78syb6dr2p"; depends=[igraph]; }; SEMModComp = derive2 { name="SEMModComp"; version="1.0"; sha256="1za67470f13z8jsy3z588c7iiiz993d3vjqrb8v9fann2r6sf1md"; depends=[mvtnorm]; }; SETPath = derive2 { name="SETPath"; version="1.0"; sha256="1dpgmki0dhph13h1fd3mbf308746wccgfz5g5gdm7bwbjnmjzd98"; depends=[]; }; SEchart = derive2 { name="SEchart"; version="0.1"; sha256="19gqcd6xzwg37nzc67p88ip4i0v2f59ds85xfw9qq8lybvdm76k2"; depends=[JM]; }; + SFS = derive2 { name="SFS"; version="0.1.1"; sha256="1dlgriddp998wzcgsbl11ngzflj1grh3ws5nw4s4hgim6vqls0rj"; depends=[Rcpp RcppArmadillo]; }; + SFtools = derive2 { name="SFtools"; version="0.1.0"; sha256="08k2ywkpk1pzp0qcwm7qx9gnv9hglspl9hrsrrfblagdpkw6rm2x"; depends=[doParallel ff wordspace]; }; SGCS = derive2 { name="SGCS"; version="2.6"; sha256="09czgfc0mg64qcigp36kjaf52zlmrpz3m2d1dp42d9hhlciliqf5"; depends=[spatstat]; }; SGL = derive2 { name="SGL"; version="1.1"; sha256="1wc430jqn3li102zpfmyyavfbab7x7ww9p89clxsndyigrrbjdr7"; depends=[]; }; - SGP = derive2 { name="SGP"; version="1.6-0.0"; sha256="02q9kbafnlrwyzrf5xv4lj89ifhmx1gj03jvlrhb9a4g04084w1z"; depends=[Cairo colorspace crayon data_table digest doParallel doRNG equate foreach gridBase gtools iterators jsonlite matrixStats quantreg randomNames RSQLite sn toOrdinal]; }; + SGP = derive2 { name="SGP"; version="1.7-0.0"; sha256="0jjrrza8s6sj3gmmldnyxshfmcaf8xhp4g50vc3rcwnkg1jhzkg8"; depends=[Cairo colorspace crayon data_table digest doParallel doRNG equate foreach gridBase gtools iterators jsonlite matrixStats quantreg randomNames RSQLite sn toOrdinal]; }; SGPdata = derive2 { name="SGPdata"; version="17.0-0.0"; sha256="1pjilyqwhgisz1iiy50l86dwc4dg3c8dzlpx7mm7n75049vzp2xq"; depends=[data_table]; }; SHELF = derive2 { name="SHELF"; version="1.2.3"; sha256="1d52a1yci9zq9zl2mkq9ji340jfa47w47br5gpapd84yk9d61llb"; depends=[ggExtra ggplot2 MASS shiny tidyr]; }; SHIP = derive2 { name="SHIP"; version="1.0.2"; sha256="0b83cclibdz1r7sz968nmca4najwgps9wrdlsh4gxrl7fq40k4ln"; depends=[]; }; SHLR = derive2 { name="SHLR"; version="1.0"; sha256="0anj2bfbax8kipn7cgjhr4ijjcipixm9lshafh19qbxag2li1891"; depends=[doParallel FactoMineR foreach geepack kinship2 MASS Matrix stringr]; }; - SIBER = derive2 { name="SIBER"; version="2.1.2"; sha256="13ag1z15gw5y0l3r011sq3rpla3pmhamswvy3klnj0n0mpa0r4yc"; depends=[hdrcde mnormt rjags spatstat viridis]; }; + SIBER = derive2 { name="SIBER"; version="2.1.3"; sha256="14ab9zid0i400kj924m2y5qgp2iibnpllhqw11rlmdf8j9cr7858"; depends=[dplyr ggplot2 hdrcde magrittr mnormt rjags spatstat_utils tidyr viridis]; }; SID = derive2 { name="SID"; version="1.0"; sha256="1446zy4rqbw0lpyhnhyd06dzv238dxpdxgmsk34hqv7g3j7q5h1w"; depends=[igraph Matrix pcalg RBGL]; }; - SIDES = derive2 { name="SIDES"; version="1.10"; sha256="13v4pdsaqah5v92fpc1lmsg5391igdys1l2frrw4432bvgm74rg9"; depends=[doParallel foreach MASS memoise multicool nnet survival]; }; + SIDES = derive2 { name="SIDES"; version="1.11"; sha256="1gmhfj44qdklsdklmg8p35lmvlgla8i881i3iaziblslyscbyw9f"; depends=[doParallel foreach MASS memoise multicool nnet survival]; }; SII = derive2 { name="SII"; version="1.0.3"; sha256="1k9mvz6g25qs351c0vx7n5h77kb6k833jrcww14ni59yc9jgvsyg"; depends=[]; }; SIMMS = derive2 { name="SIMMS"; version="1.0.2"; sha256="1phvphk7ir9zw77ycm27y4fin6wyxppsmb1cnm4xc83v1yq7lql4"; depends=[glmnet MASS survival xtable]; }; SIN = derive2 { name="SIN"; version="0.6"; sha256="0vq80m3vl8spdnlkwvwy0gk3ziyybqzjp3scnfdcpn942ds7sgg9"; depends=[]; }; - SIS = derive2 { name="SIS"; version="0.8-3"; sha256="03hb5bldbpdm84viwx75vhh7zvh8nrn5nv155pb75v76rcsqx79m"; depends=[glmnet ncvreg survival]; }; + SIS = derive2 { name="SIS"; version="0.8-4"; sha256="1bhpj0l28804f48nc68xg0cfbpzplr2n32ccfs4w9g2m7lgarg07"; depends=[glmnet ncvreg survival]; }; SISIR = derive2 { name="SISIR"; version="0.1"; sha256="08lw9y38j5qq00m2vcxsac97lg14j4w1y6607vw8isrb3qb5db9z"; depends=[doParallel expm foreach glmnet Matrix RSpectra]; }; - SKAT = derive2 { name="SKAT"; version="1.2.1"; sha256="0i8samw6bwzbwcpdf12b932r46yy2fkqp4dn7a5kk50mzzfphib2"; depends=[]; }; + SKAT = derive2 { name="SKAT"; version="1.3.0"; sha256="1iksiz3hm3m3aw45wxlrr47n8lk1fmkvianjdk657xbhx5zlkiqq"; depends=[]; }; SLC = derive2 { name="SLC"; version="0.3"; sha256="0l0y1sjj0glsb7vwla99ijclcgaq2y85bgz1wqm348n4shsmm2rs"; depends=[]; }; - SLDAssay = derive2 { name="SLDAssay"; version="1.6"; sha256="0dzy66jlz0y7f0k4534jj4yfbrd1lyqaf6d3z3mqwl3zngyb2m1g"; depends=[]; }; + SLDAssay = derive2 { name="SLDAssay"; version="1.7"; sha256="123yh2xasfa90bjjqdihrrrjb2754frlkggx5wg6590sk3i1kp5n"; depends=[]; }; SLHD = derive2 { name="SLHD"; version="2.1-1"; sha256="0y3ilxd0phmks8zkmpgw7p5zrkwq4k95h976cwk58pavvhfwj9kb"; depends=[]; }; SLOPE = derive2 { name="SLOPE"; version="0.1.3"; sha256="12naak08qjpn6l1ikqwf17h72zk4b5mppgxx7ks9wmnqy9ylhy3x"; depends=[Rcpp]; }; SMC = derive2 { name="SMC"; version="1.1"; sha256="1r4ajgi785lmpnlxrba0n6phmk1f0mb6b5yqk6hx8gng2w8ggclz"; depends=[]; }; @@ -2917,7 +3035,6 @@ in with self; { SMCRM = derive2 { name="SMCRM"; version="0.0-3"; sha256="1x06w00sdijhg5h1s61q4ym5wgk97pw9md6api7if2cxjv7h5zcy"; depends=[]; }; SMFI5 = derive2 { name="SMFI5"; version="1.0"; sha256="10qp33l0dig00y9gfhpzqig6dbkjw76ch9pfq64dn4xrdkpq1kx5"; depends=[corpcor ggplot2 reshape]; }; SMIR = derive2 { name="SMIR"; version="0.02"; sha256="02q8m5m8lcfrpi78p3kajkps8wiir3jwyqc54j9vfx8aj6mk1v71"; depends=[]; }; - SML = derive2 { name="SML"; version="0.1"; sha256="0pdj7321wy50v5l23hknlm30kp8cfgn072pbbifyp8qzmk0hyd8h"; depends=[glmnet lattice Matrix]; }; SMLoutliers = derive2 { name="SMLoutliers"; version="0.1"; sha256="10frs7wcyn368m7fvw2f1cyd0xqr6sv5jziixnyvr8q5fadyl2p0"; depends=[]; }; SMMA = derive2 { name="SMMA"; version="1.0.1"; sha256="0ld8jjh67iw5w5cmb2gb899269apjydgqjsnn5hq5lzqjilpzzl8"; depends=[Rcpp RcppArmadillo]; }; SMNCensReg = derive2 { name="SMNCensReg"; version="3.0"; sha256="06542jacy74mw6ic0i1ml09pn45sll96bya7dqja6bg9yp0m6bvr"; depends=[Matrix PerformanceAnalytics]; }; @@ -2943,13 +3060,14 @@ in with self; { SOUP = derive2 { name="SOUP"; version="1.1"; sha256="0k8nlvl4681cz07xjazprcc0jhknfa5hgr7w1qxxmgrp3sprr8r4"; depends=[tensor]; }; SPA3G = derive2 { name="SPA3G"; version="1.0"; sha256="15f38imwqn1zifym2821q7xysvws9vhlif4g16w0pnvk0wlhyb92"; depends=[]; }; SPACECAP = derive2 { name="SPACECAP"; version="1.1.0"; sha256="11szdq7sqr8ldwz7apbf1dv5mh43rbyb7dkivms58s5623xrq3sm"; depends=[coda]; }; + SPADAR = derive2 { name="SPADAR"; version="1.0"; sha256="0xzhcy5nglwx9j2jkm3i9xj1iw1y9wbf6rwfjyhpiwwq6qn8mn5r"; depends=[mapproj RCEIM]; }; SPARQL = derive2 { name="SPARQL"; version="1.16"; sha256="0gak1q06yyhdmcxb2n3v0h9gr1vqd0viqji52wpw211qp6r6dcrc"; depends=[RCurl XML]; }; SPAr = derive2 { name="SPAr"; version="0.1"; sha256="068jlsvaxx80ih6n86286m2r75cvy6w0m51vpj4gfclhh38py4p4"; depends=[]; }; - SPAtest = derive2 { name="SPAtest"; version="1.1.0"; sha256="0dy63ha8d9pzqcf61inbp24nhbpb6pzhw08vsf134znirll0kgr4"; depends=[]; }; + SPAtest = derive2 { name="SPAtest"; version="1.1.1"; sha256="0mi4q76r2ddvh391689gvk18zc528kd7vg5f3b16q40ic5wyjpbj"; depends=[]; }; SPCALDA = derive2 { name="SPCALDA"; version="1.0"; sha256="1bmp2zz0favmpyp0ap8a2r1mg1nlan7zg5cj75drdnfpqlsn5vgl"; depends=[MASS]; }; SPECIES = derive2 { name="SPECIES"; version="1.0"; sha256="0p45llf2wjr467bqr4pbljfank9zz3fm42yl3i0r3jbkxgz0rjf0"; depends=[]; }; - SPEDInstabR = derive2 { name="SPEDInstabR"; version="1.3"; sha256="1yzls6i0v3c44lhdb9d2ydw6abphyjnrx2idxdcp0qqj87fw92l4"; depends=[]; }; - SPEI = derive2 { name="SPEI"; version="1.6"; sha256="0mbz4nydnzwypfbi1d9fjy09x6133q096qbfrc913dbidzkvfpqv"; depends=[lmomco]; }; + SPEDInstabR = derive2 { name="SPEDInstabR"; version="1.4"; sha256="19xcmbqkd94z4zvqdz64l9g6lkld3wd8ap0bh57wk2s304px09sv"; depends=[]; }; + SPEI = derive2 { name="SPEI"; version="1.7"; sha256="0lj7d3bbik7q4di5nqc3a1rn94z2y2v9x45r1jjkvgf03frj96qd"; depends=[ggplot2 lmomco]; }; SPIAssay = derive2 { name="SPIAssay"; version="1.1.0"; sha256="0y02122lj4v95g62w84jmdjdazfz3rch133aid5sgakj2kv68cvh"; depends=[]; }; SPIGA = derive2 { name="SPIGA"; version="1.0.0"; sha256="0yd06x5rh1h1s4v9apj43c90rkz8m5kssbny7y5mnw5mr2acds9b"; depends=[GA]; }; SPIn = derive2 { name="SPIn"; version="1.1"; sha256="109xxrg7bsmmfd6ik85kxrw2qclxbh5ipsh5mmrdl4hki3hnyp2s"; depends=[quadprog]; }; @@ -2967,16 +3085,17 @@ in with self; { SRCS = derive2 { name="SRCS"; version="1.1"; sha256="13zf3cqs53w68f9zc1fkb9ql84rvzn7g1hbykqrbvss8hjaq8x1r"; depends=[]; }; SRRS = derive2 { name="SRRS"; version="0.1.1"; sha256="0jv545a97q4pyl89lmhn3y0jhdzyq033mvx144x8lcgx59s7cyi3"; depends=[gtools tcltk2]; }; SSBtools = derive2 { name="SSBtools"; version="0.2.1"; sha256="1cqdmvh9gxyx2yciy0j54v84hl8cayifv368ip5y3k6g1cff6488"; depends=[]; }; - SSDM = derive2 { name="SSDM"; version="0.2.2"; sha256="0xvlvmdfxbdk0xla75dgdhvka0ajh0fg80xxyn24rzi2rc830mnw"; depends=[dismo e1071 earth gbm gplots mgcv nnet randomForest raster rpart SDMTools shiny shinydashboard shinyFiles sp spThin]; }; + SSDM = derive2 { name="SSDM"; version="0.2.3"; sha256="177lh4qf9b7gwi911mhy8ypfqlpl7yhl60pznhwcpynk9iqp2hzx"; depends=[dismo e1071 earth gbm gplots mgcv nnet randomForest raster rpart SDMTools shiny shinydashboard shinyFiles sp spThin]; }; SSDforR = derive2 { name="SSDforR"; version="1.4.15"; sha256="0vjfzjs2bhxzavcnlz5lq5f96pp2sw5zdzlz3vivxbmvzp50kbr7"; depends=[MASS psych TSA TTR]; }; SSL = derive2 { name="SSL"; version="0.1"; sha256="0fy6svf8xfni72bpsg8a5wr8ly46srhfixk8866lrcsp8pb6mqcd"; depends=[caret e1071 klaR NetPreProc proxy Rcpp xgboost]; }; SSN = derive2 { name="SSN"; version="1.1.10"; sha256="0fhwshl6vwf9cvbg8j284i27vayjrslk5hpyvrby390jma9klk4i"; depends=[BH igraph lattice maptools MASS Matrix rgdal rgeos RSQLite sp]; }; SSRA = derive2 { name="SSRA"; version="0.1-0"; sha256="1d0lg2dz8vf1d63366s5apm0ygrsfxivbrsij907r244zj6i1c37"; depends=[shape stringr]; }; - SSRMST = derive2 { name="SSRMST"; version="0.1.0"; sha256="05bjc2bmsfykrddch7ynixqsq6z813wvibpwh37223q78xpb8nry"; depends=[survival survRM2]; }; + SSRMST = derive2 { name="SSRMST"; version="0.1.1"; sha256="15s6vcmk8a27yw3rlfkajby6qkizp4sfiyi63m7hc86svd15x4wg"; depends=[survival survRM2]; }; SSrat = derive2 { name="SSrat"; version="1.0"; sha256="1qpsdfdngsgxx3mqgn4avl65w4v5v4jwsh1nnxzfn9iqi9mg4bhi"; depends=[plyr sna]; }; SSsimple = derive2 { name="SSsimple"; version="0.6.4"; sha256="0p7d4hx7mhn5myq8ajcij6hhg79rjxigk5v8z93yfdw4gjcb5wad"; depends=[mvtnorm]; }; STAND = derive2 { name="STAND"; version="2.0"; sha256="07wrpmvk0jjlghvrb37xyai48vgzj0fby8y09qdxsxdlgwqg1f3s"; depends=[survival]; }; STAR = derive2 { name="STAR"; version="0.3-7"; sha256="1g78j4iyh78li1jaa3zz5qv4p41cg0imhmvbfakd34l32ppih4ll"; depends=[codetools gss mgcv R2HTML survival]; }; + STARTS = derive2 { name="STARTS"; version="0.0-9"; sha256="1r93gy1044sn4cdjqfbqc9pcrq63135rm8fvvy0jjmqqmx5xigi2"; depends=[]; }; STB = derive2 { name="STB"; version="0.6.3.1"; sha256="0fj1cfxqhijpxl41z799zd7id95jsb84ylrbqzrd1jlp80plyw83"; depends=[Matrix VCA]; }; STEPCAM = derive2 { name="STEPCAM"; version="1.2"; sha256="03crbc7hag8w333j9c7k0q7zy7xmfid4lq773p74r55jmac5xpjf"; depends=[ade4 ape FD geometry gtools MASS vcd]; }; STI = derive2 { name="STI"; version="0.1"; sha256="1p408y9w2h4ljaq0bsw7vc1xghczjprf558cyg6994m0nv5fh4c4"; depends=[fitdistrplus zoo]; }; @@ -2995,17 +3114,19 @@ in with self; { SampleSizeProportions = derive2 { name="SampleSizeProportions"; version="1.0"; sha256="0mvkvx3nni0l8ys68sq3h2zlbjvksdcdzxqlf03k0ca5bbcmdf9l"; depends=[]; }; SamplerCompare = derive2 { name="SamplerCompare"; version="1.2.7"; sha256="149ipraps9dngmvpy5w5q9a1zgnwqblhawrk6184g52ij33jv4ji"; depends=[mvtnorm]; }; SamplingStrata = derive2 { name="SamplingStrata"; version="1.1"; sha256="0yxwkj61l6s29yz4adg6im7imx7vz6v9lkvdyr04cig0dhikxch1"; depends=[memoise]; }; + SanFranBeachWater = derive2 { name="SanFranBeachWater"; version="0.1.0"; sha256="18w2q3hzcrbmagnjyrn1ikwiyjh723mjb2vy0d8p1a6za0460p9w"; depends=[dplyr lubridate magrittr readr rvest tibble xml2]; }; Scale = derive2 { name="Scale"; version="1.0.4"; sha256="1fa3840kji34qpbw6mxfavk8wq0vq0vx2w6ya71idbkxnvwc3y06"; depends=[Hmisc MASS psych]; }; SchemaOnRead = derive2 { name="SchemaOnRead"; version="1.0.2"; sha256="0xa53mqmv31gid6n82bnfmds6p8nkjlmkj15hyycxhja2j752knm"; depends=[caTools foreign haven ncdf4 network readbitmap readODS readxl tiff xml2]; }; SciViews = derive2 { name="SciViews"; version="0.9-5"; sha256="199waafpn0ndg7szwfhw2jlgcx1f0pv7j0vix2vzz60knwm698xb"; depends=[ellipse MASS]; }; SciencesPo = derive2 { name="SciencesPo"; version="1.4.1"; sha256="1y9ymm5h6mmcx1ncl7yq2nn681gm0hd25fgxxwill9bzpy34pdnr"; depends=[data_table ggplot2 htmltools lubridate pander Rcpp rstudioapi shiny stringr xtable]; }; ScoreGGUM = derive2 { name="ScoreGGUM"; version="1.0"; sha256="0f7sjfr3a8b8y1n9lrwyiyyljls3rbz84d9s93psi2fnmjj0kvgw"; depends=[]; }; ScottKnott = derive2 { name="ScottKnott"; version="1.2-5"; sha256="1ywwhdghcy30mp2nhsk2yhgb37nrdmb9yan5vvzsg66bchc3xgll"; depends=[]; }; - ScottKnottESD = derive2 { name="ScottKnottESD"; version="1.1"; sha256="135g575hbxlv4arw7l5miwc094z92ykx49aa3mia1spxj8ldly64"; depends=[effsize reshape2 ScottKnott]; }; + ScottKnottESD = derive2 { name="ScottKnottESD"; version="1.2.2"; sha256="0b1xy1977d4l2ybl7qqlf6a4pajmkynfs39nlkipdffxnvys214z"; depends=[car effsize reshape2 ScottKnott]; }; ScrabbleScore = derive2 { name="ScrabbleScore"; version="1.0"; sha256="19vgaxnhvqsbllqxfbnhnar2j4g0fkxi7rfsmkks2bd2py81x04m"; depends=[]; }; ScreenClean = derive2 { name="ScreenClean"; version="1.0.1"; sha256="0haanr05g4vwp5apncyzv8i3r61g4xf9ihm8ilcabcgpri56gpjk"; depends=[MASS Matrix quadprog]; }; SearchTrees = derive2 { name="SearchTrees"; version="0.5.2"; sha256="11p81x1klkmxarypxpbisf78dlrmhzzg9y9hxpwz75pks1y56gqg"; depends=[]; }; SecKW = derive2 { name="SecKW"; version="0.2"; sha256="13x9l6ncx8qszkcr7dpfzrk4zqj4w8z5lwd394437vl4xf1xv0k6"; depends=[fdrtool pracma]; }; + SeerMapper = derive2 { name="SeerMapper"; version="1.2.0"; sha256="1w1gpwf7n7y2czgj5ilmfljas9mps1ygbvvdrz9hjx9rcixrx594"; depends=[maptools RColorBrewer rgdal SeerMapper2010East SeerMapper2010Regs SeerMapper2010West SeerMapperEast SeerMapperRegs SeerMapperWest sp stringr]; }; SeerMapper2010East = derive2 { name="SeerMapper2010East"; version="1.2.0"; sha256="1lgjxixdgmgxy79s34pz7k4khhw5x4hs8m6yg8qiq813w4byqkls"; depends=[sp]; }; SeerMapper2010Regs = derive2 { name="SeerMapper2010Regs"; version="1.2.0"; sha256="0sb0l539cwh76559znvgbi1wcbs7h53pmk1m8jz853wc266f8ibx"; depends=[sp]; }; SeerMapper2010West = derive2 { name="SeerMapper2010West"; version="1.2.0"; sha256="0zdh3k813r4w23r2aa26bglvfv10xja2ibacnl2vairl3nzpa8vc"; depends=[sp]; }; @@ -3018,19 +3139,21 @@ in with self; { SeleMix = derive2 { name="SeleMix"; version="1.0.1"; sha256="1qzy59wbjh8llm66l70xi0p3lv94iawh2h5vwa9sqy2ra5vmpaxk"; depends=[mvtnorm]; }; Select = derive2 { name="Select"; version="1.1"; sha256="16ih65dfk6s8xkn1mqdn2391x40lzlmfsv46g01ngpsym4dry8dq"; depends=[lattice latticeExtra Rsolnp]; }; SelvarMix = derive2 { name="SelvarMix"; version="1.2"; sha256="03yhsrfnl32n2dk3gn63vsys5vm5j30zrar1kvhrmckl8qczhqr1"; depends=[glasso Rcpp RcppArmadillo Rmixmod]; }; - SemiCompRisks = derive2 { name="SemiCompRisks"; version="2.6"; sha256="0dxr0jjj9fivbpwkknsxd8n2z4amszlkb240p66lj10i8bk5bd8f"; depends=[MASS survival]; }; + SemiCompRisks = derive2 { name="SemiCompRisks"; version="2.7"; sha256="092mf3dfwa78rh9bh3a4f2gsflax013100a4zld47j5lkp24diy4"; depends=[MASS survival]; }; SemiMarkov = derive2 { name="SemiMarkov"; version="1.4.3"; sha256="1qfsy88bd07xk3gy2r7cjcs6fhx9889aqn1494d92msxmc6zvcz7"; depends=[MASS numDeriv Rsolnp]; }; SemiPar = derive2 { name="SemiPar"; version="1.0-4.1"; sha256="05gnk4s0d6276rmnyyv6gy1wpkji3sw563n8l7hmi9qqa19ij22w"; depends=[cluster MASS nlme]; }; - SemiParBIVProbit = derive2 { name="SemiParBIVProbit"; version="3.8-1"; sha256="0a69x24dd4chpag2abf1a0jwr3942d3ydb1i370ky6f4ky5w71q9"; depends=[gamlss_dist ggplot2 magic matrixStats mgcv mnormt Rmpfr survey trust VGAM VineCopula]; }; - SemiParSampleSel = derive2 { name="SemiParSampleSel"; version="1.4"; sha256="0b8dfjrjx7c409mid013wbp5s3wz4q5rh4dcgsla2vin2allv0az"; depends=[copula gamlss_dist magic Matrix matrixStats mgcv mvtnorm trust VGAM VineCopula]; }; + SemiParBIVProbit = derive2 { name="SemiParBIVProbit"; version="3.8-2"; sha256="0zhdkc6ccpxhmrh9fjn5px41pphl9zccr26kaymg56bqq181krd2"; depends=[copula gamlss_dist ggplot2 magic matrixStats mgcv mnormt psych Rmpfr scam survey survival trust VGAM VineCopula]; }; + SemiParSampleSel = derive2 { name="SemiParSampleSel"; version="1.5"; sha256="0apbg8sddz2ab9170wvf7p6cgawvp4w13r97r5q7p3hx2hylb8sw"; depends=[CDVine copula gamlss_dist magic Matrix matrixStats mgcv mvtnorm trust VGAM]; }; SenSrivastava = derive2 { name="SenSrivastava"; version="2015.6.25"; sha256="0r4p6wafnfww07kq19lfcs96ncfi0qrl8n9ncp441ri9ajwj54qk"; depends=[]; }; SensMixed = derive2 { name="SensMixed"; version="2.0-10"; sha256="0r2lga40xr782n1viyxc4wn9gzgm7g2ick45pfnkgq6m60wx9rfh"; depends=[doBy ggplot2 Hmisc lme4 lmerTest plyr reshape2 shiny shinyBS xtable]; }; SensitivityCaseControl = derive2 { name="SensitivityCaseControl"; version="2.1"; sha256="00jqzqx7g0av9lw13is723gph486gb8ga0wgcmmzpmb24s5nya9z"; depends=[]; }; SensoMineR = derive2 { name="SensoMineR"; version="1.20"; sha256="1qw97cixndg2h29bbpssl0rqag3w8im4nm9964lr7r012y5wdqhx"; depends=[cluster FactoMineR KernSmooth]; }; SensusR = derive2 { name="SensusR"; version="2.0.0"; sha256="1897d9lh3srgg99lnjs77j2yrgskbzp68d04i4pkar6slc6xsmli"; depends=[ggmap ggplot2 jsonlite lubridate plyr sp]; }; + SentimentAnalysis = derive2 { name="SentimentAnalysis"; version="1.2-0"; sha256="1hxn7lnq21ja9hgi35pz446q7gr6pzmfxg3mcd7yfk9679cixjpq"; depends=[ggplot2 glmnet mgcv moments ngramrr qdapDictionaries SnowballC spikeslab stringdist tm XML]; }; SeqAlloc = derive2 { name="SeqAlloc"; version="1.0"; sha256="04rhr3gb2p9i35a3x4k8m0lv42ncfqlhx6sf3bq8yihppwrag8x3"; depends=[]; }; SeqFeatR = derive2 { name="SeqFeatR"; version="0.2.4"; sha256="0wk40lhx2bjyfl8gcv9g1c3bm7kf3b12pfdb0zk22vcp2flr0mci"; depends=[ape Biostrings calibrate coda ggplot2 phangorn plotrix plyr qvalue R2jags scales tcltk2 widgetTools]; }; SeqGrapheR = derive2 { name="SeqGrapheR"; version="0.4.8.5"; sha256="041hlf64zbndz76r076pmym4dw4xl3fahryvpvjspw0sdlhmfm8c"; depends=[Biostrings cairoDevice gWidgets gWidgetsRGtk2 igraph rggobi]; }; + SeqKat = derive2 { name="SeqKat"; version="0.0.4"; sha256="0n6crb2lvyvx86k3ipyc29q5g4f452pdn3c77303y6jhbpy4hcjd"; depends=[doParallel foreach Rcpp]; }; SeqMADE = derive2 { name="SeqMADE"; version="1.0"; sha256="0nf1xjhk0kpmmzgcxycg3ccxvwq6gydjq7xq6n9m7k7v35v9v3qf"; depends=[MASS]; }; SequenceAnalysis = derive2 { name="SequenceAnalysis"; version="1.3"; sha256="0jrpq5ryw7rwkv99w0a5p3r0vj8nbzj6adlcsr84d9ffgxafmhif"; depends=[XML]; }; Sequential = derive2 { name="Sequential"; version="2.3.1"; sha256="0rdcxmqysi9x8671zvjndaxp91g7h5a8qhcs0qb5zxh3pbrch0jk"; depends=[]; }; @@ -3041,7 +3164,7 @@ in with self; { ShapePattern = derive2 { name="ShapePattern"; version="1.0.1"; sha256="18jzs0sq21qhldm86mgx7yb9kl473vv1aljl9hm4560xy5pd5fnb"; depends=[rgdal rgeos sp]; }; ShapeSelectForest = derive2 { name="ShapeSelectForest"; version="1.3"; sha256="1vvfl1ldrn0l9w38hx0hhszvj5a2dpmfl6ljzw7f0ji181lrx96m"; depends=[coneproj raster rgdal]; }; SharpeR = derive2 { name="SharpeR"; version="1.1.0"; sha256="0qhvpwv81jznqfzm7xysm051ckv8ilq7zhsysxc7wripnlj01c4m"; depends=[matrixcalc sadists]; }; - ShinyItemAnalysis = derive2 { name="ShinyItemAnalysis"; version="1.1.0"; sha256="1njnfmysd16bl46wqynzgw32f84yy0vkf8i1flgy19jkrb7q9zy6"; depends=[corrplot CTT deltaPlotR difNLR difR DT ggplot2 gridExtra latticeExtra ltm mirt moments msm nnet psych psychometric reshape2 rmarkdown shiny shinyjs stringr WrightMap]; }; + ShinyItemAnalysis = derive2 { name="ShinyItemAnalysis"; version="1.2.0"; sha256="0ygd250lgxrjhrqv17vzxl96bfzmfgcgal4rzn4wmm816ks7y6h9"; depends=[corrplot CTT deltaPlotR difNLR difR DT ggplot2 gridExtra knitr latticeExtra ltm mirt moments msm nnet psych psychometric reshape2 rmarkdown shiny shinyjs stringr WrightMap xtable]; }; ShinyTester = derive2 { name="ShinyTester"; version="0.1.0"; sha256="0wm4rl2p8ggw6v2chk9b6ygh5y8p8cwzbyra0nr0qr2ka97didp8"; depends=[dplyr purrr readr stringr tidyr visNetwork]; }; ShrinkCovMat = derive2 { name="ShrinkCovMat"; version="1.1.2"; sha256="1rfmsmqd4gq27scm3f0y7p5ivsmk20cjizfycp3sj8ng0qahjmaq"; depends=[]; }; SiMRiv = derive2 { name="SiMRiv"; version="0.9.1"; sha256="0aw2x9fgjzs8fiz5gqml333w3yi7k65jz611mbhjh26nvbgq82ls"; depends=[raster]; }; @@ -3055,7 +3178,8 @@ in with self; { SimCorMultRes = derive2 { name="SimCorMultRes"; version="1.4.2"; sha256="04qs0b7sn170m65176p7gmk03dzm2jjgqknmc8kjab8snlrr3r3k"; depends=[evd]; }; SimDesign = derive2 { name="SimDesign"; version="1.6"; sha256="1517gfrxnhj3c8jj5qiqf9yg7y8h9q1175czb2ykx2c291b2qvac"; depends=[foreach pbapply plyr]; }; SimHaz = derive2 { name="SimHaz"; version="0.1"; sha256="04q4xyc1ki1zr3grm3khfg0kbykjy3j9qpg332l7pxp4j3wa3aw3"; depends=[survival]; }; - SimInf = derive2 { name="SimInf"; version="4.0.0"; sha256="04ap2yszy0v8kf5pclcqvr1bm5x5vwgdb4m9b3hr5iv345f5137h"; depends=[Matrix]; }; + SimInf = derive2 { name="SimInf"; version="5.0.0"; sha256="1m0va9wi3a14pbwnz93lm2lid6ypdxaccsmwqna1c6idnpbfp841"; depends=[Matrix]; }; + SimMultiCorrData = derive2 { name="SimMultiCorrData"; version="0.1.0"; sha256="1bg9i3dw54d3xyzvmmanbgj6wlqzipa2nqc6qrlj02wa76dz9hak"; depends=[BB GenOrd ggplot2 MASS Matrix nleqslv psych triangle VGAM]; }; SimPhe = derive2 { name="SimPhe"; version="0.1.1"; sha256="00qqqsf7na5c9nslnfpbyr2ysf7d7bi6vnpfiy761nhg8vgf2vjv"; depends=[]; }; SimRAD = derive2 { name="SimRAD"; version="0.96"; sha256="0ivvd3k04v1akbblxcjhlyc315z3ig7wjs0g3b37lvlfp54ppbrg"; depends=[Biostrings ShortRead zlibbioc]; }; SimReg = derive2 { name="SimReg"; version="3.0"; sha256="188q399xcrvjw7y7lf3hfbb7x0m0hc4zaf9i1w2c4xzswmvljd8r"; depends=[ontologyIndex ontologyPlot ontologySimilarity Rcpp]; }; @@ -3077,7 +3201,7 @@ in with self; { SkyWatchr = derive2 { name="SkyWatchr"; version="0.5-1"; sha256="0mza2r80wsa091ry0rcx9x29k9v0kfk4gnafmpw6pah3bgpd2lk8"; depends=[htmlTable httr sp]; }; Sleuth2 = derive2 { name="Sleuth2"; version="2.0-4"; sha256="18mh1svmb96hw3rjmgxlwzs7kdcvjkxf4zm8k4w0sxz94ks062i7"; depends=[]; }; Sleuth3 = derive2 { name="Sleuth3"; version="1.0-2"; sha256="0b4g7j8a204wyvh0q9n1l4zrl9rk7ibyfijd49mjjdyg9zz4kbna"; depends=[]; }; - SmartSVA = derive2 { name="SmartSVA"; version="0.1.1"; sha256="1c35y20llycxs41pkjmb7b74cmspmcwwi98r8r5q6s1vgbzn96zr"; depends=[isva Rcpp RcppEigen sva]; }; + SmartSVA = derive2 { name="SmartSVA"; version="0.1.3"; sha256="10a8s2znsg8ywqkq9fsxiyqfsprrx33pqissazp2vmabs11mg4np"; depends=[isva Rcpp RcppEigen RSpectra sva]; }; SmartSifter = derive2 { name="SmartSifter"; version="0.1.0"; sha256="16rzma87k27qg6qy39mzywdj8pzkp7r9q7bpqyikazp3fk2nmfri"; depends=[mvtnorm rootSolve]; }; SmarterPoland = derive2 { name="SmarterPoland"; version="1.7"; sha256="03vs6hcd96va9kfhl2yq77alnm33j1dxy79kgrx17hlijsy65qqv"; depends=[ggplot2 htmltools httr jsonlite rjson]; }; Smisc = derive2 { name="Smisc"; version="0.3.6"; sha256="0knrgq6831rwr48880kvsmrl6c943nw3nkzds0sh63ljw0dp5ja7"; depends=[doParallel plyr]; }; @@ -3086,7 +3210,7 @@ in with self; { SnakeCharmR = derive2 { name="SnakeCharmR"; version="1.0.6"; sha256="1p15k57hi31i3p6v63v9s7hi1w9kb4aqjcgz405jk4klsifzw8va"; depends=[jsonlite Rcpp stringr]; }; SnowballC = derive2 { name="SnowballC"; version="0.5.1"; sha256="0kbg33hy6m2hv9jspyx6naqmk2q6h2zmvvczjmkwqvlhzlj0c5s4"; depends=[]; }; SoDA = derive2 { name="SoDA"; version="1.0-6"; sha256="0sh2dan4ga2k14rirnkvgzsvbksx1k4ika5gkf5cy247rjkqnpj0"; depends=[]; }; - SocialMediaLab = derive2 { name="SocialMediaLab"; version="0.23.0"; sha256="1a62yklhyvcgsw50yg8r9cvdj54pi9ckzg0ms6v7zdbcd0k0nfbm"; depends=[bitops data_table Hmisc httpuv httr igraph instaR plyr RCurl Rfacebook rjson stringr tm twitteR]; }; + SocialMediaLab = derive2 { name="SocialMediaLab"; version="0.23.2"; sha256="1adl0h3vnw17c364bxm5wffjkmvfzz9l0w5wkpwi6ry96vxzwy40"; depends=[bitops data_table Hmisc httpuv httr igraph instaR plyr RCurl Rfacebook rjson stringr tm twitteR]; }; SocialMediaMineR = derive2 { name="SocialMediaMineR"; version="0.4"; sha256="0hd05rm7qn2w8rqx7pw996wpgb2rymcwzmns8xyczcyn81vjx8z8"; depends=[httr jsonlite RCurl]; }; SocialNetworks = derive2 { name="SocialNetworks"; version="1.1"; sha256="0d868xka6d35i17r28cvm0ya971xk6y1kycsfff0279w27cjd9x0"; depends=[Rcpp]; }; SocialPosition = derive2 { name="SocialPosition"; version="1.0.1"; sha256="1rrrjlq6czzhzipvkisbq024ca22v2vzx7wa4ddr9j7hnyyzzpic"; depends=[]; }; @@ -3101,15 +3225,17 @@ in with self; { SpaDES = derive2 { name="SpaDES"; version="1.3.1"; sha256="0a2s0smd0m3dmrjl88hm7dnkv6src96v00bhllc42sq6vq81iwsf"; depends=[archivist chron CircStats data_table DEoptim DiagrammeR digest dplyr DT ff ffbase fpCompare ggplot2 gridBase httr igraph lazyeval lubridate miniUI R_utils RandomFields raster RColorBrewer rstudioapi shiny sp stringi stringr]; }; SpaTimeClus = derive2 { name="SpaTimeClus"; version="1.0"; sha256="1l204b8yd11pxwcb026xy39f4lps4sqk6mml8cybnjch8clk9djc"; depends=[Rcpp RcppArmadillo]; }; SpadeR = derive2 { name="SpadeR"; version="0.1.1"; sha256="0iy2rkq4vvps1a73kqq37zpsyl4pvl3vh07dwvpfhvp7f8nxbx99"; depends=[]; }; + SparseDC = derive2 { name="SparseDC"; version="0.1.5"; sha256="15hgcpqr3hmbpm65d15d1lcrwi2vq38pz07rrr4rgr3z2rd7f36g"; depends=[]; }; SparseFactorAnalysis = derive2 { name="SparseFactorAnalysis"; version="1.0"; sha256="0lgfvydxb86r5hks1mf0p0yhgpx8s8fbkc3q6dimc728rw26qcv5"; depends=[directlabels ggplot2 MASS proto Rcpp RcppArmadillo truncnorm VGAM]; }; SparseGrid = derive2 { name="SparseGrid"; version="0.8.2"; sha256="057xbj2bhjm9i32kn39iscnqqdsvsmq0b8c92l8hnf9avf1sx10x"; depends=[]; }; SparseLearner = derive2 { name="SparseLearner"; version="1.0-2"; sha256="1qxycxpch2m2yyk97210gdzsizhlinc0hkhk5ak00rdgkrsxxc0k"; depends=[glmnet lqa mlbench qgraph RankAggreg SIS SiZer]; }; - SparseM = derive2 { name="SparseM"; version="1.76"; sha256="16xnl9cacim35aawq6bmd2y6rrhnh1kg6dwsy3k5yslkfr1y9j62"; depends=[]; }; + SparseM = derive2 { name="SparseM"; version="1.77"; sha256="0p6ljma2h12cq1xmy0cxb48ih8dhxxbnwkqzvx3cckxf2kprycm9"; depends=[]; }; SparseTSCGM = derive2 { name="SparseTSCGM"; version="2.5"; sha256="004hbk5fdd5b5hdvg25wl1908pfya26brm2pz00zypfvis99lps3"; depends=[abind flare glasso longitudinal MASS mvtnorm network QUIC]; }; SpatMCA = derive2 { name="SpatMCA"; version="1.0.0.2"; sha256="1xm29ybbdxspj2ylkkd9qh17sizz1gkc3l34y3d0ivmxz64vn6pj"; depends=[fields MASS Rcpp RcppArmadillo RcppParallel]; }; SpatPCA = derive2 { name="SpatPCA"; version="1.1.1.2"; sha256="0v694bmfgwhpz2072f7gshqasd2vywvrbk5ncwq74xk5qrcpx9i7"; depends=[Rcpp RcppArmadillo RcppParallel]; }; + SpatialAcc = derive2 { name="SpatialAcc"; version="0.1"; sha256="0iawawaabv33rx5582aamagn83f2dvf21025hjpgwzivb9f904i7"; depends=[]; }; SpatialEpi = derive2 { name="SpatialEpi"; version="1.2.2"; sha256="172i4khjb2fh818bq7wdfdm79fwxjwi60nqfj69dgbgcaww55ffr"; depends=[maptools MASS Rcpp RcppArmadillo sp spdep]; }; - SpatialEpiApp = derive2 { name="SpatialEpiApp"; version="0.1"; sha256="0bx31z91hf6vf22knf7bcn2j72jf123v8lvsfc7fjf0ssimqhpzz"; depends=[dplyr dygraphs ggplot2 htmlwidgets knitr leaflet mapproj maptools RColorBrewer rgeos rmarkdown shiny shinyjs SpatialEpi spdep xts]; }; + SpatialEpiApp = derive2 { name="SpatialEpiApp"; version="0.2"; sha256="1f59da2r36vpz8caq7jncmlq8j4l9g5g5v5a5x4abdm750g6n7mz"; depends=[dplyr dygraphs ggplot2 htmlwidgets knitr leaflet mapproj maptools RColorBrewer rgdal rgeos rmarkdown shiny shinyjs SpatialEpi spdep xts]; }; SpatialExtremes = derive2 { name="SpatialExtremes"; version="2.0-2"; sha256="0ywybk9gziy2hzb1ks88q4rzs3lzzy6y3fzhja2s39ngg195hi6l"; depends=[fields maps]; }; SpatialNP = derive2 { name="SpatialNP"; version="1.1-1"; sha256="108gxk0gbbjck9bgxvqb9h216ww21lmh2by0hrhzwx5r63hhcbmd"; depends=[]; }; SpatialPack = derive2 { name="SpatialPack"; version="0.2-3"; sha256="1gs0x3wj3hj663m6kszwhy3ibcx0lrslr127miy1rhz8683ij71c"; depends=[]; }; @@ -3121,11 +3247,10 @@ in with self; { SpeciesMix = derive2 { name="SpeciesMix"; version="0.3.4"; sha256="0d6hfmzxqcvg4fcvpsfxx36k95fwkws4rlylrixikndj2fncgwb5"; depends=[MASS numDeriv]; }; SpecsVerification = derive2 { name="SpecsVerification"; version="0.5-2"; sha256="0dnya9mzkf48clp51jrnkz6lc4fps38nn3lap7n2wcp3dvbvdycg"; depends=[Rcpp RcppArmadillo]; }; SpectralMap = derive2 { name="SpectralMap"; version="1.0"; sha256="15689023k9jzg3s7bx5m97dmn00z876amqhxsxksy8n8wf09wr57"; depends=[fields scatterplot3d]; }; - SpherWave = derive2 { name="SpherWave"; version="1.2.2"; sha256="1wd9pql97m1zl0axzpkfq9sxadrm5cfax0gxh0ncqadaq7w7lml4"; depends=[fields]; }; SphericalCubature = derive2 { name="SphericalCubature"; version="1.3"; sha256="195is72nj1vbhdx3yqmklmc9hqaaxvipgmcxszgvnqdv5bsiypgw"; depends=[abind cubature mvmesh SimplicialCubature]; }; SphericalK = derive2 { name="SphericalK"; version="1.2"; sha256="18py4ylm10s75pihjvcy7w948379zy9l9azriw7g7pyp7px29wda"; depends=[]; }; SportsAnalytics = derive2 { name="SportsAnalytics"; version="0.2"; sha256="1vb080ak1mfvr6d0q9i3r8hd547ba80bavjdcri0gclqqcjf1ach"; depends=[]; }; - SqlRender = derive2 { name="SqlRender"; version="1.3.0"; sha256="0rjfgaf08na66vjygd3pnx9qyl5q7x0w62llfw7qxb91j29z794w"; depends=[rJava]; }; + SqlRender = derive2 { name="SqlRender"; version="1.3.7"; sha256="15jp608bnnqrv7x4dnwi7hvnhxxpykfpavb8ynrlp9r6n6d3qp71"; depends=[rJava]; }; StAMPP = derive2 { name="StAMPP"; version="1.4"; sha256="0rmp5l50dkkldq9xc1abhdxjhbwlqk3i3g0d8w3xissidnz5n31b"; depends=[adegenet doParallel foreach pegas]; }; StMoMo = derive2 { name="StMoMo"; version="0.4.0"; sha256="0zkcp19a76dm29fba5r96dxly709sic2k5p9hzc70cvwjhwhfr7v"; depends=[fanplot fields forecast gnm MASS RColorBrewer reshape2 rootSolve]; }; StMoSim = derive2 { name="StMoSim"; version="3.0"; sha256="18mdgpn0x6338zzvc7nwccz6ypqmlpv7pzcy5fwx5y2wfkmdp4rm"; depends=[Rcpp RcppParallel]; }; @@ -3136,6 +3261,7 @@ in with self; { StanHeaders = derive2 { name="StanHeaders"; version="2.15.0-1"; sha256="0j3g73fm8ac9kfhb0kv4zk1j12i4klpcdlp71zwbv95v14ll38pf"; depends=[]; }; StandardizeText = derive2 { name="StandardizeText"; version="1.0"; sha256="0s267k2b109pcdiyd26gm4ag5afikrnnb55d3cs6g2fvzp744hfp"; depends=[]; }; Stat2Data = derive2 { name="Stat2Data"; version="1.6"; sha256="0pk68ffc6ffpddfpf9wi8ch39h6k3r80kldld3z5pnql18rc8nvx"; depends=[]; }; + StatCharrms = derive2 { name="StatCharrms"; version="0.90.4"; sha256="16m7xs3f9mdixjp4gfr9sfl6c2i5cd5cnghhvl19zaxpw6nydixy"; depends=[cairoDevice car clinfun coxme gWidgets gWidgetsRGtk2 lattice multcomp nlme R2HTML RGtk2 RSCABS survival]; }; StatDA = derive2 { name="StatDA"; version="1.6.9"; sha256="01bjygis14b3yfsfkjbvy0zlhjxysjf46cfcw8p4a4lwik3qp03b"; depends=[cluster e1071 geoR MASS MBA mgcv rgl robustbase sgeostat xtable]; }; StatDataML = derive2 { name="StatDataML"; version="1.0-26"; sha256="1lcckapbhqdbg6alnhm2yls66lnkxnxamdlzx6pbfqv1dhsy36gf"; depends=[XML]; }; StatMatch = derive2 { name="StatMatch"; version="1.2.5"; sha256="1162yqqrxkbpchdxdibpk5ccv55krvh9j150jgr047zzghr9ansa"; depends=[clue lpSolve proxy RANN survey]; }; @@ -3153,23 +3279,24 @@ in with self; { StratSel = derive2 { name="StratSel"; version="1.2"; sha256="11dkhyh0xgl23f9ksxcjl6bqfhwm6k6i1chgx23dvjifbm6s5s5p"; depends=[Formula MASS memisc mnormt pbivnorm]; }; Strategy = derive2 { name="Strategy"; version="1.0.0"; sha256="1s89rl6h68sn8px3g7bhhrwmn6k4kmdqhiz0d39xr3kgpfpvi5i2"; depends=[xts zoo]; }; StratifiedBalancing = derive2 { name="StratifiedBalancing"; version="0.2.0"; sha256="0iwzvschncb2vrmsawb6i94shn2cjbkph854x1z4ykr6ddw411g2"; depends=[plyr]; }; + StratifiedRF = derive2 { name="StratifiedRF"; version="0.1.1"; sha256="0w9bd6j9mh8zib3l5xn52sj9babin0q163xqr3cyirq18fm96s6h"; depends=[C50 dplyr]; }; StreamMetabolism = derive2 { name="StreamMetabolism"; version="1.1.2"; sha256="1sv30i7armk7jhxg5x9lh0r9qq3xixn1k2h0q89halkh1yraal8a"; depends=[chron maptools zoo]; }; StressStrength = derive2 { name="StressStrength"; version="1.0.2"; sha256="1fq26bzmwsk4nzz9bgasyxz9alw8x2ssahz67mham7vw483w79pd"; depends=[]; }; StroupGLMM = derive2 { name="StroupGLMM"; version="0.1.0"; sha256="1w0xizdmwqflfhqwygyq7fw5ci7pdzmr8dfv3j0g3ljbj84kndzd"; depends=[aod broom car ggplot2 lme4 lmerTest lsmeans MASS mutoss nlme pbkrtest phia survey]; }; StructFDR = derive2 { name="StructFDR"; version="1.2"; sha256="00h3mx7kf01snngkcarhyidqiycvnjhcs81x3kprgp6597md7ph1"; depends=[ape cluster dirmult matrixStats nlme]; }; SubCultCon = derive2 { name="SubCultCon"; version="1.0"; sha256="08q6k4nsv3gl5qk87s87smdg047yc2a4i7kg0fp08i7q7h62jkvz"; depends=[]; }; SubLasso = derive2 { name="SubLasso"; version="1.0"; sha256="12m7ynlqhikjhavd12bhsd04s9cpv8aq5xgm875i10mb3ldpd1bd"; depends=[glmnet gplots psych]; }; - SubVis = derive2 { name="SubVis"; version="2.0.1"; sha256="1r9i27hx8xj8f3mhbm8ygcxwpq1lzxm26vay5mqk4q9swskg1vbh"; depends=[Biostrings shiny]; }; + SubVis = derive2 { name="SubVis"; version="2.0.2"; sha256="1nb3zgm6i5lwfwdrn8mk3wkg8a4ldfvs27ai8v46l4316qc1fa9p"; depends=[Biostrings shiny]; }; SubgrpID = derive2 { name="SubgrpID"; version="0.11"; sha256="1by23gdkbls7l5xa9nl055nbm0d3138pmfmasqmcy42h62wf7dw6"; depends=[AIM ggplot2 glmnet Matrix rpart survival]; }; SubpathwayGMir = derive2 { name="SubpathwayGMir"; version="1.0"; sha256="1rw94idhbnaszr2xv1wgnjcxlnxkml912pvmqh2a1nqpwca5mscy"; depends=[igraph XML]; }; SubpathwayLNCE = derive2 { name="SubpathwayLNCE"; version="1.0"; sha256="051csjavr9549y54yirfdn266i7swsvpbcakhziyz4sl4afwx5kl"; depends=[BiasedUrn graph igraph RBGL]; }; Sunder = derive2 { name="Sunder"; version="0.0.4"; sha256="1na41nnscyc4v1qbwzfgqk503r39xxbi6f446pscrz3v0v121f1a"; depends=[mnormt]; }; SunterSampling = derive2 { name="SunterSampling"; version="1.0.1"; sha256="0qfld3j8xlpgp7c58zqw6gzm38m4d740lvdj5vmcflfcc6ja98sf"; depends=[]; }; - SuperExactTest = derive2 { name="SuperExactTest"; version="0.99.2"; sha256="0z9yhaz81l30i7ahjz1gxl7x4c0dqyny8ynpckjm8vwsvpr9y9yf"; depends=[]; }; + SuperExactTest = derive2 { name="SuperExactTest"; version="0.99.4"; sha256="0wjqvwff5ag8hh6v2plc774hk6ydsyvr6ihlp9a15v0f0p61x6bk"; depends=[]; }; SuperLearner = derive2 { name="SuperLearner"; version="2.0-21"; sha256="0j349yv510s1qjkpks24qrfgr2bip1m70i5dh9ydlna280k43dbh"; depends=[cvAUC nnls]; }; SuperRanker = derive2 { name="SuperRanker"; version="1.0.1"; sha256="0s5d38xaan4jznb3nlr9rj054haf6wks0229lggykj8mfz746wky"; depends=[prodlim Rcpp]; }; SuppDists = derive2 { name="SuppDists"; version="1.1-9.4"; sha256="1ffx8wigqqvz2pnh06jjc0fnf4vq9z2rhwk2y3f9aszn18ap3dgw"; depends=[]; }; - Surrogate = derive2 { name="Surrogate"; version="0.1-801"; sha256="1ki4mqym7vgzvqxj19iksdn8fyv352hv0f91s91djdm02hkjl8ap"; depends=[lattice latticeExtra lme4 logistf MASS mixtools msm nlme OrdinalLogisticBiplot rgl rms survival]; }; + Surrogate = derive2 { name="Surrogate"; version="0.2"; sha256="1pihjgrf621if12fs7kjk8d8zq3xf2ppji4c5dah10imy5kj8z0x"; depends=[lattice latticeExtra lme4 logistf MASS mixtools msm nlme OrdinalLogisticBiplot rgl rms survival]; }; SurvCorr = derive2 { name="SurvCorr"; version="1.0"; sha256="01rqdl503q1qnkn49iqnsjzis6azdsfi6s2hjky5k2zd6c9g18k5"; depends=[fields survival]; }; SurvDisc = derive2 { name="SurvDisc"; version="0.1.0"; sha256="0iqjimrljh9iaw3s406v6j03xg62ysf9xdia1yxr2ray38j8148c"; depends=[cubature MASS mvtnorm nlme simex survival]; }; SurvLong = derive2 { name="SurvLong"; version="1.0"; sha256="000ywg0sdk9kailiy7ckhq4mkaawl9hh88w6apj5khgpxsyj8aw3"; depends=[]; }; @@ -3178,7 +3305,7 @@ in with self; { Survgini = derive2 { name="Survgini"; version="1.0"; sha256="1gxkdv2j1njbgnwb52vyhz7p2lrcg3hp6sry3kyhp4wkvf6gnhxi"; depends=[survival]; }; SvyNom = derive2 { name="SvyNom"; version="1.1"; sha256="1jym2x6nd9a3y7nk5hflqpy54gs67y4sqqspkvkalf5l2cc64did"; depends=[Hmisc rms survey survival]; }; SwarmSVM = derive2 { name="SwarmSVM"; version="0.1-2"; sha256="1997nbczgf5xkvj257fa211wxl85lq4jpybjl2q4hajn05ahq7yp"; depends=[BBmisc checkmate e1071 kernlab LiblineaR Matrix SparseM]; }; - SweaveListingUtils = derive2 { name="SweaveListingUtils"; version="0.7.5"; sha256="0b975il4pfnxw709ar74w49k18b6znrjrm71vw6xl0qid8xwqpfa"; depends=[startupmsg]; }; + SweaveListingUtils = derive2 { name="SweaveListingUtils"; version="0.7.7"; sha256="04yxhphf069y29b40i34kr4hvlcv8kgr6kqc2vdz2a40564fdsjb"; depends=[startupmsg]; }; SwissAir = derive2 { name="SwissAir"; version="1.1.4"; sha256="1avc32q7nbwjkcbml7z05car6khv1ghcz3miw0krm8i53w032c6f"; depends=[]; }; SyNet = derive2 { name="SyNet"; version="2.0"; sha256="0mb9dscddkvmkf7l3bbcy4dlfmrvvy588vxdqy5dr783bpa5dkiw"; depends=[tkrplot]; }; SymTS = derive2 { name="SymTS"; version="1.0"; sha256="17vhm00zd9yxl6li36bsfkm4rsizjsm93ibrzgqnkl72sqmmlwfi"; depends=[]; }; @@ -3188,8 +3315,8 @@ in with self; { SynergizeR = derive2 { name="SynergizeR"; version="0.2"; sha256="0z32ylrjjvp8kr6lghhg57yq1laf9r0h8l3adysvis8bbpz2q2sj"; depends=[RCurl RJSONIO]; }; Synth = derive2 { name="Synth"; version="1.1-5"; sha256="1cfvh91nz6skjk8jv04fhwv3ga9kcsfgq3mdy8lx75jkx16zr0pk"; depends=[kernlab optimx]; }; T2EQ = derive2 { name="T2EQ"; version="1.1"; sha256="1skkkryw63pfx1xslia1lczb2psja6v6hcbph4isdcksb4l4pcig"; depends=[]; }; - TAM = derive2 { name="TAM"; version="2.0-37"; sha256="06hm0xx01vbyp1xc22rl3wqw6i3f68qmkkrrdilrhb3kx7gzha9a"; depends=[CDM GPArotation lattice lavaan MASS mvtnorm plyr psych Rcpp RcppArmadillo sfsmisc WrightMap]; }; - TANDEM = derive2 { name="TANDEM"; version="1.0.1"; sha256="00k99inrb7ibg8g80ci22hnphnd7cwd078yxqlbwgacjxaqa36cj"; depends=[glmnet Matrix]; }; + TAM = derive2 { name="TAM"; version="2.3-18"; sha256="0kv8wf8s7wbgiqgzki2s514f07q3ny04phxy06b2vsf4fg0m57xh"; depends=[CDM coda GPArotation lattice lavaan MASS mvtnorm plyr psych Rcpp RcppArmadillo sfsmisc WrightMap]; }; + TANDEM = derive2 { name="TANDEM"; version="1.0.2"; sha256="1h6m6aq2b5m9gdy4nck4dxv75gv50pfdhxx8xifgyv0d7n8czabq"; depends=[glmnet Matrix]; }; TANOVA = derive2 { name="TANOVA"; version="1.0.0"; sha256="0c2mrahchwagisrkjl5l1s0mv0ny80kngq8dz0fjj9lwxwqwvwa5"; depends=[MASS]; }; TAQMNGR = derive2 { name="TAQMNGR"; version="2016.12-1"; sha256="1b3v30zi6ssac866grhgki2bpzbk06pd8vrfya3zcc5anry699bm"; depends=[Rcpp]; }; TAR = derive2 { name="TAR"; version="1.0"; sha256="0wjh2n9x3yn9by9a6mjvkl96qy7z549g6dsqp7b4d96xwmyqxlbv"; depends=[mvtnorm]; }; @@ -3197,7 +3324,7 @@ in with self; { TBSSurvival = derive2 { name="TBSSurvival"; version="1.3"; sha256="1r87qvnlvc18i12yi25lfpdb8b5p33fywi38hs2xp1y2vbvz5s9b"; depends=[BMS coda mcmc normalp R_utils Rsolnp survival]; }; TCGA2STAT = derive2 { name="TCGA2STAT"; version="1.2"; sha256="15a5lh0nrdcxdwj7wj5m9rsvk1ygpp6wdjb4swilk91rb1lblikv"; depends=[CNTools XML]; }; TCGAretriever = derive2 { name="TCGAretriever"; version="1.3"; sha256="0mi8j7k2b1sx75ka8ympydqpk8jqp8wz8dyf4vk4776fra7bq24p"; depends=[httr]; }; - TDA = derive2 { name="TDA"; version="1.5"; sha256="0rp41v0ihwan34bgb8bgzva5nk7lra0agfr9201ww6687mwakk9z"; depends=[BH FNN igraph Rcpp RcppEigen scales]; }; + TDA = derive2 { name="TDA"; version="1.5.1"; sha256="1ab60b1wk2j4271vikbglkk12nwl77d5b9w3xqvzpcbrbjfqsmjh"; depends=[BH FNN igraph Rcpp RcppEigen scales]; }; TDAmapper = derive2 { name="TDAmapper"; version="1.0"; sha256="0cxgr2888v8azgdr3sg4vlcdyivkrxkk6dsp1ahv4frrwvg2z09k"; depends=[]; }; TDCor = derive2 { name="TDCor"; version="0.1-2"; sha256="18085prcwhl5w717f1f7jcqskw2jvigvjjs2l5y6106ibiam6hxx"; depends=[deSolve]; }; TDD = derive2 { name="TDD"; version="0.4"; sha256="193y8brybkjsajrbnlx1sdnw1wyyn9rhlm5wvp4aamqhvi8z13vn"; depends=[pracma RSEIS signal]; }; @@ -3221,12 +3348,12 @@ in with self; { TLBC = derive2 { name="TLBC"; version="1.0"; sha256="08w187akbhfbz6nrrf7avf02lrhgj7bbrjmim9gkh4wlbjhzvw67"; depends=[caret HMM randomForest signal stringr]; }; TLMoments = derive2 { name="TLMoments"; version="0.7.2.1"; sha256="1xgkbdnh79dj54jg5kf0c5kwykcvjaf4y16yyqf0vcc7aand6a3y"; depends=[hypergeo Rcpp]; }; TLdating = derive2 { name="TLdating"; version="0.1.3"; sha256="12lmakk1zd6wqh1318pnl14i7km2hynjn4ymchfjr2bwmp45c1ra"; depends=[gplots Luminescence]; }; - TMB = derive2 { name="TMB"; version="1.7.9"; sha256="1srjy4j3rn8arvqd7bsd9snczw6g0g5zwm18dckxddg84ld9qbqr"; depends=[Matrix RcppEigen]; }; + TMB = derive2 { name="TMB"; version="1.7.10"; sha256="1rliy1zx7qrabsmc8a9qwxa1qzlkambmr5zavdr8pgk30pl2mh84"; depends=[Matrix RcppEigen]; }; TMDb = derive2 { name="TMDb"; version="1.0"; sha256="0bbcmsv7b3vvskhdjww03gbcgql44vsvyjz2fajy9w2vgkr6ga90"; depends=[httr jsonlite]; }; TOC = derive2 { name="TOC"; version="0.0-4"; sha256="1c16d4wrzir6v3c323sck6r9yz6mv1a70xamlj5ha1ydmfixcza9"; depends=[bit raster rgdal]; }; TOSTER = derive2 { name="TOSTER"; version="0.2.3"; sha256="1wyzlil7sznf0gldnmga9qkbj4qcfrbpm8imns18dpfrz3kxaw4i"; depends=[ggplot2 jmvcore R6]; }; TP_idm = derive2 { name="TP.idm"; version="1.2"; sha256="08n5bgc7gw1cbn9q7kd6jfxcwmb5mfjmdmhkhr35fi5ah21a57mh"; depends=[]; }; - TPEA = derive2 { name="TPEA"; version="3.0"; sha256="1ppy9jf0mb43vwnn5qd65g5dxf7wv3agf5rkldyas5y1ynsnbvlg"; depends=[foreach igraph Matrix MESS RCurl XML]; }; + TPEA = derive2 { name="TPEA"; version="3.1.0"; sha256="1yyc3q4dyf4d8m7wi851dnxf3xnvvfnvj28kl8z8py4r4jsb2hfy"; depends=[foreach igraph Matrix MESS RCurl XML]; }; TPmsm = derive2 { name="TPmsm"; version="1.2.1"; sha256="1vynzb6qpp8785rdjyarhvwbkasviamhljjlnp4i0dds96wwdgx1"; depends=[KernSmooth]; }; TR8 = derive2 { name="TR8"; version="0.9.16"; sha256="04zn01hqvza7pkc3pmiwiygdkawa39wc3g875mdvd5hjhi4ffkaf"; depends=[gWidgets gWidgetstcltk plyr rappdirs RCurl readxl reshape taxize XML]; }; TRADER = derive2 { name="TRADER"; version="1.2-3"; sha256="1w9m2b866dyj82s118m64q8j9a1chpq2km2pnn9mfwwj8sivgdgn"; depends=[dplR]; }; @@ -3235,6 +3362,7 @@ in with self; { TROM = derive2 { name="TROM"; version="1.2"; sha256="1gfnlchaa16q9cksrgdkissy2fz481bcbac0cmxnc4vb0vbnz4h5"; depends=[AnnotationDbi GO_db gplots gtools lattice openxlsx RColorBrewer topGO]; }; TRSbook = derive2 { name="TRSbook"; version="1.0.1"; sha256="1w2yl5pchw2vn9l3qnm1ra9mjy946i5xsxh5n5xdvrcj2kak50x5"; depends=[gdata IndependenceTests RColorBrewer xtable]; }; TSA = derive2 { name="TSA"; version="1.01"; sha256="0cm97hwxm6vfgy9mc3kgwq6dnmn86p8a4avnfjbai048qnwrn6hx"; depends=[leaps locfit mgcv tseries]; }; + TSCS = derive2 { name="TSCS"; version="0.1.0"; sha256="19g74xbk9q8xrwl2d2bld3hlbj0gcl2paxbpf8lv75x79pmkywan"; depends=[ggplot2 rgl tseries]; }; TSGSIS = derive2 { name="TSGSIS"; version="0.1"; sha256="0zrlin6xi6sv5qb18a0wi8lzldqlwa9lbwnra44w3jza3kakff7n"; depends=[glmnet MASS]; }; TSHRC = derive2 { name="TSHRC"; version="0.1-5"; sha256="05vv2zdkzlg04dicwa0lyww92fiafr7bnvsbm6990xkip1lf3cih"; depends=[]; }; TSMN = derive2 { name="TSMN"; version="1.0.0"; sha256="12wgcc7szbcbk3d1a17wz96rlwp5l39cn0i03hjsb0sbrs7mjwg5"; depends=[]; }; @@ -3250,14 +3378,14 @@ in with self; { TSclust = derive2 { name="TSclust"; version="1.2.3"; sha256="0m04svw4z2rhvzyckn8l4pg4rmwfn8xlzd9k839c47ldbzgb4z6l"; depends=[cluster dtw KernSmooth locpol longitudinalData pdc wmtsa]; }; TScompare = derive2 { name="TScompare"; version="2015.4-1"; sha256="0jmxnrbsdg368f29bp70rc9i88si5zjblbcn8rcjyn2k9vpd3q2f"; depends=[DBI tfplot tframe TSdbi]; }; TSdata = derive2 { name="TSdata"; version="2016.8-1"; sha256="199dy4phc6z0kzbp4kks55519c3xgsx4dkwrypr9sg8xhprrwnib"; depends=[]; }; - TSdbi = derive2 { name="TSdbi"; version="2015.7-1"; sha256="00dasnkkxw9rg1wyx1i2sqjr0ys1ahp9z6rdr08f8wl7zw5r8x6w"; depends=[DBI tframe]; }; - TSdist = derive2 { name="TSdist"; version="3.3"; sha256="0n5y0816nyhn21ggyjhwlm8a21rzwynf27nh1vamkwzhqms11msm"; depends=[cluster dtw KernSmooth locpol longitudinalData pdc proxy TSclust xts zoo]; }; + TSdbi = derive2 { name="TSdbi"; version="2017.4-1"; sha256="0vwx2wyls4byyp67q9bp1psxdq5jnlimwk2162khk6daaxs14aiv"; depends=[DBI tframe]; }; + TSdist = derive2 { name="TSdist"; version="3.4"; sha256="0n76sg50f21sjcpkgswrfs4g2w707jkdcwmnc8xj5ipwa57hdlp5"; depends=[cluster dtw KernSmooth locpol longitudinalData pdc proxy TSclust xts zoo]; }; TSeriesMMA = derive2 { name="TSeriesMMA"; version="0.1.1"; sha256="0dkrz3m5lh872c0q9nw4h0p6g4j1j9fn92hz8xlifpsbsyzpz63b"; depends=[]; }; TSfame = derive2 { name="TSfame"; version="2015.4-1"; sha256="197v123mkxr7qlksnb5iadms5zbc8xqbpgr2cspb8x1krz6phssz"; depends=[DBI fame tframe tframePlus tis TSdbi]; }; TSmisc = derive2 { name="TSmisc"; version="2016.8-1"; sha256="0xvn6qlvvdc65l356r8b5ppddjd35k9fc4b5w5wn3j5wzxfllbk1"; depends=[DBI gdata quantmod tframe tframePlus TSdbi tseries zoo]; }; TSodbc = derive2 { name="TSodbc"; version="2015.4-1"; sha256="0m6r97gs483jg6jlmfkbzxg3jvf6q140kvpidjccj224zb1sqlcq"; depends=[DBI RODBC tframe tframePlus TSdbi TSsql]; }; TSsdmx = derive2 { name="TSsdmx"; version="2016.8-1"; sha256="06h1iwgshiq4bvly5l1nrddrh2knc82z2aqxh8ls9ipbs7qjsvaf"; depends=[DBI rJava RJSDMX tframe tframePlus TSdbi]; }; - TSsql = derive2 { name="TSsql"; version="2015.1-2"; sha256="1hpi2cssnkzqgnaj91wrvb94fs8zpfg8hi4m1zwswzyl3az0l9sc"; depends=[DBI tframe tframePlus TSdbi zoo]; }; + TSsql = derive2 { name="TSsql"; version="2017.4-1"; sha256="0f71q6gqfx4r3ghsmr572cvkpmf2xf7kipf10ii99z1y23dxmsdn"; depends=[DBI tframe tframePlus TSdbi zoo]; }; TTAinterfaceTrendAnalysis = derive2 { name="TTAinterfaceTrendAnalysis"; version="1.5.3"; sha256="0a1v0lsfcn32w5rwcjwmvh0rghamwr5a76rx3npa6kv0dymnvhxf"; depends=[e1071 lubridate multcomp mvtnorm nlme pastecs relimp reshape tcltk2 zoo]; }; TTCA = derive2 { name="TTCA"; version="0.1.1"; sha256="16slr4c2nwbchsg6fk5prq22p2v4cjxzk93wd3xggav2lzrf8a5h"; depends=[MASS Matrix quantreg RISmed tcltk2 VennDiagram]; }; TTR = derive2 { name="TTR"; version="0.23-1"; sha256="1bmj0ngd3i3a9l2zsanifq3irz3rhsyd2rvvlhyndsgadkq9i5v9"; depends=[xts zoo]; }; @@ -3273,16 +3401,16 @@ in with self; { Tariff = derive2 { name="Tariff"; version="1.0.2"; sha256="0x139hhjjc1iyx9m3h5vdjh57q5kbc6x1mzjysz0ibnqpvhanjb2"; depends=[]; }; TauP_R = derive2 { name="TauP.R"; version="1.1"; sha256="10sjvcv70fjrsl5nnk9gm4sy7nhwm6aaq57gr37cb10v079ykmk1"; depends=[]; }; TauStar = derive2 { name="TauStar"; version="1.1.3"; sha256="06iq3kjbhyx2i8qlhvamnlch4j32psgw8q0wnvs4js513r6c0cqn"; depends=[Rcpp RcppArmadillo]; }; - Taxonstand = derive2 { name="Taxonstand"; version="1.8"; sha256="1lxnfzg6r0ak1c1xrgakcbqnqpg1vqni5xh6hk89xxbdl8zgaa91"; depends=[]; }; - TcGSA = derive2 { name="TcGSA"; version="0.10.1"; sha256="05cghnxn5r0ldr8cw371bz0iqx2b73b2qa77xj78xj7a950yvxhw"; depends=[cluster ggplot2 gplots GSA gtools lme4 multtest reshape2 stringr]; }; + Taxonstand = derive2 { name="Taxonstand"; version="2.0"; sha256="1g3k2mb2wxjy9sznjmv8358qa9kmszldahihq7jkr3h54fjlnlff"; depends=[pbapply]; }; + TcGSA = derive2 { name="TcGSA"; version="0.10.5"; sha256="14gnlk2r0q9zjc3431v97s7ydcyycvl0xh8bmz08mhzi20snrkpq"; depends=[cluster ggplot2 gplots GSA gtools lme4 multtest reshape2 stringr]; }; Tcomp = derive2 { name="Tcomp"; version="1.0.0"; sha256="0ddswvww9yk31gh8qb9nh0glf9w2mp3ny7zps79kdcnvbkrpcbfs"; depends=[forecast Mcomp]; }; - TeXCheckR = derive2 { name="TeXCheckR"; version="0.1.1"; sha256="13s73vq7rqf3ayfacrrd7dpb9ann5dvmcpl8flhjwnh3gxrghjgm"; depends=[clisymbols crayon data_table dplyr gmailr hunspell magrittr readr stringi twitteR zoo]; }; + TeXCheckR = derive2 { name="TeXCheckR"; version="0.2.0"; sha256="1dr0sls05p0np8l65vprwrmxn56mbs5k431s60ljq7xinzw3k20l"; depends=[clisymbols crayon data_table dplyr gmailr hunspell magrittr readr stringi twitteR zoo]; }; TeachBayes = derive2 { name="TeachBayes"; version="1.0"; sha256="1mfhlkm7wp2i4hvc63xzfyw3q4z1xhlbi933pkqkbrhih94z4rz7"; depends=[dplyr ggplot2 gridExtra LearnBayes shiny]; }; TeachNet = derive2 { name="TeachNet"; version="0.7"; sha256="1p39bsf846r7zwz4lrrv2bpyx9yrkqzrnacajwrz3jjqj6qpp6cn"; depends=[]; }; TeachingDemos = derive2 { name="TeachingDemos"; version="2.10"; sha256="016pivvy8gzz8f3clnr5dg488rb1lf0l5s00c3v34gm1dgiw5x1f"; depends=[]; }; TeachingSampling = derive2 { name="TeachingSampling"; version="3.2.2"; sha256="07c1wx7hl246kvj9ah55kdjpag8a9zbzh3jy0680w5nnv8vzsxxs"; depends=[]; }; TestDataImputation = derive2 { name="TestDataImputation"; version="1.0"; sha256="07k4sgjda1gwdlx5rap5fhs5rww2ahzyf0fq98dsm99gvjajnmwn"; depends=[Amelia mice]; }; - TestFunctions = derive2 { name="TestFunctions"; version="0.1.0"; sha256="0df69n004svbb8q0z57cfc59i7l8rxpq0c7krcn8mb03hp79fpwd"; depends=[]; }; + TestFunctions = derive2 { name="TestFunctions"; version="0.2.0"; sha256="018nkz8r6vqahrzq3d588i3ffb1bmd1pdk87j4ivcdsx99mq15sn"; depends=[]; }; TestScorer = derive2 { name="TestScorer"; version="1.7.2"; sha256="006c3g3gx55mfr93srldwvgz5vm6nkr3f57yi4qg6krn0d32865f"; depends=[]; }; TestSurvRec = derive2 { name="TestSurvRec"; version="1.2.1"; sha256="05f5gc8hvz09hx015jzis6ikki9c1brdq7l7a9bxm9bqbcc9f2f9"; depends=[boot survrec]; }; TestingSimilarity = derive2 { name="TestingSimilarity"; version="1.0"; sha256="1fagy9168cz09p460pa0qyn8m79zg4i2b9j5vg8gm1ssqi2znsl9"; depends=[alabama DoseFinding lattice]; }; @@ -3294,8 +3422,8 @@ in with self; { ThresholdROC = derive2 { name="ThresholdROC"; version="2.3"; sha256="08bmjsbwndb5i902plsy1wa5c1i5f96r3s6fdy0a16w9n6rvll1k"; depends=[MASS numDeriv pROC]; }; TickExec = derive2 { name="TickExec"; version="1.1"; sha256="0v0m0wi49yw0ply19vnirl2zwnk61sxalx24l8cadvkssgs13509"; depends=[]; }; TiddlyWikiR = derive2 { name="TiddlyWikiR"; version="1.0.1"; sha256="0vwwjdmfc8c0y2gfa8gls1mzvp29y39c9sxryrgpk253jj9px1kr"; depends=[]; }; - TideCurves = derive2 { name="TideCurves"; version="0.0.1"; sha256="0xpb5xf7ipfnfrrc7j5gsvkn6njqz3ral9nim5gqqfgbnhxkvk1b"; depends=[chron data_table fields]; }; - TideHarmonics = derive2 { name="TideHarmonics"; version="0.1-0"; sha256="0inqwa2y4pqs1g9d5m5y6w9j1kgc9qil6gmcilhkjrk886whf622"; depends=[]; }; + TideCurves = derive2 { name="TideCurves"; version="0.0.2"; sha256="1xm8df18i3pzb2v5g2li9axdx1hhg63q3j73381s88iadvqgf3aq"; depends=[chron data_table fields]; }; + TideHarmonics = derive2 { name="TideHarmonics"; version="0.1-1"; sha256="1g1v99gh6mns4l8ipmw7kpalbk07m92ybcqjq7b0wsjmdvs1y67s"; depends=[]; }; TideTables = derive2 { name="TideTables"; version="0.0.1"; sha256="08c1fbwxc2kc3vicjdw8qg452y8jrsgyi6b4qbnpb8j6nj91qcx3"; depends=[chron data_table]; }; Tides = derive2 { name="Tides"; version="1.2"; sha256="1bd5x5wx6dd7498dc8jl0hsflxvlya2b6rkwg39dpsxsigb4qc5n"; depends=[]; }; TileManager = derive2 { name="TileManager"; version="0.1.11"; sha256="11jlg99zfi00ss2a9qzmzxxdphdl3zy3pac0c7b0j2v2f529xwsw"; depends=[APfun raster rgeos sp]; }; @@ -3303,29 +3431,30 @@ in with self; { TimeMachine = derive2 { name="TimeMachine"; version="1.2"; sha256="1dz0j777wmd8mpkm2ryiahpcw6w88w429zjcw6m67pi20r1992cb"; depends=[]; }; TimeProjection = derive2 { name="TimeProjection"; version="0.2.0"; sha256="04yr4cg2khkw9n3y3qk0ni1327k4pxm09zz2xg8mpjdvgi4p9yi3"; depends=[lubridate Matrix timeDate]; }; TimeWarp = derive2 { name="TimeWarp"; version="1.0.15"; sha256="1v6f6d1h9dc8npdy0ph5hhc4jjkzh8kac48lz4ahgngi9n0xwql9"; depends=[]; }; - Tinflex = derive2 { name="Tinflex"; version="1.1"; sha256="1wnb893x4gj1h3fpyblks07dln5ilpllpmmwp7wpqbvj7hzrj661"; depends=[]; }; + Tinflex = derive2 { name="Tinflex"; version="1.2"; sha256="0rx4aj0bxiaaap3f43jzf3rlmrjp0g8aplg1ybccdyahx4p727bn"; depends=[]; }; TipDatingBeast = derive2 { name="TipDatingBeast"; version="1.0-5"; sha256="0n0kw90nzyh8ik09kp1lq301rhdink6dqzd6xw9qkl10z8rzq7v1"; depends=[DescTools mclust TeachingDemos]; }; TippingPoint = derive2 { name="TippingPoint"; version="1.1.0"; sha256="1f5bfag892yk47r1pw2rlvqz9qnkaz8radprpxh0q0knviw3f9fp"; depends=[bayesSurv ggplot2 RColorBrewer reshape2]; }; Tlasso = derive2 { name="Tlasso"; version="1.0.1"; sha256="0flx4l7q3qndp77349ayfrszyim7mvs7yfvv3j9a1mhf3gdn9j14"; depends=[expm huge igraph rTensor]; }; - Tmisc = derive2 { name="Tmisc"; version="0.1.13"; sha256="1y3907aqr8k8qdl4pa6msjf80fwqmc63ga9hbvjvdn20h8w39a55"; depends=[audio dplyr]; }; + Tmisc = derive2 { name="Tmisc"; version="0.1.17"; sha256="11i807ma7mhx9ba675ifs42b5gr2dgr2z2zx35ga0jav464n9vk0"; depends=[audio dplyr rstudioapi tibble]; }; Tnseq = derive2 { name="Tnseq"; version="0.1.2"; sha256="1n76yzk15p8i5bp3k6fszmdqk2d791r4sb8hg5hb61zb92r7wqlj"; depends=[Biobase Ckmeans_1d_dp DESeq edgeR limma]; }; TopKLists = derive2 { name="TopKLists"; version="1.0.6"; sha256="1hmm9g68scq8sqdb9axqn51p00mx6p6lw0fdgjljfi2q72xcqhq3"; depends=[gplots Hmisc]; }; TotalCopheneticIndex = derive2 { name="TotalCopheneticIndex"; version="0.1"; sha256="1477zp8jzq1p22q8484vkrdx5nxwq4i44mxg4zhj9fixiw4shpx9"; depends=[ape]; }; - TraMineR = derive2 { name="TraMineR"; version="1.8-13"; sha256="058fj2jkr9hzpigmawzfv20c7dzdf70lwwxng46x0b1r34pdgrfr"; depends=[boot Hmisc RColorBrewer]; }; - TraMineRextras = derive2 { name="TraMineRextras"; version="0.2.6"; sha256="1ih2d02p8dnpcvsxqqi6mcnac36i93g4fkq1pdpl7p2i1hl15hyr"; depends=[cluster combinat RColorBrewer survival TraMineR]; }; + TraMineR = derive2 { name="TraMineR"; version="2.0-6"; sha256="1yinx7ym8rj8z9p98bz9sw3vxnr4gk6vk7j9shskrraz5md5siw0"; depends=[boot cluster Hmisc RColorBrewer]; }; + TraMineRextras = derive2 { name="TraMineRextras"; version="0.4.0"; sha256="1n8i815cr8fclfrh97pzbyyrcv0v8y4j9y6c14bz0kzx8n7pzjy1"; depends=[cluster combinat RColorBrewer survival TraMineR]; }; TrackReconstruction = derive2 { name="TrackReconstruction"; version="1.1"; sha256="1f2l3nshb6qrhyczw5rxqqzmsjxf0rvv3y78j8d9lv1nnd9kxzq5"; depends=[fields RColorBrewer]; }; Trading = derive2 { name="Trading"; version="1.1"; sha256="1mzqck9n14xp16vflx1sx8lry0wjmx37hqv76ldj21xnk5zbrgil"; depends=[]; }; Traitspace = derive2 { name="Traitspace"; version="1.1"; sha256="1wlrpnzb39vgkqy0ynbwlgrkkqgklrk6pw7f8p7p2i132qk2c291"; depends=[mclust permute]; }; - TransModel = derive2 { name="TransModel"; version="1.0"; sha256="1cxvfmf304x8riwcnx6gp5fb5gkqa552zby2n6yxc0ic0m0w77kb"; depends=[survival]; }; + TransModel = derive2 { name="TransModel"; version="2.1"; sha256="0brlr4w5k8xsgbrizm7ha0cmq0kqzd2fcjpszq7gym844jj93csi"; depends=[MASS survival]; }; TransP = derive2 { name="TransP"; version="0.1"; sha256="0p6pfcp8qjdah0lfhx0a396nxjzp3ckpda9hl3snpppx79iyww55"; depends=[]; }; TransferEntropy = derive2 { name="TransferEntropy"; version="1.4"; sha256="0620axdj6qyskf7xszrs8j5d2l73ns4bgbdg03fvr8i7jmq70zb8"; depends=[BH Rcpp]; }; TreatmentSelection = derive2 { name="TreatmentSelection"; version="2.0.3"; sha256="00z85vmpy7k4vi2jj9yspybc9hkwqqfnvl1x9jqayyb8xw8wk0f6"; depends=[binom ggplot2 survival]; }; TreeBUGS = derive2 { name="TreeBUGS"; version="1.1.0"; sha256="1xw3wqax6d8pys2177cj6bdp92xx7pr08y6qa1g3k83hhi2frikw"; depends=[coda hypergeo MASS Rcpp RcppArmadillo rjags runjags]; }; TreePar = derive2 { name="TreePar"; version="3.3"; sha256="1sm518b1b4b1p0n5979qzvi2nacxpp3znbg9n75pf2a8z8wy6p4l"; depends=[ape deSolve Matrix subplex TreeSim]; }; TreeSim = derive2 { name="TreeSim"; version="2.3"; sha256="1y98m2whpx9kssgklw2d6prs6af9vcn8yva1l7lm1l509py1fn6h"; depends=[ape geiger]; }; - TreeSimGM = derive2 { name="TreeSimGM"; version="1.2"; sha256="0y6hadwx3apw11jy5d4al3dav3his8b4xvkv7s5d5rd92l7yrw0r"; depends=[TreeSim]; }; + TreeSimGM = derive2 { name="TreeSimGM"; version="2.1"; sha256="1aqycpin2v99n7ayfk1l54l4s6nzwxl9qpl89i8is45bnnwy9fln"; depends=[ape TreeSim]; }; TrendInTrend = derive2 { name="TrendInTrend"; version="1.0.1"; sha256="1fph4sz3y7drni0mjivz82jvmfa8hp468vmqk00k51w4nkg3hyif"; depends=[]; }; TriMatch = derive2 { name="TriMatch"; version="0.9.7"; sha256="06idgh9bwwbwa16hlc2kgm06n9shzm0825f7k65zpz3isq23dp7q"; depends=[ez ggplot2 gridExtra PSAgraphics psych reshape2 scales]; }; + TriadSim = derive2 { name="TriadSim"; version="0.1.1"; sha256="0m14k512b7q09zx51v2kxa8q9pk2i179w6ckl6jxj2acc860xw3k"; depends=[doParallel foreach snpStats]; }; TrialSize = derive2 { name="TrialSize"; version="1.3"; sha256="1hikhw2l7d3c7cg4p7zzrgdwhy9g4rv06znpw5mc6kwinyakp75q"; depends=[]; }; TripleR = derive2 { name="TripleR"; version="1.5.3"; sha256="13s1vlmr4sqa2sq2fbcld86bh3g73yb204aawbks11rjblwzvb0h"; depends=[ggplot2 plyr reshape2]; }; TropFishR = derive2 { name="TropFishR"; version="1.1.3"; sha256="114vg4jvb1k7mzz81ag1hs7zvpnq4ql68p55xbci24gi3qg5s7cj"; depends=[beepr doParallel GA GenSA MASS msm propagate reshape2]; }; @@ -3341,7 +3470,7 @@ in with self; { UBL = derive2 { name="UBL"; version="0.0.5"; sha256="13dvfpkyn9fc2lwlxzf5s47zjhgjnm7s9825w2brgq4l6x5afz9q"; depends=[]; }; UCR_ColumnNames = derive2 { name="UCR.ColumnNames"; version="0.1.0"; sha256="1nwwq93f60r9aik51l7mzckg81f81nz5kgzynyzp5sm4y2wmpzwn"; depends=[]; }; UNCLES = derive2 { name="UNCLES"; version="2.0"; sha256="0c61sm09dh0yfrjrjjnizg7qrf8xgc1zdldwhjh64kq8k8g5wa69"; depends=[class kohonen pdist]; }; - UNF = derive2 { name="UNF"; version="2.0.5"; sha256="1lag4aby81nnd7w8f68zswgm4afp24xhj72k0v7cka9hyxz0p129"; depends=[base64enc digest]; }; + UNF = derive2 { name="UNF"; version="2.0.6"; sha256="0sr740dhfp7z9wvhajww43g5gz79x5y5dbflw5a813jgmiqm1jyq"; depends=[base64enc digest]; }; UPMASK = derive2 { name="UPMASK"; version="1.1"; sha256="1qxajvld8g2mii12agypcm50fps9bai6d2wx6l0bv3srk80in7ai"; depends=[DBI MASS RSQLite]; }; USAboundaries = derive2 { name="USAboundaries"; version="0.2.0"; sha256="1if3wf22h395iqcn1n5rfnacwhxd3mpmbvygdwbs2amk55r18vg4"; depends=[sp]; }; USGSstates2k = derive2 { name="USGSstates2k"; version="1.0.1"; sha256="11yk0pkss23j6fmmxnjkjm9p24ln343y4hijigbrbvcnb21wj2py"; depends=[sp]; }; @@ -3355,9 +3484,10 @@ in with self; { UncerIn2 = derive2 { name="UncerIn2"; version="2.0"; sha256="08cg7armz9xwwn1222aws98cwrvmw0s73pxpnszmrmrli1qs92k1"; depends=[automap fields geoR gstat RandomFields Rcpp sp]; }; UncertainInterval = derive2 { name="UncertainInterval"; version="0.3.0"; sha256="09x52g691qqsphy2sppm3852gak0ammsan4x306vd16yz9z0zlb2"; depends=[nloptr reshape2 rootSolve]; }; Unicode = derive2 { name="Unicode"; version="9.0.0-1"; sha256="1daf4wlglqzha0p6cbmrkwn4ppkzfvpvg1aa64gphr4dg2g5jsdf"; depends=[]; }; + UnivRNG = derive2 { name="UnivRNG"; version="1.0"; sha256="1d55a103q30vhyjq659a6bbnqbm4g4calr5j4xw8p0h0x5i4p5xh"; depends=[]; }; UpSetR = derive2 { name="UpSetR"; version="1.3.3"; sha256="08vj7l92b8fpqyqwxshll2mhk3yhgyr74axvr2lf29z78bapymhz"; depends=[ggplot2 gridExtra plyr scales]; }; UsingR = derive2 { name="UsingR"; version="2.0-5"; sha256="1w1swcb5srb2b76agbh3mipz8b3vbhpnhxfhg7k546y38j3crafq"; depends=[HistData Hmisc MASS]; }; - V8 = derive2 { name="V8"; version="1.4"; sha256="0k97cz7hzlqpbwcmzpxd86hb8fbxqj70zshlnn4hnayjx0jaybi4"; depends=[curl jsonlite Rcpp]; }; + V8 = derive2 { name="V8"; version="1.5"; sha256="155389k8laa48akg0bfsz65s4ddmpk0xpi1ha56z1sayv01vrrgc"; depends=[curl jsonlite Rcpp]; }; VAR_etp = derive2 { name="VAR.etp"; version="0.7"; sha256="0py5my3ilhcmz44m15hh0d219l9cz7rda4a9gbmf8wh9cgvvj1s3"; depends=[]; }; VARSEDIG = derive2 { name="VARSEDIG"; version="1.3"; sha256="1qvc9lyfdc0irivi4y27hc5yn5lk05nbgqx7zcj602s0r7i7nvln"; depends=[]; }; VARsignR = derive2 { name="VARsignR"; version="0.1.3"; sha256="09mnf9hvsi4wx1c81yq97mzggwk6s7nka7awrws63icjybqjmra9"; depends=[HI minqa mvnfast]; }; @@ -3376,18 +3506,18 @@ in with self; { VIMGUI = derive2 { name="VIMGUI"; version="0.10.0"; sha256="14na9ss0vkcys979kdcciynwssqsvy2w566nydgzd3n7gcmx2agm"; depends=[Cairo foreign gWidgets gWidgetsRGtk2 Hmisc RGtk2 survey tkrplot VIM]; }; VLF = derive2 { name="VLF"; version="1.0"; sha256="1il8zhm80mc22zj16dpsy4s6s9arj21l9ik0vccyrpnlr8ws3d3l"; depends=[]; }; VLMC = derive2 { name="VLMC"; version="1.4-1"; sha256="0y91cl9pv1d5s8956grdx3y4xa5l1fabrh1wl5hn11fjgyz1dcij"; depends=[MASS]; }; - VNM = derive2 { name="VNM"; version="4.1"; sha256="1vmdm4f7y69imsbxnd7q85q1ygcyl94pq5n7f33d0sd8rw51dmdj"; depends=[Rcpp]; }; + VNM = derive2 { name="VNM"; version="5.1"; sha256="132m23np3qk4cf2fnsjg0ykcifqs20psavybmzs5b86qp9m77h9h"; depends=[Rcpp]; }; VRPM = derive2 { name="VRPM"; version="1.1"; sha256="19rr31w0yzy7w9k34ny2sjk9ijwgnkfzbdizdch77g9rnpzpw597"; depends=[fields ggplot2 Hmisc kernlab R2HTML ROCR shiny survival viridis]; }; VSE = derive2 { name="VSE"; version="0.99"; sha256="07m5080nw72b77238v2wwdh4dxsvv6y78d4j1329n90wyj2crxl4"; depends=[car GenomicRanges igraph IRanges]; }; VSURF = derive2 { name="VSURF"; version="1.0.3"; sha256="0fgy1qk1jkrnil4cirkp2lj21xjwbpgjgxqrsjs321s69rw2dy1j"; depends=[doParallel foreach randomForest rpart]; }; VTrack = derive2 { name="VTrack"; version="1.11"; sha256="1w8zp7l60mwzppg3gqq0zv5a065y0vdrp2v0x0yl4a8jq0zlvppx"; depends=[doParallel foreach plotKML sp spacetime]; }; - VWPre = derive2 { name="VWPre"; version="0.9.5"; sha256="1qxaq60zpb8hdpq3c17sm77jvm8r0yy88xvq1k8i52ggn8nn7gsc"; depends=[dplyr ggplot2 lazyeval mgcv shiny tidyr]; }; + VWPre = derive2 { name="VWPre"; version="0.9.6"; sha256="11ild9xs3wgjbsbcbrz8037k60sqgfhxvvb4kq6rxnagzbkilvkx"; depends=[dplyr ggplot2 lazyeval mgcv shiny tidyr]; }; VaRES = derive2 { name="VaRES"; version="1.0"; sha256="0gw05jiqgirhz3c8skbb07y4h44r6vi68gnd5y7ql455v0c2raza"; depends=[]; }; VarED = derive2 { name="VarED"; version="1.0.0"; sha256="16j9p2a143y4hqclsv1mig0fccrzjx2r0lll0wz8isjp9x1wzjv8"; depends=[]; }; - VarReg = derive2 { name="VarReg"; version="1.0"; sha256="1xbm5l1jxcmjk38hl61bz2zyfcwa932487l03dzr8izxcain1dfi"; depends=[sn survival]; }; + VarReg = derive2 { name="VarReg"; version="1.0.1"; sha256="00ygs9gk2719fnhb47z1pj7qacapzg9qs1li2206vsfrmqxjvj1a"; depends=[sn survival]; }; VarSelLCM = derive2 { name="VarSelLCM"; version="1.2"; sha256="1pzcadzg1snv2nkdrbhgi6scrd70cawprncm8hs82gcl3r9dscic"; depends=[Rcpp RcppArmadillo]; }; VarSwapPrice = derive2 { name="VarSwapPrice"; version="1.0"; sha256="12q2wp2cqi9q47mzbb7sc250zkjqkhs9z0h93ik0h63dv339abgj"; depends=[]; }; - VarfromPDB = derive2 { name="VarfromPDB"; version="2.1.11"; sha256="1pxv6f7bz7g75hk3y7ndc9qcf49fzl82xc8f165w18wgkqk0v6a4"; depends=[RCurl RISmed stringi stringr XML XML2R]; }; + VarfromPDB = derive2 { name="VarfromPDB"; version="2.2.7"; sha256="1sb31338r2p0jsa3k72q9lc5f57cybywmda7q2j8byngh1fjvgyz"; depends=[curl RISmed stringi stringr XML XML2R]; }; VariABEL = derive2 { name="VariABEL"; version="0.9-2.1"; sha256="00k08mvd09rpplakvid6qal1zdxaj1bxn4d2ivpnqihisf7nxqbs"; depends=[]; }; VariableScreening = derive2 { name="VariableScreening"; version="0.1.1"; sha256="03l929qhgr1bd721488xx0il1hlswv3zdad518ki94ghq9c4nmg3"; depends=[expm gee MASS]; }; VarianceGamma = derive2 { name="VarianceGamma"; version="0.3-1"; sha256="0h424hdphbgi9i84bgzdwmsq05w61q8300x8f9y4szbxa5k2dnar"; depends=[DistributionUtils GeneralizedHyperbolic RUnit]; }; @@ -3401,7 +3531,7 @@ in with self; { VetResearchLMM = derive2 { name="VetResearchLMM"; version="0.2.0"; sha256="1vx72pn3fl27mjsa48kz5j1sj1bkjq8q0ifs5dxdfrcdswfqhjcw"; depends=[ggplot2 lme4 lmerTest multcomp nlme]; }; ViSiElse = derive2 { name="ViSiElse"; version="1.2.0"; sha256="0k5hhzyjws0haawx2r2c0rxjbjdfx821x0jmj88786q6x67x86n0"; depends=[chron colorspace Matrix stringr]; }; VideoComparison = derive2 { name="VideoComparison"; version="0.15"; sha256="0592fz0v4xvq1qy2hj4ph90v7zn1cnzr6a094mp9p1k61ki3fbg2"; depends=[pracma Rcpp RCurl RJSONIO zoo]; }; - VineCopula = derive2 { name="VineCopula"; version="2.1.1"; sha256="1cqfa7s3gqrbdhjy2v8yn44k6vlxpzi0bmlcpzf9kkzy36p3vz84"; depends=[ADGofTest copula doParallel foreach kdecopula lattice MASS mvtnorm network]; }; + VineCopula = derive2 { name="VineCopula"; version="2.1.2"; sha256="0h1h0sk7s4gh5ngsyjbaw6j535yycng2r4lm5ysrzv46lm6x5y03"; depends=[ADGofTest copula doParallel foreach kdecopula lattice MASS mvtnorm network]; }; VisuClust = derive2 { name="VisuClust"; version="1.2"; sha256="0hnjmrz352950rzky88q4nwvkx7zp6x3lsm7kff5dl4w05iq4wsl"; depends=[aplpack]; }; VizOR = derive2 { name="VizOR"; version="0.8-5"; sha256="1v76m67xdlg06w3dmp27mh3mv3lfqy6bd1iq907dynp2g4qf4ww0"; depends=[lattice rms]; }; Voss = derive2 { name="Voss"; version="0.1-4"; sha256="056izh1j26vqjhjh01fr7nwiz1l6vwr5z4fll87w99nc5wc4a467"; depends=[fields]; }; @@ -3421,28 +3551,29 @@ in with self; { WMDB = derive2 { name="WMDB"; version="1.0"; sha256="10wdjy3g2qg975yf1dhy09w9b8rs3w6iszhbzqx9igfqvi8isrr1"; depends=[]; }; WPC = derive2 { name="WPC"; version="1.0"; sha256="0li502hwa4n945yfnilslyvl12ls66kazbfmxb4kkjbaf500mjp9"; depends=[msm survival]; }; WPKDE = derive2 { name="WPKDE"; version="0.1"; sha256="100vla11fbw16x5n4w4kbslz4n725v4x6j0hrxzrk99ryl0crmf6"; depends=[]; }; - WRS2 = derive2 { name="WRS2"; version="0.9-1"; sha256="0w7qnqf289p5jnfr9l83bcplxg1rvbhc90iz7wwnphx7246nkdvv"; depends=[MASS mc2d plyr reshape]; }; - WRTDStidal = derive2 { name="WRTDStidal"; version="1.0.1"; sha256="14xi1wksyj07nch678dd4rbaa3q1in4nbsarv5bijl2b11dhfi7j"; depends=[caret dplyr fields foreach forecast ggplot2 gridExtra lubridate quantreg RColorBrewer survival tidyr]; }; - WVPlots = derive2 { name="WVPlots"; version="0.2.3"; sha256="1664gbhpn02qcgxvw5adqk2kdx8zrlrm5ca5f7d9c3k7a3db00ih"; depends=[ggplot2 gridExtra mgcv replyr reshape2 sigr wrapr]; }; + WRS2 = derive2 { name="WRS2"; version="0.9-2"; sha256="0szjq9ffckjqa128avs4cymqvxk7dhldzj620kcq7q59aagrnj04"; depends=[MASS mc2d plyr reshape]; }; + WRTDStidal = derive2 { name="WRTDStidal"; version="1.1.0"; sha256="0yyhls0qzwwj4sz5d1nvzfiacx28dmf2hgjc7xgfi2qjkckg40hs"; depends=[caret dplyr EnvStats fields foreach forecast ggplot2 gridExtra lubridate purrr quantreg RColorBrewer survival tidyr]; }; + WVPlots = derive2 { name="WVPlots"; version="0.2.4"; sha256="13vivk497ix0qpww705awws69lgn8whminfvs53inlyqnqinrwp4"; depends=[ggplot2 gridExtra mgcv plotly replyr reshape2 sigr wrapr]; }; WWGbook = derive2 { name="WWGbook"; version="1.0.1"; sha256="0q8lnd1fp4rmz715x0lf61py3xw8wg55yq3gvswaqwy68dlqrzjc"; depends=[]; }; - WWR = derive2 { name="WWR"; version="1.1.0"; sha256="19pq31ivga8yy9hxmw3birbbnhrph52hazydagz9d44az2x2877x"; depends=[inline]; }; + WWR = derive2 { name="WWR"; version="1.2.0"; sha256="1m60zchm1f85m2b5h1yqcyhnm4593d0r7wakhmx5zpkhbx1rhgmg"; depends=[inline]; }; WaterML = derive2 { name="WaterML"; version="1.7.1"; sha256="0aqcanq2l3m9w1kglmkbqshs80wx9inmjp0c1i2j901g4k35ss5j"; depends=[httr RJSONIO XML]; }; Watersheds = derive2 { name="Watersheds"; version="1.1"; sha256="1gn52nl0rr29pqq94gjasc4fi1kjxlrpjdkgm2x56j5jbd162drk"; depends=[lattice maptools rgeos sp splancs]; }; Wats = derive2 { name="Wats"; version="0.10.3"; sha256="1wh4wxzmdj154mh61ng4bg827hpx1kw85x34c1d7xdpbq3wag4g1"; depends=[colorspace ggplot2 lubridate plyr RColorBrewer testit zoo]; }; - WaveLetLongMemory = derive2 { name="WaveLetLongMemory"; version="0.1.0"; sha256="1qfh5ca8389b3zimqfrlhjyzkrvvj3dixhbab1a0wrnbcc55dcq1"; depends=[fracdiff wmtsa]; }; + WaveLetLongMemory = derive2 { name="WaveLetLongMemory"; version="0.1.1"; sha256="1pc32vaw7c1xqh8shf8nwja4rmfg0xaxwr2ij5shp6ab6h8060fg"; depends=[fracdiff wmtsa]; }; WaveletComp = derive2 { name="WaveletComp"; version="1.0"; sha256="16ghxqjbv39pmgd52im6ilkkh0hpnaw8ns0hwkngpbr479m1grdp"; depends=[]; }; WaverR = derive2 { name="WaverR"; version="1.0"; sha256="084fhzggzm075w6wp2lqd3j0an21idhw8z5l8ynz4y96mpmn204a"; depends=[kimisc MASS]; }; - WebGestaltR = derive2 { name="WebGestaltR"; version="0.0.8"; sha256="0wwxqfskrj5g50g223cdr33l8n7z3psi1gwl34261fv1v48nxxvr"; depends=[data_table doParallel foreach pkgmaker PythonInR rjson]; }; + WebGestaltR = derive2 { name="WebGestaltR"; version="0.1.1"; sha256="0cdpfwp4whx8pff73acxga072lwbibl44hxdjs9jsb5i21h55vbr"; depends=[data_table doParallel foreach pkgmaker PythonInR rjson]; }; Weighted_Desc_Stat = derive2 { name="Weighted.Desc.Stat"; version="1.0"; sha256="030i12mnwlj976avvk3grrccgprsckmc35dm2ajwdfc9dijhypnj"; depends=[]; }; - WeightedCluster = derive2 { name="WeightedCluster"; version="1.2"; sha256="1d0df284fzfa34fi7b3d7f4zzm9ppyah46rj865446l5pjvl9np3"; depends=[cluster RColorBrewer TraMineR]; }; + WeightedCluster = derive2 { name="WeightedCluster"; version="1.2-1"; sha256="04gsr65mssv4cz4v8sh44qhyzn0isll057d45z4ljv6sx0an5yhl"; depends=[cluster RColorBrewer TraMineR]; }; WeightedPortTest = derive2 { name="WeightedPortTest"; version="1.0"; sha256="007v3w9ssiv2sds7sikpal27g6pxwxhs7bvcyw6kr0vg8gvlbi8h"; depends=[]; }; + WeightedROC = derive2 { name="WeightedROC"; version="2017.06.08"; sha256="07vx6blkq86cqsraxp9sixd4y4vrrmdxnzkp1c8jpivzpqiydh9y"; depends=[]; }; WhatIf = derive2 { name="WhatIf"; version="1.5-8"; sha256="0vnkb16ap1aiqbmcw18cr558kyixq0rmfcwh0bp6v1djwb78adhd"; depends=[lpSolve Zelig]; }; WhiteStripe = derive2 { name="WhiteStripe"; version="2.2.2"; sha256="0jaxy5a4m4ir25assi2dsdgfcm88lbgjdghsh36v7zvhblrfcfap"; depends=[mgcv oro_nifti]; }; WhopGenome = derive2 { name="WhopGenome"; version="0.9.7"; sha256="1xa7d9x5ny8g79scfkv7v5ix9m3mfzg0fks2bsan9zqyhcd01fsq"; depends=[]; }; WiSEBoot = derive2 { name="WiSEBoot"; version="1.4.0"; sha256="1fch78884ay7m2gy602k8df78gkvjiwzkjk550w0k4xbv430ld0h"; depends=[FAdist wavethresh]; }; WikiSocio = derive2 { name="WikiSocio"; version="0.7.0"; sha256="1rc90cidc8mj8x7vw82vx41ivwnmil3cmc1whc8ghxrwli256w32"; depends=[httr igraph pbapply plyr RCurl stringr XML]; }; - WikidataQueryServiceR = derive2 { name="WikidataQueryServiceR"; version="0.1.0"; sha256="17vnfarnqf5cqdldgwg505vcj2l0hji409zdyncks7xcq8myvswz"; depends=[dplyr httr jsonlite]; }; - WikidataR = derive2 { name="WikidataR"; version="1.2.0"; sha256="053gyls7bv4xb34jifxm5040zml2cwznna3brckf0191cvd5jgws"; depends=[httr jsonlite WikipediR]; }; + WikidataQueryServiceR = derive2 { name="WikidataQueryServiceR"; version="0.1.1"; sha256="1bqgp3wldfmnwwh9llig8xpa4x0rcp1hcwyw7d7pw4ym61b2v65x"; depends=[dplyr httr jsonlite]; }; + WikidataR = derive2 { name="WikidataR"; version="1.3.0"; sha256="0ymbvnalayx082hbjdyxazx25k1qclf16qch5ikzxn3vc8qwffaa"; depends=[httr jsonlite WikipediR]; }; WikipediR = derive2 { name="WikipediR"; version="1.5.0"; sha256="1w4ggq42vlq7zbrz3v9ripz9yscbd8m8as60q7cplpxn9zqfdl7q"; depends=[httr jsonlite]; }; WikipediaR = derive2 { name="WikipediaR"; version="1.1"; sha256="0fxk247jb82g0f3nmwraa4kvdpjxy5s4dcyzj9vkjw2lq8by3l0h"; depends=[httr XML]; }; WilcoxCV = derive2 { name="WilcoxCV"; version="1.0-2"; sha256="1kbb7ikgnlxybmvqrbn4cd8xnqrkwipk4xd6yja1xsi39a109xzl"; depends=[]; }; @@ -3451,13 +3582,13 @@ in with self; { Wrapped = derive2 { name="Wrapped"; version="1.0"; sha256="1c12yk0qw017ccdjr2hk6zxm93735hx7lwg2gp2cj15yb3rwnscf"; depends=[AdequacyModel ald cubfits evd fBasics gamlss_dist GeneralizedHyperbolic GEVStableGarch glogis irtProb LCA lqmm NormalLaplace normalp ordinal sgt SkewHyperbolic sld sn VarianceGamma VGAM]; }; WrightMap = derive2 { name="WrightMap"; version="1.2.1"; sha256="16zp7h28fap5hq5xzvkb4lc217yhfmwzfbvw2lsni0gf9qxqkgqd"; depends=[]; }; WriteXLS = derive2 { name="WriteXLS"; version="4.0.0"; sha256="0nwxi36w3rkzw9j0qil64gakhb101rxg1wydjkwlpg0nbsj1sm50"; depends=[]; }; - WufooR = derive2 { name="WufooR"; version="0.6.1"; sha256="0nshs1c00f2cw7wmrphz1833gd336bckqa9h0q90hxj388kwis3y"; depends=[dplyr httr jsonlite]; }; + WufooR = derive2 { name="WufooR"; version="0.6.2"; sha256="1k5nmg8mg8m9salcb0jr87ws548ydc597v8m94y4qrrfchy623rg"; depends=[dplyr httr jsonlite]; }; XBRL = derive2 { name="XBRL"; version="0.99.18"; sha256="1bwvxqbxdf1ynz2bv27l86h05h8y19q2li2y79xk819p5nkxq341"; depends=[Rcpp]; }; XGR = derive2 { name="XGR"; version="1.0.10"; sha256="19fgjg7cd6ax4iiwkp0r4ssr6ygfg16s3i62vr3y63an6ykmg206"; depends=[BiocGenerics dnet GenomicRanges ggplot2 igraph IRanges Matrix plot3D RCircos rtracklayer S4Vectors supraHex]; }; XHWE = derive2 { name="XHWE"; version="1.0"; sha256="1ca8y9q3623d0vn91g62nrqf3pkbcbkpclmddw5byd37sdrgsi5l"; depends=[]; }; - XLConnect = derive2 { name="XLConnect"; version="0.2-12"; sha256="0b7nz5k3sai32fvpqzxim5ckcqrqmzd111qxm65369zvg3q281jh"; depends=[rJava XLConnectJars]; }; - XLConnectJars = derive2 { name="XLConnectJars"; version="0.2-12"; sha256="1wkdrvm6h1kpkfvwf5xcx7v1j06dmp6qxgiy5ca5b0qixhqg8sv7"; depends=[rJava]; }; - XML = derive2 { name="XML"; version="3.98-1.6"; sha256="1amxx7fpik162nimrr7m5lvv6rhx9cwdyg44fxp1i5wm3y4skwnz"; depends=[]; }; + XLConnect = derive2 { name="XLConnect"; version="0.2-13"; sha256="1a6a156m1cinscvhnh27di1z8fckrqf876clzg96zrx0h01q2sfz"; depends=[rJava XLConnectJars]; }; + XLConnectJars = derive2 { name="XLConnectJars"; version="0.2-13"; sha256="1g2ld0r6mjz9fmy1ijhj7x2sxw562yzrnwsryj3a4qj2fmy61g48"; depends=[rJava]; }; + XML = derive2 { name="XML"; version="3.98-1.9"; sha256="1hzkdkgs0nzmfg9wm7kyh1j9i0i2g7925whzlihqvg9grdlh3dx3"; depends=[]; }; XML2R = derive2 { name="XML2R"; version="0.0.6"; sha256="0azfh950r2b7ck3n1vzk3mdll7zy844nx3mbk676jxnj8gg7nxk5"; depends=[plyr RCurl XML]; }; XMRF = derive2 { name="XMRF"; version="1.0"; sha256="0jnyy9pcksfadznidqsbwh8nlqv3k0yppj76q8a2g0aidbdmg2cc"; depends=[glmnet igraph MASS Matrix snowfall]; }; XNomial = derive2 { name="XNomial"; version="1.0.4"; sha256="1mwx302576rmsjllbq2clfxilm3hkyp5bw0wmwqbn0kgv5wpy8z6"; depends=[]; }; @@ -3467,23 +3598,26 @@ in with self; { XRSCC = derive2 { name="XRSCC"; version="0.1"; sha256="0hs2whjsd02avaz79zkrd8gjw9qd7l6ysxmhx4w1r7gb1cj9rr7c"; depends=[]; }; XiMpLe = derive2 { name="XiMpLe"; version="0.10-1"; sha256="10163snplpw4r4902w2ws60m6wr1icnniv7y0vy7y1nq2c0i0is5"; depends=[]; }; Xmisc = derive2 { name="Xmisc"; version="0.2.1"; sha256="11gwlcyxhz1p50m68cnqrxmisdk99v8vrsbvyr7k67f0kvsznzs1"; depends=[]; }; + Xplortext = derive2 { name="Xplortext"; version="1.00"; sha256="0llygkb73x1c124w12cf4lccky7s5placnchx6dqfmygh9d4m933"; depends=[FactoMineR ggplot2 gridExtra slam stringr tm]; }; YPmodel = derive2 { name="YPmodel"; version="1.3"; sha256="1vll33nm7xynnbq15wksk9c38jhjfd6l1bbzijn5skqc5yik1r5x"; depends=[]; }; YaleToolkit = derive2 { name="YaleToolkit"; version="4.2.2"; sha256="12wggdyz0wgnmxnqhp8bypyy1x1p50g49fwdzl2l43il44cdyv0g"; depends=[foreach iterators]; }; YieldCurve = derive2 { name="YieldCurve"; version="4.1"; sha256="0w47j8v2lvarrclnixwzaq98nv1xh2m48q5xvnmk7j9nsv2l3p68"; depends=[xts]; }; YplantQMC = derive2 { name="YplantQMC"; version="0.6-6"; sha256="153sznajgp4bjsjhn3xk6kbp68ihswdc48gn0y3wmg5xa15yrqlk"; depends=[geometry gplots LeafAngle maps rgl]; }; YuGene = derive2 { name="YuGene"; version="1.1.5"; sha256="1f1bia1q1z2rzp4pw218zglf02x1m9zpz5gqllrd77ggw8ilqfjc"; depends=[mixOmics]; }; + ZIBseq = derive2 { name="ZIBseq"; version="1.2"; sha256="13rjy4jl9wil6hhpra4qmdis0iyqxchzsf9l7q6r0dz1f7dpd2nq"; depends=[gamlss gamlss_dist nlme]; }; ZIM = derive2 { name="ZIM"; version="1.0.3"; sha256="1497ki0pr0x21fz5wa2z6zgb2br99z56gvfxyn9cglqq45if6cjh"; depends=[MASS]; }; ZRA = derive2 { name="ZRA"; version="0.2"; sha256="1sx1q5yf68hhlb5j1hicpj594rmgajqr25llg7ax416j0m2rnagi"; depends=[dygraphs forecast]; }; ZeBook = derive2 { name="ZeBook"; version="0.5"; sha256="1djwda6hzx6kpf4dbmw0fkfq39fqh80aa3q9c6p41qxzcpim27dw"; depends=[deSolve triangle]; }; - Zelig = derive2 { name="Zelig"; version="5.0-17"; sha256="0wn99v9l49ph1150fgd5jmjvwxingdmibrw1p4cg7cqyjwvdc7n0"; depends=[AER Amelia coda dplyr geepack jsonlite MASS MatchIt maxLik MCMCpack quantreg sandwich survey survival VGAM]; }; - ZeligChoice = derive2 { name="ZeligChoice"; version="0.9-4"; sha256="02wbgzrp0jxkzz1bj5s6zk6m0w7l26jncml91mwhb2w5hzhjnbaj"; depends=[dplyr jsonlite MASS VGAM Zelig]; }; - ZeligEI = derive2 { name="ZeligEI"; version="0.1-0"; sha256="1vkni4p1b0aq63l4nqg16f6a28c6ccm8nyg67z45x0yfq7xgcsi6"; depends=[dplyr ei eiPack jsonlite MASS MCMCpack Zelig]; }; + Zelig = derive2 { name="Zelig"; version="5.1-2"; sha256="00i36haj1ac99fins20nx1ljp5dmkw7gcx8yz7brz9a8as5k02r9"; depends=[AER Amelia coda dplyr Formula geepack jsonlite MASS MatchIt maxLik MCMCpack quantreg sandwich survey survival VGAM]; }; + ZeligChoice = derive2 { name="ZeligChoice"; version="0.9-6"; sha256="1whfwc42lsi54xfr423h6jwbvpj6yjyyf0854k1f1ms13liahm8w"; depends=[dplyr Formula jsonlite MASS VGAM Zelig]; }; + ZeligEI = derive2 { name="ZeligEI"; version="0.1-2"; sha256="0kilzfqmm6a41mmjvlynh3rnj30fqiq8gsja28fzwpf0lbl89slg"; depends=[dplyr ei eiPack Formula jsonlite MASS MCMCpack Zelig]; }; ZillowR = derive2 { name="ZillowR"; version="0.1.0"; sha256="1wrr58p76ps29fqzzwgfvfibxrvc72p2yzs5kc2rv1yxzzcpyxvb"; depends=[RCurl XML]; }; aCRM = derive2 { name="aCRM"; version="0.1.1"; sha256="0kzp568hd9c9a9qgniia5s5gv0q5f89xfvvwpzb197gqhs3x092v"; depends=[ada dummies kernelFactory randomForest]; }; aLFQ = derive2 { name="aLFQ"; version="1.3.4"; sha256="1q2l5cwkcsng22nxckgc7aalvy3qhvgga5nkchfpy53sxg68awqv"; depends=[bio3d caret data_table lattice plyr protiq randomForest reshape2 ROCR seqinr]; }; aRpsDCA = derive2 { name="aRpsDCA"; version="1.1.0"; sha256="128f3ggnqpdv12d1f1hpkq5nb1wdwihifvvb2k2ixizmhw7vn6dy"; depends=[]; }; - aRxiv = derive2 { name="aRxiv"; version="0.5.15"; sha256="1l2v66kk08awinw08xhm2xpr8d83n74fvzq4r5d2sy77vrfvgxnh"; depends=[httr XML]; }; - aSPU = derive2 { name="aSPU"; version="1.46"; sha256="01xysgyc7hj0pzidbmmg1119krcz1hvx52qbybijhjr3y0hw2mfi"; depends=[fields gee MASS matrixStats mvtnorm Rcpp RcppArmadillo]; }; + aRxiv = derive2 { name="aRxiv"; version="0.5.16"; sha256="1dghv40waprld9gg81p2is72sk0z6fla0pfiqzzfhky8lazaih01"; depends=[httr XML]; }; + aSPC = derive2 { name="aSPC"; version="0.1.2"; sha256="1q301rw7dax5v58srg4jlcam1qq2igkaj7kg8wlnlml0hsck4c4a"; depends=[energy mvtnorm]; }; + aSPU = derive2 { name="aSPU"; version="1.48"; sha256="0kjvwwvyhiz9i5kxqg68lq6cvxnk9vzvp5zca5hfv2g77j42wh9h"; depends=[fields gee MASS matrixStats mvtnorm]; }; aTSA = derive2 { name="aTSA"; version="3.1.2"; sha256="1p3spas0sxj08hkb8p6k2fy64w86prlw1hbnrqnrklr0hnkg2g54"; depends=[]; }; aVirtualTwins = derive2 { name="aVirtualTwins"; version="1.0.0"; sha256="193289dm3nvmkx0dmclm1isz62jvvmhynnm1w1964v5nz2jc8vzd"; depends=[party randomForest rpart]; }; abbyyR = derive2 { name="abbyyR"; version="0.5.1"; sha256="1s8zf18sh0s89vk3dl09fzrq50csmmfvmsanf5vfkv9n5lx6pklg"; depends=[curl httr plyr progress readr XML]; }; @@ -3491,7 +3625,7 @@ in with self; { abc_data = derive2 { name="abc.data"; version="1.0"; sha256="1bv1n68ah714ws58cf285n2s2v5vn7382lfjca4jxph57lyg8hmj"; depends=[]; }; abcdeFBA = derive2 { name="abcdeFBA"; version="0.4"; sha256="1rxjripy8v6bxi25vdfjnbk24zkmf752qbl73cin6nvnqflwxkx4"; depends=[corrplot lattice rgl Rglpk]; }; abcrf = derive2 { name="abcrf"; version="1.5"; sha256="1jfplr549cd6mpm694spc8ws0d56q3pa5wv1z57blayk4mxnczwv"; depends=[MASS ranger readr stringr]; }; - abctools = derive2 { name="abctools"; version="1.0.4"; sha256="0y03sql473ylwcbiayl7rn4psc7d8ck0z6vbimnwpx73l143jww2"; depends=[abc abind plyr]; }; + abctools = derive2 { name="abctools"; version="1.1.1"; sha256="0x6pjdvn5z510j42byddzdvg2mgv81yy72snia5k8h7bs9k5glfg"; depends=[abc abind Hmisc plyr]; }; abd = derive2 { name="abd"; version="0.2-8"; sha256="191gspqzdv573vaw624ri0f5cm6v4j524bjs74d4a1hn3kn6r9b7"; depends=[lattice mosaic nlme]; }; abf2 = derive2 { name="abf2"; version="0.7-1"; sha256="0d65mc1w4pbiv7xaqzdlw1bfsxf25587rv597hh41vs0j0zlfpxx"; depends=[]; }; abind = derive2 { name="abind"; version="1.4-5"; sha256="0b1zd8jbnl6l292cr9rb50m09fy3ylxvzkpgi5lfb1nbzddcwfis"; depends=[]; }; @@ -3504,7 +3638,7 @@ in with self; { accelmissing = derive2 { name="accelmissing"; version="1.1"; sha256="0s2vy16zcpvbqyqz4ifdqccs6bfp8sf7azvfy8jjcm73xncv6ij3"; depends=[mice pscl]; }; accrual = derive2 { name="accrual"; version="1.2"; sha256="1d9jis7d2fihkmwlqqvjl2kh6dcinzbffc9c0m4aqwzaq7c6ngjx"; depends=[fgui SMPracticals tcltk2]; }; accrued = derive2 { name="accrued"; version="1.4.1"; sha256="05g1jb5914z18rcai1ahn7nihn27vr2rnadwv94gc1j7ivvikvs5"; depends=[]; }; - acebayes = derive2 { name="acebayes"; version="1.3.4"; sha256="0zg2yzbmmbv8nfgvncgc1hxrswxpj786pljlpmkib0iw9zvpy48w"; depends=[compare lhs Rcpp RcppArmadillo]; }; + acebayes = derive2 { name="acebayes"; version="1.4"; sha256="1wjbcf8v277rfr79zh68xws60xahc0bkb9bkapzsz0bbcg7h3hmg"; depends=[compare lhs randtoolbox Rcpp RcppArmadillo]; }; acepack = derive2 { name="acepack"; version="1.4.1"; sha256="1f98rpfjmhd92rdc3j004plyfpjailz6j0ycysbac0kgj83haxc2"; depends=[]; }; acid = derive2 { name="acid"; version="1.1"; sha256="030i0y8s283ivbsmjccpbv9v7mgbcg2jk9df7vgcbbns74swf9hd"; depends=[gamlss gamlss_dist Hmisc]; }; acm4r = derive2 { name="acm4r"; version="1.0"; sha256="1wqzc35i1rshx0zlmas8y4qkkvy6h9r4i4apscjjv1xg2wjflzxa"; depends=[MASS]; }; @@ -3518,7 +3652,7 @@ in with self; { acss_data = derive2 { name="acss.data"; version="1.0"; sha256="09kl4179ipr8bq19g89xcdi1xxs397zcx5cvgp6viy8gn687ilgv"; depends=[]; }; activity = derive2 { name="activity"; version="1.1"; sha256="1lqajgxfps2h6amz1791vp3f52rs9ghmanq1nqfxqd2jmk3idkrx"; depends=[circular overlap pbapply]; }; activpalProcessing = derive2 { name="activpalProcessing"; version="1.0.2"; sha256="1y0bjx2qx53iy930y9iww4q1yzjj8y16cwgixk1mq3w4g1f116d1"; depends=[chron]; }; - actuar = derive2 { name="actuar"; version="2.1-0"; sha256="0zmfhdii3k1bjcv7dk4ic21645j96z75mvrqgwhg926qfzifsick"; depends=[expint]; }; + actuar = derive2 { name="actuar"; version="2.1-1"; sha256="0d390sygdcy67ww4wdxxfybars7jqpwbc12pvyv01hdqzhzqp04z"; depends=[expint]; }; ada = derive2 { name="ada"; version="2.0-5"; sha256="1h3a07czp0w3hrhjcg1fz721y8vsfclzqi3rq8qfzgpfb4h1f06r"; depends=[rpart]; }; adabag = derive2 { name="adabag"; version="4.1"; sha256="0a6hwcr0fg0a99y91i3wxrk6k0f7ldwvz9jr3akmiprc28v8r4zz"; depends=[caret mlbench rpart]; }; adagio = derive2 { name="adagio"; version="0.6.5"; sha256="0jy8g5604alaqbi5ynj95ig07igzbgk8x03a4x1rzkvfwvydfflz"; depends=[]; }; @@ -3526,6 +3660,7 @@ in with self; { adaptDA = derive2 { name="adaptDA"; version="1.0"; sha256="0nk7n628d30jz03a2rmpgzrwwd79rlpqvr6lwhilmkg1gblvz7r1"; depends=[MASS]; }; adaptMCMC = derive2 { name="adaptMCMC"; version="1.1"; sha256="1y1qxn3qm59nyy9ld5x30p452yam7b2fyl236b14xvpm8g3xx1fa"; depends=[coda Matrix]; }; adaptTest = derive2 { name="adaptTest"; version="1.0"; sha256="08d7a5dlzhaj236jvaw3c91008l66vf5i4k5anhcs32a3j8yh2iv"; depends=[lattice]; }; + adaptiveGPCA = derive2 { name="adaptiveGPCA"; version="0.1"; sha256="0jp9wfl4yz7fzxgdh3ixnsb1sr0y4rhifkv4j113dkiy719s7h8m"; depends=[ape ggplot2 phyloseq shiny]; }; adaptivetau = derive2 { name="adaptivetau"; version="2.2-1"; sha256="1hd2l1jv4i5mg0k0g8bbrvv43nk1zxbwh21594zayrzjyikb2593"; depends=[]; }; adaptsmoFMRI = derive2 { name="adaptsmoFMRI"; version="1.1"; sha256="1h79gh1bd6s2xhwf4whh72wf2cz4di2p8dnlf6192mfg108qc6nw"; depends=[coda Matrix MCMCpack mvtnorm spatstat]; }; addhaz = derive2 { name="addhaz"; version="0.4"; sha256="0i3czmv538m8s3pnxrhh2a1mrdv9m3hgzjkb25p7hygwnzz54drg"; depends=[boot MASS Matrix]; }; @@ -3552,7 +3687,8 @@ in with self; { advclust = derive2 { name="advclust"; version="0.4"; sha256="1g8a8q4zh6d4152jb66fh7wj7k6ks5k4kfcazzw70jdn10yi6b38"; depends=[clue ggplot2 knitr MASS reshape2]; }; adwave = derive2 { name="adwave"; version="1.1"; sha256="0kkwgcyxddzmrb8h1w1f4xy2cq40b86q0lxwfdhx25z3zjc4m1ni"; depends=[waveslim]; }; aemo = derive2 { name="aemo"; version="0.2.0"; sha256="11msifszq7pzmcmwibf2dk2j5dqjc74hrxdxshlprkp6p8sfhijh"; depends=[assertthat dplyr lubridate stringr]; }; - afex = derive2 { name="afex"; version="0.17-8"; sha256="1ypa6np04ls2dpbdh8p7c56zcagiwnad17akhfpdmv3qxi1lkn43"; depends=[car coin lme4 lmerTest lsmeans pbkrtest reshape2 stringr]; }; + afc = derive2 { name="afc"; version="1.4.0"; sha256="1iy1wa88kf6zi6x7lbd0jdir653cvzvdraliqpxbac413wwb5gwl"; depends=[]; }; + afex = derive2 { name="afex"; version="0.18-0"; sha256="0ls4mc75f2swhxrabvyilggdhf4ps893d4krpp07magz3iyi7gv5"; depends=[car coin lme4 lmerTest lsmeans pbkrtest reshape2 stringr]; }; affluenceIndex = derive2 { name="affluenceIndex"; version="1.0"; sha256="1nb2dlsnvjsvkyrfdaskmpr3kv3qgdfb60xgmzvscfli0yf4dzr1"; depends=[]; }; afmToolkit = derive2 { name="afmToolkit"; version="0.0.1"; sha256="1pm3xyh9vq10mmfgknlvlfr9f027xprrgy1dvbbxpi7f111hv1gl"; depends=[assertthat DBI dplyr ggplot2 gridExtra minpack_lm scales tibble]; }; aftgee = derive2 { name="aftgee"; version="1.0-0"; sha256="0gfp05r6xvn9fcysbqyzkz916axpsc2d3lb5wmb1v92z1zw3037b"; depends=[BB geepack MASS survival]; }; @@ -3567,11 +3703,13 @@ in with self; { aidar = derive2 { name="aidar"; version="1.0.0"; sha256="01vs14bz4k504q5lx65b60kyi7hgvjdmib8igiipjmg4snwh8hdk"; depends=[XML]; }; aimPlot = derive2 { name="aimPlot"; version="1.0.0"; sha256="1d52b7kccxba6j7n0gbd7pzs0p87zn32vv8gdf2f7lyr75qzgz7x"; depends=[ggplot2]; }; airGR = derive2 { name="airGR"; version="1.0.5.12"; sha256="02nasl8qamvbggwwfpgjfgqazfs1bfv6h48r1kab9wynpgqknynm"; depends=[]; }; + ajv = derive2 { name="ajv"; version="1.0.0"; sha256="1qd5ncb7rdnnvqfknsvq9nrpxrh0zv3jyh4b91dcvfvhp262vfrm"; depends=[RJSONIO V8 yaml]; }; akima = derive2 { name="akima"; version="0.6-2"; sha256="1klprj4a2pgy5pwdwnrn3siisi2lh8hr4z6vz38sdvjkcmakxnk1"; depends=[sp]; }; akmeans = derive2 { name="akmeans"; version="1.1"; sha256="1nqbxbx583n0h2zmpy002rlmr6j86j6bg76xj5c69brrh59dpyw1"; depends=[]; }; alabama = derive2 { name="alabama"; version="2015.3-1"; sha256="0mlgk929gdismikwx4k2ndqq57nnqj7mlgvd3479b214hksgq036"; depends=[numDeriv]; }; - alakazam = derive2 { name="alakazam"; version="0.2.6"; sha256="18l3l2gwlsws4qc8kkg6828nvxyipqqan5y1xixh6i9xjxwhr5w4"; depends=[dplyr ggplot2 igraph lazyeval Rcpp readr scales seqinr stringi]; }; + alakazam = derive2 { name="alakazam"; version="0.2.7"; sha256="11gv8y7a29vy9q3sfm6nsvlgacsa502j5fpisdqhw4b3f60q3mw3"; depends=[dplyr ggplot2 igraph lazyeval progress Rcpp readr scales seqinr stringi]; }; ald = derive2 { name="ald"; version="1.1"; sha256="1ar9mrvfw2jz4js9prbp9icsync7fw6wpirpximsr4cy1klqjfpn"; depends=[]; }; + alfred = derive2 { name="alfred"; version="0.1.1"; sha256="04g9956r4359l5k6fjiqddn2qfay3nicrhhbk58sdgl79lay44gz"; depends=[dplyr lubridate magrittr tibble tidyr xml2]; }; algorithmia = derive2 { name="algorithmia"; version="0.0.2"; sha256="0kly70l9si8ni8n5xm30vai70pvfvip6354scvjqj34362s0lm0a"; depends=[base64enc httr rjson xml2]; }; algstat = derive2 { name="algstat"; version="0.0.2"; sha256="1ssdrrwnxrhx3syndqxqcaldlbnjamk3x2yiq7jgxy0qsiadmqsi"; depends=[mpoly Rcpp reshape2 stringr]; }; alineR = derive2 { name="alineR"; version="1.1.3"; sha256="000rywvianwi0xm0ccsmc7g2hl9d0zjl3qplidrr7rz872f6snwm"; depends=[]; }; @@ -3590,24 +3728,27 @@ in with self; { alterryx = derive2 { name="alterryx"; version="0.2.0"; sha256="042cbxw0s43ffmicf25mvg0na1l0x8qbf6rl63ia44r9l3v8jcyd"; depends=[base64enc digest httr jsonlite]; }; altmeta = derive2 { name="altmeta"; version="2.2"; sha256="1k3p06v8ccj0dbjfpl4nw6579bwcy4j925rk15v55khqmrlx780l"; depends=[]; }; amap = derive2 { name="amap"; version="0.8-14"; sha256="1dz37z9v4zvyvqrs4xvpfv468jwvpxav60qn2w0049bw8llj6xdl"; depends=[]; }; - ameco = derive2 { name="ameco"; version="0.2.6"; sha256="1jbkw79kv6b83kv1s2id2xrljzbz25bc7yqld3p8dfpngcpmgvq8"; depends=[]; }; + ameco = derive2 { name="ameco"; version="0.2.7"; sha256="0n4y2k7cifly94qhfasy8r8i0mgaap1p0s9qqh2i19wiacr348gh"; depends=[]; }; amei = derive2 { name="amei"; version="1.0-7"; sha256="0dyx6a1y5i0abwka0y89d0mpj55rm5ywb4r9c2mqmy43djp181hn"; depends=[]; }; - amen = derive2 { name="amen"; version="1.1"; sha256="084bl46sxn2sxslcpi9lm22k6x8cz1jld228l0iardy4vmh4cxdk"; depends=[]; }; + amen = derive2 { name="amen"; version="1.3"; sha256="1qaznfmnh3dlnp41afd37lr328qzy50hn8hi0c302wj0f992ycqg"; depends=[]; }; aml = derive2 { name="aml"; version="0.1-1"; sha256="09xxlxp784wlb561apns3j8f2h9pfk497cy5pk8wr4hhqqv4d3al"; depends=[lars]; }; ampd = derive2 { name="ampd"; version="0.2"; sha256="0bi8qngd37n60ym516yjcahxc536vdwm60rq5ld32170hww69j7c"; depends=[]; }; - anacor = derive2 { name="anacor"; version="1.0-6"; sha256="0nq3jhai586d3980y8raqmbhh8snd5bpx5z8mlwrxvkmr62hcrpl"; depends=[car colorspace fda rgl scatterplot3d]; }; + anMC = derive2 { name="anMC"; version="0.1.0"; sha256="14kihqh95hqw0rqr7wjh6pzw0k3zz3nlgg8gmxpj9c9i3c903gyj"; depends=[microbenchmark mvtnorm Rcpp RcppArmadillo]; }; + anacor = derive2 { name="anacor"; version="1.1-3"; sha256="0mj8g9p4fla0ax9jvcq7kii4lrhj8g872p11nys06anva22qjp51"; depends=[car colorspace fda]; }; analogsea = derive2 { name="analogsea"; version="0.5.0"; sha256="1lfa8vl42n2wjl8r4m0144sircrrdvcanjd85l5m54r4vack846p"; depends=[httr jsonlite magrittr yaml]; }; analogue = derive2 { name="analogue"; version="0.17-0"; sha256="00wk4jnzif28ibx9s3m68qdx64ycdgg5yr6ybb0srlydikvf1sy8"; depends=[brglm lattice MASS mgcv princurve vegan]; }; analogueExtra = derive2 { name="analogueExtra"; version="0.1-1"; sha256="1s3qs10hf6hkna0bicid1mc8x8r449bl93xpgyw6lnsjgh2yx62c"; depends=[analogue rgl vegan3d]; }; - analytics = derive2 { name="analytics"; version="1.0"; sha256="1f5jmc0j3r8y401d9j0acl83d3mp63a2n4hsmxznph2vva9y9kxc"; depends=[cluster MASS powerplus]; }; + analytics = derive2 { name="analytics"; version="2.0"; sha256="1jkdjqc3fnvvsgi6x9ncf36rxzq0a55cmgkcv92mfmpcramg2lk6"; depends=[car cluster fractal lmtest MASS np powerplus robust trend TSA urca]; }; analyz = derive2 { name="analyz"; version="1.4"; sha256="0qdh1gld2dkl0krbhm2vcqg8dfs03dn51rclgsw02554s06dlgxw"; depends=[]; }; anapuce = derive2 { name="anapuce"; version="2.2"; sha256="0qs27as628090k3sq5b14l90g7qdp23d0jz5lb1wxsgi3ji0f7qj"; depends=[]; }; + anchoredDistr = derive2 { name="anchoredDistr"; version="1.0.3"; sha256="07q4np0zryb49cpi7w5iz0qna63cyp9nz13d8ws6x9ccg417r99a"; depends=[DBI dplyr ggplot2 np plyr reshape2 Rmisc RSQLite]; }; anchors = derive2 { name="anchors"; version="3.0-8"; sha256="12gd2526y7s2a8i6b9xma2c3sc6zxnwzl6sn8b50hbxizwr8d34j"; depends=[MASS rgenoud]; }; andrews = derive2 { name="andrews"; version="1.0"; sha256="130i86qkdy1xpcf611jpzqgmd17iik7j7spdcfwzk48f31biyp8v"; depends=[]; }; anesrake = derive2 { name="anesrake"; version="0.75"; sha256="1blq1blyq122jlj2yp8l7gam49q6h1wg6c9v0kkfkmnh5dwgz3mm"; depends=[Hmisc weights]; }; anfis = derive2 { name="anfis"; version="0.99.1"; sha256="1v8di5dzwb1g1ldi7idcmmr9nirp9kxvc8km1qq1i8zaw1bh8pqb"; depends=[]; }; - aniDom = derive2 { name="aniDom"; version="0.1"; sha256="0nffgszifar9da8310ymhfns19xnnnjh49rlvaxxk711h0a72fc5"; depends=[rptR]; }; - anim_plots = derive2 { name="anim.plots"; version="0.1"; sha256="0qjwmxpkvjf27parh1fvhrkiczm4zlv9c034dp04yysbdz65r1by"; depends=[animation]; }; + angstroms = derive2 { name="angstroms"; version="0.0.1"; sha256="1k8q4pkb5vcjfp2n2dga3q2ydmdxv020k5qzrb6w01ixrgf15d8l"; depends=[nabor ncdf4 proj4 raster sp spbabel]; }; + aniDom = derive2 { name="aniDom"; version="0.1.1"; sha256="0y7gdcp2926b70clr28qdrs0azqvrx829j5aypl6m8gnwj6qnc45"; depends=[rptR]; }; + anim_plots = derive2 { name="anim.plots"; version="0.2"; sha256="1plpi90qzk4ng0sm77fvqyv1063w67axvdc29q5nvz4h6v4j7ks3"; depends=[animation]; }; animalTrack = derive2 { name="animalTrack"; version="1.0.0"; sha256="0jlvfflpaq64s48sblzh1n1vx8g3870iss97whigri29s6hn79ry"; depends=[rgl]; }; animation = derive2 { name="animation"; version="2.5"; sha256="0pxmihfr3q1hh4cdnzf7wbzqak5spa3kv4p1wl89giqqngqzwcmj"; depends=[]; }; anocva = derive2 { name="anocva"; version="0.1.0"; sha256="1kira0bs3yjmsq7zrd4y5zzl948pz3rgbfsvkzidi2n6vvcl5344"; depends=[cluster]; }; @@ -3615,27 +3756,32 @@ in with self; { anomalyDetection = derive2 { name="anomalyDetection"; version="0.1.1"; sha256="0446qdh8abl02f7s2rli5qh7vl1y075nwirmxhc2i59jl0jhx44f"; depends=[caret dplyr gmp gplots magrittr MASS matrixStats plyr purrr qdapTools RColorBrewer tibble tidyverse]; }; anominate = derive2 { name="anominate"; version="0.5"; sha256="0qhq3ngxi1d3yln6bafg3c36a7whnznnww0101da2y0i6dw79lg5"; depends=[coda MCMCpack oc pscl wnominate]; }; anonymizer = derive2 { name="anonymizer"; version="0.2.0"; sha256="0zlzxcqy8fjhh6ab58a1pi0k686dzgap58d160ms6bsr5mgn3fbf"; depends=[]; }; - antaresProcessing = derive2 { name="antaresProcessing"; version="0.10.0"; sha256="036qjsppygszd6v8xxf94a0p28nv78zxlq5wqxrwamhahc7mafin"; depends=[antaresRead data_table]; }; - antaresRead = derive2 { name="antaresRead"; version="1.1.1"; sha256="0bpz7h4m0q0f7mrhgf16rag7whg6s924ylkg2a9fczgc1dam197p"; depends=[data_table lubridate plyr]; }; + antaresProcessing = derive2 { name="antaresProcessing"; version="0.10.2"; sha256="0zcwgdypqmfg3444cz7jx2v14z3lvc1mfwhk1sgdmzdf0nm4kakq"; depends=[antaresRead data_table]; }; + antaresRead = derive2 { name="antaresRead"; version="1.1.3"; sha256="1fkznfhj46wyr2sqn76rynca7yh6lm3cchgpgxrf8hf1gbsxkajy"; depends=[data_table lubridate plyr]; }; + antaresViz = derive2 { name="antaresViz"; version="0.10"; sha256="07g5hlwdv2dga3irflafgjjfvx568aw0j12z2qyyw86jc07d8cjp"; depends=[antaresProcessing antaresRead data_table dygraphs geojsonio htmltools htmlwidgets leaflet leaflet_minicharts lubridate magrittr manipulateWidget miniUI plotly shiny sp tibble webshot]; }; antitrust = derive2 { name="antitrust"; version="0.95.1"; sha256="14qz4c78lyfhgh3xyybn2sb8kl4rjzvb3dwrwxl9dzjmk5k6ab7i"; depends=[BB evd ggplot2 MASS numDeriv]; }; - anytime = derive2 { name="anytime"; version="0.2.2"; sha256="01m5cjk119k2v9hsmcgh9pk6sw52xx0nl4xrap5sfzvzjvy5brgm"; depends=[BH Rcpp]; }; + antiword = derive2 { name="antiword"; version="1.1"; sha256="0nbx2l0d2y4qvcw4dw3m26zfkgdmav4cq0l00gib7l3y9pqxzjh5"; depends=[sys]; }; + anytime = derive2 { name="anytime"; version="0.3.0"; sha256="1byhgplskj17d0gib9sajfnzyv8p9slgq1vy8fq9j2ibirl86a91"; depends=[BH RApiDatetime Rcpp]; }; aod = derive2 { name="aod"; version="1.3"; sha256="1a6xs5d5289w69xd2salsxwikjjhjzvsnplqrq78b1sr6kzfyxz3"; depends=[]; }; aods3 = derive2 { name="aods3"; version="0.4-1"; sha256="074c16wmgd1vc2yvwx1y84bg55hvmm5yi8zgpwh51jcsbqlhbpgn"; depends=[boot lme4]; }; - aoos = derive2 { name="aoos"; version="0.4.0"; sha256="16kkgbk54fqn18pm2psw6v1g71vl8xrc9mk0na5zh83ag69cjqcz"; depends=[magrittr roxygen2]; }; + aoos = derive2 { name="aoos"; version="0.5.0"; sha256="0y92vs27i0mkpjdclqzq4j9g1axkymhi3v8xp1v6hazh35yzjkfj"; depends=[magrittr roxygen2]; }; aop = derive2 { name="aop"; version="1.0.0"; sha256="1i3mixiwcvqygbcvj6f9vm223plmydzmixpy6nhis2zv9d90vakd"; depends=[ggplot2 graph igraph plyr Rgraphviz rjson]; }; aoristic = derive2 { name="aoristic"; version="0.6"; sha256="0b9h2l59vvrvbjjwwb43j74frvwa8lsj4x5kwhwpsfjfch1yqwjl"; depends=[classInt ggplot2 GISTools lubridate maptools MASS plotKML RColorBrewer reshape2 rgdal sp spatstat]; }; apTreeshape = derive2 { name="apTreeshape"; version="1.4-5"; sha256="0mvnjchhfbpbnrgnplb6qxa7r2kkvw29gqiprwggkf553wi6zl48"; depends=[ape quantreg]; }; apa = derive2 { name="apa"; version="0.2.0"; sha256="1f9c8m5z8j7mbmbh61vcs680ya1zq5spwqs90zhajaw5fhvlg8km"; depends=[dplyr magrittr purrr rmarkdown stringr]; }; apaStyle = derive2 { name="apaStyle"; version="0.5"; sha256="1x3kgyxhgbx3r7wi759j75wh811jcm6z559mrk4zm4p99vqz10bl"; depends=[ReporteRs]; }; - apaTables = derive2 { name="apaTables"; version="1.5.0"; sha256="18gd06syl6sylrbrdmp5mlw9q4whnxlv0w7l0yll5jk1bn440fw8"; depends=[broom car dplyr MBESS rockchalk tidyr]; }; + apaTables = derive2 { name="apaTables"; version="1.5.1"; sha256="1ajff635vvypi457wk55bp8kddm80hg2af3hayp3rvjvdk8a8fjv"; depends=[broom car dplyr MBESS]; }; apc = derive2 { name="apc"; version="1.3"; sha256="1hgkqkvry9is8kjk2w46k637sig7fdznnc75wbrc8bq1hbrmf785"; depends=[lattice]; }; apcluster = derive2 { name="apcluster"; version="1.4.3"; sha256="1pqcxh83189388qqc6cngqnsygvpx4kjy0j2r8ykcgxvdwi8r58m"; depends=[Matrix Rcpp]; }; apdesign = derive2 { name="apdesign"; version="1.0.0"; sha256="041zyd7ih9nnj92jj9vb9ya1ij9lmj1dzx64q74vyiadw1ix5l66"; depends=[Matrix]; }; ape = derive2 { name="ape"; version="4.1"; sha256="0959fiiy11rzfzrzaknmgrx64bhszj02l0ycz79k5a6bmpfzanlk"; depends=[lattice nlme]; }; + apercu = derive2 { name="apercu"; version="0.2.1"; sha256="11ykbl3g752imj8zr03p5sv6pwl12apdrq4wg66yj1fdqflhd9sp"; depends=[pls]; }; apex = derive2 { name="apex"; version="1.0.2"; sha256="0p2sjpjg3b6i0ya99hkx2vl40w97k34z0z6ccnz08sfg3fyjiv24"; depends=[adegenet ape phangorn]; }; + aphid = derive2 { name="aphid"; version="1.0.0"; sha256="08jm83qr78c44z00kxx9n47w0vc4yizn6zaxzck4v8rhwndjy541"; depends=[openssl phylogram Rcpp]; }; aplore3 = derive2 { name="aplore3"; version="0.9"; sha256="0af6klscsxvh4amp519b6r41bzysf61p040fj4l5706bbya1arhw"; depends=[]; }; aplpack = derive2 { name="aplpack"; version="1.3.0"; sha256="0i6jy6aygkqk5gagngdw9h9l579lf0qkiy5v8scq5c015w000aaq"; depends=[]; }; apmsWAPP = derive2 { name="apmsWAPP"; version="1.0"; sha256="1azgif06dsbadwlvv9nqs8vwixp6balrrbpj62khzmv1jvqr4072"; depends=[aroma_light Biobase DESeq edgeR genefilter gtools multtest seqinr]; }; + apng = derive2 { name="apng"; version="1.0"; sha256="13hvr1w566anrhdicaqwqjgfq2lk3zkn5gcfgy8zazjnad4vy07y"; depends=[bitops]; }; appell = derive2 { name="appell"; version="0.0-4"; sha256="0g7pzhxqgscnyf07xycbrpyimp1z1hljgcr3nqigpx09w7zi5wlw"; depends=[]; }; apple = derive2 { name="apple"; version="0.3"; sha256="194z2f6hwdjjxdkjwlmfhpfp26p9yp3gparklhdbb6zlb4a9nnhz"; depends=[MASS]; }; appnn = derive2 { name="appnn"; version="1.0-0"; sha256="0wkpr6lcd68wlzk6n622ab7sd99l837073czn4k56hw8bw9v68j3"; depends=[]; }; @@ -3654,11 +3800,12 @@ in with self; { arc = derive2 { name="arc"; version="1.1"; sha256="1ms0ibvsdjqgdramd4nxy5dcnw019yfpd5xryjficmkfxs6jl9pf"; depends=[arules discretization Matrix R_utils]; }; archdata = derive2 { name="archdata"; version="1.1"; sha256="07ca51kl5imy6d9s0qi501xxl3zn4q3gbm0w8kvznfw8imclq17z"; depends=[]; }; archetypes = derive2 { name="archetypes"; version="2.2-0"; sha256="1djzlnl1pjb0ndgpfj905kf9kpgf9yizrcvh4i1p6f043qiy0axf"; depends=[modeltools nnls]; }; - archiDART = derive2 { name="archiDART"; version="1.4"; sha256="1ymk56w07jj51p2r4g7qa4a3nyhnjrbn6igxgn6644mm0v118b8h"; depends=[XML]; }; + archiDART = derive2 { name="archiDART"; version="2.0"; sha256="1ypbkj0wzpj8rhpjp3vc9yk7icjg40xn0ms11mcmhphkjpczmay5"; depends=[rgl XML]; }; archivist = derive2 { name="archivist"; version="2.1.2"; sha256="1d6bm9hdaj1lfbismv50qdzz3v91pvw28ijjxvhnaa4yqq9qh967"; depends=[DBI digest httr lubridate magrittr RCurl RSQLite]; }; archivist_github = derive2 { name="archivist.github"; version="0.2.2"; sha256="04xb2i47y12ic87gb2l30bldil0505h7s9601hq0afjg3npx6jq7"; depends=[archivist digest git2r httr jsonlite]; }; arf3DS4 = derive2 { name="arf3DS4"; version="2.5-10"; sha256="12cbrk57c9m7fj1x7nfmcj1vp28wj0wymsjdz8ylxhm3jblbgmxc"; depends=[corpcor]; }; - arfima = derive2 { name="arfima"; version="1.3-4"; sha256="0348zkr8h5la1vh66fifl1fn21hp03k34zv5ga29crmwvvsvk8pi"; depends=[ltsa]; }; + arfima = derive2 { name="arfima"; version="1.4-0"; sha256="0xfhaimhnwsb7ggx9rhlpqyc405k42h4lx6nrmjnsdw39g7i1w1i"; depends=[ltsa]; }; + argon2 = derive2 { name="argon2"; version="0.2-0"; sha256="0kqn06rpb39jlzizjlnc5c44mfic8llrshxn7ljgmyj35lbqwxqh"; depends=[]; }; argosfilter = derive2 { name="argosfilter"; version="0.63"; sha256="0rrc2f28hla0azw90a5gk3zj72vxhm1b6yy8ani7r78yyfhgm9ig"; depends=[]; }; argparse = derive2 { name="argparse"; version="1.0.4"; sha256="1qyca2kmvks338v48g7bqzg3gc6vn3cynwn77liqk42kwd327g8g"; depends=[findpython getopt proto rjson]; }; argparser = derive2 { name="argparser"; version="0.4"; sha256="0s1wxshx4jk69wfxhycx973q6y8cmqrfymyjklhq1i8xrj0kmmx9"; depends=[]; }; @@ -3676,25 +3823,25 @@ in with self; { arules = derive2 { name="arules"; version="1.5-2"; sha256="0i5cj2v86nmrqf4lr0jisfpvscjz6pp6d8kzaj1ry09d4j3z2siz"; depends=[Matrix]; }; arulesCBA = derive2 { name="arulesCBA"; version="1.1.1"; sha256="185zj7yajziadb8xhyk376gxsa4xn03jjd3kp1lqn2ck6v0cvsnj"; depends=[arules caret Matrix testthat]; }; arulesNBMiner = derive2 { name="arulesNBMiner"; version="0.1-5"; sha256="1q4sx6c9637kc927d0ylmrh29cmn4mv5jxxpl09yaclzfihjlk9a"; depends=[arules rJava]; }; - arulesSequences = derive2 { name="arulesSequences"; version="0.2-18"; sha256="1vpsq10l6zg16b03akxf57fyd8qhfcj5f3az761fmws0n6bc0vm3"; depends=[arules]; }; + arulesSequences = derive2 { name="arulesSequences"; version="0.2-19"; sha256="1cncvrf7za38b3vdwbzy4yrbakj7jbpxrl1jg6bvjnlkymiajavx"; depends=[arules]; }; arulesViz = derive2 { name="arulesViz"; version="1.2-1"; sha256="0x4hg5nhkga6zikl5ah5g0vvqfn0xw9277c9q4hfxp4x2hzdbsyy"; depends=[arules colorspace DT igraph plotly scatterplot3d seriation vcd]; }; as_color = derive2 { name="as.color"; version="0.1"; sha256="1y5qpm0pabfk5qvgx6s2vqqxfhp1x99g7dva24zay34nvf4bxrzn"; depends=[]; }; asVPC = derive2 { name="asVPC"; version="1.0.2"; sha256="07nfwr0lsfpwgfdgzcdn1svw8dnjfni5ga9q77yjd1bj0wf76ci2"; depends=[ggplot2 plyr]; }; asaur = derive2 { name="asaur"; version="0.50"; sha256="0c1rgic76w3i2xhna7i52lyc0p01s5b1mxyn55gqw6i19v9mq0b3"; depends=[]; }; - asbio = derive2 { name="asbio"; version="1.3-4"; sha256="02jpbc4lsca6bvp8ljv7nb452diz7maas6y3kjg07v3hgmwrkwvy"; depends=[deSolve lattice multcompView mvtnorm pixmap plotrix scatterplot3d]; }; + asbio = derive2 { name="asbio"; version="1.4-2"; sha256="0f7zw4vmlklf8sc0sdhn67z15xawl0qaxsk7i29m98a2q8gfnjl4"; depends=[deSolve lattice multcompView mvtnorm pixmap plotrix scatterplot3d]; }; ascii = derive2 { name="ascii"; version="2.1"; sha256="19dfbp7k4bjxjn8wdzhbmz7g3za6gn8vcnd5qkm4dz7gg1fg7b8p"; depends=[]; }; asd = derive2 { name="asd"; version="2.2"; sha256="0p3r4qjam3sl3rpcilb0pgx4xx3ly71xqnvkv31vzjs885lgxz4l"; depends=[mvtnorm]; }; asdreader = derive2 { name="asdreader"; version="0.1-2"; sha256="0lfm0c5nzm276zaaxxwkpkqca5xg9r6ysfpgl6wvdbbvs9s83x4a"; depends=[]; }; ash = derive2 { name="ash"; version="1.0-15"; sha256="1ay2a2agdmiz7zzvn26mli0x0iwk09g5pp4yy1r23knhkp1pn2lb"; depends=[]; }; ashr = derive2 { name="ashr"; version="2.0.5"; sha256="0blr19ipcanwjxizilkd8hb37dlhb6idjcw2lf0ll8pkd2l68f5z"; depends=[assertthat doParallel etrunct foreach pscl Rcpp SQUAREM truncnorm]; }; - asht = derive2 { name="asht"; version="0.9"; sha256="1sphcvwb4nqmbr3lppripk3wz8kakbi7d1kwkq3ji3yn5yvd7384"; depends=[bpcp coin exact2x2 exactci ssanv]; }; + asht = derive2 { name="asht"; version="0.9.1"; sha256="1la0dnyxrl35pb531awfkajinx7bwf78gzm8f1pryh5x5g8lpli6"; depends=[bpcp coin exact2x2 exactci ssanv]; }; aslib = derive2 { name="aslib"; version="0.1"; sha256="0dkb6bb6dqavjklbciqxqhi3fdqib9asdnhiap2gp9b9wfnkyq7k"; depends=[BatchExperiments BatchJobs BBmisc checkmate corrplot ggplot2 llama mlr parallelMap ParamHelpers plyr reshape2 RWeka stringr yaml]; }; asnipe = derive2 { name="asnipe"; version="1.1.3"; sha256="1kg58k52wiwcqgxgzsvrcn10j5gcl395mw4vky4k85kmcw1h63ks"; depends=[MASS Matrix]; }; aspace = derive2 { name="aspace"; version="3.2"; sha256="1g51mrzb6amafky2kg2mx63g6n327f505ndhna6s488xlsr1sl49"; depends=[Hmisc shapefiles splancs]; }; aspect = derive2 { name="aspect"; version="1.0-4"; sha256="1kxddm8v1y0v2r7lg24r1wpzk7lqzxlrpzq5xb9kn343g53lny6i"; depends=[]; }; aspi = derive2 { name="aspi"; version="0.2.0"; sha256="0rhvxw243vvdv3hxa6pi343gcjc2cbxq1jzqirl9k1l4i3897l87"; depends=[]; }; asremlPlus = derive2 { name="asremlPlus"; version="2.0-12"; sha256="119r7wwrz11j85idq21xdp2wq7l2jly73q3179d3bsywbmx5sr17"; depends=[dae ggplot2]; }; - assertable = derive2 { name="assertable"; version="0.2.2"; sha256="0443kjr7f7icz36a2aigldg3k2iwkhn2pkvvbv8sa9d1wdjy7kjn"; depends=[data_table]; }; + assertable = derive2 { name="assertable"; version="0.2.4"; sha256="1d1mc5k9jwn2h5bny3bpkwy10kfz5qlp03z12z9401v47q12d61i"; depends=[data_table]; }; assertive = derive2 { name="assertive"; version="0.3-5"; sha256="0blbbhlxcb5ffdxqxi62xs33ljiawh6s22a0pyvbbh79jf46rzr3"; depends=[assertive_base assertive_code assertive_data assertive_data_uk assertive_data_us assertive_datetimes assertive_files assertive_matrices assertive_models assertive_numbers assertive_properties assertive_reflection assertive_sets assertive_strings assertive_types knitr]; }; assertive_base = derive2 { name="assertive.base"; version="0.0-7"; sha256="1xs3ysvj0z57c58jw57pckq2rynia6ks4rmjmc02alczhk54wbgh"; depends=[]; }; assertive_code = derive2 { name="assertive.code"; version="0.0-1"; sha256="0drdrc9ljznkz52lvpwx0mvrghl0wf6dffzc3msz8lnvraxmanyw"; depends=[assertive_base assertive_properties assertive_types]; }; @@ -3711,23 +3858,24 @@ in with self; { assertive_sets = derive2 { name="assertive.sets"; version="0.0-3"; sha256="1cqvh2syvh5b6d85h601zjmsdbbf3h8q98ids4dfl4frdshpasc7"; depends=[assertive_base]; }; assertive_strings = derive2 { name="assertive.strings"; version="0.0-3"; sha256="0n6jrk88670g4ym0r8ii40a08a90z1xadj8wcryk8h0nl04dchfm"; depends=[assertive_base assertive_types stringi]; }; assertive_types = derive2 { name="assertive.types"; version="0.0-3"; sha256="0zxq1jfrzgw95ll7alvm0xnk7aihjdksngq4ya2whyvfjbmv4vdb"; depends=[assertive_base assertive_properties codetools]; }; - assertr = derive2 { name="assertr"; version="2.0.2"; sha256="19di52iwsdxzs08pm49smiwhld04528vysm1fyfdvl51zl04hwgd"; depends=[dplyr lazyeval MASS]; }; + assertr = derive2 { name="assertr"; version="2.0.2.2"; sha256="0l2sjj9amhpkd8mg88mfs82gy0v84brkk8504mkjcaz7j2j9s3l5"; depends=[dplyr lazyeval MASS]; }; assertthat = derive2 { name="assertthat"; version="0.2.0"; sha256="1wp5znk3xy338x6hknppk702jn596yr735d9i7c3wabm3sdzfgnp"; depends=[]; }; - assignPOP = derive2 { name="assignPOP"; version="1.1.1"; sha256="11786lxnrwi4gb1nddk8bkz7h9wyjiav8gajss43cybhiwpcy0p1"; depends=[caret doParallel e1071 foreach ggplot2 MASS randomForest reshape2 stringr tree]; }; + assignPOP = derive2 { name="assignPOP"; version="1.1.3"; sha256="12ldcm1v1s311n3c9sysaw5ba2z8yrzrf95rl7ip6fl2q8g0fv6b"; depends=[caret doParallel e1071 foreach ggplot2 MASS randomForest reshape2 stringr tree]; }; assist = derive2 { name="assist"; version="3.1.3"; sha256="0ngnn75iid5r014fcly29zhcfpqkqq24znncc3jdanbhdmfyybyz"; depends=[lattice nlme]; }; assortnet = derive2 { name="assortnet"; version="0.12"; sha256="1vyzrb8vsi9pcdn6jd83k77bg0q2a3dwdvlnmxnshqiif2pakb8m"; depends=[]; }; aster = derive2 { name="aster"; version="0.9.1"; sha256="0z976r9ljawfdzvmsb1arpllgs3l2r5wimdvbpcw08r1qdyyzwj8"; depends=[trust]; }; aster2 = derive2 { name="aster2"; version="0.3"; sha256="17d200sg0vn1fj6lb480dhszm70q6ipjldilb3x0jp72hiczakk9"; depends=[Matrix]; }; astro = derive2 { name="astro"; version="1.2"; sha256="1c7zrycgj2n8gz50m94ys1dspilds91s1b2pwaq6df1va17pznby"; depends=[MASS plotrix]; }; astroFns = derive2 { name="astroFns"; version="4.1-0"; sha256="0g5q0y067xf1ah91b4lg8mr9imj0d6lgig7gbj3b69fn335k363g"; depends=[]; }; - astrochron = derive2 { name="astrochron"; version="0.6.6"; sha256="1ycpjxdcrvbh26ykhy5srwmd9pm88l4y550887lray4jqa4gr9f1"; depends=[fields IDPmisc multitaper]; }; + astrochron = derive2 { name="astrochron"; version="0.7"; sha256="12p4n530f4w4idadqidm6w38xdm119bipc63z34q3a2z5gmdd71b"; depends=[fields IDPmisc multitaper]; }; astrodatR = derive2 { name="astrodatR"; version="0.1"; sha256="00689px4znwmlp6qbj6z2a51b7ylx1yrrjpv6zjkvrwpv6lyj9fw"; depends=[]; }; astrolibR = derive2 { name="astrolibR"; version="0.1"; sha256="0gkgry5aiz29grp9vdq9zgg6ss47ql08nwcmz1pfvd0g0h9h75l8"; depends=[]; }; astsa = derive2 { name="astsa"; version="1.7"; sha256="1rzl1ayzv8lnn2009j4v667pp8sxdbn7qbqqyjpq00c75f4wss6x"; depends=[MASS]; }; asymLD = derive2 { name="asymLD"; version="0.1"; sha256="1q05pxwn6arpalspgf2m0cym4ivnwyv94i58k9kaihd37kvm5lgc"; depends=[]; }; - asymmetry = derive2 { name="asymmetry"; version="1.2"; sha256="08xq0m3z0z8j875792hx6c3i7ssdxi62mbnpchsvwwa930nzdk3j"; depends=[gplots rJava smacof]; }; + asymmetry = derive2 { name="asymmetry"; version="1.2.1"; sha256="09mz7cwld2qn6vg35rmi80bygy2mxbapigcczxn83lqfj1aj0khk"; depends=[gplots rJava smacof]; }; asympTest = derive2 { name="asympTest"; version="0.1.3"; sha256="11nlkgws3y8xbz3yli55414a2rkk7367q9q5r2ssa61jaiimibhh"; depends=[]; }; asypow = derive2 { name="asypow"; version="2015.6.25"; sha256="0il38djkmw5ka7czpalmhq6yycx7flpdpgbd7p5nx52rsjdv49mj"; depends=[]; }; + atlantistools = derive2 { name="atlantistools"; version="0.4.2"; sha256="0dajmmj8k2daqbj7zpwi67p22a004nyrg1wd2xx59m45ihgxa209"; depends=[circlize dplyr ggplot2 gridExtra lazyeval magrittr proj4 purrr RColorBrewer RNetCDF rvest scales stringr tibble tidyr xml2]; }; atmcmc = derive2 { name="atmcmc"; version="1.0"; sha256="05k69b5wlysz3kh0yiqvshgvr0nyz34zkvn6bjs30cwz7s9j21pn"; depends=[]; }; atsd = derive2 { name="atsd"; version="1.0.8441"; sha256="1jz2bdgvk1wamrm8r9ygprhyf0z3mdk9c1pwlb4bfmwvbnqd0yqa"; depends=[httr RCurl]; }; attrCUSUM = derive2 { name="attrCUSUM"; version="0.1.0"; sha256="113y40v9hyvnvvzvyqg81n0n1h84pj4zph5q8p0vc0384hw00544"; depends=[Rcpp RcppArmadillo]; }; @@ -3744,15 +3892,16 @@ in with self; { automap = derive2 { name="automap"; version="1.0-14"; sha256="1190kbmp0x80x0hyifdbblb4ijq79kvrfn9rkp5k6diig4v30n0w"; depends=[gstat lattice reshape sp]; }; automultinomial = derive2 { name="automultinomial"; version="1.0.0"; sha256="15cxnqaai2dln6jvk7lpfqvlpv5237zn18axp459p5zxcgg0lw88"; depends=[Hmisc igraph MASS Matrix]; }; autopls = derive2 { name="autopls"; version="1.3"; sha256="1qf5gk1vsz1p5670w7bgzh3b15wvrx1gy6ih4sivw0vj8bcjxbw9"; depends=[pls]; }; - autothresholdr = derive2 { name="autothresholdr"; version="0.2.0"; sha256="18a41nrh5ll1i4gqh58iwbyg8wl9w4969mx24knldaf6c303c8ss"; depends=[EBImage magrittr rJava RSAGA]; }; + autothresholdr = derive2 { name="autothresholdr"; version="0.5.0"; sha256="1a0lmsqxjcq5bzxjha95hy79m6ns5wxcap8ksvkyj3w191i6dapk"; depends=[EBImage magrittr Rcpp rJava RSAGA]; }; autovarCore = derive2 { name="autovarCore"; version="1.0-0"; sha256="08h51bh1m3d47nprd5z7v3k3lkrixbxwinr73zd5442wskf4x82v"; depends=[Amelia jsonlite Rcpp urca vars]; }; averisk = derive2 { name="averisk"; version="1.0.3"; sha256="02j27d4jxgy2bk5sgxp1xdfyqr321civs99qj0g8cp34gwqk0j3m"; depends=[MASS]; }; aws = derive2 { name="aws"; version="1.9-6"; sha256="0mfq44pji0p6d7s1wbwi0f97lsh3f33wnj8fiyimpg9fv8lr4inz"; depends=[awsMethods gsl]; }; - aws_alexa = derive2 { name="aws.alexa"; version="0.1.2"; sha256="0ddgsk8bj51dz43flkxha73m7cmqbi63bp4ascwd3yp8645jjx6h"; depends=[aws_signature httr plyr XML]; }; + aws_alexa = derive2 { name="aws.alexa"; version="0.1.4"; sha256="1dqfmmmvdmlpk9ld563f65chwp2ahhlnrvbzsj9m5rfjs0bw6yny"; depends=[aws_signature httr plyr XML]; }; aws_ec2metadata = derive2 { name="aws.ec2metadata"; version="0.1.1"; sha256="0xzilzvrvzhna1iyhjb5r9k1wbd7545sc1yjcf69r35585gnm8rr"; depends=[curl jsonlite]; }; aws_polly = derive2 { name="aws.polly"; version="0.1.2"; sha256="0ij0rbng8q7xfa08p4x1l1lcmskmz3fy2pvln28zxqbs6jbc22rm"; depends=[aws_signature httr jsonlite tuneR]; }; + aws_s3 = derive2 { name="aws.s3"; version="0.3.3"; sha256="1vk4ykgfdyfispd9nkk1qc1jjhvjhxqzhd48g5ddqz09wm0wx4w3"; depends=[aws_signature base64enc digest httr xml2]; }; aws_ses = derive2 { name="aws.ses"; version="0.1.4"; sha256="13hf4iqhnpkm9rnr7nzwky663vplnkjrgk90zix91cn2fvaspjgp"; depends=[aws_signature httr jsonlite]; }; - aws_signature = derive2 { name="aws.signature"; version="0.2.6"; sha256="0cd92kymlmcm1940s57p025blckbvavwx9rsrrsn13p7b03xwakf"; depends=[base64enc digest]; }; + aws_signature = derive2 { name="aws.signature"; version="0.3.2"; sha256="11b3gbx870l4qkk2njq09pm19w9j2b19ymmbicm63jqciyp34gwq"; depends=[base64enc digest]; }; aws_sns = derive2 { name="aws.sns"; version="0.1.5"; sha256="1l013yczlvgbi07xfdslfrwmnc39j58f6kfqwa8j4kdxb0h58lq4"; depends=[aws_signature httr jsonlite xml2]; }; aws_sqs = derive2 { name="aws.sqs"; version="0.1.8"; sha256="1qgq2jbm523jb4qhzjbpq2f04saanwarz6nnhyn4g3dliv3fhsf6"; depends=[aws_signature httr jsonlite xml2]; }; awsMethods = derive2 { name="awsMethods"; version="1.0-4"; sha256="0n4mxn9fkqkvv19mfaqhrmhwhmkxiahfnls47b5ki3a3gsr6cm8l"; depends=[]; }; @@ -3768,15 +3917,16 @@ in with self; { backShift = derive2 { name="backShift"; version="0.1.4.1"; sha256="1vixr9l9zqaqy0knahijp6y9vzix4m8bz3abiprk3v2pjzg5nrvm"; depends=[clue ggplot2 igraph jointDiag MASS matrixcalc mvnmle reshape2]; }; backblazer = derive2 { name="backblazer"; version="0.1.0"; sha256="020kdydksm0brnxsa00blf5sylxd4hz49wmngk1x1fx43kdlyc41"; depends=[httr jsonlite openssl]; }; backpipe = derive2 { name="backpipe"; version="0.1.8.1"; sha256="1nid5rbgwiq8axkrl2gwl4vr5bjq5k5nrhq7macddvijcn3r2dz8"; depends=[]; }; - backports = derive2 { name="backports"; version="1.0.5"; sha256="1pn1ii8vbkgxcqvx52kzsbwf9gkn9fp33388087zky2hmdzdirn0"; depends=[]; }; + backports = derive2 { name="backports"; version="1.1.0"; sha256="1kcz6j82by28cjk5wi2j6dfqdin1kib4y7d2r4h3zabcxmk6jly5"; depends=[]; }; backtest = derive2 { name="backtest"; version="0.3-4"; sha256="1s0mf247dz2vvyf4m3sp9xiqhv7xcs4rphyg9gdcy73060sah2ad"; depends=[lattice]; }; backtestGraphics = derive2 { name="backtestGraphics"; version="0.1.6"; sha256="14l9dbkbcx4kl45kpjbq4ihzf47j859khhd1db40vnp8x57g9xcx"; depends=[dplyr dygraphs scales shiny xts]; }; bacr = derive2 { name="bacr"; version="1.0.1"; sha256="14zr1v4rihx0ra3x0vsb81vsz0g8gzskkdxkg7nhiz835hp2fiy8"; depends=[MCMCpack]; }; badgecreatr = derive2 { name="badgecreatr"; version="0.1.0"; sha256="070zb5jw817s9ykqc3dvzjqk48612gydkdc31svc0ji01s1y1545"; depends=[stringr]; }; badger = derive2 { name="badger"; version="0.0.2"; sha256="15qnb0a6rqsf1dbb1cf9ag2z5f4zhf8b8psxbsdhh42qrg8g3mma"; depends=[dlstats rvcheck]; }; bagRboostR = derive2 { name="bagRboostR"; version="0.0.2"; sha256="1k9w98p3ad3myzyqhcrc4rsn7196qvhnmk5ddx3fpd1rdvy2dnby"; depends=[randomForest]; }; - baitmet = derive2 { name="baitmet"; version="1.0.0"; sha256="0qrg3a5h5c0w8awnpnn1bfvgqqm4bylkwgjwq3l58xkfji6l0d08"; depends=[erah HiClimR osd Rcpp signal XML]; }; - bamdit = derive2 { name="bamdit"; version="3.0.0"; sha256="0hph6z3id4japk9ljgmn9ygbbswlj50viqllww4qsi2a5wxjls3f"; depends=[ggExtra ggplot2 gridExtra MASS R2jags rjags]; }; + baitmet = derive2 { name="baitmet"; version="1.0.1"; sha256="02ydakqr8v41hdnhcsgigwnic8d48qswryg1srb5w1fqdmdglnkl"; depends=[erah HiClimR Rcpp signal XML]; }; + bamboo = derive2 { name="bamboo"; version="0.9.18"; sha256="1y95apf43bpgw15jh4bzqfyiqs2imdrmn4wmbplxgjn4369mbqq9"; depends=[rscala]; }; + bamdit = derive2 { name="bamdit"; version="3.1.0"; sha256="148ikj7mly8m6kxs2n4gidi7kb70i3x2vbf9xsllrf0cgvrjccps"; depends=[ggExtra ggplot2 gridExtra MASS R2jags rjags]; }; bamlss = derive2 { name="bamlss"; version="0.1-2"; sha256="1d5pinyq16y0ljjgf23mpabzpsx4n2vh91c89qmzclcw7ns0l7xw"; depends=[coda colorspace Formula Matrix MBA mgcv mvtnorm sp spam survival]; }; bandit = derive2 { name="bandit"; version="0.5.0"; sha256="03mv4vbn9g4mqikd9map33gmw2fl9xvb62p7gpxs1240w5r4w3fp"; depends=[boot gam]; }; bannerCommenter = derive2 { name="bannerCommenter"; version="0.1.0"; sha256="0ycx771g9a73w0sx8zzix8kswwbjagzhbyvaq7l5r8a9ayfli8ic"; depends=[]; }; @@ -3787,37 +3937,37 @@ in with self; { bartMachineJARs = derive2 { name="bartMachineJARs"; version="1.0"; sha256="1vnicq9amayxh69jqgly8jm7hvgjr22kvm1g6y2n7vphz70p9cq9"; depends=[rJava]; }; base64 = derive2 { name="base64"; version="2.0"; sha256="1labh0ycdm2xcjssj8bhnyjvbk44mcdsi0rb2p8rfqa428mrq9cf"; depends=[openssl]; }; base64enc = derive2 { name="base64enc"; version="0.1-3"; sha256="13b89fhg1nx7zds82a0biz847ixphg9byf5zl2cw9kab6s56v1bd"; depends=[]; }; - base64url = derive2 { name="base64url"; version="1.1"; sha256="1f0asnf5ri55q6mhjkv7lfhr2hncs65vrykmr80r5sxsha6bqndz"; depends=[backports]; }; - basefun = derive2 { name="basefun"; version="0.0-37"; sha256="0v1v4a1kvzyzw7zrfvnbiqdg6jwa0z58w64gmzrb0a0aygnwk8fp"; depends=[Matrix orthopolynom polynom variables]; }; + base64url = derive2 { name="base64url"; version="1.2"; sha256="1dmpb6cyabs6fqnbwshyws107p961203wic7his6zywsn9axymfc"; depends=[backports]; }; + baseballDBR = derive2 { name="baseballDBR"; version="0.1.2"; sha256="0w54g1avcqamc12lmvjchlqbqck9jfjccm441k03nsql460mpydq"; depends=[dplyr magrittr rvest xml2]; }; + basefun = derive2 { name="basefun"; version="0.0-38"; sha256="17g37p73ym42vmnjrfv1lzfxvi7y03ji42w5mb2wdngd2ynd5cb2"; depends=[Matrix orthopolynom polynom variables]; }; baseline = derive2 { name="baseline"; version="1.2-1"; sha256="1vk0vf8p080ainhv09fjwfspqckr0123qlzb9dadqk2601bsivgy"; depends=[SparseM]; }; - basicspace = derive2 { name="basicspace"; version="0.18"; sha256="1jnylqaxgmdj9ld9q7hkmi4af8yzswaqgykbw96qzzxp9cvini1y"; depends=[]; }; bastah = derive2 { name="bastah"; version="1.0.7"; sha256="08xdba16wj0inp0kq2sbcrdr6wj8bwlq7rqnfrzjrz03wxhc5bk0"; depends=[BigQuic foreach glmnet lars MASS Matrix scalreg]; }; batade = derive2 { name="batade"; version="0.1"; sha256="1lr0j20iydh15l6gbn471vzbwh29n58dlpv9bcx1mnsqqnsgpmal"; depends=[hwriter]; }; batch = derive2 { name="batch"; version="1.1-4"; sha256="03v8a1hsjs6nfgmhdsv6fhy3af2vahc67wsk71wrvdxwslmn669q"; depends=[]; }; batchmeans = derive2 { name="batchmeans"; version="1.0-3"; sha256="1qkdljngvlahk0pbrkarkjh2g4sxxwiva9f3m5y8gz8pjw9fpy9n"; depends=[]; }; - batchtools = derive2 { name="batchtools"; version="0.9.2"; sha256="0hi2bxfx2gvsr1vssydi39595kxwb0qwk8w9xvwbhc7n92gc9bwf"; depends=[backports base64url brew checkmate data_table digest progress R6 rappdirs stringi]; }; + batchtools = derive2 { name="batchtools"; version="0.9.3"; sha256="1xl49zqhdwlw1gw22517kq3fjbkyzsdh2gwvm4vzz91iyi2j21fb"; depends=[backports base64url brew checkmate data_table digest progress R6 rappdirs stringi]; }; batman = derive2 { name="batman"; version="0.1.0"; sha256="0ccgx506p4iri23k2ikb8jmh04dp08w66785bv52iy8kd359h43f"; depends=[Rcpp]; }; batteryreduction = derive2 { name="batteryreduction"; version="0.1.1"; sha256="0j838q7063bplkzd50kmnxji80cgysfsq7m1qifv8z7a2zsh8c8g"; depends=[pracma]; }; bayesAB = derive2 { name="bayesAB"; version="0.7.0"; sha256="1visjwxf7jc9z1m99dnplg01sbbx4w4cr6ykh3n1nzh5r9xinimm"; depends=[devtools ggplot2 plumber Rcpp reshape2]; }; bayesCL = derive2 { name="bayesCL"; version="0.0.1"; sha256="1l278lxidn16nma2ny14wjajcqyzbr6j5xl2lj08cic26c7hvjbm"; depends=[]; }; - bayesDP = derive2 { name="bayesDP"; version="1.0.2"; sha256="1c71p20acvmbwqm1a67f9d89g0fgmw9zlg1w1sic3adz3gwcsifx"; depends=[ggplot2 Rcpp RcppArmadillo survival]; }; + bayesDP = derive2 { name="bayesDP"; version="1.1.1"; sha256="0px17fkl0p6vnyz8alv2cjxkph056r2xmbvzksszqqvj9l2k47ah"; depends=[ggplot2 Rcpp RcppArmadillo survival]; }; bayesDccGarch = derive2 { name="bayesDccGarch"; version="2.0"; sha256="1s2b8f43wi9ja966n2p2r4l4s79vk6xb8mqaxsagnw90g969p681"; depends=[coda numDeriv]; }; bayesDem = derive2 { name="bayesDem"; version="2.5-1"; sha256="1cxrqil1p692mbzkcj1fvsx335qyy6c1y43mq48s4shs1hhc69bn"; depends=[bayesLife bayesPop bayesTFR gWidgets gWidgetsRGtk2 RGtk2 wpp2015]; }; bayesGARCH = derive2 { name="bayesGARCH"; version="2.1.3"; sha256="1480mmzfshchfbfh3x420cq5qblfh59jkl21hkq2jvnwppksdn9w"; depends=[coda mvtnorm]; }; bayesGDS = derive2 { name="bayesGDS"; version="0.6.2"; sha256="0ash16hmassn76x3f59dfvp4plqp8vb17qzcwmag7vi3mi3y2ap6"; depends=[Matrix]; }; bayesImageS = derive2 { name="bayesImageS"; version="0.4-0"; sha256="1z8jvjqz56xlj5x2ilp9m93v74qsqd7xvdld5pk7y80pxnfd6wpy"; depends=[Rcpp RcppArmadillo]; }; - bayesLife = derive2 { name="bayesLife"; version="3.0-4"; sha256="1n15df1rsyad3ij7l6ib79q7yflgwaykxq8msbkaq4ly8fvyy72x"; depends=[bayesTFR car coda hett wpp2015]; }; + bayesLife = derive2 { name="bayesLife"; version="3.0-5"; sha256="076smmvdf1k1wgcscdy5q4jin93697vy7y7b9mcv1m12whbr3ah3"; depends=[bayesTFR car coda hett wpp2015]; }; bayesMCClust = derive2 { name="bayesMCClust"; version="1.0"; sha256="14cyvcyx3nmkbvsy7n4xjp7zvcgdhy013dv9d72y8j5dvlv82pb4"; depends=[bayesm boa e1071 gplots gtools MASS mnormt xtable]; }; bayesPop = derive2 { name="bayesPop"; version="6.0-4"; sha256="16i9h7zvym1mj1al3wzima3y4igxhwax03npgnypaxahi1sbiwha"; depends=[abind bayesLife bayesTFR fields googleVis plyr rworldmap wpp2012 wpp2015]; }; bayesQR = derive2 { name="bayesQR"; version="2.3"; sha256="1c6y7r9h9626ghp68pl5k1g0l95fwd6dp0jfznmhy53qza0ny8z4"; depends=[]; }; - bayesSurv = derive2 { name="bayesSurv"; version="2.6"; sha256="0lam6w0niy30wgzbc3zrwbfz291whig20prjzdpcpv91syrnw687"; depends=[coda smoothSurv survival]; }; + bayesSurv = derive2 { name="bayesSurv"; version="3.0"; sha256="0p1kn7hc02v9vrnzicwh2vy5h7aw0mdhh2cssm09dp9wz4sajwgk"; depends=[coda smoothSurv survival]; }; bayesTFR = derive2 { name="bayesTFR"; version="6.0-0"; sha256="0dyjq7s2gvwwz0yylz5g0csjnhdfbbii1sd4606r2yphfwb9v0x8"; depends=[coda MASS mvtnorm wpp2015]; }; bayesbio = derive2 { name="bayesbio"; version="1.0.0"; sha256="08qa4lzkrcwin7n3kzfqfdlnlqahdmjl1lxpdh29n780cgyjfvs0"; depends=[]; }; bayesboot = derive2 { name="bayesboot"; version="0.2.1"; sha256="0gd3in9z8kx3d29dvyd8blmhlc7wxxl5b2hxnrrq0w13jcnsn57w"; depends=[HDInterval plyr]; }; bayescount = derive2 { name="bayescount"; version="0.9.99-5"; sha256="0c2b54768wn72mk297va3k244256xlsis9cd6zn6q5n1l7ispj6j"; depends=[coda rjags runjags]; }; bayesianETAS = derive2 { name="bayesianETAS"; version="1.0.3"; sha256="0nbif0b6lcik2kh948zg5ska5mvkdsfr0dg8ndnfpscm2mp7y1dg"; depends=[]; }; bayesloglin = derive2 { name="bayesloglin"; version="1.0.1"; sha256="0j2ziahf6mwsz2gvb1azvdzlmszlpqgr5zqcqa68pxgq947sa2cs"; depends=[igraph]; }; - bayesm = derive2 { name="bayesm"; version="3.0-2"; sha256="014l14k8fraxjqfch2s6ydgp1mcljvj4cgrznjyz2l35fwj3rcf3"; depends=[Rcpp RcppArmadillo]; }; + bayesm = derive2 { name="bayesm"; version="3.1-0"; sha256="01hklyina6qs5p6ilhz5dw2qzh75i3m8sn3dwvblb7kvs3rxm5ja"; depends=[Rcpp RcppArmadillo]; }; bayesmeta = derive2 { name="bayesmeta"; version="1.4"; sha256="0ks0g7jdr2jqm7nwbm0p34nk8hm9746nldf0kyzgkl7vb29jb9f1"; depends=[forestplot]; }; bayesmix = derive2 { name="bayesmix"; version="0.7-4"; sha256="1qms1nnk2nq3gqr8zf2b9ri4wv8jrxv5i8s087k1rwdvya3k5r9a"; depends=[coda rjags]; }; bayesplot = derive2 { name="bayesplot"; version="1.2.0"; sha256="10xk90vh9p9ifnkffh4l7icq7072zmn3cf5gdr8j4982pbb3d4w0"; depends=[dplyr ggplot2 reshape2]; }; @@ -3825,7 +3975,7 @@ in with self; { bayesreg = derive2 { name="bayesreg"; version="1.0"; sha256="0crld04cxxqw0xq2d4rdv040iq7vchwjbzacj0z8jv245hwgr9qy"; depends=[BayesLogit]; }; bayess = derive2 { name="bayess"; version="1.4"; sha256="0axipk5hn2hw3g4dfh7y3xa0dxqmi8kqpbr77nl14y7ydpija6xm"; depends=[combinat gplots MASS mnormt]; }; bayou = derive2 { name="bayou"; version="1.1.0"; sha256="1ndd7lygphngvn4a432616f6anmhxbdzmkksrhpl76xvrw5agwkc"; depends=[ape coda denstrip fitdistrplus foreach geiger MASS mnormt phytools Rcpp RcppArmadillo]; }; - bazar = derive2 { name="bazar"; version="0.1.4"; sha256="1dmxii9y61hpi7vpdm7vqdrc9lcsdazi3634k9yrdjcf6xzh4byd"; depends=[kimisc]; }; + bazar = derive2 { name="bazar"; version="0.1.6"; sha256="07jmfw2xf2zh3jqw0ai6wm9mdm0hl2b4fsghsm8fwgyc8vixy239"; depends=[kimisc]; }; bbefkr = derive2 { name="bbefkr"; version="4.2"; sha256="1wjx652w3p41sq71a2zdzmb7frjxm6xvcgrc2ark2spwb0lbjjw6"; depends=[]; }; bbemkr = derive2 { name="bbemkr"; version="2.0"; sha256="015c57s8mpimm82nddnh382wlkisxgdmc2hvp7k38pcnqxc5gb5q"; depends=[MASS]; }; bbmle = derive2 { name="bbmle"; version="1.0.19"; sha256="014h6mw16gv4acs2p78dy7lla7s428n633aybsb1mbi6250dg0p8"; depends=[lattice MASS numDeriv]; }; @@ -3843,7 +3993,8 @@ in with self; { bcv = derive2 { name="bcv"; version="1.0.1"; sha256="0yqcfariw9sw0b8cpljcr7vf5rf0cwr1wbif23icchfaxk2m42gj"; depends=[]; }; bda = derive2 { name="bda"; version="5.1.6"; sha256="0rpxvmjbqiph8hpzsvlj8q6h70jsc9771fiq7l3lmkz69jn1gf4q"; depends=[]; }; bde = derive2 { name="bde"; version="1.0.1"; sha256="1f25gmjfl58x4pns89abfk85yq5aad3bgq9yqpv505g5gxk62d3v"; depends=[ggplot2 shiny]; }; - bdots = derive2 { name="bdots"; version="0.1.9"; sha256="0nwcwzrh7pdxsyqnhhgd2jb9icgi7y9irlzlpz97f61mrr9n18ry"; depends=[doParallel doRNG foreach mvtnorm nlme]; }; + bdlp = derive2 { name="bdlp"; version="0.9-1"; sha256="1ydb5hsaj1bfdz7hcdkc74qlk608kf0xrbpw247klkxrhsh9ba2p"; depends=[DBI GenOrd MASS MultiOrd rgl RSQLite stringdist]; }; + bdots = derive2 { name="bdots"; version="0.1.13"; sha256="050wrm25frinah7556j7bal9vfym77q7w50kzdk4jazmryhnqxk6"; depends=[doParallel doRNG foreach mvtnorm nlme]; }; bdpopt = derive2 { name="bdpopt"; version="1.0-1"; sha256="1z7mdqklw3frsdzyhvx8s8wvblwm28fr1gca2yrivqjng0r47lx4"; depends=[coda rjags]; }; bdpv = derive2 { name="bdpv"; version="1.1"; sha256="0i6wdf27243ch8pn2chqriwxjg3g72wbvzlx52mz4ahw700xjc7n"; depends=[]; }; bdrift = derive2 { name="bdrift"; version="1.2.2"; sha256="03vwiyvxv174l0sy76gp2x8lwjf3s45zxzwrlbn97hg9c3j9adjm"; depends=[Quandl quantmod scales xts zoo]; }; @@ -3855,10 +4006,11 @@ in with self; { beadarrayFilter = derive2 { name="beadarrayFilter"; version="1.1.0"; sha256="044dq5irc00v2f2gjz0vb69w7q7b84lppc55ganabdv4f0dxdblc"; depends=[beadarray RColorBrewer]; }; beadarrayMSV = derive2 { name="beadarrayMSV"; version="1.1.0"; sha256="0785vmjsli37hjyppk7hlqmn0b683s1apysx9dghbw4h6rgvr8n9"; depends=[Biobase geneplotter limma rggobi]; }; beanplot = derive2 { name="beanplot"; version="1.2"; sha256="0wmkr704fl8kdxkjwmaxw2a2h5dwzfgsgpncnk2p2wd4768jknj9"; depends=[]; }; - beanz = derive2 { name="beanz"; version="1.7.1"; sha256="1x810fwciw5ca9710z8km5ccq4dspz6c7jx0kx800k7w648lnvqq"; depends=[BH Rcpp RcppEigen rstan StanHeaders survival]; }; + beanz = derive2 { name="beanz"; version="2.1"; sha256="0lnjaka2cmkgc7id8njclmmkjb22v6gz9bkncq5n6zidawrczqp0"; depends=[BH loo Rcpp RcppEigen rstan StanHeaders survival]; }; bedr = derive2 { name="bedr"; version="1.0.3"; sha256="1v1r5rndpd1wbwcsyzpqwag0dswicdppvs4qq28zr1acgi8cy722"; depends=[data_table R_utils testthat VennDiagram yaml]; }; beepr = derive2 { name="beepr"; version="1.2"; sha256="0w4szy3rgj1bdcanxbcb9agyw38jqp0hc7qsn7j9700vh20zqbln"; depends=[audio stringr]; }; beeswarm = derive2 { name="beeswarm"; version="0.2.3"; sha256="0hy89bwv7jixlg91li1fywa77916am2whqp1m1fx1khd45g44581"; depends=[]; }; + beginr = derive2 { name="beginr"; version="0.0.1"; sha256="1gpn5zff9c1y5qc830izdln2h0zsvqngj514iwv9lj6ibg4jxqnc"; depends=[]; }; belex = derive2 { name="belex"; version="0.1.0"; sha256="1563yngc1lvncmx3h6kgsj1r6k3hvxidh6h9rb7apxs2rq5k32ms"; depends=[XML]; }; benchden = derive2 { name="benchden"; version="1.0.5"; sha256="1cwcgcm660k8rc8cpd9sfpzz66r55b4f4hcjc0hznpml35015zla"; depends=[]; }; benchmark = derive2 { name="benchmark"; version="0.3-6"; sha256="05rgrjhbvkdv06nzbh0v57b06vdikrqc1d29wirzficxxbjk1hih"; depends=[ggplot2 plyr proto psychotools relations reshape scales]; }; @@ -3885,40 +4037,42 @@ in with self; { bfast = derive2 { name="bfast"; version="1.5.7"; sha256="0n75minka55rxpvs3qkj0c65ydn1gc3i8lkr2gdyn1adjkl5yn01"; depends=[forecast raster sp strucchange zoo]; }; bfork = derive2 { name="bfork"; version="0.1.2"; sha256="0gcmvxs57gkyvsx67dyg2jqs9wr3clndmmfqq5rvi5ys31g6krb8"; depends=[]; }; bfp = derive2 { name="bfp"; version="0.0-35"; sha256="13jfbzijg087sva45bxzdnpz16l51mbszzh443nad23lym0w4bfg"; depends=[Rcpp]; }; + bgeva = derive2 { name="bgeva"; version="0.3-1"; sha256="0qm4xknyab8hdyn3in2hsvm8s062cnmqqf41b5jvax1mi5hs0z8c"; depends=[magic mgcv trust]; }; bglm = derive2 { name="bglm"; version="1.0"; sha256="1ln5clsfhpzjkm6cjil0lfqg687b0xxbvw1hcvangc0c0s314mrz"; depends=[mvtnorm]; }; bgmfiles = derive2 { name="bgmfiles"; version="0.0.6"; sha256="10qldfjjq5fx5jrrakdxc8k2pf0vp8ifg18nq56lvx9n28mqigim"; depends=[]; }; bgmm = derive2 { name="bgmm"; version="1.8.3"; sha256="09hsqjjyzlpl0fqb7832j5ydrr0yc42zb1c9q1y5hbrms7yp00p8"; depends=[car combinat lattice mvtnorm]; }; bgsmtr = derive2 { name="bgsmtr"; version="0.1"; sha256="09h118msqf9yl2z7d6dsvgn4vrvy43ynznajj58k7gkxdlm1nimg"; depends=[coda EDISON Matrix mnormt mvtnorm sparseMVN statmod]; }; - bhm = derive2 { name="bhm"; version="1.1"; sha256="00xnqppq95qvdbiklsz4af4f0f4p61b7c7v0l1k1isxqr3mgcgia"; depends=[coda survival]; }; + bhm = derive2 { name="bhm"; version="1.11"; sha256="1d35fvwk8v8b2x1knhsk5rz48hc5k9lkrxqd6y8p0gn63k5iy5ag"; depends=[coda survival]; }; biasbetareg = derive2 { name="biasbetareg"; version="1.0"; sha256="1562zdin0y5mrp36ih11ir3h9cv49cx1l98chxd89fkj8x3c1fbg"; depends=[betareg]; }; - bib2df = derive2 { name="bib2df"; version="0.1.1"; sha256="0jhl1cbd04dgr9y9qw3s1wa6cnzvgid3668kv0mmn721i30hk5q3"; depends=[dplyr plyr stringr]; }; - bibliometrix = derive2 { name="bibliometrix"; version="1.5"; sha256="08wn1wykxlry3y1wlhja75g6kva2gjrvslphilx6qabxq54bal0m"; depends=[dplyr factoextra FactoMineR ggplot2 igraph Matrix RColorBrewer rscopus SnowballC stringr]; }; + bib2df = derive2 { name="bib2df"; version="0.2"; sha256="06gzkvf5fngijkicsi97a9vzabkc3af32mr52wl178y2pzigf4hc"; depends=[dplyr humaniformat plyr stringr]; }; + bibliometrix = derive2 { name="bibliometrix"; version="1.6"; sha256="1jfssm4xaxl9zfxm7lqlvm0yirz98kbhyh2app17zha0fpg67ji6"; depends=[factoextra FactoMineR ggplot2 igraph Matrix RColorBrewer rscopus SnowballC stringdist stringr]; }; bibliospec = derive2 { name="bibliospec"; version="0.0.4"; sha256="0abrbaw2knnlh8g5r4c2i6cc7a6ilfxry8zhscrx0x58irmp790b"; depends=[DBI RSQLite]; }; bibtex = derive2 { name="bibtex"; version="0.4.0"; sha256="0sy1czwjff3kdfnmlkp036qlnw8dzdl5al7izy1cc0535hsijv0d"; depends=[]; }; + biclique = derive2 { name="biclique"; version="1.0.1"; sha256="0wxvqjxc11ccvfnlnnb6gv6r74a48pg3yabsjynrg1m2kbynnqjf"; depends=[]; }; biclust = derive2 { name="biclust"; version="1.2.0"; sha256="03vkj7zp3dl4zbv2gzv9pahcd1018lbv4ixghvv1g0fsbndrybdg"; depends=[colorspace flexclust lattice MASS]; }; bifactorial = derive2 { name="bifactorial"; version="1.4.7"; sha256="187zlsqph7m63wf6wajvs6a4a08aax9hiqssgvma6cpkpisfiz4k"; depends=[lattice multcomp mvtnorm Rcpp]; }; - bife = derive2 { name="bife"; version="0.2"; sha256="00hfnd916aya48dn9n27igljav5v9xmac3bj5mhv9vggyccrim48"; depends=[Formula Rcpp RcppArmadillo]; }; + bife = derive2 { name="bife"; version="0.4"; sha256="1h3r5vigs2ghga84smx492m0v9aq6gynnw5r23n20kkbiscv1fxk"; depends=[Formula Rcpp RcppArmadillo]; }; bigFastlm = derive2 { name="bigFastlm"; version="0.0.2"; sha256="012vxy5mpknc3998h382qdzgrxnyfpyddy003zjp3v42clim5y64"; depends=[BH bigmemory Rcpp RcppEigen]; }; bigGP = derive2 { name="bigGP"; version="0.1-6"; sha256="0fwm06rzx1qbh16ii93x26i4v4yb50jk67k3qmzyr3gr4z9b9xhg"; depends=[Rmpi]; }; - bigKRLS = derive2 { name="bigKRLS"; version="1.5.2"; sha256="1hv8gxxdck2vnn292gq1dmhnn8q570jjx50z8bl5xyjqddk64rp0"; depends=[BH bigalgebra biganalytics bigmemory ggplot2 Rcpp RcppArmadillo shiny]; }; - bigQueryR = derive2 { name="bigQueryR"; version="0.2.0"; sha256="1z9a725jd9nparid0df7fyvsa5mvz92krj0q7mq75x6cprr44f29"; depends=[googleAuthR googleCloudStorageR]; }; + bigKRLS = derive2 { name="bigKRLS"; version="1.5.3"; sha256="1dapdxk6bmbpixgxs04hb64wjx9nlr55gg76zpbnwbddwwmp2b28"; depends=[BH bigalgebra biganalytics bigmemory ggplot2 Rcpp RcppArmadillo shiny]; }; + bigQueryR = derive2 { name="bigQueryR"; version="0.3.1"; sha256="1lhkd4yz7gybcsx0wsg2ikilns5xxmij5vpc1rsskwpsmgv7xwsh"; depends=[assertthat googleAuthR googleCloudStorageR httr jsonlite]; }; bigRR = derive2 { name="bigRR"; version="1.3-10"; sha256="08m77r9br6wb9i21smaj4pwwpq3nxdirs542gnkrpakl7bvyp6s3"; depends=[DatABEL hglm]; }; bigReg = derive2 { name="bigReg"; version="0.1.2"; sha256="1hmvh5j40zpzz6c88hmikphps8rb741yvkg60dxmkfl8gxqsrp3w"; depends=[MASS Rcpp RcppArmadillo uuid]; }; bigalgebra = derive2 { name="bigalgebra"; version="0.8.4"; sha256="19rv552ac0q9djc1yvpldkc0lipdf6q143m9dnndpsqs7ayqlr4g"; depends=[BH bigmemory]; }; biganalytics = derive2 { name="biganalytics"; version="1.1.14"; sha256="1hsqdg5hkhs6z9pwvn055q02hzpksjwrf33q5zdnkm387g188ca6"; depends=[BH biglm bigmemory foreach Rcpp]; }; - bigdata = derive2 { name="bigdata"; version="0.1"; sha256="1n1zcjhvb2s87d7fkcm95x11ss4b8pczza0n55gxjv4przfiq0in"; depends=[glmnet lattice Matrix]; }; biglars = derive2 { name="biglars"; version="1.0.2"; sha256="17zs25dvlja9ynx2fm5f4nmgkx4mnyqs5iscwsyahr6qigx1rz9x"; depends=[ff]; }; - biglasso = derive2 { name="biglasso"; version="1.3-5"; sha256="09ckg2cdq0cg78ji08mg831shy8q5d949b2bi2zw7x05glx7b0mg"; depends=[BH bigmemory Matrix ncvreg Rcpp RcppArmadillo]; }; + biglasso = derive2 { name="biglasso"; version="1.3-6"; sha256="044l2l34l4pl7ijwgq569cn8x5clj795qpfwb1b9qfwvggvgzgni"; depends=[BH bigmemory Matrix ncvreg Rcpp RcppArmadillo]; }; biglm = derive2 { name="biglm"; version="0.9-1"; sha256="1z7h4by457z93k5i6qf5rq7xmd1y2kcd1rq4pv465cd32d4mb2g1"; depends=[DBI]; }; bigmemory = derive2 { name="bigmemory"; version="4.5.19"; sha256="191gbzca557kpk7mdsg716vfyqpr7j5din6qb8hin4g1nkzzwmg6"; depends=[BH bigmemory_sri Rcpp]; }; bigmemory_sri = derive2 { name="bigmemory.sri"; version="0.1.3"; sha256="0mg14ilwdkd64q2ri9jdwnk7mp55dqim7xfifrs65sdsv1934h2m"; depends=[]; }; bigml = derive2 { name="bigml"; version="0.1.2"; sha256="0vl5krjbgckknxwl26b2hn63jhb80zbn7abpckhxzxfxzncpnfz9"; depends=[plyr RCurl RJSONIO]; }; bigpca = derive2 { name="bigpca"; version="1.0.3"; sha256="0hqkaamj5fyp2jw5727pkvmnqr194ngh4hlja14qmj81nr26a88p"; depends=[biganalytics bigmemory bigmemory_sri irlba NCmisc reader]; }; - bigrquery = derive2 { name="bigrquery"; version="0.3.0"; sha256="0g13fqs0x5v7nzqd0iyajw4dw9arykm3zn0wvnk0lb7c9izkk9lr"; depends=[assertthat DBI dplyr httr jsonlite R6]; }; + bigrquery = derive2 { name="bigrquery"; version="0.4.1"; sha256="07hi5z8l2qm9cjfc9y1y5vjijkkwmxq1dgz3bvv578kasz6yjs11"; depends=[assertthat DBI httr jsonlite progress readr]; }; bigsplines = derive2 { name="bigsplines"; version="1.1-0"; sha256="0jjlv9qidn8xrz630wbyq7kz7vlxgaphv2y2siv90j01j5nj4s89"; depends=[quadprog]; }; bigstep = derive2 { name="bigstep"; version="0.7.4"; sha256="0g45fgnamdv1v3b8xvpsj4rzhisyvbbddwyzvzvmmi4a8w20pzn5"; depends=[bigmemory matrixStats R_utils RcppEigen speedglm]; }; bigtabulate = derive2 { name="bigtabulate"; version="1.1.5"; sha256="1jvp3m0ms2cav9z8vvhh80gsa0kvc351brv2jq99rxv1mwvpa4xj"; depends=[BH biganalytics bigmemory Rcpp]; }; bigtcr = derive2 { name="bigtcr"; version="1.0"; sha256="1wh85r6f4jd8xzinczr5g1p1acbcyn4am3v1n4blfbn447l9nx4z"; depends=[]; }; + bikedata = derive2 { name="bikedata"; version="0.0.1"; sha256="1wndc27yxwfrsyjn2q19fq5xsd63qkfdpjfkgk6bacwnvdpcrjab"; depends=[BH dplyr httr lubridate Rcpp reshape2 RSQLite tibble xml2]; }; bikeshare14 = derive2 { name="bikeshare14"; version="0.1.0"; sha256="12399c01s8p9rmpi3fpy4rm7xxnsf627slz3h234frbahhs882c4"; depends=[]; }; bild = derive2 { name="bild"; version="1.1-5"; sha256="03has1zi57inicahl52ja006vv5cdndyxfsxp77l6nc3zc6ixna8"; depends=[]; }; bimetallic = derive2 { name="bimetallic"; version="1.0"; sha256="181qi4dr0zc7x6wziq7jdc1his20jmprfpq3hrfm56fr5n1sj8wl"; depends=[]; }; @@ -3929,7 +4083,7 @@ in with self; { binda = derive2 { name="binda"; version="1.0.3"; sha256="15rhxnlif7agblzd09gyllkqkf5d8cc75b4vmp7grx8a6y7w47g0"; depends=[entropy]; }; bindata = derive2 { name="bindata"; version="0.9-19"; sha256="15ya21fz1kvq4qsppkn9ypiqvaq8q4vszdcgcymampa7zc07z2ld"; depends=[e1071 mvtnorm]; }; bindr = derive2 { name="bindr"; version="0.1"; sha256="0d95ifm0x4mrfzi20xf39f5pzd7rfzqsld0vjqf6xzga5rhnd8fc"; depends=[]; }; - bindrcpp = derive2 { name="bindrcpp"; version="0.1"; sha256="0djmmvkkf9z291r1h41g542v81qccqqh50xdn5y7za1kaxmh9pj1"; depends=[bindr plogr Rcpp]; }; + bindrcpp = derive2 { name="bindrcpp"; version="0.2"; sha256="0l1l22zl87wiyl79m3gj2vlxmkhxvrkl4alhyy08h55q7hqs3vyh"; depends=[bindr plogr Rcpp]; }; binequality = derive2 { name="binequality"; version="1.0.1"; sha256="0an73s9nj96hm83va4p5zfv2sv8vnp1fwjwx4ls5carg8f5pmfv5"; depends=[gamlss gamlss_cens gamlss_dist ineq survival]; }; binford = derive2 { name="binford"; version="0.1.0"; sha256="04mpdvynlm4gddybys04k0446gc9hyq0vaxr6a525p76ls5aw4b1"; depends=[]; }; bingat = derive2 { name="bingat"; version="1.2.2"; sha256="1vx6zm6vvv7nzp781fa6mb2iq6hmndi5f3yml15ydw4cx3f8r0xd"; depends=[doParallel foreach genalg gplots matrixStats network]; }; @@ -3938,7 +4092,7 @@ in with self; { binom = derive2 { name="binom"; version="1.1-1"; sha256="0mjj92dqf5q69jxzqya4izb1mly3mkydbnmlm4wb3zqqg82a324c"; depends=[]; }; binomSamSize = derive2 { name="binomSamSize"; version="0.1-5"; sha256="1an6dcqsjh5r0w4kc3n6yfvvha5qhrb2i4bpf7g5ykhl3i60zfcc"; depends=[binom]; }; binomTools = derive2 { name="binomTools"; version="1.0-1"; sha256="14594i7iapd6hy4j36yb88xmrbmczg8zgbs0b6k0adnmqf83bn4v"; depends=[]; }; - binomen = derive2 { name="binomen"; version="0.1.0"; sha256="0r89xcbp0jjirr36j3i4xmdjn2wh142c0jv1whzpzjdmcsh806g6"; depends=[dplyr jsonlite lazyeval]; }; + binomen = derive2 { name="binomen"; version="0.1.2"; sha256="0w1m5b2qvq3g28hahfgkq7wrrjqy43x1x4kvrrrf284s5ka90531"; depends=[dplyr jsonlite lazyeval]; }; binomialcftp = derive2 { name="binomialcftp"; version="1.0"; sha256="00c7ymlxk1xnx3x1814x7bcyir7q5sy4rb82dcpzf2bdly4xa1qr"; depends=[]; }; binomlogit = derive2 { name="binomlogit"; version="1.2"; sha256="1njz1g9sciwa8q6h0zd8iw45vg3i1fwcvicj5y8srpk8wqw3qp7k"; depends=[]; }; binr = derive2 { name="binr"; version="1.1"; sha256="0kgk91zy7bdrhpkh9c5bi206y9hjwjwzb508i8qqmznqyxmza70r"; depends=[]; }; @@ -3946,7 +4100,7 @@ in with self; { binsmooth = derive2 { name="binsmooth"; version="0.1.0"; sha256="1zlw4zmkckg7rwf4hx8wyr2yl644xkdkazayysy99saysr9pk2c9"; depends=[ineq pracma triangle]; }; binst = derive2 { name="binst"; version="0.2.0"; sha256="13hg9kmxlaczbkbimlqphpimzx67kncc6qvnlk9cxqyvfkb0ph47"; depends=[]; }; bio_infer = derive2 { name="bio.infer"; version="1.3-3"; sha256="14pdv6yk0sk6v8g9p6bazbp7mr3wmxgfi6p6dj9n77lhqlvjcgm9"; depends=[]; }; - bio3d = derive2 { name="bio3d"; version="2.3-1"; sha256="0dm582jam4ll5q82vfxf1gjrmv1qzl60kws6vmxjx91d5jwf1fqy"; depends=[Rcpp]; }; + bio3d = derive2 { name="bio3d"; version="2.3-2"; sha256="1l2k6sh46dbdc78v05brnnb1gkj9w3cglsc7964ci47xk3wj96aa"; depends=[Rcpp]; }; bioOED = derive2 { name="bioOED"; version="0.1.1"; sha256="18b66s5dn8a67iwb0g1bmbi856ip81yfa57m40kf7phsga52ncg1"; depends=[bioinactivation corrplot dplyr FME ggplot2 MEIGOR]; }; bioPN = derive2 { name="bioPN"; version="1.2.0"; sha256="0mvqgsfc7d4h6npgg728chyp5jcsf49xhnq8cgjxfzmdayr1fwr8"; depends=[]; }; biogas = derive2 { name="biogas"; version="1.7.0"; sha256="1c0w78x2jjgsxffcz61lfs5m72kkds55c73z970nbxvhqk8n15j6"; depends=[]; }; @@ -3955,15 +4109,16 @@ in with self; { bioimagetools = derive2 { name="bioimagetools"; version="1.1.0"; sha256="0ws99rx7bhqi448qqy08jsl3c4vbq96gigqb85yv1mzrc82sg62p"; depends=[EBImage httr tiff]; }; bioinactivation = derive2 { name="bioinactivation"; version="1.1.5"; sha256="0m20947n2kzrfy8a592k1d9fg1xlv83vjf11pp4h5hhxd8fbm0w5"; depends=[deSolve dplyr FME ggplot2 lazyeval MASS]; }; biolink = derive2 { name="biolink"; version="0.1.2"; sha256="12hpd50swnij9jzc8m6bz7iwmndgwmlyj7vnd8hvnz1gc68bjs2p"; depends=[memoise rentrez xml2]; }; - biomartr = derive2 { name="biomartr"; version="0.4.0"; sha256="0smjddxp99w79m26ywbd3ph0822v1cakvqsfgxdy1p7ak164jp21"; depends=[biomaRt Biostrings curl data_table downloader dplyr httr jsonlite RCurl readr stringi stringr tibble XML]; }; + biomartr = derive2 { name="biomartr"; version="0.5.1"; sha256="05wmpq1g9zk4a5rc9zr5876ls8i1xjnw2sq777m17686fjws61q1"; depends=[biomaRt Biostrings curl data_table downloader dplyr httr jsonlite RCurl readr stringr tibble XML]; }; biomod2 = derive2 { name="biomod2"; version="3.3-7"; sha256="0mbf6j4m7vvq82l1grmznfqirj1ynr6jzzlpx0s2wjd3hdbvgzia"; depends=[abind dismo earth gbm ggplot2 MASS maxent mda nnet PresenceAbsence pROC randomForest raster rasterVis reshape rpart sp]; }; bionetdata = derive2 { name="bionetdata"; version="1.0.1"; sha256="1l362zxgcvxln47b1vc46ad6ww8ibwhqr2myxnz1dnk2a8nj7r2q"; depends=[]; }; bioplots = derive2 { name="bioplots"; version="0.0.1"; sha256="184wp1jvgf7a80srrfq72a4r1la2psr8b16kxs00v2gcbgjyvr10"; depends=[ggplot2 gplots RColorBrewer reshape2]; }; biorxivr = derive2 { name="biorxivr"; version="0.1.3"; sha256="1vi035c4jld5i52xnp79dn5642308cv11vfrw0n62wlsbjfbdma4"; depends=[XML]; }; bios2mds = derive2 { name="bios2mds"; version="1.2.2"; sha256="1avzkbk91b7ifjba5zby5r2yw5mibf2wv05a4nj27gwxfwrr21cd"; depends=[amap cluster e1071 rgl scales]; }; biosignalEMG = derive2 { name="biosignalEMG"; version="2.0.1"; sha256="1prdr0pa1vd190pqxr7y87sjy10icfj9wb7jc3r5q8qmk5lpnyq5"; depends=[signal]; }; + biospear = derive2 { name="biospear"; version="1.0.0"; sha256="1lhpbmjc2l0wk9w6m87lllqk7mdf29zifkqm01xwfcr9n706lxiv"; depends=[cobs corpcor devtools glmnet grplasso MASS Matrix mboost pkgconfig plsRcox pROC PRROC RCurl survAUC survival]; }; biotic = derive2 { name="biotic"; version="0.1.2"; sha256="1p18jkdd263dgk90626n9awkj6m4zn1n7897596fzrzrahksa978"; depends=[]; }; - biotools = derive2 { name="biotools"; version="3.0"; sha256="0k5dgaw2ris9vp370d8qhpnvnd0hllac8cv5sp52vgqskwygg7fx"; depends=[boot lattice MASS rpanel SpatialEpi tkrplot]; }; + biotools = derive2 { name="biotools"; version="3.1"; sha256="15y3ccmj1gslzc0lp0gvc66hf0yigx3zkqnw46crgrizjm2kmjay"; depends=[boot lattice MASS rpanel SpatialEpi tkrplot]; }; bipartite = derive2 { name="bipartite"; version="2.08"; sha256="16j70ikzprjsm81w9bqbp26xxf14ckw654dy7c5hkz24x62qsx2i"; depends=[fields igraph MASS permute sna vegan]; }; biplotbootGUI = derive2 { name="biplotbootGUI"; version="1.1"; sha256="0k92z9iavvq5v56x2hgkmrf339xl7ns1pvpqb4ban8r1j8glzawi"; depends=[cluster dendroextras MASS rgl shapes tcltk2 tkrplot]; }; birdnik = derive2 { name="birdnik"; version="0.1.0"; sha256="1ql29qbv7jw6cngd36qcgljx0zvvzp2v5rjd44v0j04gww1kb2bc"; depends=[httr]; }; @@ -3972,17 +4127,17 @@ in with self; { bisectr = derive2 { name="bisectr"; version="0.1.0"; sha256="1vjsjshvzj66qqzg32rviklqswrb00jyq6vwrywg1hpqhf4kisv7"; depends=[devtools]; }; bisoreg = derive2 { name="bisoreg"; version="1.4"; sha256="1ianhk5vrzhwb9ymzvlx9701p5c4iasxyq7nhrvm815dm15rf2wf"; depends=[bootstrap coda monreg R2WinBUGS]; }; bit = derive2 { name="bit"; version="1.1-12"; sha256="0a6ig6nnjzq80r2ll4hc74za3xwzbzig6wlyb4dby0knzf3iqa6f"; depends=[]; }; - bit64 = derive2 { name="bit64"; version="0.9-5"; sha256="0fz5m3fhvxgwjl76maag7yn0zdw24rx34gy6v77378fajag9yllg"; depends=[bit]; }; + bit64 = derive2 { name="bit64"; version="0.9-7"; sha256="07znvz9vp1nz1y5ljng4qyskvm943cdbmy996s67560ijxzsm6kv"; depends=[bit]; }; bitops = derive2 { name="bitops"; version="1.0-6"; sha256="176nr5wpnkavn5z0yy9f7d47l37ndnn2w3gv854xav8nnybi6wwv"; depends=[]; }; bitrugs = derive2 { name="bitrugs"; version="0.1"; sha256="0sqgp05b902mdldr4ckz4knmkbsqvgl1vx0l792cn2r437yqlgp3"; depends=[]; }; bivarRIpower = derive2 { name="bivarRIpower"; version="1.2"; sha256="0vgi0476rwali6k8bkp317jawzq5pf04v75xmycpmadb7drnpzy0"; depends=[]; }; bivrp = derive2 { name="bivrp"; version="1.0"; sha256="0q00k24fssvjkgpndg84vdm7w9hswq593k6yjha4pl0a8bmnv6f8"; depends=[MASS]; }; biwavelet = derive2 { name="biwavelet"; version="0.20.11"; sha256="0fmk4b8gzbq0l4n08zq4pl1csaxxxi3hpqd886ccbhmg6zn8dz01"; depends=[fields foreach Rcpp]; }; biwt = derive2 { name="biwt"; version="1.0"; sha256="1mb3x8ky3x8j4n8d859i7byyjyfzq035i674b2dmdca6mn7paa14"; depends=[MASS rrcov]; }; - bizdays = derive2 { name="bizdays"; version="1.0.2"; sha256="1p2jlpjfwhpqmb9ahz0dp0iwywsg62x8f5sq6aws267v6jdhnqwd"; depends=[]; }; + bizdays = derive2 { name="bizdays"; version="1.0.3"; sha256="16187266vz5kzqlywiai6z0qkvcwmm67vl83pdkbjpqnswxwz57l"; depends=[]; }; bkmr = derive2 { name="bkmr"; version="0.2.0"; sha256="0dk6dn73bqlvwinn3aginls4533931xcr3h59k0w60yxs3v8yakv"; depends=[dplyr fields magrittr MASS nlme tidyr tmvtnorm truncnorm]; }; blackbox = derive2 { name="blackbox"; version="1.0.18"; sha256="1sgq6i8p066li9lr3241zplygv7yc7mp7k13c6nih0289v3l7jg7"; depends=[geometry lattice MASS nloptr numDeriv proxy rcdd Rcpp RcppEigen spaMM]; }; - blavaan = derive2 { name="blavaan"; version="0.2-3"; sha256="1hbcvjgkf0hcajg12dmf0zpyf4nhp938gbqk511vz1033iaamha2"; depends=[coda lavaan loo MASS MCMCpack mnormt nonnest2 runjags]; }; + blavaan = derive2 { name="blavaan"; version="0.2-4"; sha256="1bjczm5i9q1h3i1sl5p31jv87hi9bj4b546fi4g338ljqqrzx6a5"; depends=[coda lavaan loo MASS MCMCpack mnormt nonnest2 runjags]; }; blendedLink = derive2 { name="blendedLink"; version="1.0"; sha256="19d1pnjag89jjvkl5a6wx531qjqp4cv5jk95md6jby27yr52r8vp"; depends=[]; }; blender = derive2 { name="blender"; version="0.1.2"; sha256="1qqkfgf7fzwcz88a43cqr8bw86qda33f18dg3rv1k77gpjqr999c"; depends=[vegan]; }; blighty = derive2 { name="blighty"; version="3.1-4"; sha256="1fkz3vfcnciy6rfybddcp5j744dcsdpmf7cln2jky0krag8pjzpn"; depends=[]; }; @@ -3991,28 +4146,28 @@ in with self; { blm = derive2 { name="blm"; version="2013.2.4.4"; sha256="1w6c30cq38j4i1q4hjg12l70mhy5viw886l1lsnxyvniy113in4i"; depends=[]; }; blme = derive2 { name="blme"; version="1.0-4"; sha256="1ca2b0248k0fj3lczn9shfjplz1sl4ay4v6djldizp2ch2vwdgy2"; depends=[lme4]; }; blmeco = derive2 { name="blmeco"; version="1.1"; sha256="1hzg5dimzj1khygm9dv0y30mx1nf9vdhgicqdg1rvj7nf426h2ki"; depends=[arm lme4 MASS MuMIn]; }; - blob = derive2 { name="blob"; version="1.0.0"; sha256="0zjb3sbx4q36d69p2164im1nvpsdjz5mqa5rmncjziipgz6aix38"; depends=[tibble]; }; + blob = derive2 { name="blob"; version="1.1.0"; sha256="05pazzcyz3c3vd2l70zq9cf172cgjff4dnf419zigfnxycyn1mhn"; depends=[tibble]; }; blockTools = derive2 { name="blockTools"; version="0.6-3"; sha256="0023p0msfmp8swq4f5aff40m976np7y051x8hjizzw91hrfa4w2n"; depends=[MASS tibble]; }; blockcluster = derive2 { name="blockcluster"; version="4.2.3"; sha256="1b3rqpg3i5bplz85lxfspb1vv8l7qsxwkalnn0h5pwy9ppqdbcb7"; depends=[Rcpp rtkore]; }; blockmatrix = derive2 { name="blockmatrix"; version="1.0"; sha256="14k69ly4i8pb8z59005kaf5rpv611kk1mk96q6piyn1gz1s6sk6r"; depends=[]; }; blockmodeling = derive2 { name="blockmodeling"; version="0.1.8"; sha256="0x71w1kysj9x6v6vsirq0nndsf6f3wzkf8pbsq3x68sf4cdji1xl"; depends=[]; }; blockmodels = derive2 { name="blockmodels"; version="1.1.1"; sha256="088629i4g63m8rnqmrv50dgpqbnxd1a4zl5wr3ga0pdpqhmd53wp"; depends=[digest Rcpp RcppArmadillo]; }; blockrand = derive2 { name="blockrand"; version="1.3"; sha256="1090vb26w6s7iqjcal0xbb3qb6p6j46a5w25f1wjdppd1spvh7f9"; depends=[]; }; - blocksdesign = derive2 { name="blocksdesign"; version="2.4"; sha256="0nwcayxrp829599hlz860xkrm49ij1l6anxrf4gsvfgs4rlm380j"; depends=[crossdes]; }; + blocksdesign = derive2 { name="blocksdesign"; version="2.5"; sha256="1l64z2j7qzyycpll63ny0y451fr2mhwgbqam3v0iw5vg4qk5q8wh"; depends=[crossdes]; }; blockseg = derive2 { name="blockseg"; version="0.2"; sha256="183hjb66589qqjwf14rzdmy770biad73r0l5pkh6f4xk9xac1r62"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2]; }; - blsAPI = derive2 { name="blsAPI"; version="0.1.7"; sha256="0q04vsmhxz5galdjcqrbabghfn747pi6zdpchj3xavcf6wx8xs5s"; depends=[RCurl rjson]; }; - blscrapeR = derive2 { name="blscrapeR"; version="2.1.2"; sha256="0qyj1fnhb5cb425y3ws1rwpv6sm2bqx9j3gyk3l8m2yn5z6qmjns"; depends=[ggplot2 httr jsonlite magrittr]; }; + blsAPI = derive2 { name="blsAPI"; version="0.1.8"; sha256="1xikaix2n667281w6xga158c198s6fs5iga24qyrl1j5119a8way"; depends=[RCurl rjson]; }; + blscrapeR = derive2 { name="blscrapeR"; version="2.1.5"; sha256="0mkigpv6chsbdsnfy28gaqjlqcivq2w1kryg9xnrbgd4jgr4xl4r"; depends=[ggplot2 httr jsonlite magrittr]; }; bmd = derive2 { name="bmd"; version="0.5"; sha256="0d4wxyymycb416sdn272292l70s1h2m5kv568vakx3rbvb8y6agy"; depends=[drc]; }; bmem = derive2 { name="bmem"; version="1.5"; sha256="1miiki743rraralk9dp12dsjjajj3iizcrfwmplf6xas6pl8sfk6"; depends=[Amelia lavaan MASS sem snowfall]; }; bmeta = derive2 { name="bmeta"; version="0.1.2"; sha256="19pm60xpmlanngq4nbibp0n5m98xw24b2xghz92ly31i3mkg2n68"; depends=[forestplot R2jags]; }; - bmixture = derive2 { name="bmixture"; version="0.3"; sha256="1q22wdg3909krdqg0vgkny9lq9l7j0cs99ay68aggqjd9kcgrl4g"; depends=[]; }; + bmixture = derive2 { name="bmixture"; version="0.5"; sha256="144nd1s18nyii135jfr2f65szyzw8hi4zg57z85dnmr2xwas22qb"; depends=[BDgraph]; }; bmk = derive2 { name="bmk"; version="1.0"; sha256="1wxkrlrhmsxsiraj8nyiax9bqs834ln2swykmpf40wxspkykgfdq"; depends=[coda functional plyr]; }; - bmlm = derive2 { name="bmlm"; version="1.2.10"; sha256="1kng958v08vv54y3wbvf65rlpq6iwwfnr2gj0j3n05nq3c3qdm9n"; depends=[BH ggplot2 Rcpp RcppEigen rstan StanHeaders]; }; + bmlm = derive2 { name="bmlm"; version="1.3.0"; sha256="0ahkfg6d10729p4vq77ly2sf667jnyf7ysp3rap87l8vgy24aris"; depends=[BH ggplot2 Rcpp RcppEigen rstan StanHeaders]; }; bmmix = derive2 { name="bmmix"; version="0.1-2"; sha256="00php2pgpnm9n0mnamchi6a3dgaa97kdz2ynivrf38s0vca7fqx8"; depends=[ggplot2 reshape2]; }; bmp = derive2 { name="bmp"; version="0.2"; sha256="059ps1sy02b22xs138ba99fkxq92vzgfbyf2z5pyxwzszahgy869"; depends=[]; }; - bmrm = derive2 { name="bmrm"; version="3.0"; sha256="0ix5hfsvs2vnca0l1aflynddw6z85cqdyxn0y7xynkkapk182g4p"; depends=[LowRankQP lpSolve]; }; + bmrm = derive2 { name="bmrm"; version="3.3"; sha256="0d2p49j7pnwif96cr3mafkxnnqsvpvf9wfjkvn5m66x1mvjmjbi7"; depends=[LowRankQP lpSolve matrixStats]; }; bnlearn = derive2 { name="bnlearn"; version="4.1.1"; sha256="16jqkysz9s1a9hd7wki9l4ifzj88176c5p5fsa1ww2zadsa9njbd"; depends=[]; }; - bnnSurvival = derive2 { name="bnnSurvival"; version="0.1.4"; sha256="0rbv8vq7wlzc1mmjqaw9yxjfdgb0cwiwvhwlay24njq16fhidk9w"; depends=[pec prodlim Rcpp]; }; + bnnSurvival = derive2 { name="bnnSurvival"; version="0.1.5"; sha256="1d9jmfx0id4lmw122zga7hb52vlfdfqn4amhzpsmhyck99rv92j4"; depends=[pec prodlim Rcpp]; }; bnormnlr = derive2 { name="bnormnlr"; version="1.0"; sha256="0l2r7vqikak47nr6spdzgjzhvmkr9dc61lfnxybmajvcyy6ymqs9"; depends=[mvtnorm numDeriv]; }; bnpmr = derive2 { name="bnpmr"; version="1.1"; sha256="0hvwkdbs2p2l0iw0425nca614qy3gsqfq4mifipy98yxxvgh8qgc"; depends=[]; }; bnspatial = derive2 { name="bnspatial"; version="1.0.1"; sha256="0cm4kqidjlb64rnjmiwsbjay8fjzwbmpm8k1bl1kz6nj4y532v6d"; depends=[doParallel foreach gRain gRbase raster]; }; @@ -4021,18 +4176,19 @@ in with self; { bodenmiller = derive2 { name="bodenmiller"; version="0.1"; sha256="0gqrjscgq4qgk7yl32w0965yscc1py9klr49s8q8hkzyihlwzim2"; depends=[]; }; boilerpipeR = derive2 { name="boilerpipeR"; version="1.3"; sha256="0467bjqhdmi3p02fp0r7rgm00x9ry464f2hniav990qzsw8i16q6"; depends=[rJava]; }; bold = derive2 { name="bold"; version="0.4.0"; sha256="09ib3h9a3cjcysf5503qh1vrxd79dycsd0rg0xkikrxljzmfmv4b"; depends=[assertthat data_table httr jsonlite plyr reshape stringr tibble xml2]; }; - bookdown = derive2 { name="bookdown"; version="0.3"; sha256="0r9bchzg7im6psc3jphvshzbidc5bv5xaih1qg7b5518jy4iyvb9"; depends=[htmltools knitr rmarkdown yaml]; }; + bookdown = derive2 { name="bookdown"; version="0.4"; sha256="1fp1k7hivrb7s2dwgrsqy9s7xg6pk9hczhrc149y1dwh901j6qvv"; depends=[htmltools knitr rmarkdown yaml]; }; + bookdownplus = derive2 { name="bookdownplus"; version="1.0.2"; sha256="12bffg2bq7077bm68gp8h13p8y7izk6h63l1h6l7rmy53h7ymkmx"; depends=[bookdown knitr yaml]; }; boolean3 = derive2 { name="boolean3"; version="3.1.6"; sha256="00s6ljhqy8gpwa3kxfnm500r528iml53q364bjcl4dli2x85wa9p"; depends=[lattice mvtnorm numDeriv optimx rgenoud rlecuyer]; }; boostSeq = derive2 { name="boostSeq"; version="1.0"; sha256="0sikyzhn1i6f6n7jnk1kb82j0x72rj8g5cimp2qx3fxz33i0asx6"; depends=[genetics lpSolveAPI]; }; boostmtree = derive2 { name="boostmtree"; version="1.1.0"; sha256="1k6cwiz6354xgmqyadm4vfrl4szcr2c9mgxgmmngdc28p7sm50i7"; depends=[nlme randomForestSRC]; }; boostr = derive2 { name="boostr"; version="1.0.0"; sha256="123ag8m042i1dhd4i5pqayqxbkfdj4z0kq2fyhxfy92a7550gib2"; depends=[foreach iterators stringr]; }; - boot = derive2 { name="boot"; version="1.3-18"; sha256="0pi348vvgzn1ny54yxhw6kq6nl7rx9bpr9ji1a6wqs8ah5zj7z8j"; depends=[]; }; + boot = derive2 { name="boot"; version="1.3-19"; sha256="16hsw4bw9pkfc2lqxfwycm1sbvbrm4linvm0ci71n8sxc7srvkis"; depends=[]; }; bootES = derive2 { name="bootES"; version="1.2"; sha256="0hcaw1v80zspdsy4wr464lmgq33807i2f6n2dc3r7qqwa80g4zz0"; depends=[boot]; }; bootLR = derive2 { name="bootLR"; version="1.0"; sha256="1asf4yxy3abfkgqqg89mv9r2iifc5bgcjipy5idni0lvwfjashnd"; depends=[boot]; }; bootRes = derive2 { name="bootRes"; version="1.2.3"; sha256="0bb7w6wyp9wjrrdcyd3wh44f5sgdj07p5sz5anhdnm97rn1ib6dz"; depends=[]; }; bootSVD = derive2 { name="bootSVD"; version="0.5"; sha256="14xwbrpqj3j1xpsppgjxpn9ggsns2n1kmni9vn30vgy68zwvs2wy"; depends=[ff]; }; bootStepAIC = derive2 { name="bootStepAIC"; version="1.2-0"; sha256="0p6v4zjsaj1p6c678010fazdh40lpv0rvhczd1halj8aic98avdx"; depends=[MASS]; }; - bootnet = derive2 { name="bootnet"; version="0.4"; sha256="1xc7ajvbsic4c881pn4k9xrbvijpjig9x8ij284ljvfbwd6ymgfd"; depends=[abind corpcor dplyr ggplot2 gtools huge IsingFit IsingSampler Matrix mgm mvtnorm parcor qgraph]; }; + bootnet = derive2 { name="bootnet"; version="1.0.0"; sha256="101a1d7x4f09j175n7n3czzihqnpl1pia0rk2q08a6s2zbl1z44m"; depends=[abind corpcor dplyr ggplot2 gtools huge igraph IsingFit IsingSampler Matrix mgm mvtnorm parcor qgraph relaimpo tidyr]; }; bootruin = derive2 { name="bootruin"; version="1.2-4"; sha256="1gbvh99snchipf13kjhymcx60s2kni23y7lv8lhzd3d402grp68h"; depends=[]; }; bootsPLS = derive2 { name="bootsPLS"; version="1.0.3"; sha256="0jkpci97chbvlfkcbbj3gm2dnj5aiwfrh739kd4fa0zra4ac1adh"; depends=[mixOmics]; }; bootspecdens = derive2 { name="bootspecdens"; version="3.0"; sha256="0hnxhfsc3ac4153lrjlxan8xi4sg1glwb5947ps6pkkyhixm0kc1"; depends=[MASS]; }; @@ -4056,24 +4212,28 @@ in with self; { brainGraph = derive2 { name="brainGraph"; version="1.0.0"; sha256="0vphir0jyf21yyrsbfdjciyi9nb1ijkrkzdgqfnv1jxpvzk4g5zn"; depends=[abind ade4 boot cairoDevice data_table foreach ggplot2 Hmisc igraph oro_nifti permute plyr RcppEigen RGtk2 scales]; }; brainR = derive2 { name="brainR"; version="1.2"; sha256="1515v6kk73p4s3vrnkpkilfxfyqrf7b762sq6j364ygsyfybvh2z"; depends=[misc3d oro_nifti rgl]; }; brainwaver = derive2 { name="brainwaver"; version="1.6"; sha256="0r79dpd9bbbn34rm29512srzj3m29qgvbryvrp1mwv8mmcsh6ij6"; depends=[waveslim]; }; - brant = derive2 { name="brant"; version="0.1-1"; sha256="143nlap5dl5rymlzhaqq8n2vw6y9mxmps5pm6hlrnmcbkb2mk36v"; depends=[MASS]; }; + brant = derive2 { name="brant"; version="0.1-3"; sha256="1h6aygqcdn2wmxl8mgpq6w2rpr0asqw521i0bkgl37cwzc8sk3c0"; depends=[MASS]; }; brea = derive2 { name="brea"; version="0.1.0"; sha256="0jawpl4d7himydb9z4kqpa7s6b7ghw9yp5j6xvzilbka0agpazck"; depends=[]; }; breakage = derive2 { name="breakage"; version="1.1-1"; sha256="0zjazyz92criiimpz4wyd4hd8ccspvh3hhqpd4qkfdzdf9wp3kns"; depends=[Imap]; }; breakaway = derive2 { name="breakaway"; version="3.0"; sha256="0y3h7gifv279z3x77jmr97c0i3vy58m5wsr8pa2vyn26m02rbkpc"; depends=[]; }; + breakfast = derive2 { name="breakfast"; version="0.1.0"; sha256="14rcr2jlq4sfi0gfq6gm8kls0hbhll19ifnasngag10i3savbf6y"; depends=[plyr]; }; breakpoint = derive2 { name="breakpoint"; version="1.2"; sha256="004vi1qr7iib8ykg6sp7xzv0bb841h4vsz2x0cyrhkdp41frglx9"; depends=[doParallel foreach ggplot2 MASS msm]; }; + breathtestcore = derive2 { name="breathtestcore"; version="0.3.0"; sha256="0wmchp30nx90s1jfv99qxchd71r3ifbkxl4zn5x5jk0267rsfgkx"; depends=[assertthat broom dplyr ggplot2 MASS nlme purrr readr signal stringr tibble tidyr]; }; + breathteststan = derive2 { name="breathteststan"; version="0.3.0"; sha256="1hbsyjvymn58rsa0r0pimh3k74730k7908yia7f06jygkzk0aki2"; depends=[BH breathtestcore dplyr purrr Rcpp RcppEigen rstan StanHeaders stringr tibble tidyr]; }; brew = derive2 { name="brew"; version="1.0-6"; sha256="1vghazbcha8gvkwwcdagjvzx6yl8zm7kgr0i9wxr4jng06d1l3fp"; depends=[]; }; brewdata = derive2 { name="brewdata"; version="0.4"; sha256="1i8i3yhyph212m6jjsij61hz65a5rplxw8y2xqf6daqiisam5q6i"; depends=[RCurl stringdist XML]; }; - brglm = derive2 { name="brglm"; version="0.5-9"; sha256="14hxjamxyd0npak8wyfmmb17qclj5f86wz2y9qq3gbyi2s1bqw2v"; depends=[profileModel]; }; - brglm2 = derive2 { name="brglm2"; version="0.1.3"; sha256="073i573rsnfzdqji027l7i5icpk60x4iw8hda1d982lwdchrdg0l"; depends=[enrichwith MASS Matrix nnet]; }; + brglm = derive2 { name="brglm"; version="0.6.1"; sha256="17r3az6za98v2r06aak77kypdaqssc9wxcc6m6vb20y7xm8dp1mp"; depends=[profileModel]; }; + brglm2 = derive2 { name="brglm2"; version="0.1.4"; sha256="15fv8hkn05zifwd0l2a3x4nf83pd59r2r8dbvii6pjch4b447chv"; depends=[enrichwith lpSolveAPI MASS Matrix nnet]; }; bride = derive2 { name="bride"; version="1.3"; sha256="03k9jwklg1l8sqyjfh914570880ii0qb5dd9l0bg0d0qrghbj0rk"; depends=[]; }; bridgedist = derive2 { name="bridgedist"; version="0.1.0"; sha256="0hqkpwpi3nv6mfhljl65zcflf4wy72ag36hdam6s7kynfj41qz6w"; depends=[]; }; bridger2 = derive2 { name="bridger2"; version="0.1.0"; sha256="0clp42nnbvd01n65azdi2ghp0mfqwsipzdl2d30q04lcvfkdpxrf"; depends=[BSDA data_table ggplot2 outliers plotly shiny shinydashboard]; }; - bridgesampling = derive2 { name="bridgesampling"; version="0.1-1"; sha256="0bzni5hjclavkg7k7z65d95zjsxkvy8h4qv499h6ai091mk2ggs0"; depends=[Brobdingnag coda Matrix mvtnorm scales stringr]; }; + bridgesampling = derive2 { name="bridgesampling"; version="0.2-2"; sha256="0sz3svkfwn0xf8z2h3mhz5lnybfph6jky0p1rzpa2adxwg0fsvjg"; depends=[Brobdingnag coda Matrix mvtnorm scales stringr]; }; briskaR = derive2 { name="briskaR"; version="0.1.0"; sha256="0fx254pc250jv53kmd6miw8blcp43c72myah9g5ns2s84pcdmx6h"; depends=[deldir fftwtools fields MASS mvtnorm pracma raster rgdal rgeos sp]; }; + brlrmr = derive2 { name="brlrmr"; version="0.1.2"; sha256="1hl05rnlswsnsqgijqxzkk744vw18l7l1c4ghdpdxbajx0ssmsh7"; depends=[boot brglm MASS profileModel Rcpp]; }; brm = derive2 { name="brm"; version="1.0"; sha256="0h4kgig28hkqv1amadznc0n9256dx613rxbn8s8si11ygx79x2dd"; depends=[]; }; - brms = derive2 { name="brms"; version="1.6.1"; sha256="1r7zpfw1r3rdf56piqdb7242lywal18xi9dhzglbindrnkrhcnpa"; depends=[abind bayesplot coda ggplot2 loo Matrix matrixStats mgcv nlme Rcpp rstan rstantools RWiener shinystan]; }; + brms = derive2 { name="brms"; version="1.7.0"; sha256="1gbbm30x5n6rpiawf4256qpvaixdnwg5y9n2dw56cs2j02gmdcd2"; depends=[abind bayesplot coda ggplot2 loo Matrix matrixStats mgcv nlme Rcpp rstan rstantools RWiener shinystan]; }; brnn = derive2 { name="brnn"; version="0.6"; sha256="0q3f3cbl89hgpav7bn54s13cysgz8fi0zm8byc9rgz0sqkjrxval"; depends=[Formula]; }; - broman = derive2 { name="broman"; version="0.65-1"; sha256="1zfcrkky4a71zq4mgnc0xcy0m8c9srwq850s97qry9a69f6j5c42"; depends=[assertthat ggplot2 jsonlite RPushbullet]; }; + broman = derive2 { name="broman"; version="0.65-4"; sha256="0cmcyifp49c1m3sawcs5ijjl218wk4sffvr68dfi3y9vh58f5iss"; depends=[assertthat ggplot2 jsonlite RPushbullet]; }; broom = derive2 { name="broom"; version="0.4.2"; sha256="0i2s3jbi0v5xhbqkmms4f17i3x9s6lan4bj521qmxwiwc89r8h4z"; depends=[dplyr nlme plyr psych reshape2 stringr tidyr]; }; brotli = derive2 { name="brotli"; version="1.0"; sha256="0sicqwri8rxqxwhj4z8ckfls2yz09jwb9c5pjk5dhxrsyh85k80m"; depends=[]; }; brr = derive2 { name="brr"; version="1.0.0"; sha256="050ivnqcaxiyypd1sxfpy6ianhzzmvs6c77ga40g3440cvfigkgw"; depends=[gsl hypergeo pander stringr SuppDists TeachingDemos]; }; @@ -4085,17 +4245,19 @@ in with self; { bspec = derive2 { name="bspec"; version="1.5"; sha256="0jynvir7z4q1vrvhdn6wijdrjfrkk4544nlawabw2fnfxss91a91"; depends=[]; }; bsplus = derive2 { name="bsplus"; version="0.1.0"; sha256="1hpjrmsn66brf1hpwfmg55jbpwbhvkz7sbr160z1cgq3hdhqm7r8"; depends=[htmltools lubridate magrittr purrr rmarkdown stringr]; }; bspmma = derive2 { name="bspmma"; version="0.1-1"; sha256="0bd6221rrbxjvabf1lqr9nl9s0qwav47gc56sxdw32pd99j9x5a9"; depends=[]; }; + bssm = derive2 { name="bssm"; version="0.1.1"; sha256="1i6hsmd8v7wg9q0nmsg8l5bbrl1rg6i8kz45qzqvxqkz6vy1g501"; depends=[BH coda diagis ggplot2 ramcmc Rcpp RcppArmadillo sitmo]; }; bssn = derive2 { name="bssn"; version="0.7"; sha256="1g2xhb7bqapwd5zbc4bl4h1fskd7k6gd0rz74hnydiiwxrwiihf6"; depends=[sn]; }; bst = derive2 { name="bst"; version="0.3-14"; sha256="02rnnv3f89329kw81a1v88wjzrfjshqjijw5hp3zyydcsfa3j088"; depends=[doParallel foreach gbm rpart]; }; - bsts = derive2 { name="bsts"; version="0.7.0"; sha256="1v3a8vv9mj7y74jxl6vvhi6znkz0kagc1x4r8f7c6270z37v1sbk"; depends=[BH Boom BoomSpikeSlab xts zoo]; }; + bsts = derive2 { name="bsts"; version="0.7.1"; sha256="07bnhh82abagphfp6y40wchmgb10h2l5lnqc7am50arfa324blrh"; depends=[BH Boom BoomSpikeSlab xts zoo]; }; btb = derive2 { name="btb"; version="0.1.14"; sha256="0nk76ddsg8pjd35y2yqw27iammk948i29xmr0ha9l8b867693m44"; depends=[Rcpp sp]; }; btergm = derive2 { name="btergm"; version="1.9.0"; sha256="03xqzavq3n1zcsfagkprn30i4k11cv1145ni0i8x0jij5dwn7av9"; depends=[boot coda ergm ggplot2 igraph Matrix network ROCR RSiena sna speedglm statnet statnet_common texreg xergm_common]; }; - btf = derive2 { name="btf"; version="1.1"; sha256="0n1h4hmjpvj97mpvannh3s5l08m4zfv0w64hrgdv4s5808miwfzc"; depends=[coda Matrix Rcpp RcppEigen]; }; - bujar = derive2 { name="bujar"; version="0.2-1"; sha256="0g6mj1x9zbxkn3kxwbs2ncjfsicicvyr92krz8yqrms042gbk9ji"; depends=[bst earth elasticnet gbm mboost mda modeltools mpath rms]; }; + btf = derive2 { name="btf"; version="1.2"; sha256="110p7rk43g48yrnr6c9xkyzsh3kqdywsvi23dav89hl7sxahrf75"; depends=[coda Matrix Rcpp RcppEigen]; }; + bujar = derive2 { name="bujar"; version="0.2-3"; sha256="0gc5wrnhark1gawl4qqjh179xaxjal5r7qq4ilx30yn3qhzrqdaz"; depends=[bst earth elasticnet gbm mboost mda modeltools mpath rms]; }; + bulletr = derive2 { name="bulletr"; version="0.1"; sha256="181rnrp62almf08gr41qnrnq8qnbqraqdvj4zixdh8fachsq2imp"; depends=[dplyr ggplot2 plotly plyr reshape2 robustbase smoother xml2 zoo]; }; bunchr = derive2 { name="bunchr"; version="1.2.0"; sha256="1b8hdg2x26k0ahx4gxdpzr36hy056939r4496q3vbgyd4bbk2fbd"; depends=[shiny]; }; bundesligR = derive2 { name="bundesligR"; version="0.1.0"; sha256="0dnhbh9jh7dfbk7mfh8msq4ys5kakalr0kwkycycrb2q8rd049vp"; depends=[]; }; - bupaR = derive2 { name="bupaR"; version="0.1.1"; sha256="1fir2q3y8rzcx61x0gd8zqwb5japajpmhax13jlnmjkydml6npqv"; depends=[data_table dplyr magrittr]; }; - burnr = derive2 { name="burnr"; version="0.1.2"; sha256="1cmf820148wmm9m8f41r81kckhn2iv3cw6k9qdybcxy1j1m520jp"; depends=[ggplot2 plyr reshape2]; }; + bupaR = derive2 { name="bupaR"; version="0.2.0"; sha256="0kwhb4izhlay0lc768xsqc85mz94lphn6lasr208pl0v0ryddda5"; depends=[data_table dplyr magrittr miniUI shiny]; }; + burnr = derive2 { name="burnr"; version="0.2.0"; sha256="032ymd3c4bpljfj3g52fzmw0dpy3idpmlmz1780743mm3fjl04bx"; depends=[ggplot2 MASS plyr reshape2]; }; bursts = derive2 { name="bursts"; version="1.0-1"; sha256="172g09d1vmwl83xs6gr4gfblqmx3apvblpzdr5d7fcw1ybsx0kj6"; depends=[]; }; bvarsv = derive2 { name="bvarsv"; version="1.1"; sha256="1bv4fbbi8bn7sqqpjlf8w5jpgydjr15wv5v9940wc42yk792yjrx"; depends=[Rcpp RcppArmadillo]; }; bvenn = derive2 { name="bvenn"; version="0.1"; sha256="1xrya49w5bd2b7plfxpqla60b2828rkm0rjmc4qnqzvrahsbal0y"; depends=[]; }; @@ -4106,7 +4268,7 @@ in with self; { c212 = derive2 { name="c212"; version="0.93"; sha256="10gwkr2w05bi27zwvspm3g31a1dpqbh1i52vyrfaamqkxypa11nh"; depends=[coda]; }; c3net = derive2 { name="c3net"; version="1.1.1"; sha256="0m4nvrs41kmlakc6m203zlncqwgj94wns8kzcb31xngjcacmcq42"; depends=[igraph]; }; cAIC4 = derive2 { name="cAIC4"; version="0.2"; sha256="13sp3wywv82wgi1vsbxwn68v9xigy0fi3mcwyxjmmgmnsxns2fza"; depends=[lme4 Matrix]; }; - cIRT = derive2 { name="cIRT"; version="1.2.0"; sha256="1qgcga9rk4xqz1i2rzwwf11sip3s3gni44czg9d8sjd725hx1pmz"; depends=[Rcpp RcppArmadillo]; }; + cIRT = derive2 { name="cIRT"; version="1.2.1"; sha256="1i43pqlyzykyd1a6abg1yi7ai9ay7d2jkvnw1sa4c6q07jk56d89"; depends=[Rcpp RcppArmadillo]; }; cOde = derive2 { name="cOde"; version="0.2.2"; sha256="0v26ilbkg2af4mgn639mnslvvwlsq6il3pxx5brwdsd4816saav4"; depends=[]; }; cSFM = derive2 { name="cSFM"; version="1.1"; sha256="1znxsqa8xdifmryg7jiqbpzm837n4n862kg5x1aki52crc4zyk3k"; depends=[MASS mgcv mnormt moments sn]; }; ca = derive2 { name="ca"; version="0.70"; sha256="0730c7nk49hz0k1i5nnhq2j3wbhrlhr1qvb50mk8vmqkbhb1pz1l"; depends=[]; }; @@ -4129,10 +4291,12 @@ in with self; { cancerGI = derive2 { name="cancerGI"; version="1.0.0"; sha256="1chkcyf9m98gbn6b3vmb1baw7kii4g5vxvg2xfi7i6wwdn8sqr65"; depends=[igraph qvalue reshape2 survival systemfit]; }; cancerTiming = derive2 { name="cancerTiming"; version="3.1.8"; sha256="1sfi8q2f5ag7iak0sf9pmqncb89w3gnxdiwjwpivkwhr28ais4mq"; depends=[gplots LearnBayes]; }; candisc = derive2 { name="candisc"; version="0.7-2"; sha256="0sbvngpyni4pagqb5xqjnk5yjd391rdjqq7aypnm2wd3i1am90hm"; depends=[car heplots]; }; - canvasXpress = derive2 { name="canvasXpress"; version="0.15.2"; sha256="0kymbm8qy132ac7jj27p2ad0vxvwydrgm56ghvrqqywnfqkhygxr"; depends=[htmlwidgets]; }; + canprot = derive2 { name="canprot"; version="0.1.0"; sha256="0g3sqc81qw8jx6v2p6makclccnvhshimwlhk2cabq20rfs8npgbm"; depends=[CHNOSZ colorspace xtable]; }; + canvasXpress = derive2 { name="canvasXpress"; version="0.16.2"; sha256="1lc6smczahmm33mkhvad3ylj1n71y2a7z9xji1iaza40bafijv1q"; depends=[htmlwidgets]; }; cape = derive2 { name="cape"; version="2.0.2"; sha256="0ngm9scd3f2zcy7gy0lqk05cgbfrhhcss3mj5g6bj0byhgwd7msn"; depends=[corpcor doParallel evd fdrtool foreach HardyWeinberg igraph Matrix qpcR RColorBrewer regress shape]; }; caper = derive2 { name="caper"; version="0.5.2"; sha256="1l773sxmh1nyxlrjz8brnwhwraff826scwixrqmgdciqk7046d35"; depends=[ape MASS mvtnorm]; }; - capm = derive2 { name="capm"; version="0.9.1"; sha256="1njfw4pl6hmapdspvwabn7db2c4nqf3ja4rlv1lmpaakinzhivj2"; depends=[deSolve FME ggplot2 maptools reshape2 rgdal shiny sp survey]; }; + capm = derive2 { name="capm"; version="0.11.0"; sha256="1yw7h1r5m4md8yv0fn1j4wxvhwybifqyvrn8ip3fl32kxbwsmnvz"; depends=[deSolve FME ggplot2 maptools reshape2 rgdal shiny sp survey]; }; + capn = derive2 { name="capn"; version="1.0.0"; sha256="14vfk00xyx0az3whmxjpcv1785lf0gx81w7qc54i3wcfp3i22kcr"; depends=[]; }; captioner = derive2 { name="captioner"; version="2.2.3"; sha256="0xg72pmgm84f0v45phfwxpsslhf12nhn1swmrj1yifj7g9sjvybj"; depends=[]; }; captr = derive2 { name="captr"; version="0.3.0"; sha256="13j2nq9hm37g4h5fjdpz7kix0sqajdd7zssjfgil06ixfmnsijkx"; depends=[curl jsonlite]; }; capushe = derive2 { name="capushe"; version="1.1.1"; sha256="1aa76ir1kp67hiz7dr60azyc71yzslshyc640fjh0fpw0sp5kwbc"; depends=[MASS]; }; @@ -4146,31 +4310,37 @@ in with self; { caretEnsemble = derive2 { name="caretEnsemble"; version="2.0.0"; sha256="0v9gyp81abrbm8b79ch927iqh0v84q5222bvg1wx8n65vx59sx42"; depends=[caret data_table digest ggplot2 gridExtra lattice pbapply plyr]; }; caribou = derive2 { name="caribou"; version="1.1"; sha256="0ibl3jhvsgjfcva0113z0di9n5n30bs90yz0scckfv1c0pjhn4xd"; depends=[]; }; caroline = derive2 { name="caroline"; version="0.7.6"; sha256="1afxxbrd7w628l4pxdmvwbs7mbgxlhnfq3nxk2s93w47gn7r9fp7"; depends=[]; }; - carpenter = derive2 { name="carpenter"; version="0.2.0"; sha256="0n2w8l9gch0zvq3k0bsqqq28vf6s0czn3ybm0sy2i1bkq85zfm82"; depends=[dplyr lazyeval magrittr pander tidyr]; }; + carpenter = derive2 { name="carpenter"; version="0.2.1"; sha256="1f6g85qgd53wzha8kfq8x29lb5wilgxm6bj49znzd1qj03nlnpna"; depends=[dplyr lazyeval magrittr pander tidyr]; }; cartogram = derive2 { name="cartogram"; version="0.0.2"; sha256="055aq2fmbx6ypyqsj427l37px8fld4b9bmc2kcmsi6fmnncb5pxa"; depends=[rgeos sp]; }; cartography = derive2 { name="cartography"; version="1.4.2"; sha256="1bqadjn1h9xlmswjsylipgni2f78lld4v0y0vybi0cd68m22wxp2"; depends=[classInt raster rgeos rosm sp]; }; carx = derive2 { name="carx"; version="0.6.2"; sha256="1wijkpbv2x75ay9pba4sjazjpalrd31zclnnansmhghf1wiizciq"; depends=[matrixStats mvtnorm nlme tmvtnorm xts zoo]; }; caschrono = derive2 { name="caschrono"; version="2.0"; sha256="091zqin2cr9p50zmifrb52dxy10zflm7f0lr9nissy589qjdd0gk"; depends=[Hmisc zoo]; }; caseMatch = derive2 { name="caseMatch"; version="1.0.7"; sha256="1xd7mlnknjrilxcp0w0b36aaiql6jdqgyin1823r2x8vl9r4aqns"; depends=[]; }; + casebase = derive2 { name="casebase"; version="0.1.0"; sha256="0216qzyxv44cl9f806lal9lx4n0zzr9csx8ggyjva04h5iiqrq6w"; depends=[data_table ggplot2 survival VGAM]; }; + castor = derive2 { name="castor"; version="1.1"; sha256="15ma7zhd53x2ncmnaqn6g1phsr4zbhx62g0c7lm6yw9amdcfyxfn"; depends=[naturalsort Rcpp]; }; cat = derive2 { name="cat"; version="0.0-6.5"; sha256="1gv7chqp6kccipkrxjwhsa7yizizsmk4pj8672rgjmpfcc64pqfm"; depends=[]; }; catIrt = derive2 { name="catIrt"; version="0.5-0"; sha256="09010z1q96nbnpys6mybspaqy57lvgd2cvwgnfijzgx3kl87pwnl"; depends=[numDeriv]; }; catR = derive2 { name="catR"; version="3.12"; sha256="15db9mfpnrrghiksfrfqqwfhw6fwlqlabc12xq1szg010k343dvb"; depends=[]; }; + catSurv = derive2 { name="catSurv"; version="1.0.2"; sha256="1j3qkgsv85qpb2kcim1d9c10l725s93apns3glamfrh7pd0jsbcm"; depends=[BH ltm Rcpp RcppArmadillo RcppGSL RcppParallel]; }; catdap = derive2 { name="catdap"; version="1.2.4"; sha256="0vvrlbdjml1cxf6jafjycv0k3kzd2xy1zcwjv0rh3cswxmvpnh3a"; depends=[]; }; catdata = derive2 { name="catdata"; version="1.2.1"; sha256="0fjylb55iw8w9sd3hbg895pzasliy68wcq95mgrh7af116ss637w"; depends=[MASS]; }; cate = derive2 { name="cate"; version="1.0.4"; sha256="0qck6675xm5xbw440m1b6n38wjwk7izx3s0zpxbmhc9wh12c5prk"; depends=[corpcor esaBcv leapp MASS ruv sva]; }; catenary = derive2 { name="catenary"; version="1.1.1"; sha256="0gd46zvd51xvra0d7k7qdcmfl71vcfk750lcafkhmr4cg0vkqcz7"; depends=[boot ggplot2]; }; cati = derive2 { name="cati"; version="0.99.1"; sha256="0sg6qagv1wiygylgygjfn7v4n99ifaaa34qvaspmm9b4fyfcxqa5"; depends=[ade4 ape e1071 FD geometry hypervolume mice nlme rasterVis vegan]; }; catlearn = derive2 { name="catlearn"; version="0.4"; sha256="1bpmvbpa6qab40ajmy64hg6f3zh3yifqj0rfqyk0b9f9jpdqxz9h"; depends=[Rcpp]; }; + catmap = derive2 { name="catmap"; version="1.6.4"; sha256="18449qh10jxfi8p49gmbnib5y013nfdgdblbs4n0mfs0nnzb10sx"; depends=[forestplot metafor]; }; catnet = derive2 { name="catnet"; version="1.15.0"; sha256="0z2ps2wb33hc0dg08v70gvpy2zibr6kqjjv90g07hkmrhp6zjk5n"; depends=[]; }; catspec = derive2 { name="catspec"; version="0.97"; sha256="1crry0vg2ijahkq9msbkqknljx6vnx2m88bmy34p9vb170g9dbs1"; depends=[]; }; causaldrf = derive2 { name="causaldrf"; version="0.3"; sha256="16gqx8b8alwm8a4lm69qamnqr3bg2qbz0d6q4lyqyrwsk12grid6"; depends=[mgcv survey]; }; - causaleffect = derive2 { name="causaleffect"; version="1.3.3"; sha256="1nglsdnd0zb0qzyyw22fnlqzc8ds9mqdnc9anl9g3pdn9lz2wkqc"; depends=[ggm igraph XML]; }; + causaleffect = derive2 { name="causaleffect"; version="1.3.4"; sha256="186ndqlz501zzmls0vbfprqbfgz0faqr2l64zr8i7j5asxmwzija"; depends=[ggm igraph XML]; }; causalsens = derive2 { name="causalsens"; version="0.1.1"; sha256="1z92ckqa07ajm451wrldxx9y43nawlvj2bsz0afxc9mrhjwjg5dh"; depends=[]; }; - cba = derive2 { name="cba"; version="0.2-18"; sha256="15fjnc9mg30fhm9rfsgz7d24hx83ra8bgyc2s1sz5gda4ppq53pr"; depends=[proxy]; }; + cba = derive2 { name="cba"; version="0.2-19"; sha256="0nyssc7j5rkv1gcgx4cg31hwc37wd5k3yn9s2k22ffxlnrknss2l"; depends=[proxy]; }; cbanalysis = derive2 { name="cbanalysis"; version="0.1.0"; sha256="170rhycd78k8ivibvaa7r5hx64wpqwb067s182iwx51fb2yf01a7"; depends=[]; }; + cbar = derive2 { name="cbar"; version="0.1.0"; sha256="15klwzqkprliqlj33kwf5wi0gr3mvp6gdn6gkikg6xlzyj5r7srr"; depends=[Boom bsts dplyr ggplot2 magrittr]; }; cbird = derive2 { name="cbird"; version="1.0"; sha256="0kzylylk46swd7f0j6kjyrcs3plbx9799q9kb8hjxmgh0qcjk2p6"; depends=[]; }; cbsodataR = derive2 { name="cbsodataR"; version="0.2.1"; sha256="0nsg0fzaqhzv8r2lwz5xlybwgv25c0a2hid91ky95yaqvnjrp6mq"; depends=[jsonlite whisker yaml]; }; ccChooser = derive2 { name="ccChooser"; version="0.2.6"; sha256="1vgp4zhg46hcf9ma2cmwgnfrqkmq1arh0ahyzjpfk3817vh7disc"; depends=[cluster]; }; + ccRemover = derive2 { name="ccRemover"; version="1.0.1"; sha256="1i7rbpqdzzhwhc4c2i5cq7dy8a0mzniahwq5nsd2zzjqpx0a8fdj"; depends=[]; }; ccaPP = derive2 { name="ccaPP"; version="0.3.2"; sha256="166spwqsqbp42mr1acglydlxspcpn8vhnim8r3s9m81sa9pmazpj"; depends=[pcaPP Rcpp RcppArmadillo robustbase]; }; ccafs = derive2 { name="ccafs"; version="0.1.0"; sha256="1bb1127mfpz6s2hs43msjcxk56bsk6vhxznpnv0fb21r8xnx0g7m"; depends=[crul data_table httr jsonlite rappdirs raster tibble xml2]; }; cccd = derive2 { name="cccd"; version="1.5"; sha256="0m364zsrgr7mh1yhl2lqxpaf71gzq3y3pp9qgnj4spiy4iadyy7i"; depends=[deldir FNN igraph proxy]; }; @@ -4181,8 +4351,9 @@ in with self; { ccgarch = derive2 { name="ccgarch"; version="0.2.3"; sha256="0angffla3sk9i86v6bbsav95fp3mz5yvq7qfv0fx2v0nd2cx116w"; depends=[]; }; cchs = derive2 { name="cchs"; version="0.3.0"; sha256="0163qvy1k39bwbbidr7wj6cs0nv8m8nh0as9532j8mshq14d0i8c"; depends=[survival]; }; cclust = derive2 { name="cclust"; version="0.6-21"; sha256="1n5hh0017bcq8ck52qq89jm9zgdfpmiksrypsnv2vvhk3nr0s91c"; depends=[]; }; + cctools = derive2 { name="cctools"; version="0.1.0"; sha256="1x35dxmyyjbf3v2hsbbnq2f88zy5sk6qz3xzx9p2kg5wi5187xl5"; depends=[qrng Rcpp RcppArmadillo]; }; cda = derive2 { name="cda"; version="2.0.0"; sha256="1vq90z6kafiz5b884hxsz3lg8a0zis1n475lmvwlymcam5rpgjrc"; depends=[randtoolbox Rcpp RcppArmadillo reshape2 statmod]; }; - cdata = derive2 { name="cdata"; version="0.1.0"; sha256="0f27ib3klwapzk9mn757pc9a2zjh8j7k14ndq127hgv1zz7rmkgx"; depends=[dplyr replyr tibble tidyr wrapr]; }; + cdata = derive2 { name="cdata"; version="0.1.1"; sha256="09iawwg5fjmfcb52cykvifdmcfpl2c51ygapmrfhryr7a92di5wl"; depends=[dplyr tibble tidyr wrapr]; }; cdb = derive2 { name="cdb"; version="0.0.1"; sha256="1rdb4lacjcw67apdyiv7cl1xvv9d1mrzck1qk605n6794k7wf2ys"; depends=[bitops]; }; cdcfluview = derive2 { name="cdcfluview"; version="0.5.1"; sha256="0k63hrx3cc04xpi2sxl5g8mn7lc7rh4q33mj3filyiyppj16jixf"; depends=[dplyr httr jsonlite purrr readr V8 xml2]; }; cdcsis = derive2 { name="cdcsis"; version="1.0"; sha256="1fxdsaqpjhpffn2fxddfcrx8wxwyvfws6rxkpp57g25980xiyzkd"; depends=[ks]; }; @@ -4198,15 +4369,18 @@ in with self; { cellranger = derive2 { name="cellranger"; version="1.1.0"; sha256="16fgi3annn34c3cxi0pxf62mmmmxi21hp0zzlv7bkfsjqy4g4f2x"; depends=[rematch tibble]; }; cem = derive2 { name="cem"; version="1.1.17"; sha256="1jnhsrc1jhax3zlw9ynla7g9z5i4w01iar7f7hmv92kp1cwh8rbd"; depends=[combinat lattice MatchIt nlme randomForest]; }; cems = derive2 { name="cems"; version="0.4"; sha256="0mk02m702xfr1gh0l3973z1hdpncgjl2vfd1k1iss5s64k56gs4q"; depends=[plotrix rgl vegan]; }; + censCov = derive2 { name="censCov"; version="1.0-0"; sha256="0i9vmyi12f1m5xnrl4cxk3z9qv7ymzxsyf4gbnpg1ph63yfnhv3g"; depends=[survival]; }; censNID = derive2 { name="censNID"; version="0-0-1"; sha256="1ij5ci6nkqf0rq51vyh4jw5sr3y46yndfkjmwl78ppdj66axxir5"; depends=[]; }; censReg = derive2 { name="censReg"; version="0.5-26"; sha256="1g69261ajha9p762xg2a5pj127b9pfws6ylpiqhjv7h96n12f2pi"; depends=[glmmML maxLik miscTools plm sandwich]; }; censorcopula = derive2 { name="censorcopula"; version="2.0"; sha256="16pk4xlpliif02qznrhvl8qmrr6k4kknygqxcm83nsjxy6dcyga8"; depends=[copula]; }; censusGeography = derive2 { name="censusGeography"; version="0.1.0"; sha256="1ncgd05ml571g3vy1g4p5xxg2bm08hbb6d5r3hpz7frn7w3l8l1d"; depends=[qdapTools]; }; - censusr = derive2 { name="censusr"; version="0.0.2"; sha256="1x2s0q0d30hsb5sqdgvlz8anv5vcsm0ld9p96jzsin6lfsgbb1dm"; depends=[dplyr httr]; }; + censusapi = derive2 { name="censusapi"; version="0.2.0"; sha256="0c8qcjmws6h1kmqkfbl261c87ap7h17729lqx9sgvr4336fkjn9f"; depends=[httr jsonlite]; }; + censusr = derive2 { name="censusr"; version="0.0.3"; sha256="0lcji62kzdxaslvvp54bwfdmbx69lds7inmvywlj0plfqg1kvsid"; depends=[dplyr httr stringr]; }; censys = derive2 { name="censys"; version="0.1.0"; sha256="0r0yvaidn0qn96hx461415hywsjfgaz9wvvdssx7w97v2ndnk9sy"; depends=[httr jsonlite purrr stringi]; }; cents = derive2 { name="cents"; version="0.1-41"; sha256="03ycbd0c8b7danbblaixg6sm7msr9ixkanqswczqa8n2frhjfgj0"; depends=[]; }; cepp = derive2 { name="cepp"; version="1.7"; sha256="01hvm6586xnb1crvk7brqh3dm2j44ia5lrl5swnf6pb682yskbq0"; depends=[randtoolbox trust]; }; cernn = derive2 { name="cernn"; version="0.1"; sha256="0gz2x20pgsiq85hwkkpg4s1cdlw9plygx0446djc7qsymp469p2w"; depends=[]; }; + cfa = derive2 { name="cfa"; version="0.10-0"; sha256="12z58y4ls9m58wpj1xa4ir2p2apzxaskps05sxy2946m24i71zfk"; depends=[]; }; cffdrs = derive2 { name="cffdrs"; version="1.7.6"; sha256="00n3h2vf855anxh0xgsps7sv0kj819864wjdmkiak1lsacysav8s"; depends=[data_table doParallel foreach raster rgdal spatial_tools]; }; cg = derive2 { name="cg"; version="1.0-3"; sha256="1kbyal1sicbr10yvxpwgcij710kqpi23vmndp9kyfzn3k8zfird3"; depends=[Hmisc lattice MASS multcomp nlme rms survival VGAM]; }; cgAUC = derive2 { name="cgAUC"; version="1.2.1"; sha256="172f9rkfhv4xzwpw8izsnsdbcw9p3hvxhh0fd8hzlkil7vskr3k8"; depends=[Rcpp]; }; @@ -4220,19 +4394,22 @@ in with self; { cgwtools = derive2 { name="cgwtools"; version="3.0"; sha256="01888n056x4c8g0676jnbh6d89hamzxrh33aw6r28mzlnmfy5lmw"; depends=[]; }; changepoint = derive2 { name="changepoint"; version="2.2.2"; sha256="1jbki95pck10phpxna0b4i79hhl912zqi5ii9mjqb673y64dszkj"; depends=[zoo]; }; changepoint_np = derive2 { name="changepoint.np"; version="0.0.2"; sha256="03i4l59h8cr6bizbqn288x9r85kvaz1dyhkv5fsj1189qpdi9m88"; depends=[changepoint zoo]; }; + charlatan = derive2 { name="charlatan"; version="0.1.0"; sha256="1q5ybipi6b0lzpis53rxsfa0mlkp3c9zmcw5fwq5h93vlrdf6986"; depends=[R6 tibble whisker]; }; cheb = derive2 { name="cheb"; version="0.3"; sha256="0vqkdx7i40w493vr7xywjypr398rjzdk5g410m1yi95cy1nk4mc7"; depends=[]; }; chebpol = derive2 { name="chebpol"; version="1.3-1789"; sha256="1505zdzvc9drw7n8qw5jmqligjgp5gwwki4wlk8dsm0p3p06dvd2"; depends=[]; }; + checkarg = derive2 { name="checkarg"; version="0.1.0"; sha256="0rkdjs2c4yx9laqgayxz57bwxhwgdh6ndrr4i3b1kh31lcmk1xc6"; depends=[]; }; checkmate = derive2 { name="checkmate"; version="1.8.2"; sha256="1zqcggl9m7slvc0q6zyhssdypb7jzf3l9byl5vxh1qdwjiw2y64g"; depends=[backports]; }; - checkpoint = derive2 { name="checkpoint"; version="0.4.0"; sha256="0ffyb681025yw7ghwbvszispm0dklxkspdafbbwk9df33mx0464k"; depends=[]; }; + checkpoint = derive2 { name="checkpoint"; version="0.4.1"; sha256="0hp37scj0iaivwk5w2vprq2yzqfpg6zi19nzaxzaz8w2sk8dql7v"; depends=[]; }; cheddar = derive2 { name="cheddar"; version="0.1-631"; sha256="0s6v3xcpv8ppgx6q6h2hgrjcf3f3i87kmylnr9q9zhry7729aiyn"; depends=[]; }; chemCal = derive2 { name="chemCal"; version="0.1-37"; sha256="1sbmr8arczc65nzbgr5rfk2mbbnk6h60ni9cd9jngbhgdf0g1scw"; depends=[]; }; + chemmodlab = derive2 { name="chemmodlab"; version="1.0.0"; sha256="0lzibshhfz52m61xldf0xq4cc1xx64fjlw18hlkiv65dj3gcj2mh"; depends=[caret class e1071 elasticnet foreach lars MASS nnet pls pROC randomForest rpart tree]; }; chemometrics = derive2 { name="chemometrics"; version="1.4.2"; sha256="0shqns0n964pfwnd0q5sadglrlpgs4g5fbv45fsj9p37l4pq61dp"; depends=[class e1071 lars MASS mclust nnet pcaPP pls robustbase rpart som]; }; cherry = derive2 { name="cherry"; version="0.6-11"; sha256="0ixrzbzg559h0qb33b9158rk6w6as2b34b7iq5vzm429cpyzl7l8"; depends=[bitops lpSolve Matrix slam]; }; - chi = derive2 { name="chi"; version="0.0"; sha256="0mn402vwiwcjdbchk1d3pdq4ir992aa0h3xf1m7y9mfkqyzkdqpj"; depends=[]; }; + chi = derive2 { name="chi"; version="0.1"; sha256="1y91mwahj4j2wz0y5k5vdpq7ygq834h8jkn37n74lqnwvv1968rr"; depends=[]; }; chi2x3way = derive2 { name="chi2x3way"; version="1.1"; sha256="13qc8sigiw4gcxk8y50q7yfgzbssjyl41fizzjqzcp3p14kpsmzw"; depends=[]; }; - childsds = derive2 { name="childsds"; version="0.6"; sha256="1zi6gchyd087c1gx3359gpsfsciry66dxj921q6zxdzn5sg09bfn"; depends=[dplyr gamlss magrittr tidyr]; }; + childsds = derive2 { name="childsds"; version="0.6.2"; sha256="0y62977mnlrx4zgn2advk99xvbdglb84a5q5iriknga442mn76kq"; depends=[boot class dplyr gamlss gamlss_dist magrittr tidyr]; }; chillR = derive2 { name="chillR"; version="0.66"; sha256="1qw9l3drw3r4an1jy2bckaslwla3s5fvpqr7ahvd2m6alx05b0k6"; depends=[fields httr Kendall pls raster readxl RMAWGEN sp XML]; }; - chinese_misc = derive2 { name="chinese.misc"; version="0.1.5"; sha256="1grp7kyvn9wppsikyvcr5sh1wfm9w1lcffraggmlr3014kl6siaq"; depends=[jiebaR Matrix NLP Ruchardet slam stringi tm]; }; + chinese_misc = derive2 { name="chinese.misc"; version="0.1.6"; sha256="0mm21mla6wxa62k2hq5cp6489n41a8n11l3vzrjj5a6wma9ddc2q"; depends=[jiebaR Matrix NLP Ruchardet slam stringi tm]; }; chipPCR = derive2 { name="chipPCR"; version="0.0.8-10"; sha256="1mff7n7ga4sfwvcq7zkjkrl68nybnm2zkn37hmxvnw9yl3ls9lnw"; depends=[lmtest MASS outliers ptw quantreg Rfit robustbase shiny signal]; }; chngpt = derive2 { name="chngpt"; version="2016.7-31"; sha256="1hjqdkqai6aij3giarbxasijipb376qm081ri9w6snd5gy6izzsi"; depends=[boot kyotil MASS survival]; }; choiceDes = derive2 { name="choiceDes"; version="0.9-1"; sha256="07nnqqczi9p3cffdijzx14sxhqv1imdakj7y94brlr5mbf5i4fl4"; depends=[AlgDesign]; }; @@ -4246,48 +4423,55 @@ in with self; { chromoR = derive2 { name="chromoR"; version="1.0"; sha256="1x11byr6i89sdk405h6jd2rbvgwrcvqvb112bndv2rh9jnrvcw4z"; depends=[gdata haarfisz]; }; chron = derive2 { name="chron"; version="2.3-50"; sha256="1w3sl60gsirniqslb3pa75caiqbzbvc44phpd4czvwkb62xx1vx9"; depends=[]; }; chunked = derive2 { name="chunked"; version="0.3"; sha256="1qhrq957w8nyxndvrnf3xh1p1g7f9qjyr12ybcysgrz4lk0q8xcs"; depends=[DBI dplyr LaF lazyeval]; }; + cifti = derive2 { name="cifti"; version="0.4.2"; sha256="1l7dfq53plisyf244l1ch0il0ziy1qcxv0zj3gr4fxdp6k8d1br1"; depends=[base64enc gifti oro_nifti rgl xml2]; }; cin = derive2 { name="cin"; version="0.1"; sha256="1pwvy5nh5nrnysfqrzllb9fcrpddqg02c7iw3w9fij2h8s2v6kq5"; depends=[]; }; cir = derive2 { name="cir"; version="2.0.0"; sha256="0ycjnbikpyhcfdik7c5knw4s9gl8y5h4219c4fhs4axs04np004v"; depends=[]; }; - circlize = derive2 { name="circlize"; version="0.3.10"; sha256="19zkklqyyqq88njcybbafi6vbz87sivsfhg7kk9kywdijl799mxw"; depends=[colorspace GlobalOptions shape]; }; - circular = derive2 { name="circular"; version="0.4-7"; sha256="1kgis2515c931ir76kpxnjx0cscw4n09a5qz1rbrhf34gv81pzqw"; depends=[boot]; }; + circlize = derive2 { name="circlize"; version="0.4.0"; sha256="0p1zx1aawkblz48kzzfn5w1k3lbwv9wrk1k5gcfjrr2b4sz1pp5b"; depends=[colorspace GlobalOptions shape]; }; + circular = derive2 { name="circular"; version="0.4-93"; sha256="0hki85rs8wc5950pjaw28q54rly2napfbcrx3pchlfap6wwy5kkn"; depends=[boot mvtnorm]; }; cit = derive2 { name="cit"; version="2.1"; sha256="1kiph7znr9fiq704wfbms6hsl4shxfqijrlh4dhmik9x9m8sj538"; depends=[]; }; citbcmst = derive2 { name="citbcmst"; version="1.0.4"; sha256="1zkd117h9nahwbg5z6byw2grg5n3l0kyvv2ifrkww7ar30a2yikl"; depends=[]; }; citccmst = derive2 { name="citccmst"; version="1.0.2"; sha256="1b7awn1hjckxisfdi4ck697hwd4a5sqklwi7xzh6kgqhk9pv7vjn"; depends=[]; }; citr = derive2 { name="citr"; version="0.2.0"; sha256="1nzn0yw74k6zkwzb6spfzqkj3cbx6ry6ypbsnhy6w2flabnnvy4v"; depends=[assertthat curl miniUI RefManageR rstudioapi shiny yaml]; }; cjoint = derive2 { name="cjoint"; version="2.0.4"; sha256="0c2vs5zbw83r7jlm6kwjylyd5yjnyz5qaqnk0lh9x54jd0f3nqwv"; depends=[ggplot2 lmtest sandwich survey]; }; + ck37r = derive2 { name="ck37r"; version="1.0.0"; sha256="0nn2sfsfs8mhgjrz0ghn041ybhj2qim4rs3lkci7s4n95c8hbgdi"; depends=[caret cvAUC doParallel doSNOW foreach ggplot2 pryr randomForest RANN reader RhpcBLASctl ROCR snow stringr SuperLearner tmle]; }; ckanr = derive2 { name="ckanr"; version="0.1.0"; sha256="1cvn0cih763f0ppl1y90vnwj3cgqyb7az89sn12nyn2qb6igiqyl"; depends=[httr jsonlite magrittr]; }; clValid = derive2 { name="clValid"; version="0.6-6"; sha256="1l9q7684vv75jnbymaa10md13qri2wjjg7chr1z1m0rai8iq3xxw"; depends=[class cluster]; }; cladoRcpp = derive2 { name="cladoRcpp"; version="0.14.4"; sha256="0d4vl7xrrwbhhx56ymw52rb5svw9nskxdya4dl04lw1qxc45p4jy"; depends=[Rcpp RcppArmadillo]; }; + clampSeg = derive2 { name="clampSeg"; version="1.0-1"; sha256="0y0yxdv75xqmv7v6q8q8v1qj6xr8i7ik4nkh759rpyn0da7qq076"; depends=[Rcpp stepR]; }; clarifai = derive2 { name="clarifai"; version="0.4.2"; sha256="0igi4xl27nz0r85hpws2zfc2gn5z2nmywp3saxgp74mh2y99lg6s"; depends=[curl jsonlite]; }; class = derive2 { name="class"; version="7.3-14"; sha256="173b8a16lh1i0zjmr784l0xr0azp9v8bgslh12hfdswbq7dpdf0q"; depends=[MASS]; }; classGraph = derive2 { name="classGraph"; version="0.7-5"; sha256="19jb9jr1gfg4karymrbilh0zjrlsczhy2q03x5b0jxnh4ykhxfj8"; depends=[graph Rgraphviz]; }; classInt = derive2 { name="classInt"; version="0.1-24"; sha256="18ng9y647jwb855pkmz555zdrznjgw4ynppaw43xm8qf8n291p7k"; depends=[class e1071]; }; + classiFunc = derive2 { name="classiFunc"; version="0.1.0"; sha256="0rgl7yzdia2wl4b03zny8fyz6mn9lr3l2lf2134kcsfvw63apc12"; depends=[BBmisc checkmate dtw fda fda_usc fdasrvf proxy]; }; classifierplots = derive2 { name="classifierplots"; version="1.3.3"; sha256="01rvn0jwliyxj7q4cmyv8an5g7fzn6y3sccp8mj6bcqjyblfcfaa"; depends=[caret data_table ggplot2 gridExtra png Rcpp ROCR]; }; classifly = derive2 { name="classifly"; version="0.4"; sha256="0mw1vcas0gr1r4yvh0j02zhk7kp5342r0bhhg776hqgqdczgh5zj"; depends=[class plyr]; }; classify = derive2 { name="classify"; version="1.3"; sha256="0134h12h6v06d7ldj9qgqjhh5f5ap98pvr0v6d4k8dqndnn0pggy"; depends=[ggplot2 lattice plyr R2jags Rcpp reshape2]; }; classyfire = derive2 { name="classyfire"; version="0.1-2"; sha256="0rar3mi2m1wf14lmahjbpdh1jlnisvgsbx86xbqlb8c0f8zfzxq3"; depends=[boot e1071 ggplot2 neldermead optimbase snowfall]; }; + cld2 = derive2 { name="cld2"; version="1.1"; sha256="0zlvnnyz5aqjwzxwghfs9pyxcgr86yg3wpmrdg85dnlggjh2j12z"; depends=[Rcpp]; }; + cld3 = derive2 { name="cld3"; version="1.0"; sha256="0qka14z9w01b7xy6k97qcgd9qi6myfaw61imnf09mc8nqm0z3kya"; depends=[Rcpp]; }; cleanEHR = derive2 { name="cleanEHR"; version="0.1"; sha256="1ppjg72cfh9kdwl8kk7zxyr529xqcwpfcl5lisy7hgpqirma52qn"; depends=[data_table ggplot2 knitr pander Rcpp XML yaml]; }; - cleanNLP = derive2 { name="cleanNLP"; version="1.5.2"; sha256="09zhhv1pkd28l275g6g38b5l7bpgrcj0ks66d8vhqmpqq2038q7c"; depends=[dplyr Matrix readr]; }; + cleanNLP = derive2 { name="cleanNLP"; version="1.9.0"; sha256="0ww3a9b3nfv9h9i3v5khr823fcq121llcygb1rnyz7hh9hk3njp1"; depends=[dplyr Matrix readr]; }; cleangeo = derive2 { name="cleangeo"; version="0.2-1"; sha256="05zzp0dbkpljc9jcx05pdlkdwfbrh6h0l2zksq3cpaw5bvz5g1pl"; depends=[maptools rgeos sp]; }; cleanr = derive2 { name="cleanr"; version="1.1.3"; sha256="0vf2c2inb729kzmpxaznqa2zwj80j1ix9198gc36zq41ag5pd7jk"; depends=[checkmate]; }; clere = derive2 { name="clere"; version="1.1.4"; sha256="1nk3chcnaa4y1c5rr6c3bapvi106ikbk9grqcq6s6j0imny1jp4a"; depends=[lasso2 Rcpp RcppEigen]; }; clhs = derive2 { name="clhs"; version="0.5-6"; sha256="0m7pw655d6jidrppk1z84z35n93k1alwq43jh28lf81ydw8finma"; depends=[ggplot2 plyr raster reshape2 scales sp]; }; clickR = derive2 { name="clickR"; version="0.2.0"; sha256="01fsaqgc4fxf0p9ww6z3g84ybn5kgj7qyk781flhg7r4s51qmcwv"; depends=[beeswarm ClustOfVar lme4 lmerTest lqmm ordinal ReporteRs survival xtable]; }; - clickstream = derive2 { name="clickstream"; version="1.2.0"; sha256="0syjb7wcyf15iw6r2vg3k3nbs9rsvgvyxg61hzdavas0f2pjsyyx"; depends=[arules data_table ggplot2 igraph linprog plyr reshape2 Rsolnp]; }; - clifro = derive2 { name="clifro"; version="3.1-3"; sha256="1y03x1d49h482nc4r4w6h3vycf16k4jzqpxhbygy8igq1lpphvn1"; depends=[ggplot2 lubridate RColorBrewer RCurl reshape2 scales selectr XML]; }; + clickstream = derive2 { name="clickstream"; version="1.2.1"; sha256="1wan098mp2ml194al616h9qvv69q5l19218ja2x9j1qdq9dgp978"; depends=[arules ClickClust data_table ggplot2 igraph linprog plyr reshape2 Rsolnp]; }; + clifro = derive2 { name="clifro"; version="3.1-4"; sha256="1llzdcm4h060pajbh3avn209b717gipxw67rslpbxl1xa4vg1rdn"; depends=[ggplot2 lubridate RColorBrewer RCurl reshape2 scales selectr XML]; }; clikcorr = derive2 { name="clikcorr"; version="1.0"; sha256="0zdnbcl5q293mmm6pbn4ri7p1q6z6sff74axsb3nyd153v2xamr5"; depends=[mvtnorm]; }; climatol = derive2 { name="climatol"; version="3.0"; sha256="0wfqs8yk3m6wpm86yfhsg100d4x67bzz1871mxrs69r6ybrh30qx"; depends=[]; }; climbeR = derive2 { name="climbeR"; version="0.0.1"; sha256="10i74bph7dhv2xj01qdhymlmfwj32lzxivanif11zmzmq9p5bqsw"; depends=[ggplot2]; }; climdex_pcic = derive2 { name="climdex.pcic"; version="1.1-6"; sha256="0dyhqxrma8g4ny4afv6drr885m88q2b8g1n19yy3yjbrbddyz8yl"; depends=[caTools PCICt Rcpp]; }; clime = derive2 { name="clime"; version="0.4.1"; sha256="0qs9i7cprxddg1cmxhnmcfhl7v7g1r519ff2zfipxbs59m5xk9sf"; depends=[lpSolve]; }; - climextRemes = derive2 { name="climextRemes"; version="0.1.2"; sha256="1m9jb8n7df9v4yakgh2ncmaqnhdw1vkhfcg3k6cib07nz69wx98j"; depends=[extRemes]; }; + climextRemes = derive2 { name="climextRemes"; version="0.1.3"; sha256="0nf885qsph2sygikw7hf4icq98393smamxkjahdxciv539a0cgvm"; depends=[extRemes]; }; climtrends = derive2 { name="climtrends"; version="1.0.6"; sha256="01007b0av9kv6rx2kkp5y39xkk5nqsyqbxa5z43qdq5zgf5pwvd9"; depends=[]; }; climwin = derive2 { name="climwin"; version="1.1.0"; sha256="10dpdv1nm5sxagac6vb2slqkxvpwa6q0jl2fwwkpr9pdmvacp4h4"; depends=[evd ggplot2 gridExtra lme4 lubridate Matrix MuMIn numDeriv plyr RcppRoll reshape]; }; + clinPK = derive2 { name="clinPK"; version="0.9.0"; sha256="1n1m8szd8mxdshwz8l3hfdxi7zrmsah46kxkv7jiffwnfhijfhsm"; depends=[curl testit]; }; clinUtiDNA = derive2 { name="clinUtiDNA"; version="1.0"; sha256="0x3hb09073gkh60fc8ia0sfk948sm6z6j8sqkz275k4m8ryrabas"; depends=[]; }; - clinfun = derive2 { name="clinfun"; version="1.0.13"; sha256="0l4brcfr960yplgx63hy6imszk1zy8my6issilx839hvs4d5z7l9"; depends=[mvtnorm]; }; + clinfun = derive2 { name="clinfun"; version="1.0.14"; sha256="13ip144qzgx9bg9pvdgz7y4v21sjvyjjixbm8mnvn6a6k62ycgmf"; depends=[mvtnorm]; }; clinsig = derive2 { name="clinsig"; version="1.2"; sha256="1wgfl9kks57yizrf8z6x7dhmbl3a80q8nnj3a5n2hpc9yr8l9ijf"; depends=[]; }; - clipr = derive2 { name="clipr"; version="0.3.2"; sha256="13g1iwld4xijn5raip71a88vdn51dc056nnqaasb7g00zbbb8jwl"; depends=[]; }; - clisymbols = derive2 { name="clisymbols"; version="1.1.0"; sha256="0idnlx29ps4njiwf4afqzahkpjzz6lam93hxjrr67756k1lw1xjj"; depends=[]; }; + clipr = derive2 { name="clipr"; version="0.3.3"; sha256="1dr1cranf9cp7ccj2lnld4x9g3xfdiric6kfayc36zy5jc4ia441"; depends=[]; }; + clisymbols = derive2 { name="clisymbols"; version="1.2.0"; sha256="1q7gi2zmykhzas9v8fdnbpdq7pzdcpbhim1yxvd2062l777g4j86"; depends=[]; }; clogitL1 = derive2 { name="clogitL1"; version="1.4"; sha256="0m9yrg9mzzfv5qkdf6w55xyrjdghyrf27kk7b4x2gyvwvi5b7dkm"; depends=[Rcpp]; }; clogitLasso = derive2 { name="clogitLasso"; version="1.0.1"; sha256="1mm815w31n0jvbh2rwq15ja1mzvjaz1x846xq1949aj4pb692zrl"; depends=[foreach lassoshooting]; }; clogitboost = derive2 { name="clogitboost"; version="1.1"; sha256="19wcb7229amlxn6xahxj6pf9rwfm02s7qkxz2yvyhnq95y0clxkm"; depends=[Rcpp]; }; @@ -4299,7 +4483,7 @@ in with self; { clues = derive2 { name="clues"; version="0.5.9"; sha256="0znlsbfmnz5wkp2cswrkjbgchdmmf7h78mv2zwx382m9n9n9hshy"; depends=[]; }; clusrank = derive2 { name="clusrank"; version="0.5-2"; sha256="168xad5dyz46yxm139q09n9vp1304yrhikxz5bcfzhm3psyv5fbf"; depends=[MASS Rcpp]; }; clust_bin_pair = derive2 { name="clust.bin.pair"; version="0.0.6"; sha256="0hmj85byw1j1b1crb7nj12wz0rddp5cg21jg1dwg7b0mn5xvy981"; depends=[]; }; - clustMD = derive2 { name="clustMD"; version="1.2"; sha256="0xz4347v4z95ir9mw6hw94p0j5a3ff96dyzjs5wfnynpbc025zmh"; depends=[ggplot2 MASS mclust msm mvtnorm reshape2 truncnorm viridis]; }; + clustMD = derive2 { name="clustMD"; version="1.2.1"; sha256="0w4s9dab2mm5x0xibyl6s101c64if945a2cmwin9psd95p76mcny"; depends=[ggplot2 MASS mclust msm mvtnorm reshape2 truncnorm viridis]; }; clustMixType = derive2 { name="clustMixType"; version="0.1-17"; sha256="08drby5ifv8wcww4ns2cma2gyhzwj3x6klvh7fs03wrzn6w78hr0"; depends=[]; }; clustRcompaR = derive2 { name="clustRcompaR"; version="0.1.0"; sha256="1md1ra18q1iga01q12jyy9va4qyvzlybvbdrdfy2kxhh82w057ww"; depends=[dplyr ggplot2 ppls quanteda tidyr]; }; cluster = derive2 { name="cluster"; version="2.0.6"; sha256="1z4gbz7chxxi4ly6c0yjlikwgf8aa8dlg05cn5cd6pjr21zvh97l"; depends=[]; }; @@ -4309,7 +4493,7 @@ in with self; { clusterGenomics = derive2 { name="clusterGenomics"; version="1.0"; sha256="127hvpg06is4x486g1d5x7dfkrbk7dj35qkds0pggnqxkq3wsc1c"; depends=[]; }; clusterPower = derive2 { name="clusterPower"; version="0.5"; sha256="1g2qpvizyk4q3qlgvar436nrfqxwp5y8yi2y6rch9ak5mbg3yzqb"; depends=[lme4]; }; clusterRepro = derive2 { name="clusterRepro"; version="0.5-1.1"; sha256="0vsf6cq6d51a4w23ph8kdz2h8dfpzyd6i85049p2wakn1kdvkz5p"; depends=[]; }; - clusterSEs = derive2 { name="clusterSEs"; version="2.3.3"; sha256="1c68zz6l4dyj77a2sfg8fj5yjn3jlpyj8pbjqjh68wlbpdm4ckvc"; depends=[AER Formula lmtest mlogit plm sandwich]; }; + clusterSEs = derive2 { name="clusterSEs"; version="2.4"; sha256="10xlcmmsrca8zwis94cv3pafp9k5ykbq9fnmadbhk0ppibndyjak"; depends=[AER Formula lmtest mlogit plm sandwich]; }; clusterSim = derive2 { name="clusterSim"; version="0.45-2"; sha256="0mf0qy902v4aqszcapk3c0j2b6kj66krxz7s6adpqzwhwx975zfi"; depends=[ade4 cluster e1071 MASS modeest R2HTML rgl]; }; clusterfly = derive2 { name="clusterfly"; version="0.4"; sha256="0mxpn7aywqadyk43rr7dlvj0zjcyf4q7qbqw5ds38si7ik34lkrg"; depends=[e1071 plyr reshape2 rggobi RGtk2]; }; clusterhap = derive2 { name="clusterhap"; version="0.1"; sha256="1ic6588mqp146jsvrxlxk449zw4n81xixgrny9r29497z7hg5a1m"; depends=[]; }; @@ -4317,14 +4501,14 @@ in with self; { clusternomics = derive2 { name="clusternomics"; version="0.1.1"; sha256="05nkw6h2dvky07fj50myzw5xlkqyiflbn4vwqw8a1q2idv4awi7b"; depends=[magrittr MASS plyr]; }; clustertend = derive2 { name="clustertend"; version="1.4"; sha256="1aqg8cy1hk3lmzvyqh9qc1mcknrva2i0c77hyd0yff9whz80ik4j"; depends=[]; }; clusteval = derive2 { name="clusteval"; version="0.1"; sha256="1ld0bdl4fy8dsfzm3k7a37cyxc6pfc9qs31x4pxd3z5rslghz7rj"; depends=[mvtnorm Rcpp]; }; - clustrd = derive2 { name="clustrd"; version="1.1.0"; sha256="0l1mllgqqlkywhhp1a24hlvsiwkk26k58c9rg9m5pagb623w73p4"; depends=[cluster corpcor dplyr dummies fpc GGally ggplot2 ggrepel plyr]; }; + clustrd = derive2 { name="clustrd"; version="1.2.0"; sha256="029z46ihr2c57wan03c201d9kpaiyhhfvny41fjc2mvvc50rh2z7"; depends=[ca cluster corpcor dplyr dummies fpc GGally ggplot2 ggrepel plyr]; }; clustsig = derive2 { name="clustsig"; version="1.1"; sha256="0n5nf712vsa8zb0c2lv4gjqsgva62678vjngr9idgswb73shxm8v"; depends=[]; }; clustvarsel = derive2 { name="clustvarsel"; version="2.3"; sha256="1f7qyffm4jrlg4bh3mg550igs7wib8y9pksx0h6gn0n9pkv1s8rc"; depends=[BMA foreach iterators Matrix mclust]; }; clv = derive2 { name="clv"; version="0.3-2.1"; sha256="1qgp2qhblg6ysyrlg0ad169ahwhcyn5pvsqzdlqj700y1k7wl7mc"; depends=[class cluster]; }; cmaes = derive2 { name="cmaes"; version="1.0-11"; sha256="1hwf49d1m660jdngqak9pqasysmpc4jcgr8m04szwbyzyy6xrm5k"; depends=[]; }; cmaesr = derive2 { name="cmaesr"; version="1.0.3"; sha256="03zx2nrw24wmmjjpyh8pswasjjq0amf0g375fm2b3s111dx8fbj9"; depends=[BBmisc checkmate ggplot2 ParamHelpers smoof]; }; cmm = derive2 { name="cmm"; version="0.8"; sha256="1661v2lzxgf4s37wdsrnbsvqwppcr7mbp70i1xsysfzki1z6xr19"; depends=[]; }; - cmna = derive2 { name="cmna"; version="0.3.1"; sha256="0aayvvzpj5cvhhzpnqdlszmf0s07ivxzl9lw3lqgipk1739wxz5n"; depends=[]; }; + cmna = derive2 { name="cmna"; version="1.0.0"; sha256="1x4w47j39p2f2n4jxrp4r1vw6gvpqzkgr5h158s18z26zllpvrnr"; depends=[]; }; cmpprocess = derive2 { name="cmpprocess"; version="1.0"; sha256="0gqfmbm86bfi2l81pf2dn70rxg58h1y8hiyrp8sv9v84cx20422v"; depends=[compoisson numDeriv]; }; cmprsk = derive2 { name="cmprsk"; version="2.2-7"; sha256="1imr3wpnj4g57n2x4ryahl4lk8lvq9y2r7319zv3k82mznha8bcm"; depends=[survival]; }; cmprskQR = derive2 { name="cmprskQR"; version="0.9.1"; sha256="002s6ls670sdzrxgqv9gbl646b675q1gn6dzkngnf6rgcdqwid7n"; depends=[quantreg survival]; }; @@ -4338,17 +4522,17 @@ in with self; { coala = derive2 { name="coala"; version="0.5.0"; sha256="1yk2cfv73wng1bm00v1xfd208lvc9r7nx1w2rgdgw9m9yv0mw89f"; depends=[assertthat digest R6 Rcpp RcppArmadillo rehh scrm]; }; coalescentMCMC = derive2 { name="coalescentMCMC"; version="0.4-1"; sha256="0xxv1sw5byf84wdypg5sfazrmj75h4xpv7wh4x5cr9k0vgf80b3s"; depends=[ape coda lattice Matrix phangorn]; }; coarseDataTools = derive2 { name="coarseDataTools"; version="0.6-3"; sha256="0f1fkpmqq142yrqzbqv11s5q4jkq7dilmrllcns871hc6vah6ikd"; depends=[MCMCpack]; }; - cobalt = derive2 { name="cobalt"; version="1.3.1"; sha256="00zgq2c3vkrx4q8wp43giwid4778j9wxcjfn3nkbwlgrsswm0adb"; depends=[ggplot2]; }; + cobalt = derive2 { name="cobalt"; version="2.1.0"; sha256="1a0ynwbnfndgyhihgd73l4cdhivsva8nzimqb2bda425n0vligpn"; depends=[ggplot2 ggstance]; }; cobs = derive2 { name="cobs"; version="1.3-3"; sha256="1pqvz7czcchri4x79g78hbwyagb3bqzdqb047zkbdinyz067c7kb"; depends=[quantreg SparseM]; }; cocor = derive2 { name="cocor"; version="1.1-3"; sha256="106zyrrypil8jyg0pva5zj4hgb53z81nca3d0mh2q3j55zq3wl12"; depends=[]; }; - cocoreg = derive2 { name="cocoreg"; version="0.1.0"; sha256="1x6ffwh8z6nj867wxnvq8qjq7rx0j3swdnb12zv917s0y54dwncx"; depends=[abind CCAGFA combinat e1071 ggplot2 glmnet gridExtra MASS multiway pls reshape RGCCA]; }; + cocoreg = derive2 { name="cocoreg"; version="0.1.1"; sha256="0jrrkak964pl1vih592jgqgl6bw08j0fa1rh3j85x64bqq4m7278"; depends=[abind CCAGFA combinat e1071 ggplot2 glmnet gridExtra MASS multiway pls reshape RGCCA]; }; cocorresp = derive2 { name="cocorresp"; version="0.3-0"; sha256="1r1ssz0cip1gk52nkbr1kpz8gwrg6lwri8ymk41xj2adlsp576v2"; depends=[vegan]; }; cocron = derive2 { name="cocron"; version="1.0-1"; sha256="0dl14y9v9kndy5gzhhbhq3f31ja724y1hra40givy6bij7h2cj30"; depends=[]; }; coda = derive2 { name="coda"; version="0.19-1"; sha256="14a4a8df4ygj05h37chmdn8kzcqs07fpbflxfrq530563mrza7yl"; depends=[lattice]; }; codadiags = derive2 { name="codadiags"; version="1.0"; sha256="1x243pn6qnkjyxs31h1hxy8x852r0fc952ww77g40qnrk8qw79xg"; depends=[coda]; }; codep = derive2 { name="codep"; version="0.6-5"; sha256="18da81wja7z9gnn11xiwi7cg43mrj4w2kjkk8s780krbycnfsn5p"; depends=[]; }; codetools = derive2 { name="codetools"; version="0.2-15"; sha256="0h7sjmvvsi35041jp47cxhsqzgf1y8jrw6fxii7n26i8g7nrh1sf"; depends=[]; }; - codingMatrices = derive2 { name="codingMatrices"; version="0.3.0"; sha256="0xbqmcb6yzqdwhq4pcpdsjfix3vy410vd3lbsablna1hgfbbj4p7"; depends=[fractional Matrix]; }; + codingMatrices = derive2 { name="codingMatrices"; version="0.3.1"; sha256="09jr163n886qnw2hy8fvdvaw2w8n1752z7yrwy2bqrpfj3cw93yh"; depends=[fractional Matrix]; }; codyn = derive2 { name="codyn"; version="1.1.0"; sha256="0s8ssaq59vddilz0fin9sgr8fir70c220cffbsy2l0qn34q48627"; depends=[assertthat permute]; }; coefficientalpha = derive2 { name="coefficientalpha"; version="0.5"; sha256="0pfw64z7f0gp415nn7519rcw829a7wnwnjx94sc55jsvgb1di3kc"; depends=[lavaan rsem]; }; coefplot = derive2 { name="coefplot"; version="1.2.4"; sha256="0phpz4fvvxvpaybp4q1s69qxcpdzj8qxambivncps101mz7jj3sq"; depends=[ggplot2 plyr reshape2 useful]; }; @@ -4356,10 +4540,10 @@ in with self; { coenoflex = derive2 { name="coenoflex"; version="2.2-0"; sha256="06f75spl4wkbgicm0bksnid2lb1gkvi05915wn5y4km45d82fkkr"; depends=[mgcv]; }; coexist = derive2 { name="coexist"; version="1.0"; sha256="15ydhrx996i6caa0360c2bgn2zvgwfg5wdhsqq1gvrggs15w7nml"; depends=[]; }; cofeatureR = derive2 { name="cofeatureR"; version="1.0.1"; sha256="1nxdi97b37pw5xr6cib8hjgziazmy9lfbjgixn9ayacvdhkjs7ib"; depends=[dplyr ggplot2 lazyeval]; }; - coin = derive2 { name="coin"; version="1.1-3"; sha256="0db000pks4vr5jr765zagd5amqk0l4qxqg67vwwkbj03b71fr24b"; depends=[modeltools multcomp mvtnorm survival]; }; + coga = derive2 { name="coga"; version="0.2.0"; sha256="17v4v5k50ps81wrjdj9zv1q1y2fry735pbwycfb9pkcsgdcl1g9r"; depends=[Rcpp RcppGSL]; }; + coin = derive2 { name="coin"; version="1.2-0"; sha256="0lkwg3siaasdg1c6n3zvfwg36yrvv6v5pjpmj2gplsyifd60kjan"; depends=[modeltools multcomp mvtnorm survival]; }; cointReg = derive2 { name="cointReg"; version="0.2.0"; sha256="0n4s809avhlrmrjdqzc2s752m7x96c4432gnjd4qv77r2nns7dw4"; depends=[checkmate MASS matrixStats]; }; cointmonitoR = derive2 { name="cointmonitoR"; version="0.1.0"; sha256="0rsacvib9prgb199m5ndi0zlgfsvf1giqc5s41wp0yvxdxjdq5lw"; depends=[cointReg matrixStats]; }; - cold = derive2 { name="cold"; version="1.0-4"; sha256="00rl2h4pirzvgwi28pr94kkn233wvm2z8yyfsz6andbkjsihp6jw"; depends=[]; }; colf = derive2 { name="colf"; version="0.1.2"; sha256="1xbmc32rp0xlj73krwhqn2ji5xa9kd2anaw88mvi5psdi3d2y1np"; depends=[nlmrt]; }; collUtils = derive2 { name="collUtils"; version="1.0.5"; sha256="0gbk3lrb2lwq2ixrpcngng6qz6axjb4iyqy5606x1zmjm71c060p"; depends=[Rcpp rJava]; }; collapsibleTree = derive2 { name="collapsibleTree"; version="0.1.4"; sha256="14zg5cm6qf2106jw5wsmmlkldd71wg0576raqvzzhwbsfkapsb1r"; depends=[data_tree htmlwidgets]; }; @@ -4367,10 +4551,12 @@ in with self; { coloc = derive2 { name="coloc"; version="2.3-1"; sha256="1j3m9afpkm0bzib38yqvk85b6s6l56s6j2ni96gii4a06r87ig60"; depends=[BMA colorspace MASS]; }; colorRamps = derive2 { name="colorRamps"; version="2.3"; sha256="0shbjh83x1axv4drm5r3dwgbyv70idih8z4wlzjs4hiac2qfl41z"; depends=[]; }; colorSpec = derive2 { name="colorSpec"; version="0.5-3"; sha256="0ffn1x9763xzhfsm5vgkvgpm2a792bqx54ra2x4vda7m78lb6nqr"; depends=[MASS]; }; + colordistance = derive2 { name="colordistance"; version="0.8.0"; sha256="0fqj8apgfvk021cs1m79nk9kx294zxbj55jqylcrg3hadxy4plkf"; depends=[abind ape clue emdist gplots jpeg magrittr mgcv plotly png scatterplot3d spatstat]; }; coloredICA = derive2 { name="coloredICA"; version="1.0.0"; sha256="1xj4dsrwgqzm2644nk3y8nj47m036b4ylh6v60jccj3707spb32r"; depends=[MASS]; }; colorfulVennPlot = derive2 { name="colorfulVennPlot"; version="2.4"; sha256="01b3c060fbnap78h9kh21v3zav547ak2crdkvraynpd2096yk51w"; depends=[]; }; colorhcplot = derive2 { name="colorhcplot"; version="1.0"; sha256="1hxh09sg9mdbfz4vx2z9wyx9xs5a82l8sw1wbwaa717a6q3ayjyj"; depends=[]; }; colormap = derive2 { name="colormap"; version="0.1.4"; sha256="0032ji9n8pivl70jppq989fgg781wil8zag7pfl1hs9xrpin8asy"; depends=[ggplot2 stringr V8]; }; + colorpatch = derive2 { name="colorpatch"; version="0.1.2"; sha256="18p9hgccp37pbdf437xffkv6z500896v08fsw2jm8zcl9ladygaf"; depends=[colorspace ggplot2 gridExtra TSP]; }; colorplaner = derive2 { name="colorplaner"; version="0.1.3"; sha256="0mqqk59yjklbc7a0n7jgyhj458622dfdsa1101a5w6kwppbjvnfg"; depends=[digest ggplot2 gtable scales]; }; colorr = derive2 { name="colorr"; version="1.0.0"; sha256="1wwrgb9fc9gzxxwxrdrkwwrmhqqllv29wr4q8y1shj9d3nzcpwmh"; depends=[]; }; colorscience = derive2 { name="colorscience"; version="1.0.4"; sha256="19943gnzszh13mg74clbkhbc6xg4259ilqk19mrv8d6ml6f6wspl"; depends=[Hmisc munsellinterpol pracma sp]; }; @@ -4382,14 +4568,15 @@ in with self; { colr = derive2 { name="colr"; version="0.1.900"; sha256="0ilz1y0jd2vgyh81g3dwx2l64sir6z6sgmqx7lnvr1hafsqnwfc8"; depends=[]; }; comato = derive2 { name="comato"; version="1.0"; sha256="03jnvv0sczy13r81aljhj9kv09sl5hrs0n5bn3pdi7ba64zgbjiw"; depends=[cluster clusterSim gdata igraph lattice Matrix XML]; }; combinat = derive2 { name="combinat"; version="0.0-8"; sha256="1h9hr88gigihc4na7lb5i7rn4az1xa7sb34zvnznaj6pdrmwy4qm"; depends=[]; }; - combiter = derive2 { name="combiter"; version="0.1.0"; sha256="1wzrz2wc4j4inn078id6jr1585pl62r8ym8cc3vmg4acq2klm93c"; depends=[iterators itertools Rcpp]; }; + combiter = derive2 { name="combiter"; version="1.0.2"; sha256="159q7zh6bafh10mjjvl641gbxqhv5car62k8hjg9v7wflaqw7rab"; depends=[iterators itertools Rcpp]; }; comclim = derive2 { name="comclim"; version="0.9.4"; sha256="0m6ynccscsrrq70p0drwrwxp4skc630kv1l5smh48pi8kagahj1g"; depends=[]; }; cometExactTest = derive2 { name="cometExactTest"; version="0.1.3"; sha256="08ck1cv5apzn379j6mm2gmhm4qj18418crmqbbp46d80waf0ghxq"; depends=[dplyr]; }; - comf = derive2 { name="comf"; version="0.1.6"; sha256="1dfba8i08gc319ybqhfs96wa2mp0ndh4rrkv9i432gc56p4kgapr"; depends=[plyr]; }; + comf = derive2 { name="comf"; version="0.1.7"; sha256="1waxapw870fssmy9mzzpslypbal7vanlajzv9ffnsh5w2yzjdpfi"; depends=[plyr]; }; commandr = derive2 { name="commandr"; version="1.0.1"; sha256="1d6cha5wc1nx6jm8jscl7kgvn33xv0yxwjf6h3ar3dfbvi4pp5fk"; depends=[]; }; commentr = derive2 { name="commentr"; version="1.0.4"; sha256="0anlcbk8rj0yr8i23qmr6v5ws0695nkc3mvgr6pnq1fg2d4c4brj"; depends=[stringr]; }; commonmark = derive2 { name="commonmark"; version="1.2"; sha256="12q5mncxvkwdxc35is6y5idx8a1h99hyz5x6ri0arni6k25krchk"; depends=[]; }; - compHclust = derive2 { name="compHclust"; version="1.0-2"; sha256="1h39krvz516xwsvn5987i1zbzan8vx2411qz6dad112hpss0vyk9"; depends=[]; }; + commonsMath = derive2 { name="commonsMath"; version="1.0.0"; sha256="0yx5yglsdplm3vz268016b1mbwk92hyqwnjircifm81ihivqb3r1"; depends=[]; }; + compHclust = derive2 { name="compHclust"; version="1.0-3"; sha256="0agay7rn5mrw07imz4l547b7m9pfcg3rhz4krfxrvg1q2z2kryvj"; depends=[]; }; compactr = derive2 { name="compactr"; version="0.1"; sha256="0f2yds6inmx0lixj08ibqyd2i61l2cbg1ckgpb8dl2q7kcyyd6mx"; depends=[]; }; compare = derive2 { name="compare"; version="0.2-6"; sha256="0k9zms930b5dz9gy8414li21wy0zg9x9vp7301v5cvyfi0g7xzgw"; depends=[]; }; compareC = derive2 { name="compareC"; version="1.3.1"; sha256="0dachfr23lps2jj1y5gc958k54vskmww84gdgk4amihsdgjsnphg"; depends=[]; }; @@ -4401,13 +4588,12 @@ in with self; { compendiumdb = derive2 { name="compendiumdb"; version="1.0.3"; sha256="0glaqlzz5wr14yfhka1y7yw5ha6yc4waw61msbz0vkwj5z2hd2hk"; depends=[Biobase GEOquery RMySQL]; }; compete = derive2 { name="compete"; version="0.1"; sha256="1b1320jw8pcnjkzb0lr8j6d3z7yhlq31gszd79wdcmwnpzap9k0z"; depends=[igraph sna]; }; complexity = derive2 { name="complexity"; version="1.1.1"; sha256="1lpsvry88jpqfw0wkdlwjzkqjl17f4adjcqvq0dwk483mi54xnfk"; depends=[combinat shiny]; }; - complexplus = derive2 { name="complexplus"; version="2.0"; sha256="05b36gql6fqcairwpxvis9vllpvmpgv6rg69zd8vabl5xsgv8q44"; depends=[expm Matrix]; }; + complexplus = derive2 { name="complexplus"; version="2.1"; sha256="16w9v7d1ckavqmr86l34frr37pkvdn0iqnb17ssb8xaggns5lgqx"; depends=[expm Matrix]; }; complmrob = derive2 { name="complmrob"; version="0.6.1"; sha256="1dr80r1p05h3mlnjbgh6kfw86np8y2bhy9yi5qydv85w52k133n1"; depends=[boot ggplot2 robustbase scales]; }; compoisson = derive2 { name="compoisson"; version="0.3"; sha256="0v5dl7xydqi4p97nipn4hyhpq2gghmx81ygvl0vc8b65jhq89y0p"; depends=[MASS]; }; compositions = derive2 { name="compositions"; version="1.40-1"; sha256="1hn139g86bc1q3dj6kj9f21042v4x0xgrp4ni1zvx1zx8xmy3h8b"; depends=[bayesm energy robustbase tensorA]; }; compound_Cox = derive2 { name="compound.Cox"; version="3.3"; sha256="13gqc094c3sx52qx4yvk3la6qs31rgrpm8l6asysn4jp0q6hqgqq"; depends=[numDeriv survival]; }; compute_es = derive2 { name="compute.es"; version="0.2-4"; sha256="1b5i8z66zbag0vdv98mmpwmizpm68vc3ajh0n3q94zdcmhcbx12d"; depends=[]; }; - comtradr = derive2 { name="comtradr"; version="0.0.1"; sha256="03pic8ld3bbzd415hxxsx3dq520az1byqbp7v08ks64nz5whmplw"; depends=[dplyr httr jsonlite]; }; concatenate = derive2 { name="concatenate"; version="1.0.0"; sha256="1kvsw7vwa3hn97ff7r6z21h5ajs74azwv2dk4pzgyaasnbp778hw"; depends=[]; }; conclust = derive2 { name="conclust"; version="1.1"; sha256="1k9y1mniy7s51dmm5ia693k72s2vxk5bznxxf74s7mx9n3mg2i8r"; depends=[]; }; concor = derive2 { name="concor"; version="1.0-0.1"; sha256="0hjyvi6p16cyrmq0bq7fph1r5f3adp7zpf123wkm5bkjnc5122k0"; depends=[]; }; @@ -4417,7 +4603,7 @@ in with self; { condGEE = derive2 { name="condGEE"; version="0.1-4"; sha256="0mqj2pc91n8h3arpd4b9f7ndbcnai21c67is22qg22wj7vhhs87h"; depends=[numDeriv rootSolve]; }; condMVNorm = derive2 { name="condMVNorm"; version="2015.2-1"; sha256="04563jljnjhbiaiq33gn5dxjfvv05xp3lhl3w942v0smy0cdhrh4"; depends=[mvtnorm]; }; condSURV = derive2 { name="condSURV"; version="2.0.1"; sha256="0xjpypc4fzrnfjcznyc2bslkkza4fib8nx8ff2j7xh2nf84lk3f1"; depends=[doParallel doRNG foreach KernSmooth np survival]; }; - condformat = derive2 { name="condformat"; version="0.5.0"; sha256="0cxayvw5is3b2bwfyjd2465q45dx1w1dqhaa10gld0b2336i7hkz"; depends=[dplyr gplots htmlTable knitr lazyeval rmarkdown scales]; }; + condformat = derive2 { name="condformat"; version="0.6.0"; sha256="150rvgs5v20k3l4hjzvjjckzv0xs788aiigi3pjgdgx1q2kgicbk"; depends=[dplyr gplots htmlTable htmltools knitr lazyeval rmarkdown scales tibble]; }; condir = derive2 { name="condir"; version="0.1.1"; sha256="133598h1ga4jyr77lchnby6m8bh3adq6s38cgw45q4fyvzad4qds"; depends=[BayesFactor effsize knitr psych shiny xtable]; }; conditions = derive2 { name="conditions"; version="0.1"; sha256="0vhqkbsil3qfvrz7924i3wvjknw69cp27g7ayapf6w94bbggx4x8"; depends=[]; }; condmixt = derive2 { name="condmixt"; version="1.0"; sha256="05q1fj7akf6lsq9rbcqqkzlx82jvk6mlvmwx6jzk8j228fwqmg90"; depends=[evd]; }; @@ -4427,10 +4613,11 @@ in with self; { confSAM = derive2 { name="confSAM"; version="0.1"; sha256="00l4hk0n63p3gdv6hpxqkkn3nw4rgw77rpwzn2k8fgq53ja44yfg"; depends=[]; }; confidence = derive2 { name="confidence"; version="1.1-0"; sha256="11y2mjh9ykmsgf6km6f2w5rql1vqwick4jzmxg5gkfkiisvsq1cp"; depends=[ggplot2 knitr markdown plyr xtable]; }; config = derive2 { name="config"; version="0.2"; sha256="1p0gaqrqhcrdkp5cr3rn4i5ny8mr96b3q1fwgs0i8lk5riljkk20"; depends=[yaml]; }; - configr = derive2 { name="configr"; version="0.2.1"; sha256="0b5mkhnnlpp1m3b4gflyn4n1pdr21f10jpx8kbw2dhjd3imbdq0s"; depends=[ini jsonlite RcppTOML stringr yaml]; }; - confinterpret = derive2 { name="confinterpret"; version="0.1.0"; sha256="1rl742pf6lz48q3sq8c57fp45zdh90kx3wx0zmq63ic18ql1hg51"; depends=[]; }; + configr = derive2 { name="configr"; version="0.3.0"; sha256="08q91pamw1qwpc9parqvr9isnqjiqawyvs1l2cs18y7qykshbd5a"; depends=[glue ini jsonlite RcppTOML stringr yaml]; }; + confinterpret = derive2 { name="confinterpret"; version="0.2.0"; sha256="168x9hk4vv158fqryfqqp4233lalbi5qv8qrhvicmvraa1zbvp8m"; depends=[]; }; conformal = derive2 { name="conformal"; version="0.2"; sha256="13d8yv8l333n3m8kl2sdnd0m5b7gjixkqjlpfj312fk9nxvqdbcg"; depends=[caret e1071 ggplot2 randomForest]; }; confreq = derive2 { name="confreq"; version="1.5.1"; sha256="0gy6d1kffb1w86ifldswb9krxyc2p646g9yjlfm1h243qlp52sfa"; depends=[gmp]; }; + congressbr = derive2 { name="congressbr"; version="0.1.1"; sha256="1kfpyrakbri9zqggcfy7flxyfpf85w5gqxi0p249qjw5khz8nkz5"; depends=[dplyr httr lubridate magrittr pscl purrr stringi stringr tibble tidyr xml2]; }; conicfit = derive2 { name="conicfit"; version="1.0.4"; sha256="1d704xgiyqmbwfxnsmhqg885x10q8yqxmrk4khqpg3lh696bw97d"; depends=[geigen pracma]; }; conics = derive2 { name="conics"; version="0.3"; sha256="06p6dj5dkkcy7hg1aa7spi9py45296dk0m6n8s2n3bzh3aal5nzq"; depends=[]; }; conjoint = derive2 { name="conjoint"; version="1.39"; sha256="0f8fwf419js9c292i3ac89rlrwxs2idhwxml1qd8xd2ggwfh6w5m"; depends=[AlgDesign clusterSim]; }; @@ -4445,6 +4632,7 @@ in with self; { convertGraph = derive2 { name="convertGraph"; version="0.1"; sha256="1jsrygj6ydzc0nzyzaq95j4blqavj7dqz182vgm1ckv8an3if0jx"; depends=[]; }; convertr = derive2 { name="convertr"; version="0.1"; sha256="1y9aq5in2qv1323amblmq3g22flpqvpkgkrw12kahg56mqf2b3iq"; depends=[DT miniUI rstudioapi shiny]; }; convevol = derive2 { name="convevol"; version="1.0"; sha256="05nhpndixvrmiq5paswj7qwsq3k3al34q3j751bic4kb8zhby3fk"; depends=[ape cluster geiger MASS phytools]; }; + convexjlr = derive2 { name="convexjlr"; version="0.5.1"; sha256="18fagv4xnylc03fakf3k6r700bs6sb2dhji8cbgi69w7n7ibq5rz"; depends=[magrittr XRJulia]; }; convey = derive2 { name="convey"; version="0.2.0"; sha256="1sngpp769q13lp3ykk510di2iq06i7fc79z6mhdivmlw3pf40lcb"; depends=[survey]; }; convoSPAT = derive2 { name="convoSPAT"; version="1.2"; sha256="1qxn9kwxbl1qvhdn4xfky9lc7qvg9v8qgmd1wvbz2b6yc0wvhxia"; depends=[ellipse fields geoR MASS plotrix StatMatch]; }; cooccur = derive2 { name="cooccur"; version="1.3"; sha256="1wlaghhi4f3v8kzwhcgq3c6as7v3zlpkzhb232qz1amr7f0058kv"; depends=[ggplot2 gmp reshape2]; }; @@ -4454,8 +4642,9 @@ in with self; { copBasic = derive2 { name="copBasic"; version="2.0.5"; sha256="0xijw9abqkljacwnblyncjkpaj178s9kq8jazxb39v4qk8pmvq6c"; depends=[lmomco randtoolbox]; }; copCAR = derive2 { name="copCAR"; version="2.0-2"; sha256="032gphv64v2mmy63q86qgpa31i36ix6fkjsdxmzgqyxcyzgb0jcy"; depends=[mcmcse numDeriv Rcpp RcppArmadillo spam]; }; cope = derive2 { name="cope"; version="0.2.3"; sha256="1r02nb6wy25ixhdcbqqz167s7ny3hydpxfxry5ar4136qvcamgyy"; depends=[abind fields maps MASS Matrix mvtnorm nlme]; }; + coppeCosenzaR = derive2 { name="coppeCosenzaR"; version="0.1.0"; sha256="06kk9j0rjmbvn06nhhjs8qsmy5vsk49gknjw84jv2z6ypp90hfz3"; depends=[]; }; coprimary = derive2 { name="coprimary"; version="1.0"; sha256="0pjln9p5lzv6wl5xrz0kb90hnjlnp7ch2kvh054nxdbmlxv5akc3"; depends=[digest gsDesign plyr proto]; }; - copula = derive2 { name="copula"; version="0.999-16"; sha256="0mnhp5jhrbynnkdf9cmxzd5kqg8zvdrwldy8pn7sdjq18xq6qawa"; depends=[ADGofTest colorspace gsl lattice Matrix mvtnorm numDeriv pcaPP pspline stabledist]; }; + copula = derive2 { name="copula"; version="0.999-17"; sha256="19i4x4adynn63f0z85hk5npr40lcn36d7cb2z46qnqmpplz9rqh3"; depends=[ADGofTest colorspace gsl lattice Matrix mvtnorm numDeriv pcaPP pspline stabledist]; }; copulaedas = derive2 { name="copulaedas"; version="1.4.2"; sha256="09w6b1m1lnlnsx0qp2mzlp0z9rxzz90qs9jqzwwjl56lzdad3vpr"; depends=[copula mvtnorm truncnorm vines]; }; corHMM = derive2 { name="corHMM"; version="1.20"; sha256="1amfy419m8y9w6swa1avvjdyk2rjymsa280qsdy9zbq0izrgf9dr"; depends=[ape corpcor expm GenSA nloptr numDeriv phangorn]; }; corTools = derive2 { name="corTools"; version="1.0"; sha256="0arvqk2xp19ap73zmdk0kb1fycb3v2mf65b4bhanvcqwr4kg4vdk"; depends=[]; }; @@ -4463,22 +4652,22 @@ in with self; { corcounts = derive2 { name="corcounts"; version="1.4"; sha256="0irlx62ql5rp5s7nnjdy6jh723wl4039wn10zxri8ihxwqsyyz3f"; depends=[]; }; cord = derive2 { name="cord"; version="0.1.1"; sha256="18xj6cwmx1a7p3vqx5img8qf8s75nc6pcv78v15j081pgn786ma5"; depends=[Rcpp RcppArmadillo]; }; coreNLP = derive2 { name="coreNLP"; version="0.4-2"; sha256="0rvyqj7s3lijq4rzil65060b29m393m7zmg99mykp1g1kby5bjd8"; depends=[rJava XML]; }; - coreSim = derive2 { name="coreSim"; version="0.2.3"; sha256="00hrhiml3g0jld6pllpgjfrlpm2lqcdb01l6k9gkjyh3lab827fg"; depends=[dplyr MASS]; }; + coreSim = derive2 { name="coreSim"; version="0.2.4"; sha256="1fhlss420rhs21l9i2ag5g3j0vnrkpqdh13ca4rwfan6h35qr3sm"; depends=[dplyr MASS]; }; coreTDT = derive2 { name="coreTDT"; version="1.0"; sha256="14rnh61gk3m6g8rq77hm9ybds0px15di2mxm3jiyfdfynx5ng58f"; depends=[]; }; corehunter = derive2 { name="corehunter"; version="3.1.0"; sha256="1q5bmzkmm8fzdnbj8s8mi0jxmrqp6ps14m1fm0c3frlqj3fy1ngm"; depends=[naturalsort rJava]; }; corkscrew = derive2 { name="corkscrew"; version="1.1"; sha256="1nb81r4lsrajcj3xz3f7p6xznnb38yg3rnnh44rd3kabca4d8r1s"; depends=[ggplot2 gplots igraph RColorBrewer]; }; corlink = derive2 { name="corlink"; version="1.0.0"; sha256="06n9pcvbn8y9gy0mn9c0sw05424ss8smpaw3ly6a785cmj3d9b6m"; depends=[]; }; corpcor = derive2 { name="corpcor"; version="1.6.9"; sha256="1hi3i9d3841snppq1ks5pd8cliq1b4rm4dpsczmfqvwksg8snkrf"; depends=[]; }; corpora = derive2 { name="corpora"; version="0.4-3"; sha256="0zh8mabfy9yqgx7asi4yqv4c0kj59yvyxxaxjgdjy5kkr17zd4g4"; depends=[]; }; - corpus = derive2 { name="corpus"; version="0.2-0"; sha256="1cgk3j6wsdxh310yka6r4nnvnnx15jlibnk0s7w2cw5rr2b5pwxp"; depends=[]; }; + corpus = derive2 { name="corpus"; version="0.7.0"; sha256="1fxxc66zn7wyd23fxc0inll31zq3ccai1kgy5dhmbayk3ad5j35n"; depends=[Matrix]; }; corr2D = derive2 { name="corr2D"; version="0.1.12"; sha256="06jhcb4sr9mz06pc8jjrpl1qhxjp4bacal3hgy1k76lfbayxn7fv"; depends=[colorspace doParallel fields foreach mmand rgl]; }; correctedAUC = derive2 { name="correctedAUC"; version="0.0.3"; sha256="0c2kq7asq5mp48p8niqb84wnw4q2q2985wxbrywrhsszm9p3xspb"; depends=[ICC mnormt]; }; - corregp = derive2 { name="corregp"; version="0.1.4"; sha256="09gkxl5bmshsg8j9manvpwzy88djqqi8xrdhbmq6azk3g3lr70rp"; depends=[ellipse gplots rgl]; }; - corrgram = derive2 { name="corrgram"; version="1.11"; sha256="13znr4gqj6pnilqpw0ypc8zjk259gm06pribr3sz9bnrkpr6pcfc"; depends=[seriation]; }; + corregp = derive2 { name="corregp"; version="1.0.2"; sha256="14d9hr7yi43lcc2qwb3h4zr24h8539clxmcc3qa333jh3ir3zcb1"; depends=[diagram ellipse gplots rgl]; }; + corrgram = derive2 { name="corrgram"; version="1.12"; sha256="1z0h2mkf4805w3wnhy31cf1gm9miliapxchgc4ksg3kx2799gv91"; depends=[seriation]; }; corrplot = derive2 { name="corrplot"; version="0.77"; sha256="1lr873lqg4zdjccf9g8a1fbvvdbvyb30j980ygiyxwpajpwnzdjl"; depends=[]; }; corrr = derive2 { name="corrr"; version="0.2.1"; sha256="1d04nk92fjmk4kc5zipjqjhhmb1w97kid7l2jz5a8pkwiccn5byc"; depends=[dplyr ggplot2 ggrepel lazyeval magrittr purrr seriation tibble tidyr]; }; corrsieve = derive2 { name="corrsieve"; version="1.6-8"; sha256="0ak3j9khcwv5rxbicck2sr260wpmd3xj254y7pdavx2fk0b72yxs"; depends=[]; }; - corset = derive2 { name="corset"; version="0.1-3"; sha256="1bx8dzxyvvi9cc2vql1whlnva8n3af8jsglyzh77jzrrqk78rkh1"; depends=[]; }; + corset = derive2 { name="corset"; version="0.1-4"; sha256="0ladyqvkys4cldvbhkii9jwn1k5p1ym2g5bgdlz1hq1sv30ixn2f"; depends=[]; }; cosinor = derive2 { name="cosinor"; version="1.1"; sha256="02nnqg51vq48lzk667cyarnmhcf5mifnsdij7dlgqvz2k4fdq4pl"; depends=[ggplot2 shiny]; }; cosmoFns = derive2 { name="cosmoFns"; version="1.0-1"; sha256="0a6xhbgxxnymlvicg99yhgny2lscxcbmvqmy17kxmahdi797dsg6"; depends=[]; }; cosso = derive2 { name="cosso"; version="2.1-1"; sha256="1wyq27qak0kz4bbzynm24r5ksvb6ddd43h2ykh6m935xck16blyb"; depends=[glmnet quadprog Rglpk]; }; @@ -4486,22 +4675,26 @@ in with self; { cotrend = derive2 { name="cotrend"; version="1.0"; sha256="0h0y502wqq83wlf9ab1b9rxg1wycvi3sp4lbqfpvy46vgljrjw87"; depends=[xts]; }; couchDB = derive2 { name="couchDB"; version="1.4.1"; sha256="1n99amvnsjp88y091603hjsvp243c5i6dbrsvdjfmzgj5dsrv70m"; depends=[bitops httr RCurl rjson]; }; countrycode = derive2 { name="countrycode"; version="0.19"; sha256="0cgv8sds01figs5dsm1gga2py2nzf3a3xrlkmblal52xxpng2jf8"; depends=[]; }; - countyfloods = derive2 { name="countyfloods"; version="0.0.1"; sha256="0m9vhsqksr6wprxmvg0cmvyfmmv92a4icak89pv9lmsqmvy5q3ca"; depends=[dataRetrieval dplyr ggplot2 lubridate maps plyr R_utils tidyr]; }; + countyfloods = derive2 { name="countyfloods"; version="0.0.2"; sha256="04b1jryy0vcgmidnbasfcm649ig7jgnzxyz9sqi5q5g0pfphrxa3"; depends=[dataRetrieval dplyr ggplot2 lubridate maps plyr R_utils tidyr]; }; countytimezones = derive2 { name="countytimezones"; version="1.0.0"; sha256="0sk22fmz9d3wvlfvjl1xdavvl04q1ywy8ww2gi5am3yiizkf0v9w"; depends=[dplyr lubridate]; }; countyweather = derive2 { name="countyweather"; version="0.1.0"; sha256="0q56bnh9x6jyj1sdd1q4yv2n774mbv268pgp285bjybgqm2pyisz"; depends=[dplyr geosphere ggmap ggplot2 lubridate purrr raster rnoaa sp stringi tibble tidyr tigris]; }; covBM = derive2 { name="covBM"; version="0.1.0"; sha256="0ky1lhr8m4hy2ss1nr2xymf6cmj1rr8px8zsxna6bsisf5bq4j4w"; depends=[nlme]; }; covLCA = derive2 { name="covLCA"; version="1.0"; sha256="15jsjrlaws1cqyrwvh4lzbhxkb11jmgpmddg98nfrzmjpczn2iw3"; depends=[Matrix mlogit poLCA]; }; - covRobust = derive2 { name="covRobust"; version="1.1-0"; sha256="1nvy5cqs4g565qj2hhgk5spr58ps2bhas3i752rf7wvrskb89fk7"; depends=[]; }; + covRobust = derive2 { name="covRobust"; version="1.1-3"; sha256="0zcfala4l0j4w0sx5hlw40vxiypans3d7pgkxy25nj0d2m1jkvba"; depends=[]; }; covTest = derive2 { name="covTest"; version="1.02"; sha256="0p4di8bdjghsq5jd678dprlhiwnxr5piqlx2z7hi2bjjpvvl5657"; depends=[glmnet glmpath lars MASS]; }; - covafillr = derive2 { name="covafillr"; version="0.4.0"; sha256="0q6zzgpgwzmdwpz9lzhprhyy9nsrzwk35g35ighayd8d6c7ih44f"; depends=[ggplot2 RcppEigen]; }; + covafillr = derive2 { name="covafillr"; version="0.4.1"; sha256="0fb08jdvdg6jdsmpp10dmbmhral6kgmfs5mqlprr4p3qbn8pis69"; depends=[ggplot2 RcppEigen]; }; + covatest = derive2 { name="covatest"; version="0.2.1"; sha256="1a89fr3v20w6afgirfy2n0hwnbnaimz58ya6c4idb7226s1wbdir"; depends=[gstat matrixcalc sp spacetime]; }; + covfefe = derive2 { name="covfefe"; version="0.1.0"; sha256="178qc77y4bn04qad3g70wr8y4v0ggyg807w67m8wvhbcxqr8yq7c"; depends=[tokenizers]; }; covmat = derive2 { name="covmat"; version="1.0"; sha256="00y966897x83v471yarfikpr794b7adhgn5c9hgh0j1j4yfdc3b8"; depends=[DEoptim doParallel fGarch foreach ggplot2 gridExtra lhs Matrix mvtnorm optimx reshape2 RMTstat robust robustbase scales VIM xts zoo]; }; - covr = derive2 { name="covr"; version="2.2.2"; sha256="0bx2fjaxqigiic2fndpn1y0whag6b2j733dn1cq4qd601sfca1w3"; depends=[crayon httr jsonlite rex withr]; }; + covr = derive2 { name="covr"; version="3.0.0"; sha256="0qww8mpwk38dz963202n2yx3aia8plzlcivv3smn0wm8xf93bcha"; depends=[crayon httr jsonlite rex withr]; }; covreg = derive2 { name="covreg"; version="1.0"; sha256="0v19yhknklmgl58zhvg4szznb374cdh65i7s8pcj2nwrarycwzaq"; depends=[]; }; covsep = derive2 { name="covsep"; version="1.0.0"; sha256="1i6ygzzf2s0f7a42q2pb1v0gn369wxdyxvbk4k891irq352sf18r"; depends=[mvtnorm]; }; + cowbell = derive2 { name="cowbell"; version="0.1.0"; sha256="1zz0g30zvqfk5lh09y90iq3s7x2wwbs852i3d56mfp926gxdxc2y"; depends=[ggplot2 misc3d rgl]; }; cowplot = derive2 { name="cowplot"; version="0.7.0"; sha256="03iimcsh1pk7iqzjdlfcj43b8khijdk4hg00j4jdllv19xsfb0hx"; depends=[ggplot2 gtable plyr]; }; cowsay = derive2 { name="cowsay"; version="0.5.0"; sha256="16rlpyfiwk2f04p49inf5m3pb5nvb45xs6sdfjszihm1hxl09x7x"; depends=[fortunes rmsfact]; }; coxinterval = derive2 { name="coxinterval"; version="1.2"; sha256="0vb7vmzbb2dsihx04jbp2yvzcr033g435mywmwimqhfqdrmjx3fi"; depends=[Matrix survival timereg]; }; coxme = derive2 { name="coxme"; version="2.2-5"; sha256="0lpdwpvsgjgmbf55qqhflw4q40xmqm422inkssgn3ladcp68gb1s"; depends=[bdsmatrix Matrix nlme survival]; }; + coxphMIC = derive2 { name="coxphMIC"; version="0.1.0"; sha256="0lmma5wzcczr762xqa4yamvwvyviqxk8gdrps3sydg3n14hckp6d"; depends=[numDeriv survival]; }; coxphf = derive2 { name="coxphf"; version="1.12"; sha256="0vsdpbpc18fm6dwiqjwclgimwng34xqzy2mqbcijs6p7h1j124a0"; depends=[survival]; }; coxphw = derive2 { name="coxphw"; version="4.0.0"; sha256="02xiwrvc3gbwwjcz9kwy2g91jrjpawch5r4pq6l4lyvl556w296l"; depends=[survival]; }; coxrobust = derive2 { name="coxrobust"; version="1.0"; sha256="08hp0fz5gfxgs3ipglj6qfr6v63kzxkrzg650bmzabq8dvrxd97q"; depends=[survival]; }; @@ -4517,14 +4710,15 @@ in with self; { cpr = derive2 { name="cpr"; version="0.2.3"; sha256="1a2lza1bw74xzrs17a9gr9mnpvnnrykhwd73yqi63wp3k4sm42rb"; depends=[dplyr ggplot2 lazyeval lme4 magrittr plot3D Rcpp RcppArmadillo rgl tibble tidyr]; }; cpt = derive2 { name="cpt"; version="0.9"; sha256="03nvxkwwvqmzpphax4zfij6jvh26x4bsl3mn2xr4mbr7cjb2x12w"; depends=[MASS nnet randomForest]; }; cqrReg = derive2 { name="cqrReg"; version="1.2"; sha256="1sn8pkbqb058lbysdf2y1s734351a91kwbanplyzv3makbbdm4ca"; depends=[quantreg Rcpp RcppArmadillo]; }; - cquad = derive2 { name="cquad"; version="1.3"; sha256="1r6g3yp3vvm8d5351lan4im1bmir38d4l9cf8bw0ay7as33ny3x9"; depends=[MASS plm]; }; + cquad = derive2 { name="cquad"; version="1.4"; sha256="1sxf30rikzr4mj1nyr12ys7gcnx5vq0rpd9djc2lkfbqlvi4mmai"; depends=[MASS plm]; }; crackR = derive2 { name="crackR"; version="0.3-9"; sha256="18fr3d6ywcvmdbisqbrbqsr92v33paigxfbslcxf7pk26nzn2lly"; depends=[evd Hmisc]; }; cramer = derive2 { name="cramer"; version="0.9-1"; sha256="1dlapmqizff911v3jv8064ddg8viw28nq05hs77y5p4pi36gpyw4"; depends=[boot]; }; - crandatapkgs = derive2 { name="crandatapkgs"; version="0.1.7"; sha256="1kxh5ixhwv4fm78x6kzpwyzdgs7xzcx0k321zvkg5l46k3wybg6g"; depends=[]; }; + crandatapkgs = derive2 { name="crandatapkgs"; version="0.1.8"; sha256="12sz54csqnwk49iwg5zcigyczxhgskxsak6ws2ih7nqpv19v8a0m"; depends=[]; }; crank = derive2 { name="crank"; version="1.1"; sha256="117sgq7zm5wxmd97sfc927qq70snra6vd090mhpcsdhipw1py6zc"; depends=[]; }; + cranlike = derive2 { name="cranlike"; version="1.0.0"; sha256="0xas7k1a8ykgrgwmql3ndy26ww622c53xngim1g9a5xchhra7h4g"; depends=[DBI debugme desc RSQLite]; }; cranlogs = derive2 { name="cranlogs"; version="2.1.0"; sha256="1w1nbifjb9l106fk97zy0w73x73bw5azq89l3c1b8r2fz8aljkkc"; depends=[httr jsonlite]; }; crantastic = derive2 { name="crantastic"; version="0.1"; sha256="0y2w9g100llnyw2qwjrib17k2r2q9yws77mf6999c93r8ygzn4f5"; depends=[]; }; - crawl = derive2 { name="crawl"; version="2.0.1"; sha256="0jmkbcpf681v00z7p36cni5wrh0y3mbxjia6bnajqjpaqdqzz8la"; depends=[mvtnorm Rcpp RcppArmadillo shiny]; }; + crawl = derive2 { name="crawl"; version="2.1.1"; sha256="0dr9z8y8rvc3wn1gjb6mh5wmszng9j1r2a9ks6p5am8ghf754sps"; depends=[dplyr gdistance mvtnorm raster Rcpp RcppArmadillo shiny sp]; }; crayon = derive2 { name="crayon"; version="1.3.2"; sha256="0s2yam18slph7xsw4pyc9f92gdyf609r5w92yax69zh57kb7asws"; depends=[]; }; crblocks = derive2 { name="crblocks"; version="0.9-1"; sha256="1m6yy6jb1dld7m9jaasms5ps8sn3v039jvlk8b0c08hmm7y0rm3z"; depends=[]; }; crch = derive2 { name="crch"; version="1.0-0"; sha256="1wd9hwr68qlinaw23lckjizq5g67v74wc3v6ig1rxrxyssyzag68"; depends=[Formula ordinal]; }; @@ -4534,9 +4728,11 @@ in with self; { crimCV = derive2 { name="crimCV"; version="0.9.3"; sha256="1p2cma78fb9a2ckmwdvpb6fc0818xw2mvq565dgiimgkdmmr0iid"; depends=[]; }; crimelinkage = derive2 { name="crimelinkage"; version="0.0.4"; sha256="1zzk50kyccvnp51vzp28c9yi23hsp25arrgdn88lwfwa0m43rlar"; depends=[geosphere igraph]; }; crisp = derive2 { name="crisp"; version="1.0.0"; sha256="1gs8jnd9y9pd55w6kwv9mvmg3wd8hjiw3lwx7k242pxccsxklfxq"; depends=[MASS Matrix]; }; - crmPack = derive2 { name="crmPack"; version="0.2.0"; sha256="1bgy3bfsasjppd0gf9yxrfyc1glzqpgdfpl9kv2lv34xbywwad05"; depends=[BayesLogit GenSA ggplot2 gridExtra MASS mvtnorm rjags]; }; + crmPack = derive2 { name="crmPack"; version="0.2.1"; sha256="0n6731b5l4vsyk8r35jgvrmmb7sjrlxfcybhrvbpd9m0w5aqi3dz"; depends=[BayesLogit GenSA ggplot2 gridExtra MASS mvtnorm rjags]; }; + crminer = derive2 { name="crminer"; version="0.1.2"; sha256="13jqbnk4v2wrkx0zghas0qrn5cff9kawinffjpwixyz9dlgr56pf"; depends=[crul hoardr jsonlite pdftools xml2]; }; crmn = derive2 { name="crmn"; version="0.0.20"; sha256="1kl1k1s2gm63f9768cg8w4j6y1gq4hws3i7hdfhj7k9015s0a25p"; depends=[Biobase pcaMethods]; }; crn = derive2 { name="crn"; version="1.1"; sha256="1fw0cwx478bs6hxidisykz444jj5g136zld1i8cv859lf44fvx2d"; depends=[chron RCurl]; }; + crochet = derive2 { name="crochet"; version="1.0.0"; sha256="1r10lr60v5fqppbqgp994hcx3ybg3yqc0x983pi8frdhj9mqmzrz"; depends=[]; }; cronR = derive2 { name="cronR"; version="0.3.0"; sha256="0nyjgxgvasqv8g9cvkzii0jsr15x5i76waz5hzzsjar5mwq6vq8h"; depends=[digest]; }; crop = derive2 { name="crop"; version="0.0-2"; sha256="1yjpk7584wrz9hjqs21irjnrlnahjg8lajra9yfdp6r927iimg1l"; depends=[]; }; cropdatape = derive2 { name="cropdatape"; version="1.0.0"; sha256="19bn0apx4p8hnz388zg7sq59qv89vv8k5php317kcv7ai2k2gh34"; depends=[]; }; @@ -4546,22 +4742,23 @@ in with self; { crosstalk = derive2 { name="crosstalk"; version="1.0.0"; sha256="0lfa89vhrzi7a1rghmygcjr8gzddw35sinb3jx6g49mc9jias7mk"; depends=[ggplot2 htmltools jsonlite lazyeval R6 shiny]; }; crossval = derive2 { name="crossval"; version="1.0.3"; sha256="0acpcisg6pkxblyc4j9hiri58h1rn7ay43p5ib5ia8a4a8bnfa4p"; depends=[]; }; crp_CSFP = derive2 { name="crp.CSFP"; version="2.0.2"; sha256="0gazmhf5bv994x441m2xm0w18h9lw3y68qzdf6gmyqimj4wjqjgf"; depends=[MASS]; }; + crplyr = derive2 { name="crplyr"; version="0.1.2"; sha256="07qz1138i6hd4n9cba9sy7fvilbvnr8b8d0n55inbzaqkz04vlx7"; depends=[crunch dplyr lazyeval tibble]; }; crqa = derive2 { name="crqa"; version="1.0.6"; sha256="1v9fwl98jjlg2z5skqsjmmgpmmxy4g1gzvc28yflvdp50qn509v8"; depends=[fields Matrix plot3D pracma tseriesChaos]; }; crrSC = derive2 { name="crrSC"; version="1.1"; sha256="171cw56q2yv1vb4qd0va75i2q89jcw1126q8pcbv0235g7p2a86z"; depends=[survival]; }; crrp = derive2 { name="crrp"; version="1.0"; sha256="1fq54jr6avrli91a4z1hp5img4kghyw1yvjr5xyccsanf9i35x8r"; depends=[cmprsk Matrix survival]; }; crrstep = derive2 { name="crrstep"; version="2015-2.1"; sha256="03vd97prws9gxc7iv3jfzffvlrzhjh0g6kyvclrf87gdnwifyn1z"; depends=[cmprsk]; }; - crs = derive2 { name="crs"; version="0.15-24"; sha256="08k8vim4n85ll16zpkwbf3riz641kafn699qsg0h746zqzi1kfn7"; depends=[boot np quantreg rgl]; }; + crs = derive2 { name="crs"; version="0.15-27"; sha256="15f2nvf37r74z8vpisi89zxqa670v6nh0shl2rvl0p1s3s7h6lfz"; depends=[boot np quantreg rgl]; }; crskdiag = derive2 { name="crskdiag"; version="1.0.1"; sha256="0100wbyvchx6jwlrwc6rwhdjanips5c0f5zqzs2c0dgwygpqw30w"; depends=[cmprsk]; }; crsnls = derive2 { name="crsnls"; version="0.2"; sha256="0rv0xrdl9ix6bhaf554gma8zf923w47f8j1dkbs8g6xjqjr1c40a"; depends=[]; }; crtests = derive2 { name="crtests"; version="0.2.1"; sha256="0z8idz37dgwvi1q2vryldii7fn9yxd32gds77ml76jfplxbkikpd"; depends=[caret plyr stringr]; }; - crul = derive2 { name="crul"; version="0.3.4"; sha256="14dc5vs1h5rwd373ibh1dndxgx3h3i2zg5d38i43j0ffqsbiyrl2"; depends=[curl httpcode mime R6 urltools]; }; - crunch = derive2 { name="crunch"; version="1.16.0"; sha256="19iw8vpqxlanm4z2cwpnh500zkdb3j8wc7qvppkdv2b4a5cy33lq"; depends=[curl httpcache httr jsonlite]; }; + crul = derive2 { name="crul"; version="0.3.8"; sha256="1vcwbdmj357n36hgyldv70a9m8vlb5g14zn6z00ssxagsw1gk5lz"; depends=[curl httpcode mime R6 urltools]; }; + crunch = derive2 { name="crunch"; version="1.17.0"; sha256="1m6hdh1hbd48gsvr4136jirymn82p6pr8w9db62pj46h8x2p6jsy"; depends=[curl httpcache httr jsonlite]; }; + crunchy = derive2 { name="crunchy"; version="0.2.0"; sha256="1q9mqpkg5ljb798922fmvjjp36kyjr1rrm6jf3s2fwjrhq186y3z"; depends=[crunch shiny]; }; cruts = derive2 { name="cruts"; version="0.3"; sha256="0yn6xc2wg23nkjnsb7kii7dn897wf4ymnpmgppacrsznl8mmlmgd"; depends=[lubridate ncdf4 raster sp stringr]; }; cryst = derive2 { name="cryst"; version="0.1.0"; sha256="04da19dy3mkngd3ma44cd8cdkb5acjy9lbhfipa9flp339j1pp57"; depends=[flux pracma]; }; csSAM = derive2 { name="csSAM"; version="1.2.4"; sha256="1ms8w4v5m9cxs9amqyljc2hr1178cz6pbhmv7iiq9yj1ijnl4r1x"; depends=[]; }; csampling = derive2 { name="csampling"; version="1.2-2"; sha256="0gj85cgc3lgv7isqbkng4wgzg8gqcic89768q2p23k4jhhn6xm2w"; depends=[marg statmod survival]; }; cshapes = derive2 { name="cshapes"; version="0.6"; sha256="0mp6grkibmqk4k1yi4w2sglpp9ari5cfw4iip49a0z58qa98npw7"; depends=[maptools plyr sp]; }; - cslogistic = derive2 { name="cslogistic"; version="0.1-3"; sha256="1s8p3qpz81nn6zr0pzw6h9ca3p6ahd8zj640vy5gcb5waqwj6bfj"; depends=[mvtnorm]; }; csn = derive2 { name="csn"; version="1.1.3"; sha256="102w1qh9hgz4j9lh5hnbw1z3b7p034si73q4pkk564a2mhzlksw4"; depends=[mvtnorm]; }; csp = derive2 { name="csp"; version="0.1.0"; sha256="1pc5mcn9difpp4cmfb0a8pqhbpkfakxjkbr7bpqmfiwcfk8rzr1h"; depends=[]; }; csrplus = derive2 { name="csrplus"; version="1.03-0"; sha256="0kljndmiwblsvvdnxfywida9k0dmdwjq63d934l5yl6z7k4zd0xa"; depends=[sp]; }; @@ -4575,20 +4772,20 @@ in with self; { ctl = derive2 { name="ctl"; version="1.0.0-0"; sha256="12hrrql9wz43s1d3sfyzlqzx7ajrl3hvf96776ik6icbm8by8h6j"; depends=[MASS qtl]; }; ctmcd = derive2 { name="ctmcd"; version="1.1"; sha256="05r04bxd1n866rcizjgw1267ms8zdcpny3i1vycrk31ja953fs0a"; depends=[coda expm numDeriv Rcpp RcppArmadillo]; }; ctmcmove = derive2 { name="ctmcmove"; version="1.2.8"; sha256="16qi4y3ivcys2dfixm4vzyqbqbm2j1gc1l4bjrrp46c268qja2z3"; depends=[fda gdistance Matrix raster sp]; }; - ctmm = derive2 { name="ctmm"; version="0.3.5"; sha256="0lg3mrwdsphwj1c0r4655a1glk49p0y60rd1w11jvz16y6r6j59b"; depends=[expm manipulate MASS numDeriv pbivnorm raster rgdal scales]; }; + ctmm = derive2 { name="ctmm"; version="0.3.6"; sha256="0yi277hfnb5wygs4brxsha84j5jj7khplh5164xkpla1wy5f89q2"; depends=[bit64 data_table expm fasttime manipulate MASS Matrix numDeriv pbivnorm raster rgdal scales]; }; ctqr = derive2 { name="ctqr"; version="1.0"; sha256="1q4icv8qicgwr664cbrmkh2x9xmlrc80yvz8gnaqh86248kn4yp3"; depends=[pch survival]; }; - cts = derive2 { name="cts"; version="1.0-20"; sha256="0bsf52b98fji85j01qv0krc7yzr8mqhvn7w1zsy2rbanjmlwmnca"; depends=[]; }; - ctsem = derive2 { name="ctsem"; version="2.3.1"; sha256="0wgy0a39y7blmzynwqxq7vqi16rfrqcyy1hyzw1qwxfsgznpf1ws"; depends=[Matrix OpenMx plyr Rcpp rstan]; }; + cts = derive2 { name="cts"; version="1.0-21"; sha256="0wagxqb8msjc8z33qp7sc92l53f56d9bzz9160bmgpjxlj6cnqcj"; depends=[]; }; + ctsem = derive2 { name="ctsem"; version="2.4.0"; sha256="1rlbk7qwn3lbzzlfwdznfywp5nhwswgl6yj220sfxzjqwlcip9qw"; depends=[Matrix OpenMx plyr Rcpp rstan]; }; ctv = derive2 { name="ctv"; version="0.8-2"; sha256="0xpxxkn6x26vmdkd2hkn8afyn95q2yg4kl5i989dipqzxc47fbrv"; depends=[]; }; - cubature = derive2 { name="cubature"; version="1.3-6"; sha256="0ck9lrk39pnb3piz5dpgsbkbcppx7hq61c3hpjk5mcacgxnd8jvy"; depends=[Rcpp]; }; - cubfits = derive2 { name="cubfits"; version="0.1-2"; sha256="07phnpgag68ss08qyzhj2g1s084w0cc583a30i09c82ql9j3gbpk"; depends=[coda foreach]; }; + cubature = derive2 { name="cubature"; version="1.3-8"; sha256="0m0zs3rgxxzi6ihzchcrb5yy3xd2hc2zi1kxk3dic9mcjl44hfqp"; depends=[Rcpp]; }; + cubfits = derive2 { name="cubfits"; version="0.1-3"; sha256="0i2iybm9vpyqnahzka66yms1namdd36bz1i1yjy74qsc1h995rga"; depends=[coda foreach]; }; cudaBayesreg = derive2 { name="cudaBayesreg"; version="0.3-16"; sha256="1xsamdsg4cq7l5r7czkg70j5gypf1dak3h353xfbz3rq0r0dni19"; depends=[cudaBayesregData oro_nifti]; }; cudaBayesregData = derive2 { name="cudaBayesregData"; version="0.3-11"; sha256="1cls9xqgps7icjpi1mllkrksdxwc1jfhxgffvrcrqx2l16vw6qfx"; depends=[]; }; cudia = derive2 { name="cudia"; version="0.1"; sha256="1ms3bc8sp6l3bm75j418mmb707sy3gyvxznhfias3nd4sw7i074x"; depends=[MCMCpack mvtnorm]; }; cumSeg = derive2 { name="cumSeg"; version="1.1"; sha256="01hn3j1i7bi2r9vsqwbgy1f1alcisxyf4316xx57bg82lb34d0s5"; depends=[lars]; }; cumplyr = derive2 { name="cumplyr"; version="0.1-1"; sha256="07sz1wryl3kxbk67qyvnkrkdrp4virlsaia0y6rf9bqdw7rc6vi2"; depends=[]; }; cumstats = derive2 { name="cumstats"; version="1.0"; sha256="119w751z9dg6pjyk389pbl8ab8pirf9sqndi4nxi89ix2bby4xz8"; depends=[]; }; - curl = derive2 { name="curl"; version="2.5"; sha256="09p86i5f88gx1i7cidm1ka56g0jjkghqfam96p1jhwlh2fv6nrks"; depends=[]; }; + curl = derive2 { name="curl"; version="2.7"; sha256="1kd7gs2gf4pcgvca34d8cpb4bjdcb5k8zzypk85yndar7icymx3y"; depends=[]; }; currentSurvival = derive2 { name="currentSurvival"; version="1.0"; sha256="0bqpfwf4v4pb024a98qwg81m6zd7ljg1ps42ifhxpqx7b9gdyi6c"; depends=[cmprsk survival]; }; curry = derive2 { name="curry"; version="0.1.1"; sha256="1ps9hvbnb02m0b8hlw4admwbziyjvswj08ldi2dk3ymnrpawcc29"; depends=[]; }; curvHDR = derive2 { name="curvHDR"; version="1.2-0"; sha256="185097ikqhmqqc4ha7l74inx5cmg1bhgw3cw40wk0ngc4wv4sfqi"; depends=[feature geometry hdrcde KernSmooth ks misc3d ptinpoly rgl]; }; @@ -4614,20 +4811,21 @@ in with self; { cyphid = derive2 { name="cyphid"; version="1.1"; sha256="0ya9w8aw27n0mvvjvni4hxsr4xc8dd08pjxx7zkfl1ynfn5b08am"; depends=[fda]; }; cystiSim = derive2 { name="cystiSim"; version="0.1.0"; sha256="0pz8jxi4lgcwzrb4dh8xn63xhpaga5rzg5hwqicwv8isc16iqizd"; depends=[ggplot2 knitr magrittr]; }; cytoDiv = derive2 { name="cytoDiv"; version="0.5-3"; sha256="00c0gqgypywgbhavb15bvj6ijrk4b5zk86w85n9kwr4069b7jvwc"; depends=[GenKern plotrix]; }; + cytometree = derive2 { name="cytometree"; version="1.0.0"; sha256="1p2avx38cwm69ihr2wxqjf1225h53k8x9kc5axv8vwz17qdj9k2i"; depends=[ggplot2 igraph mclust Rcpp RcppArmadillo]; }; d3Network = derive2 { name="d3Network"; version="0.5.2.1"; sha256="1gh979z9wksyxxxdzlfzibn0ysvf6h1ij7vwpd55fvbwr308syaw"; depends=[plyr rjson whisker]; }; - d3Tree = derive2 { name="d3Tree"; version="0.1.0"; sha256="10nwssxx342d2hhr1iawd8p8jd273ywl3rlp7wm2cp7m73m2azil"; depends=[dplyr htmlwidgets magrittr plyr stringr]; }; + d3Tree = derive2 { name="d3Tree"; version="0.2.0"; sha256="0xjr36hdd00dy8s8z1a1s44dn2wg0nm6yqc1rri2l0dqrbh4nrbn"; depends=[dplyr htmlwidgets magrittr plyr stringr]; }; d3heatmap = derive2 { name="d3heatmap"; version="0.6.1.1"; sha256="0xx1lpp9qpkqh991ib0l9z1wn6j67jnggrhq5gr5sm63m7sjijwn"; depends=[base64enc dendextend htmlwidgets png scales]; }; - d3r = derive2 { name="d3r"; version="0.6.3"; sha256="0q0m3m97ban9aywwb37n0jbnd0sjy8132g4253nz713gawz11rav"; depends=[dplyr htmltools tidyr]; }; + d3r = derive2 { name="d3r"; version="0.6.6"; sha256="1snzkb2qjvhcbj9s8lvqqlzdf4nlqxiyl1vgcsdh9zsgzqbq8aix"; depends=[dplyr htmltools tidyr]; }; dChipIO = derive2 { name="dChipIO"; version="0.1.5"; sha256="1xrafw5h071d8rfqaic3gifc80jpiddjz5x6l2cr8kgjvph60gqh"; depends=[]; }; dCovTS = derive2 { name="dCovTS"; version="1.1"; sha256="1pd50nfmfcqpi8zj20ngl0hc23qa4rabqhc1xci3ivyhs0valhsl"; depends=[doParallel energy foreach]; }; - dGAselID = derive2 { name="dGAselID"; version="1.0"; sha256="0b8n2kkpyqia6kpmgdi93917xf23r9aya33030iyk2wn18642qdj"; depends=[ALL Biobase genefilter MLInterfaces]; }; - dHSIC = derive2 { name="dHSIC"; version="1.0"; sha256="1vyrfzgb0mjddy89jagf9zqkw18b83yn6v2amhb333vnd56644fk"; depends=[]; }; + dGAselID = derive2 { name="dGAselID"; version="1.1"; sha256="0aji6zwb201d59zdpvxxx09zfymznpv5m65wrdmm8spc5yrr72p2"; depends=[ALL Biobase genefilter MLInterfaces]; }; + dHSIC = derive2 { name="dHSIC"; version="1.1"; sha256="0ypsgl7cilq3pv1f6m4c1gb2q15k0r7q1a4kyv99dq6lbss1ydag"; depends=[]; }; dMod = derive2 { name="dMod"; version="0.3.2"; sha256="1m0rpq78h2vhgl07jsk94hf03zj42wjc08hi6q5lqj77czwpaxfg"; depends=[cOde ggplot2 stringr trust]; }; dSVA = derive2 { name="dSVA"; version="1.0"; sha256="0vy0flyg82x0n9vw6jf9f76qy84sp0wnis91faj37ac5hdv3pvsb"; depends=[sva]; }; dad = derive2 { name="dad"; version="2.0.0"; sha256="0s9x8h6d3vy0y9in54abcm7y80qnywxbyh5l8ds4sv35y6j5j4pz"; depends=[e1071 lattice]; }; dae = derive2 { name="dae"; version="2.7-20"; sha256="13nw3q0r17g1xsnnlggf4x6pd5ycg6vy34gy7pk5509mh0hfj38w"; depends=[ggplot2]; }; daewr = derive2 { name="daewr"; version="1.1-7"; sha256="01n9g3adjk66wx9lm9gl6wa3y9ba5w0w0p5ayj8rx5ywxnm8fnvi"; depends=[BsMD FrF2 lattice]; }; - daff = derive2 { name="daff"; version="0.2.0"; sha256="1yfydnfghh8943sa206jps55par4nzghqvd7xqi8xm0zimn0p7rn"; depends=[jsonlite V8]; }; + daff = derive2 { name="daff"; version="0.3.0"; sha256="1kl5pjwxds6bz58zd5xaa1hknd6f9i0512895fhljqi7kvsrldra"; depends=[jsonlite V8]; }; dafs = derive2 { name="dafs"; version="1.0-37"; sha256="1vdi57qaqdn39yf1ih2gzry02l289q4bffpksglsl4shs6bg2206"; depends=[s20x]; }; dagR = derive2 { name="dagR"; version="1.1.3"; sha256="13jyhwjvvrjjja18rqzfdcw9ck90qm5yjwd25nygxgdf1894y03b"; depends=[]; }; dagbag = derive2 { name="dagbag"; version="1.1"; sha256="1hpg7fs1yhnycziahscymkr0s3a2lyasfpj0cg677va73nrpdz12"; depends=[]; }; @@ -4636,31 +4834,40 @@ in with self; { dams = derive2 { name="dams"; version="0.2"; sha256="0hf5s8i61r5q4h3s8dfmdl3vkj7v15ha59pjvpjqx3yihsgziqz9"; depends=[RCurl]; }; darch = derive2 { name="darch"; version="0.12.0"; sha256="17nvxqxbbdv4qdallld5f2c6nhhszsz7ja04rhz5g3844s87bv2f"; depends=[caret futile_logger ggplot2 Rcpp reshape2]; }; darksky = derive2 { name="darksky"; version="1.0.0"; sha256="03vdzxz5wxwsjz08rg18zsmrg4n7dpgrrm70zrqa5pmyq1swhh2n"; depends=[dplyr ggplot2 gridExtra gtable httr]; }; + dartR = derive2 { name="dartR"; version="0.80"; sha256="1cp6dgxchyxd3qkfd23x940kgwhaz2dvyxbzbi82xrlzbh20g341"; depends=[adegenet ape data_table Demerelate directlabels doParallel foreach ggplot2 MASS misc3d pca3d pegas plyr quadprog reshape2 rgl seqinr SNPassoc SNPRelate stringr tidyr vegan]; }; darts = derive2 { name="darts"; version="1.0"; sha256="07i5349s335jaags352mdx8chf47ay41q7b0mh2xjwn2h9kzgqib"; depends=[]; }; dashboard = derive2 { name="dashboard"; version="0.1.0"; sha256="1znqwvz49r47lp6q48qaas0s63wclgybav82a247qvcavzns3kip"; depends=[Rook]; }; - dat = derive2 { name="dat"; version="0.1.0"; sha256="1gpanrwgj7qgp4r033qfpk0a3xjk4ww1fa1bz80k9g4a0dizlcw0"; depends=[aoos data_table dplyr Formula magrittr progress tibble]; }; + dat = derive2 { name="dat"; version="0.2.0"; sha256="19mhpw7lybbkklcr9s9i24ai6b08scxscijvjdawbi5zkbq3h85d"; depends=[aoos data_table dplyr Formula magrittr progress tibble]; }; data_table = derive2 { name="data.table"; version="1.10.4"; sha256="0ykbjr1x50ajxbri385vi3mnxj7zg1dcgh9y0snp341qmmmdypw6"; depends=[]; }; data_tree = derive2 { name="data.tree"; version="0.7.0"; sha256="0rgpapxsqnbzjcifnz3p41b6j8h9x2yfixr5ryd03v8vzgikyf9b"; depends=[DiagrammeR R6 stringr]; }; + data_world = derive2 { name="data.world"; version="1.1.1"; sha256="0kmlls8wicyfjxl27pajkagi4ps1s85rd7ywwfjfrkzkangy05xz"; depends=[dwapi httr ini]; }; dataMaid = derive2 { name="dataMaid"; version="0.9.2"; sha256="13wim5375vlhaba2gawjb7lykzfj4py89cdhip44xaq19agg5675"; depends=[ggplot2 gridExtra haven pander rmarkdown robustbase]; }; + dataMeta = derive2 { name="dataMeta"; version="0.1.0"; sha256="00959s531arjhrrx9xs5rdshqkdy85gpscchx2gqsapb1jffmpz2"; depends=[dplyr]; }; dataQualityR = derive2 { name="dataQualityR"; version="1.0"; sha256="0f2410sd6kldv7zkqsmbz1js0p5iq7zwlnfwmmnlbrd303p35p3j"; depends=[]; }; - dataRetrieval = derive2 { name="dataRetrieval"; version="2.6.3"; sha256="1bgjn5j0kcd9ysi12pyqygv96vcd0ld67ika9z46lcx9n99zq35d"; depends=[curl dplyr httr lubridate readr reshape2 xml2]; }; + dataRetrieval = derive2 { name="dataRetrieval"; version="2.7.2"; sha256="1c830qwvmh5xw2iw79s0pjnli4zw3r5kf2acx7nllxbj1wkmbpgd"; depends=[curl dplyr httr jsonlite lubridate readr reshape2 xml2]; }; datacheck = derive2 { name="datacheck"; version="1.2.2"; sha256="1i3n5g1b6ix8gpn4c74s7ll1dbrllrzgpb1f3hk449d6p4kmisq6"; depends=[Hmisc shiny stringr]; }; datacheckr = derive2 { name="datacheckr"; version="0.2.0"; sha256="1kk38pb4dsy6ll6drz2gsngzsv81pwmjrbvh3izm22h849mvlypv"; depends=[]; }; + datadogr = derive2 { name="datadogr"; version="0.1.0"; sha256="0rib7r8ih2z7f4anq9nkyls743rlig4yjb3vdyxs4cdmw96k14gl"; depends=[anytime dplyr glue httr lubridate purrr stringr tibble tidyr]; }; datadr = derive2 { name="datadr"; version="0.8.6"; sha256="0fmywnxcvw31vfb9iaxqiw19ycnd98v41pdsdknabysr7fpnygfq"; depends=[codetools data_table digest dplyr hexbin magrittr]; }; dataframes2xls = derive2 { name="dataframes2xls"; version="0.4.7"; sha256="10krlv0l5w021z0qd7rj93pzfjjmcjlda4xz4vq470bxbjmn1bss"; depends=[]; }; + datafsm = derive2 { name="datafsm"; version="0.2.0"; sha256="0s4pcxhdiskq6pm1v5w520vc315qa5nij5av1i720800675k9j1n"; depends=[caret GA Rcpp]; }; datamap = derive2 { name="datamap"; version="0.1-1"; sha256="0qm4zb9ldg4wz1a7paj5ilr1dhyagq81rk9l2v43hmkv52sssgkv"; depends=[DBI]; }; datamart = derive2 { name="datamart"; version="0.5.2"; sha256="0c0l157fzkcp30ch4ymaalcx18zhz6sa5srr50w9izhbx3pmldxp"; depends=[base64 gsubfn markdown RCurl RJSONIO XML]; }; - dataonderivatives = derive2 { name="dataonderivatives"; version="0.2.1"; sha256="0hlvnnn3gs73m6gryr6ngmd9sdlamwmdmac3fawbbyna2if5b77n"; depends=[assertthat downloader dplyr httr jsonlite lubridate readr]; }; + dataonderivatives = derive2 { name="dataonderivatives"; version="0.3.0"; sha256="17588r2b528ylchdh8aa1k7q7w7wc3f2mxixif8j6snzpwsvwpzc"; depends=[assertthat httr lubridate readr tibble]; }; dataone = derive2 { name="dataone"; version="2.0.1"; sha256="0n1c87wb15q7ysz0q5r69g57hk0vpd66m0w9wjbcjlyfn8whqa08"; depends=[base64enc datapack hash httr jsonlite parsedate plyr stringr uuid XML]; }; datapack = derive2 { name="datapack"; version="1.2.0"; sha256="1pyl52r6lbwvr96k8qjnz16l1v3hw80jcbh2ciaa9sld42ds6kgq"; depends=[digest hash redland uuid XML]; }; datapasta = derive2 { name="datapasta"; version="2.0.0"; sha256="100nqw315xdzxpzn1gmx4881zli4lwzwckdvqjciysv4l5gvzzfm"; depends=[clipr readr rstudioapi]; }; datarobot = derive2 { name="datarobot"; version="2.6.0"; sha256="1dnps3hdyz468i7jx2idary2dbphyy6j178n8ba37dvjf5pnhnbw"; depends=[httr jsonlite yaml]; }; - dataseries = derive2 { name="dataseries"; version="0.1.0"; sha256="1z2hvksk9c9rnwi0r2i61sbkiwk3g2q8knxh08w6wkj9864payhw"; depends=[]; }; + datasauRus = derive2 { name="datasauRus"; version="0.1.2"; sha256="1ixfc1v0iv5jb4920957xhpq9kchdy482vdsm51wj1961ldrkhvh"; depends=[]; }; + dataseries = derive2 { name="dataseries"; version="0.2.0"; sha256="11wc2p5m8qbdmkpbd21lpwl28a1dpab88c3gqyrhsn0298lpnip4"; depends=[]; }; datasets_load = derive2 { name="datasets.load"; version="0.1.0"; sha256="029rxg0h17nszkxgq5kjd0njymb8pgdsabmz5slshzd2ijjh82jz"; depends=[DT miniUI shiny]; }; datastepr = derive2 { name="datastepr"; version="0.0.2"; sha256="039yggdj8jdici7hwmkjwgix45lvwjl7rw5h2rfzsm9xaq6vw1z2"; depends=[dplyr lazyeval magrittr R6 tibble]; }; + datasus = derive2 { name="datasus"; version="0.1.0"; sha256="0i6393fdiaqcraly2zsvqw9pqlijgkifw32havnvx4549gqa77ch"; depends=[dplyr httr magrittr RCurl readr rvest stringi stringr xml2]; }; datautils = derive2 { name="datautils"; version="0.1.5"; sha256="1yy25a84zmfh54jvxwa7mv4j296rmjgd40m4p81mrsswlqvncmfn"; depends=[deldir gplots gtools]; }; + dataverse = derive2 { name="dataverse"; version="0.2.0"; sha256="0lyga8rdsir2yr1n9nr10iiaf6a7dxp1nb04bx8mq8ljrvpkgr8n"; depends=[httr jsonlite xml2]; }; dataview = derive2 { name="dataview"; version="2.1.1"; sha256="1nn33h5c1h4a3zm1xm7sdz4s6sy0f3r53jhm7bv6qk7aiylwqf6v"; depends=[data_table xtermStyle]; }; date = derive2 { name="date"; version="1.2-37"; sha256="0321kqvpy5cvl8hmm6pd0pyjpi30glm8hvw60mrql6y28sn6pqhl"; depends=[]; }; + datetime = derive2 { name="datetime"; version="0.1.2"; sha256="0qbd1makidkbpr26wkxchnb8rpwzm4l42j4vipwwmfwv3gpslmjx"; depends=[]; }; dave = derive2 { name="dave"; version="1.5"; sha256="0sw9hc4y9wdfbnnk6isg7z7sky6ni68pkjxdlrph5m7jcyqphz96"; depends=[labdsv vegan]; }; dawai = derive2 { name="dawai"; version="1.2.1"; sha256="0i0vgd4kia2hgx88rjdyi0y8hikzii4mwgal46c9iiqb6gmf8vrj"; depends=[boot ibdreg mvtnorm]; }; dbConnect = derive2 { name="dbConnect"; version="1.0"; sha256="1vab5l4cah5vgq6a1b9ywx7abwlsk0kjx8vb3ha03hylcx546w42"; depends=[gWidgets RMySQL]; }; @@ -4671,6 +4878,7 @@ in with self; { dbhydroR = derive2 { name="dbhydroR"; version="0.2-2"; sha256="06m1llg1il0v4v8yi62z26hglzrhzw009y81xpb9zaphcviqp2qr"; depends=[httr reshape2 XML]; }; dblcens = derive2 { name="dblcens"; version="1.1.7"; sha256="02639vyaqg7jpxih8cljc8snijb78bb084f4j3ns6byd09xbdwcw"; depends=[]; }; dbmss = derive2 { name="dbmss"; version="2.4-0"; sha256="0rxldlyrwfbpmvgmqzmzifflnc7hv2dv62fmhqihvac7ya1h2rx8"; depends=[cubature Rcpp RcppParallel spatstat spatstat_utils]; }; + dbplyr = derive2 { name="dbplyr"; version="1.1.0"; sha256="17gn8vr4a6m9ynarjbm9xsrhcvgn5lnxhb2qhiiglmhh5mm4a7kv"; depends=[assertthat DBI dplyr glue purrr R6 rlang tibble]; }; dbscan = derive2 { name="dbscan"; version="1.1-1"; sha256="09rh3x4g3xv5f1p8wbc847z8khj7v2r5vz9yf1lfdiy23q2w3xp1"; depends=[Rcpp]; }; dbstats = derive2 { name="dbstats"; version="1.0.4"; sha256="1miba5h5hkpb79kv9v9hqb5p66sinxpqvrw9hy9l5z4li6849yy1"; depends=[cluster pls]; }; dc3net = derive2 { name="dc3net"; version="1.2.0"; sha256="19ibsvbnq6y88vqvgkm31zrqwjhpml59d792bz0zkk50r1q5bnyr"; depends=[c3net igraph RedeR]; }; @@ -4683,7 +4891,7 @@ in with self; { ddR = derive2 { name="ddR"; version="0.1.2"; sha256="00mb9xq69dvl50v5429nw0mjazgjwh2sp98w8n2cwhhamjgp42k9"; depends=[Rcpp]; }; ddalpha = derive2 { name="ddalpha"; version="1.2.1"; sha256="0nsd515x6bap1qpfyx141hyldmpmyasnhv0f8s9dj6zcklp89af4"; depends=[BH class MASS Rcpp robustbase]; }; ddeploy = derive2 { name="ddeploy"; version="1.0.4"; sha256="06s4mn93sl33gldda9qab8l3nqig8zq0fh1s2f98igsysmn31br5"; depends=[httr jsonlite]; }; - ddpcr = derive2 { name="ddpcr"; version="1.6"; sha256="1jwrggj9cbq31z8qcfhfm3zb4z7jir8kkmjg7yqs5nmpl41pv5jn"; depends=[dplyr DT ggplot2 lazyeval magrittr mixtools plyr readr shiny shinyjs]; }; + ddpcr = derive2 { name="ddpcr"; version="1.8"; sha256="11bk4mhiqn73sjji2wz47v7jqqg9kq3amci9m6a88h4fvvgmpcz4"; depends=[dplyr DT ggplot2 lazyeval magrittr mixtools plyr readr shiny shinyjs]; }; ddst = derive2 { name="ddst"; version="1.4"; sha256="1y0immm337adkd2bjx8c5pf02w9wysv3gj26f4qf0jiba0f2wk8n"; depends=[evd orthopolynom]; }; deBInfer = derive2 { name="deBInfer"; version="0.4.1"; sha256="05khyjpyxwrm9q8jsysffgsjpjbw76w9rrl7i8ia0yc9lv0bzjc9"; depends=[coda deSolve MASS mvtnorm PBSddesolve plyr RColorBrewer truncdist]; }; deSolve = derive2 { name="deSolve"; version="1.14"; sha256="1c4yv5xjk36xwjs0ywxfas1f2xcg05ppf4380s0l3k7gl7vx44g4"; depends=[]; }; @@ -4702,22 +4910,22 @@ in with self; { deconstructSigs = derive2 { name="deconstructSigs"; version="1.8.0"; sha256="014x0nb23jb98666kaav2phkvmkr38pi38jv0dqd4jv7zp0gdf1a"; depends=[BSgenome BSgenome_Hsapiens_UCSC_hg19 GenomeInfoDb reshape2]; }; deconvolveR = derive2 { name="deconvolveR"; version="1.0-3"; sha256="1b6ghds0mj9nv4nypfx0w6sm6q9k83mbprk546ird3pza6ncjqbi"; depends=[]; }; deducorrect = derive2 { name="deducorrect"; version="1.3.7"; sha256="10lvhdnnc6xiy20hy6s5rpqcvilj8x0y6sn92rfjkdbfsl00sslp"; depends=[editrules]; }; - deductive = derive2 { name="deductive"; version="0.1.1"; sha256="09illy2zxbn7xi3vl4m0d40h1dsci3qfwhyd3wqdkb89grbysacq"; depends=[lintools stringdist validate]; }; + deductive = derive2 { name="deductive"; version="0.1.2"; sha256="1lz849p0if16877gndkxh7khx1rdvaayhps6khypayddajjr1njq"; depends=[lintools stringdist validate]; }; deepboost = derive2 { name="deepboost"; version="0.1.5"; sha256="1varzk3dlsxl8y1p4cblw3ivk5h088agsxar02jbl9hs3r6pj17l"; depends=[Rcpp]; }; deepnet = derive2 { name="deepnet"; version="0.2"; sha256="09crwiq12wzwvdp3yxhc40vdh7hsnm4smqamnk4i6hli11ca90h4"; depends=[]; }; deformula = derive2 { name="deformula"; version="0.1.1"; sha256="0h85yzl8kvjwrn1mkzyblvknf7gg8kx8y85qnvkwfbr9ik42ngn1"; depends=[]; }; degenes = derive2 { name="degenes"; version="1.1"; sha256="1xxn5j06qizywimrp1pl8z3yjdy1a167b9jnm77gmv87rp6j240c"; depends=[]; }; degreenet = derive2 { name="degreenet"; version="1.3-1"; sha256="0k0a1c1bv7zclrarfzf0d6avbd8zjnc3zd155jzmhi8dacr6r73w"; depends=[igraph network]; }; - deldir = derive2 { name="deldir"; version="0.1-12"; sha256="1fzjcvalwhqyx2a0xcyvrxpi36av7x609cx3zalww19bm2xyr9mg"; depends=[]; }; + deldir = derive2 { name="deldir"; version="0.1-14"; sha256="12cjr4r50rdrh2l0105cvd42rqwzsmmiqcax3sbqk1ggh2lnblw9"; depends=[]; }; delt = derive2 { name="delt"; version="0.8.2"; sha256="06g03wy9r2qvly0lnv5fv4k366mhlk56qkvak0xaxy99p1i34kmv"; depends=[denpro]; }; deltaPlotR = derive2 { name="deltaPlotR"; version="1.5"; sha256="0hbaibl4b50pg9ypyhz4700w6kir4jiyyl0230a8hjmb92aqn303"; depends=[MASS]; }; demi = derive2 { name="demi"; version="1.1.2"; sha256="04dq4db9ibvv91nm0gz8dfbgv1gpmalf9hv6i78dwhh1xzjg1mig"; depends=[affxparser affy devtools oligo plyr R_utils]; }; deming = derive2 { name="deming"; version="1.0-1"; sha256="00v59qb6qwbwsvcwi59d0c0g3czfz1190ccj4dx6yarizr4g6cy8"; depends=[boot]; }; demoKde = derive2 { name="demoKde"; version="0.9-4"; sha256="0p4v808m42wbv8ibdfqzm43cbbg0yl452wnm1mzqq2n37z6yljkr"; depends=[]; }; demogR = derive2 { name="demogR"; version="0.5.0"; sha256="1y7pkf1m8fqjsvs0szyaqga2y7p3dvj0r85nz8nzqbmy4zrrv4w8"; depends=[]; }; - demography = derive2 { name="demography"; version="1.19"; sha256="08cfvsvv6ayxy93vihavyb3lddgwfdlwrb2x4is5fxids79lpm9x"; depends=[cobs forecast ftsa mgcv rainbow RCurl strucchange]; }; + demography = derive2 { name="demography"; version="1.20"; sha256="097k0chs8shm1r9ny6jdx2kp2shyxsivjw1n1rhb3bs0m0l3vm9r"; depends=[cobs forecast ftsa mgcv rainbow RCurl strucchange]; }; dendextend = derive2 { name="dendextend"; version="1.5.2"; sha256="04jz58apibfrkjcrdmw2hmsav6qpb5cs6qdai81k1v1iznfcya42"; depends=[fpc ggplot2 magrittr viridis whisker]; }; - dendroextras = derive2 { name="dendroextras"; version="0.2.1"; sha256="0k1w374r4fvfcbzhrgcvklccjggyz755z7wc2vqfi3c5hvdb9ns4"; depends=[]; }; + dendroextras = derive2 { name="dendroextras"; version="0.2.2"; sha256="1a42g29w9dvmwrfd244a8ixak6asbkqhzmggl0c4j5fkrp74fpll"; depends=[]; }; dendrometeR = derive2 { name="dendrometeR"; version="1.0.0"; sha256="1par27ipgbfbrmdlwvkf82i5dgnfrcawmavakrf8lplin2hhb7gs"; depends=[forecast pspline zoo]; }; dendsort = derive2 { name="dendsort"; version="0.3.3"; sha256="1m4qh79ppfvipmbi8m8vwq0hqmwwipbg5izihz5j6x8a4g5i6iym"; depends=[]; }; denoiseR = derive2 { name="denoiseR"; version="1.0"; sha256="094nknr3hyx4kv18vnpdzrcpmfb4r7x9jgrp3p6x4nwrgzdh3r95"; depends=[FactoMineR irlba Matrix]; }; @@ -4727,7 +4935,7 @@ in with self; { densityClust = derive2 { name="densityClust"; version="0.2.1"; sha256="0blq6h6x071bcy3shr77b3bwq1im0013vbg7gckdhljm859n07bh"; depends=[Rcpp]; }; densratio = derive2 { name="densratio"; version="0.0.3"; sha256="07da5spbzr8x7sv6pdknc64a5zhs3dgnpcx4s2v68vc31xsd0gqd"; depends=[]; }; denstrip = derive2 { name="denstrip"; version="1.5.3"; sha256="10h8ivs7nd6gkf93zvqzqjb1lzfabvvs182636m67f86jfn6d4y4"; depends=[]; }; - depend_truncation = derive2 { name="depend.truncation"; version="2.5"; sha256="0g9p7a6p15shd1cl5rwxzi2m5llmj22hk94f2d9g693j3gccfzfa"; depends=[mvtnorm]; }; + depend_truncation = derive2 { name="depend.truncation"; version="2.6"; sha256="0m51kz4d7mng08jarwklfjaxf4baxidq41fhsngcn14ply520y2b"; depends=[mvtnorm]; }; depmix = derive2 { name="depmix"; version="0.9.14"; sha256="12mvsd9zab55yg02r309h5i7hldwhh3bd60bzcvwip8vsmym5611"; depends=[MASS]; }; depmixS4 = derive2 { name="depmixS4"; version="1.3-3"; sha256="0ls30v59hzyd684w4a3aygq1i5m8iq4gxsh8mmjxdq8qx0v84hk2"; depends=[MASS nnet Rsolnp]; }; depth = derive2 { name="depth"; version="2.1-1"; sha256="17fxv4a5fbb65p7kmb4iakik5ng6401y7gmknkfr66fmjq65i1sm"; depends=[abind circular rgl]; }; @@ -4736,56 +4944,64 @@ in with self; { dequer = derive2 { name="dequer"; version="2.0-0"; sha256="1cvc201g6jc0y09vccswsvvwlmxi7w8raffpald4b3pin10zfr6q"; depends=[]; }; derivmkts = derive2 { name="derivmkts"; version="0.2.2"; sha256="00bcffqzzsm2h4gfwri772q8i7h40xhv07wl8xj682fnlk246ggs"; depends=[mnormt]; }; desc = derive2 { name="desc"; version="1.1.0"; sha256="0mc1jmiwqyj7s6gzxz6fyamzjpmdn3rpfpllby2fq11ml30c6jpr"; depends=[assertthat crayon R6 rprojroot]; }; - descomponer = derive2 { name="descomponer"; version="1.2"; sha256="08hc3p4l8dy1h2z8ijifwlgidmac9b29g1k725yzwzbdr5jzvnzl"; depends=[taRifx]; }; + descomponer = derive2 { name="descomponer"; version="1.3"; sha256="0bn8h7z1swj1sia1kj46k9z8xvb4vkk7bfngjd5pnvsi05h4a5ya"; depends=[taRifx]; }; descr = derive2 { name="descr"; version="1.1.3"; sha256="0fp91gbxxxvn2hqdyddhb3x85031wgq7gnqrhzjr956prlv086r6"; depends=[xtable]; }; describer = derive2 { name="describer"; version="0.2.0"; sha256="1pjyihmn4gkaamixsc3qwynsc02pwv9bgn6s7z7acmmsybhhs6xn"; depends=[]; }; - descriptr = derive2 { name="descriptr"; version="0.1.0"; sha256="11fq98zpzvjgzihh4431javsznvhqgfrhf86m33j6fnxh3gg4d0z"; depends=[dplyr magrittr]; }; + descriptr = derive2 { name="descriptr"; version="0.1.1"; sha256="19ppyd9hhhg8s90vd2ldcf2wrr5haanqiycwfcmyrvaddc72i3mv"; depends=[dplyr magrittr]; }; + desctable = derive2 { name="desctable"; version="0.1.0"; sha256="002x4zjrcjz0xxh924z00rka1c61ldrj6lypakkf3p4hbwid6j30"; depends=[dplyr DT htmltools pander purrr]; }; deseasonalize = derive2 { name="deseasonalize"; version="1.35"; sha256="1fjsa7g34dckjs6mx9b10m99byxagggm0p9pw2f1vmpjqlasin0l"; depends=[FitAR lattice]; }; desiR = derive2 { name="desiR"; version="1.2.1"; sha256="0ghcv96bbwn74mka4dpf2lkpnlikjn3q6lx2sl8bbw77nriap0n6"; depends=[]; }; designGG = derive2 { name="designGG"; version="1.1"; sha256="1x043j36llwd7kd4skbpl2smz2ybsxjqf5yd1xwqmardq60gdv2w"; depends=[]; }; designGLMM = derive2 { name="designGLMM"; version="0.1.0"; sha256="0ya246mqclkhg8cq6f5mzqn67qks22f3fribyjcvhrx395n0f21v"; depends=[]; }; - designmatch = derive2 { name="designmatch"; version="0.2.0"; sha256="1l6504yfrlx24n7r0dd6g66rzjg35yz3s4niyg25mc8biwqags6y"; depends=[lattice MASS Rglpk slam]; }; + designmatch = derive2 { name="designmatch"; version="0.3.0"; sha256="1i8xdc6z01x59gvxdmi6qjqwqi8s9zzgfaxwd7xj49r4cl6h81pd"; depends=[lattice MASS Rglpk slam]; }; desirability = derive2 { name="desirability"; version="2.1"; sha256="094gxvp6a60lfcc0a0gk9rv1p6ajnzq9m58sy8cvhcj5337g4fmk"; depends=[]; }; desire = derive2 { name="desire"; version="1.0.7"; sha256="0jmj644nj6ck0gsk7c30af9wbg3asf0pqv1fny98irndqv508kf6"; depends=[loglognorm]; }; desplot = derive2 { name="desplot"; version="1.1"; sha256="0lqamq90hajrz43crych8a1k5m645ljhy1rmxjk9vyl4hwrbk5dc"; depends=[lattice reshape2]; }; detect = derive2 { name="detect"; version="0.4-0"; sha256="119kvkgpgd12v31ps1bg5dmc9djkaqzls548nlrvn1pbmahfnfx5"; depends=[Formula pbapply]; }; detector = derive2 { name="detector"; version="0.1.0"; sha256="010i063b94hzx7qac8gpl67gmk7hzgqm9i1c7pbbw4la3wcd9lz7"; depends=[stringr]; }; detrendeR = derive2 { name="detrendeR"; version="1.0.4"; sha256="1z10gf6mgqybb9ml6z3drq65n7g28h2pqpilc2h84l6y76sy909c"; depends=[dplR]; }; - detzrcr = derive2 { name="detzrcr"; version="0.1.3"; sha256="1j0x3175d0fllf0f4csgdi86p69ichk5wvhr5nbyzga3f034c87h"; depends=[ggplot2 MASS shiny]; }; - devEMF = derive2 { name="devEMF"; version="3.4"; sha256="1h95hdjasmb3imvkcrlq48mckaq9wkcxk8gvq13sra91lrv9cgjz"; depends=[]; }; - devRate = derive2 { name="devRate"; version="0.1.1"; sha256="088i9m9ys59p2a961183ac2w6wa0idb4xvyfnxqz9rpiins8d0bg"; depends=[]; }; - devtools = derive2 { name="devtools"; version="1.12.0"; sha256="1m5g6xnq7r4s3a0nlpa88fp5x6c8nl5icnp4869y5zwdk2ijqgla"; depends=[digest git2r httr jsonlite memoise rstudioapi whisker withr]; }; + detzrcr = derive2 { name="detzrcr"; version="0.2.0"; sha256="10868k4vmc5n8y0xx123klp7hz6fnycsssg9nnq3nm1z36fmgcb7"; depends=[ggplot2 MASS shiny]; }; + devEMF = derive2 { name="devEMF"; version="3.5"; sha256="1d197v5lgdsb074i2y441d2yzbcm7ik3m6nxxipq1m0nl0d6kdp7"; depends=[]; }; + devRate = derive2 { name="devRate"; version="0.1.2"; sha256="1x6gp12r9iajvj9lmdmqia077r40n79gdbrppbpijb3rgxs03d4b"; depends=[]; }; + devtools = derive2 { name="devtools"; version="1.13.2"; sha256="08ajsr12wd31lsx3jv5l9mq4063dc5fpr9lcnzra6kl59vi5pa7v"; depends=[digest git2r httr jsonlite memoise rstudioapi whisker withr]; }; dexter = derive2 { name="dexter"; version="0.1.7"; sha256="1bpj6izqgp4mi9h4kpm9xhnm8h6j9lvdizr31w51ljs8lkphzpwd"; depends=[colorspace plyr reshape2 RSQLite]; }; df2json = derive2 { name="df2json"; version="0.0.2"; sha256="10m7xn7rm4aql1bzpckjcx5kvdw44m1pxgzqkgkd40lzqb1cwk18"; depends=[rjson]; }; - dfcomb = derive2 { name="dfcomb"; version="2.2"; sha256="1a7z7c2shmmnfgrdmwph2b3xa7r05c1x1nrhjvbl5fljcvlwg7q9"; depends=[BH Rcpp RcppArmadillo RcppProgress]; }; + dfCompare = derive2 { name="dfCompare"; version="1.0.0"; sha256="1lhx69j0bkjbnp5jz23hrbxjcf04vf3big4k593ixz003xs2077f"; depends=[]; }; + dfcomb = derive2 { name="dfcomb"; version="2.3"; sha256="0bgbjqv15y0wv48zzkc8pssyadcbrqy1chddiq3l91499kcw9ya6"; depends=[BH Rcpp RcppArmadillo RcppProgress]; }; dfcrm = derive2 { name="dfcrm"; version="0.2-2"; sha256="1kwgxfqnz2bcicyb27lp6bnvrj30lqjpn5fg7kaqshgkj53g0s4f"; depends=[]; }; dfexplore = derive2 { name="dfexplore"; version="0.2.1"; sha256="04nbhn59l1kas26nwj4qflkjvvr33sj1mm7zg7fhvya85gvlhrbf"; depends=[ggplot2]; }; - dfmta = derive2 { name="dfmta"; version="1.4"; sha256="0ihn5hdg2drvfzf9l8ybsry466m1gym4y99217swg17jn8m6z6r0"; depends=[BH Rcpp RcppArmadillo RcppProgress]; }; + dfmta = derive2 { name="dfmta"; version="1.5"; sha256="1npa7hvcaimhjp31hbvwj1xhriryghwny3nnnp7vpvmy54i7hx84"; depends=[BH Rcpp RcppArmadillo RcppProgress]; }; dfoptim = derive2 { name="dfoptim"; version="2016.7-1"; sha256="1hs0ln5iz3h1x1b27jai83r3gad6698zwhr2jgpviiv9zwhic8c2"; depends=[]; }; dfphase1 = derive2 { name="dfphase1"; version="1.1.1"; sha256="0bk4bl5lqd7m4mzk6kg71fmh918wcy85zghr3lyayxlk30fl4ppc"; depends=[lattice Rcpp robustbase]; }; - dfpk = derive2 { name="dfpk"; version="2.1.0"; sha256="0favm57farip4kp8ywy2ps446pkv5mp6ydiyxvn7pix7rv2ww5rl"; depends=[BH dfcrm ggplot2 Rcpp RcppEigen rstan StanHeaders]; }; + dfpk = derive2 { name="dfpk"; version="3.3.0"; sha256="003bpj65rxbf8m3sa5npw1f5n0zaaamjr125pslmgwf8043wyf3k"; depends=[BH dfcrm ggplot2 PK Rcpp RcppEigen rstan StanHeaders]; }; dga = derive2 { name="dga"; version="1.2"; sha256="13mfampnghcs5xplzq69bw948lqhw561pn54j3gb0ydsg5bm5vmr"; depends=[chron]; }; - dggridR = derive2 { name="dggridR"; version="0.1.11"; sha256="179pi20rs0mp5aqydhw34wczrkyavndaaccjr017gp456gza1a83"; depends=[dplyr ggplot2 rgdal]; }; + dggridR = derive2 { name="dggridR"; version="1.0.1"; sha256="0pjd7q7zbsbv6xrjxchfzqvq0qr459lqkjd854kprcp6kmsxsbzd"; depends=[dplyr ggplot2 rgdal]; }; dglars = derive2 { name="dglars"; version="2.0.0"; sha256="0nhljv02cfsna4d220nhla4fs84hr30qs9j32mml0brnmazyjj0n"; depends=[Matrix]; }; dglm = derive2 { name="dglm"; version="1.8.3"; sha256="0vj4vddqcrjzgqsi6zsxm22gj5pa5dm50wcxip4vi8kbwxaahnaj"; depends=[statmod]; }; dgmb = derive2 { name="dgmb"; version="1.2"; sha256="1r5md917wipx78n63x87fpvsc3h87c68cpacrrs9dhss199p1a5k"; depends=[abind MASS]; }; + dgo = derive2 { name="dgo"; version="0.2.10"; sha256="14gs55ppkimxqz70mb8g77r3zvwzmqkgi8w3fpfkpanwxykafnd5"; depends=[assertthat data_table dgodata ggplot2 lubridate R6 rstan survey]; }; dgodata = derive2 { name="dgodata"; version="0.0.2"; sha256="03cyiig8pn7fdkrkrd29cwy5g63bp57bpl9jmdxfi03smngzbz0m"; depends=[]; }; dgof = derive2 { name="dgof"; version="1.2"; sha256="02qnb3i131hx05k8l5n3xbl5sqmmc2fh19bsgcacgj8ixs4wyjvi"; depends=[]; }; dhga = derive2 { name="dhga"; version="0.1"; sha256="1n48irj53g3kn451ak5ly50wxdn7qmzi2kib8clsvcx2n7mvpgcm"; depends=[VennDiagram]; }; - dhglm = derive2 { name="dhglm"; version="1.6"; sha256="0xb9kn87zv4xc9rwq0w6hxsc47vhdx59akjp4nv1ffz69y03h5wv"; depends=[boot MASS Matrix numDeriv]; }; - diagis = derive2 { name="diagis"; version="0.1.0"; sha256="12k4z0j5nmacy8ddi8ddyn8fabg6k728hms6x1sjnghr2wwns5cw"; depends=[ggplot2 gridExtra Rcpp RcppArmadillo]; }; + dhglm = derive2 { name="dhglm"; version="1.7"; sha256="09wasgvjw0xc9k68m6a8lx372p2hywk4j6ikr9wjjjfl6f17j1cw"; depends=[boot MASS Matrix numDeriv]; }; + di = derive2 { name="di"; version="1.0.0"; sha256="0lccp4xzmnj24zvwya6vw2d429b9q5rp6vfby0k3rqljgzyy6rgk"; depends=[scales]; }; + diagis = derive2 { name="diagis"; version="0.1.2"; sha256="03mq94mx28xkspxs73c4xvm0d81wzf116fifakv4l0gpnpv21xkz"; depends=[coda ggplot2 gridExtra Rcpp RcppArmadillo]; }; diagonals = derive2 { name="diagonals"; version="0.4.0"; sha256="03n6lm0hkgylswgj1qlgrjigm7basl5frip99mxx19mvaqa3bhqy"; depends=[]; }; diagram = derive2 { name="diagram"; version="1.6.3"; sha256="1iga574r31hz7g50nmicbah4rj4l46w6lgw3sz1b69iv6hpp7sq1"; depends=[shape]; }; diaplt = derive2 { name="diaplt"; version="1.2.1"; sha256="0pya6rqzsvc5nd3smhydvabarglc4nn04q605vbllmbhq9rv00pa"; depends=[]; }; dice = derive2 { name="dice"; version="1.2"; sha256="0gic7lqnsdmwv3dbzwwmcwdfyfqlq8kpr2pciqphd1j2ligzwl3s"; depends=[gtools]; }; + diceR = derive2 { name="diceR"; version="0.1.0"; sha256="17a8p0p6cirzp533s6cjib0z7rwxhdpmsngm0pwgpxbvd7hwaa1a"; depends=[abind apcluster assertthat blockcluster caret class clue cluster clusterCrit clValid dplyr flux ggplot2 gplots Hmisc infotheo kernlab klaR magrittr mclust NMF purrr quantable RankAggreg RColorBrewer Rcpp sigclust tidyr]; }; dichromat = derive2 { name="dichromat"; version="2.0-0"; sha256="1l8db1nk29ccqg3mkbafvfiw0775iq4gapysf88xq2zp6spiw59i"; depends=[]; }; dicionariosIBGE = derive2 { name="dicionariosIBGE"; version="1.6"; sha256="1rss1ydhcn6sma2lmlpq6s0h3dglwc20w499x1jzkcjnzc1rc7gl"; depends=[]; }; + didrooRFM = derive2 { name="didrooRFM"; version="1.0.0"; sha256="12clfnbm56jwldw0afb0nb0argnd97mx7369jiywhxy0p4xqibqq"; depends=[dplyr]; }; dielectric = derive2 { name="dielectric"; version="0.2.3"; sha256="1p1c0w7a67zxp1cb99yinylk5r1v89mmpfybcy94ydydhydbhivk"; depends=[]; }; diezeit = derive2 { name="diezeit"; version="0.1-0"; sha256="0rq1k08byvqn99wpql7drnrcxlzcqrcxixh7bczbc8dv1hhsgk9i"; depends=[brew httr jsonlite]; }; - difNLR = derive2 { name="difNLR"; version="1.0.0"; sha256="123r6r3n90x87p2pzsfbrcmfqjv4vb9jm0s4bq6byk1pbhsrw2ah"; depends=[CTT ggplot2 nnet reshape2]; }; + difNLR = derive2 { name="difNLR"; version="1.0.3"; sha256="0wdlkrrwxmdqddbv8g8bjwkjybpp0zqf27dxiwav3w5yacdib3pw"; depends=[CTT ggplot2 nnet reshape2]; }; difR = derive2 { name="difR"; version="4.7"; sha256="17i8l4z7dw8nfr4b5pc72l1qm7byjcflh58kasafx9kxyvfgz258"; depends=[lme4 ltm]; }; + difconet = derive2 { name="difconet"; version="1.0-4"; sha256="0cjadi4mnpfmy18vyp0dw55mnhs0zddf51w59gvq6gszk145z3bq"; depends=[data_table gplots mvtnorm stringr]; }; diffEq = derive2 { name="diffEq"; version="1.0-1"; sha256="1xmb19hs0x913g45szmm26xx5xp85v182wqf0lnl4raxaf47yhkm"; depends=[bvpSolve deSolve deTestSet ReacTran rootSolve shape]; }; diffIRT = derive2 { name="diffIRT"; version="1.5"; sha256="0kip6wz9l9q80qsqwf32pwz7d9vqin6dgfwf0nxlrlzf8xjsxgim"; depends=[statmod]; }; + diffMeshGP = derive2 { name="diffMeshGP"; version="0.1.0"; sha256="1dc37hxh3fi27gw11kij57j78p87bza77s82niagdv6dqhldj5a4"; depends=[]; }; diffdepprop = derive2 { name="diffdepprop"; version="0.1-9"; sha256="0mgrm1isr26v2mcm6fkzc7443ji00vpnqmw4zngx81n7442b3cl2"; depends=[gee PropCIs rootSolve]; }; diffeR = derive2 { name="diffeR"; version="0.0-4"; sha256="08g21h3yq8rm2i6ah364nfadg7hnghc21jnpi5aqwzqyd2v93b67"; depends=[ggplot2 raster rgdal]; }; diffobj = derive2 { name="diffobj"; version="0.1.6"; sha256="0f6wskh3nl8ngh195x8wiv1g0fc690r4zh4ypkraqd2c6x1iskg7"; depends=[crayon]; }; @@ -4794,13 +5010,13 @@ in with self; { diffrprojects = derive2 { name="diffrprojects"; version="0.1.14"; sha256="1mnqf5zs1w8dx9y5iwn4blyzb9j60ayzc04zxj5l8804nd527n25"; depends=[dplyr hellno magrittr R6 Rcpp RSQLite rtext stringb stringdist]; }; diffrprojectswidget = derive2 { name="diffrprojectswidget"; version="0.1.5"; sha256="1h69mc1wayi80vz4b9cqydylf4kp9mxsigv05r0f903pqakdrzcw"; depends=[diffrprojects dplyr hellno htmlwidgets jsonlite magrittr tidyr]; }; diffusionMap = derive2 { name="diffusionMap"; version="1.1-0"; sha256="1l985q2hfc8ss5afajik4p25dx628yikvhdimz5s0pql800q2yv3"; depends=[igraph Matrix scatterplot3d]; }; - diffusr = derive2 { name="diffusr"; version="0.1.0"; sha256="14fzfr2i2qwbgc2rihqz4p8id6wrlvn0b5cvfrrvks6d62fk3zn2"; depends=[Rcpp RcppEigen]; }; + diffusr = derive2 { name="diffusr"; version="0.1.1"; sha256="16a4dqfqbg6v5svvpc2maswq1ij5zxridpv97mc9i8xb1lmndnqf"; depends=[igraph Rcpp RcppEigen]; }; digest = derive2 { name="digest"; version="0.6.12"; sha256="1awy9phxdvqnadby7rvwy2hkbrj210bqf4xvi27asdq028zlcyd4"; depends=[]; }; digitalPCR = derive2 { name="digitalPCR"; version="1.1.0"; sha256="0hwqq84yr1hnvf4bygc5425887dhqjjjyy1ils71iavcal04s8pb"; depends=[]; }; digitize = derive2 { name="digitize"; version="0.0.4"; sha256="1qw4x4z9vrs79sd9b2daw668nc6nvjl4qhayfqmd87yxa2ydv6x0"; depends=[readbitmap]; }; dils = derive2 { name="dils"; version="0.8.1"; sha256="1q6ba9j14hzf7xy895mzxc6n9yjgind55jf350iqscwzxf7ynp33"; depends=[igraph Rcpp]; }; - dimRed = derive2 { name="dimRed"; version="0.0.3"; sha256="0rmw55g0vmvpk26akxjqp7d4wlkfrjz1j28azmwc5vmhimffl3vx"; depends=[DRR]; }; - dina = derive2 { name="dina"; version="1.0.1"; sha256="1wjnpmjwvji41afp5pqx28w36a8jmszlcw0d3b8j82j681a5h882"; depends=[Rcpp RcppArmadillo]; }; + dimRed = derive2 { name="dimRed"; version="0.1.0"; sha256="0fasca5fsbrxdwv30hch7vb9snb844l7l8p5fjf239dq45xfy37v"; depends=[DRR]; }; + dina = derive2 { name="dina"; version="1.0.2"; sha256="1dgjny7ik2g15zbi3ywl0xbab6vnv5qkxfrb4x79w7lic5m90ldc"; depends=[Rcpp RcppArmadillo]; }; dinamic = derive2 { name="dinamic"; version="1.0"; sha256="0mx72q83bbwm10ayr3f1dzwr5wgz7gclw7rh39yyh95slg237nzr"; depends=[]; }; diptest = derive2 { name="diptest"; version="0.75-7"; sha256="0rcgycgp0bf8vhga1wwgfcz3pqs5l26hgzsgf2f97dwfna40i1p1"; depends=[]; }; directPA = derive2 { name="directPA"; version="1.3"; sha256="0hcs56y69gdkfyk2xl0vxh01c19s6z1lfv02g056wxr24qfsx08c"; depends=[calibrate rgl]; }; @@ -4812,9 +5028,10 @@ in with self; { disclap = derive2 { name="disclap"; version="1.5"; sha256="0piv9gxhxcd4pbh5qjn9c3199f32y3qiw5vy8cr77ki70dnmr66n"; depends=[]; }; disclapmix = derive2 { name="disclapmix"; version="1.6.2"; sha256="01pn8hy3xbf1b1fbbsd4n2hv7gs97zalgq858xsrr4a0nqrvxmn5"; depends=[cluster disclap Rcpp]; }; disco = derive2 { name="disco"; version="0.5"; sha256="1rjylqmijc8yg20hkhqh24asxzs2g55dgbh4scp60nsf2lnw1pz8"; depends=[ggplot2 RColorBrewer tmod]; }; + discord = derive2 { name="discord"; version="0.1"; sha256="0nrjpl7l9lzkn92fwzaj3vh8zv2b6706gnh5c4zalkld0xac3c23"; depends=[dplyr]; }; discreteMTP = derive2 { name="discreteMTP"; version="0.1-2"; sha256="13qsf1kc3rph0kkdkz31qj072www5dwjyk73lfpy141rzhcn1v1x"; depends=[]; }; discreteRV = derive2 { name="discreteRV"; version="1.2.2"; sha256="1lhf67cccr96zl3j1sysh2bv0pbgvkbgjdzm35fvrdm7k74ypjsi"; depends=[MASS plyr]; }; - discretecdAlgorithm = derive2 { name="discretecdAlgorithm"; version="0.0.3"; sha256="05mbz5iw2234nq3agiwn25pzlq63l4jzj1dpr9h37xaryg1qscjr"; depends=[igraph Rcpp RcppEigen sparsebnUtils]; }; + discretecdAlgorithm = derive2 { name="discretecdAlgorithm"; version="0.0.4"; sha256="0y85fpqb2jdwv28dpxp39q7w4kfw8x48dk1a426a9z14kj807zbi"; depends=[igraph Rcpp RcppEigen sparsebnUtils]; }; discretization = derive2 { name="discretization"; version="1.0-1"; sha256="00vq2qsssnvgpx7ihbi9wcafpb29rgv01r06fwqf9nmv5hpwqbmp"; depends=[]; }; discrimARTs = derive2 { name="discrimARTs"; version="0.2"; sha256="088v4awic4bhzqcr7nvk2nldf8cm1jqshg2pzjd2l2p1cgwmlxib"; depends=[RUnit]; }; diseasemapping = derive2 { name="diseasemapping"; version="1.4.2"; sha256="065ndvpx3q9ycxfjl1f2iy3s23d7qf27s1qz31ppx0n929jynn6n"; depends=[sp]; }; @@ -4827,16 +5044,16 @@ in with self; { disposables = derive2 { name="disposables"; version="1.0.3"; sha256="0q5wacjclspn2fh7z1pg2l67ll51n75wck5h2fdq2vxy3qn3vwis"; depends=[]; }; dissUtils = derive2 { name="dissUtils"; version="1.0"; sha256="00fzlmkdfw2s3k824wp2pk3v7cvxnywi1hfp86g4mm95z2qlw9br"; depends=[]; }; distance_sample_size = derive2 { name="distance.sample.size"; version="0.0"; sha256="0hlf3kp34rg1gnkxp4k3rnv0shv4fpgb0rhx3a6x5692lhyigbcs"; depends=[MASS]; }; - distances = derive2 { name="distances"; version="0.1.0"; sha256="0hhjvi08bv84x5b6baiycvnl94nc0p8q6ljghzvgfrsadgbyjnf9"; depends=[]; }; - distcomp = derive2 { name="distcomp"; version="0.25.6"; sha256="0qp9lsi1mb9amcs8wfhzrsqv92lrl3k3glskmvvj75cqy5kwi3az"; depends=[digest httr jsonlite R6 shiny stringr survival]; }; + distances = derive2 { name="distances"; version="0.1.2"; sha256="17872h4jw6cgdk40vczjlygnays2v0wdh64mz5isk7zkvqs0x1ld"; depends=[]; }; + distcomp = derive2 { name="distcomp"; version="1.0-1"; sha256="0f69bxw52ai39dmkmfvrs0lbibcgmv6n849xa9xgd2jm5mvbc58f"; depends=[digest httr jsonlite R6 shiny stringr survival]; }; distdrawr = derive2 { name="distdrawr"; version="0.1.2"; sha256="1i1rkkic3kz2cs7fq4sb7zfr6s4wini8g1851yxzs9bjgqpsch1d"; depends=[]; }; distfree_cr = derive2 { name="distfree.cr"; version="1.0"; sha256="13y714l6b3kkpp75fdrsbdclgj1vw1xsvbj9pxi4lkwf11wwmrqr"; depends=[]; }; - distillery = derive2 { name="distillery"; version="1.0-2"; sha256="12m4cacvc18fd3aayc8iih5q6bwsmvf29b55fwp7vs8wp1h8nd8c"; depends=[]; }; + distillery = derive2 { name="distillery"; version="1.0-4"; sha256="1m0pgmlvk7bsb6q3kxagnq422babk61sf73naavac68v8x2q8fix"; depends=[]; }; distory = derive2 { name="distory"; version="1.4.3"; sha256="1mszk8fv1z46d7y1q37mhq9b5yk39w2i9rq6mgdf03afdslrmrip"; depends=[ape]; }; - distr = derive2 { name="distr"; version="2.6"; sha256="0f2y3ycng2chbhas0bq8zqp314lsm8c39chxpg40dcfq0f1z3rmk"; depends=[MASS sfsmisc startupmsg SweaveListingUtils]; }; + distr = derive2 { name="distr"; version="2.6.2"; sha256="1x118v7ycw33mkwy9frw38yn7a6ihghpssz6r2nj5766ab93i89s"; depends=[MASS sfsmisc startupmsg SweaveListingUtils]; }; distrDoc = derive2 { name="distrDoc"; version="2.6"; sha256="19yjns5cv2jp551kbld30xmdzljxr0lj5gps0lxfv8d7mrj09kf7"; depends=[distr distrEx distrMod distrSim distrTeach distrTEst MASS RandVar startupmsg SweaveListingUtils]; }; distrEllipse = derive2 { name="distrEllipse"; version="2.6.2"; sha256="1rhpnwsml7vs2nkn4q4203fi0qwfc4pxgva0b4z30zzhywb0p3hg"; depends=[distr distrEx distrSim mvtnorm setRNG startupmsg]; }; - distrEx = derive2 { name="distrEx"; version="2.6"; sha256="10gx646xg2rysj9p3pf1a13fqibs84i2nlvxppf3vc5z74vjxk4a"; depends=[distr startupmsg]; }; + distrEx = derive2 { name="distrEx"; version="2.6.1"; sha256="088a7pvkpndwdg22gmh6ypi5s2fw2gqc47njlvw5gyxfdm9gcdy5"; depends=[distr startupmsg]; }; distrMod = derive2 { name="distrMod"; version="2.6.1"; sha256="1i7b08i8zjv2k4p2j1nlqbyjrcapf52k2my83i75hcrjqdy8r3sv"; depends=[distr distrEx MASS RandVar sfsmisc startupmsg]; }; distrRmetrics = derive2 { name="distrRmetrics"; version="2.6"; sha256="077ryxl6l6fql81nsl7dm16pawsqd0l6ljfpkrnzjab4mljqaxgp"; depends=[distr fBasics fGarch startupmsg]; }; distrSim = derive2 { name="distrSim"; version="2.6"; sha256="1kq85ivnw4mplpr2jmc2w19kvk0d1wffz6laypay2j5gyd8fm44x"; depends=[distr setRNG startupmsg]; }; @@ -4848,7 +5065,7 @@ in with self; { diveRsity = derive2 { name="diveRsity"; version="1.9.90"; sha256="11pfq3syvjmfwfimjc2jnlprcnynvargr4yjd8h0aa6qzgdrrx5q"; depends=[ggplot2 qgraph Rcpp shiny]; }; diverse = derive2 { name="diverse"; version="0.1.5"; sha256="10kmx3qv58xhqs1icsxqq0y0cm8y2hx9ysb65brd3hhg33alzvk3"; depends=[foreign proxy reshape2]; }; diversitree = derive2 { name="diversitree"; version="0.9-10"; sha256="0gh4rcrp0an3jh8915i1fsxlgyfk7njywgbd5ln5r2jhr085kpz7"; depends=[ape deSolve Rcpp subplex]; }; - divest = derive2 { name="divest"; version="0.3.0"; sha256="0clk8ljhvssik29knrmbdyg0dqky74ghijfjdnk098vw7k1iyp51"; depends=[Rcpp RNifti]; }; + divest = derive2 { name="divest"; version="0.4.1"; sha256="08ifl924392lnq96j6r25x0ji18jcx6chg3bmbv9gh783vwv476b"; depends=[Rcpp RNifti]; }; divo = derive2 { name="divo"; version="0.1.2"; sha256="1g3wv89zjd5x0qic39jy81kl488gila3lwdjdilm9dxh4kb4dbw5"; depends=[cluster RcppCNPy]; }; dixon = derive2 { name="dixon"; version="0.0-5"; sha256="0x7x0l7p8kmkfqqqah8hck2r96b3w8padd41skd3q35vq8kmnsqc"; depends=[spatstat splancs]; }; dkDNA = derive2 { name="dkDNA"; version="0.1.1"; sha256="0ycyzn5bmhjl5idp0lndffkninpm9n23wrkrzi59ac8z8ghsnhf4"; depends=[]; }; @@ -4857,9 +5074,9 @@ in with self; { dlmap = derive2 { name="dlmap"; version="1.13"; sha256="0s6wlkggkm3qndwyvw72xv1n0mcjb7ss3ajbq2ll6rv30splq0db"; depends=[ibdreg mgcv nlme qtl wgaim]; }; dlmodeler = derive2 { name="dlmodeler"; version="1.4-2"; sha256="06gqvk2wrzz4kpsh4vyrbqwmxirsvg78qj7clvcxdac0sfqn4gl7"; depends=[KFAS]; }; dlnm = derive2 { name="dlnm"; version="2.3.2"; sha256="1gkpdy1mgnhiabfrfi41p3n8kzh2l480qrf3v50n8p3xcjamiagp"; depends=[mgcv nlme tsModel]; }; - dlsem = derive2 { name="dlsem"; version="1.7"; sha256="087yb5psc0yklpa5fpfazi1y5ngl8hmibfm9yfyvw652z6ykyvka"; depends=[graph gRbase nnet Rgraphviz]; }; + dlsem = derive2 { name="dlsem"; version="1.8"; sha256="0nxgysk1gpn72vap9rycjw3qrs5wnraazpakmf5m16vs8pgslc5c"; depends=[graph gRbase nnet Rgraphviz]; }; dlstats = derive2 { name="dlstats"; version="0.0.9"; sha256="0dgd4f8whk94whk9larvsp5axwijcdv5ib33akdysf25zf191mi2"; depends=[jsonlite magrittr]; }; - dma = derive2 { name="dma"; version="1.2-3"; sha256="00nwx0835i4njlqxzizs9v29d3xkq2i7rdd24xzc9bzd0c4naq4d"; depends=[MASS mnormt]; }; + dma = derive2 { name="dma"; version="1.3-0"; sha256="12gjrk0dp5w49wf0zkwc16vf8hd82822k88zb9fax3dklwm1dd3p"; depends=[MASS mnormt]; }; dml = derive2 { name="dml"; version="1.1.0"; sha256="0z1dalgxh5nhrac49vh60d5awzjylc8b8mn5fk379c324milm59l"; depends=[lfda MASS]; }; dmm = derive2 { name="dmm"; version="1.7-1"; sha256="0ihzbv2vlymyr1l0xi0jmx0xgpbj46azd7gwr3m9qsgnjp7wc1p8"; depends=[MASS Matrix nadiv pls robustbase]; }; dmt = derive2 { name="dmt"; version="0.8.20"; sha256="0rwc8l9k2y46hslsb3y8a1g2yjxalcvp1l3v7jix0c5kz2q7917w"; depends=[MASS Matrix mvtnorm]; }; @@ -4870,7 +5087,7 @@ in with self; { doBy = derive2 { name="doBy"; version="4.5-15"; sha256="0n1ml47f78nqhy92a0fgsb4brz0qyfr4q3c7im8pnb0ngia4ssdx"; depends=[MASS Matrix]; }; doFuture = derive2 { name="doFuture"; version="0.5.0"; sha256="1yb483x99z7xjrxb2r4v2l0d66y15pc799dxqn62kppmr0j452bz"; depends=[foreach future iterators]; }; doMC = derive2 { name="doMC"; version="1.3.4"; sha256="0y47jl6g4f83r14pj8bafdzq1phj7bxy5dwyz3k43d2rr8phk8bn"; depends=[foreach iterators]; }; - doMPI = derive2 { name="doMPI"; version="0.2.1"; sha256="1d2pkxsap656l7h88q37ymy1jw0zd4n9h892511a1a230dxwc0xh"; depends=[foreach iterators Rmpi]; }; + doMPI = derive2 { name="doMPI"; version="0.2.2"; sha256="0ahwm17p3gq1yvc8v6sr6sb8z7i6zws8d1pf46qynl0gd4amg938"; depends=[foreach iterators Rmpi]; }; doParallel = derive2 { name="doParallel"; version="1.0.10"; sha256="1mddx25l25pw9d0csnx2q203dbg5hbrhkr1f08kw0p02a1lln0kh"; depends=[foreach iterators]; }; doRNG = derive2 { name="doRNG"; version="1.6.6"; sha256="0xnqrc74qncg5iv4cvq0vh3r1sd407wvzx0hfpy8j2rcqy12574k"; depends=[foreach iterators pkgmaker rngtools]; }; doRedis = derive2 { name="doRedis"; version="1.1.1"; sha256="10ldfzq6m83b9w24az9bf5wbfm6y9gi233s8qgsk4dnr84n3nizx"; depends=[foreach iterators rredis]; }; @@ -4878,9 +5095,9 @@ in with self; { docopt = derive2 { name="docopt"; version="0.4.5"; sha256="1pwng6018ls0hk785bs8yjwpzsqr2pcvzgpavqd9rw19n5lvzhxn"; depends=[stringr]; }; docopulae = derive2 { name="docopulae"; version="0.3.3"; sha256="13889sj509gbl9zs7jqdvslp6sc81jv54cbqh1wpp834jp5s1q3x"; depends=[]; }; docstring = derive2 { name="docstring"; version="1.0.0"; sha256="19z5frhxbdc5c4vrkckgqbh9mx4d9w1icw8szsw9yadvbg48nlhl"; depends=[roxygen2]; }; - doctr = derive2 { name="doctr"; version="0.2.0"; sha256="1ca04ysfrxclqw50m9rj25qi9i2b2gg7bxqqbk526v4hv178zryj"; depends=[dplyr magrittr purrr readr stringr tibble tidyr]; }; - docuSignr = derive2 { name="docuSignr"; version="0.0.1"; sha256="0y61n35k3ap4xi5vh8g1nadp3b5wl301rdh8ycf9yci7zm7sagyl"; depends=[httr jsonlite magrittr]; }; + docuSignr = derive2 { name="docuSignr"; version="0.0.2"; sha256="0a0m1kdfd2pml82qwqw9wv9aa3k7hrjyj0wrsbsxap2ly8raxvj3"; depends=[httr jsonlite magrittr]; }; documair = derive2 { name="documair"; version="0.6-0"; sha256="1pphcbx90n9xn8a7gvfrwzfapwqgpbl3gg2grm7chfxgcp7i99i2"; depends=[]; }; + document = derive2 { name="document"; version="1.2.0"; sha256="1hhwhzq9cw01lvb3gv6rykbfajmkd1hr8cc7r75ni1bh7y4gy961"; depends=[callr checkmate devtools roxygen2]; }; docxtools = derive2 { name="docxtools"; version="0.1.1"; sha256="1mlgl9105mifzdgf57spgr2rr5740ghr5afmlskxn6ind7jfka70"; depends=[dplyr ggplot2 pander stringr tidyr]; }; docxtractr = derive2 { name="docxtractr"; version="0.2.0"; sha256="197j57ab8x960b1yfq6xp8fwmq51xs04nf0cb16r161h4bcmgs2j"; depends=[dplyr purrr tibble xml2]; }; domino = derive2 { name="domino"; version="0.3.0"; sha256="0lhrnrpyz98cl16a1xk7x0299kxkz303myyz61nw3x6f7kh1gvd6"; depends=[]; }; @@ -4888,22 +5105,23 @@ in with self; { dostats = derive2 { name="dostats"; version="1.3.2"; sha256="15j9sik9j5pic5wrp0w26xkrhi337xkbikw0k7sa4yfimw6f84w5"; depends=[]; }; dotCall64 = derive2 { name="dotCall64"; version="0.9-04"; sha256="0qp6magpp0jaa0b9sfkbxd91afayl24kj0yrh0ix1v3ahdnaar8f"; depends=[]; }; dotenv = derive2 { name="dotenv"; version="1.0.2"; sha256="13i8dimrgq9nxmmrxr42pacsiylj6dilwpa8ldnrfp4cl9zgrqas"; depends=[]; }; - dotwhisker = derive2 { name="dotwhisker"; version="0.2.5"; sha256="0swldw1krrnjklmm3mifxr2h278ffvry9vf8hm6lx2bcwgx3v408"; depends=[broom dplyr ggplot2 gridExtra gtable plyr stringr]; }; + dotwhisker = derive2 { name="dotwhisker"; version="0.3.0"; sha256="1sbj8blnqnsyvf7pq2cc9q7nqb66n0v2gi2rr09yjlppf7v1pcjf"; depends=[broom dplyr ggplot2 ggstance gridExtra gtable plyr stringr]; }; downloader = derive2 { name="downloader"; version="0.4"; sha256="1axggnsc27zzgr7snf41j3zd1vp3nfpmq4zj4d01axc709dyg40q"; depends=[digest]; }; downscale = derive2 { name="downscale"; version="1.2-4"; sha256="080zlfz0yhznymr7icc2m7w5c0pqiak1qp22ywcfcb6d0mri3k8l"; depends=[cubature minpack_lm raster Rmpfr sp]; }; downsize = derive2 { name="downsize"; version="0.2.2"; sha256="18b9shd79z0bsdnp0apqqwv6c73j4wnfiv41ywqz761nmxbldxbn"; depends=[magrittr R_utils]; }; dpa = derive2 { name="dpa"; version="1.0-3"; sha256="0dmwi68riddi1q4b10c12wx6n7pqfmv30ix5x72zpdbgm72v343h"; depends=[igraph sem]; }; + dparser = derive2 { name="dparser"; version="0.1.3"; sha256="0cy8k7rqz06s01hr80vppb7mkf5bmh2lpdrzn4fzzmbzciflbh32"; depends=[digest]; }; dpcR = derive2 { name="dpcR"; version="0.4"; sha256="02j7fhhfq7p2wfcnr7rdy65v6dcvdym3nfyps7717p7b429chchc"; depends=[binom chipPCR dgof e1071 evd multcomp pracma qpcR rateratio_test readxl shiny signal spatstat]; }; dpglasso = derive2 { name="dpglasso"; version="1.0"; sha256="1mx28xbm2z2bxyp33wv2v6vgn1yfsdsa0bzjjdxasgd6lvr51myf"; depends=[]; }; - dplR = derive2 { name="dplR"; version="1.6.5"; sha256="0npprzn8jz57192d4mblzx3hcibbas085mvhhy69cz5n2rdj78jr"; depends=[digest gmp lattice Matrix matrixStats plyr png R_utils stringi stringr XML]; }; + dplR = derive2 { name="dplR"; version="1.6.6"; sha256="04b0j9l2gkkycjjn16zbhv0kczhrij0bsnrdyh9qd6z53pvd3ryc"; depends=[digest lattice Matrix matrixStats plyr png R_utils stringi stringr XML]; }; dplRCon = derive2 { name="dplRCon"; version="1.0"; sha256="10xnawgnhxp5y949fxs1vvadc1qz2ldy0s9w9w7kf6iqh59d35sw"; depends=[]; }; - dplyr = derive2 { name="dplyr"; version="0.5.0"; sha256="0ks5cklb03laqf5ygcw986g1lv7wk1ipvypjlha8xly2y4lvilwk"; depends=[assertthat BH DBI lazyeval magrittr R6 Rcpp tibble]; }; + dplyr = derive2 { name="dplyr"; version="0.7.1"; sha256="1x0jknh4q7svm05yiwj77vwihcq4kq1x0xw93xqqz01a9d376xcc"; depends=[assertthat BH bindrcpp glue magrittr pkgconfig plogr R6 Rcpp rlang tibble]; }; dpmixsim = derive2 { name="dpmixsim"; version="0.0-8"; sha256="0paa2hmpd6bqf0m7p9j7l2h3j18lm64ya6ya8zvp55wm8pf7xgqg"; depends=[cluster oro_nifti]; }; dpmr = derive2 { name="dpmr"; version="0.1.9"; sha256="1cnjywkvjb4fhbf4shjmsrq47f1fg2x21hcm1q5512bm0wg9i6jd"; depends=[digest httr jsonlite magrittr rio]; }; dprep = derive2 { name="dprep"; version="3.0.2"; sha256="0iw1pqpqlv436wpwh1w832aqvy91zvxmbk2jdw7aczrb29wys2bj"; depends=[class e1071 FNN MASS nnet rgl rpart StatMatch]; }; dr = derive2 { name="dr"; version="3.0.10"; sha256="0dmz4h7biwrn480i66f6jm3c6p4pjvfv24pw1aixvab2vcdkqlnf"; depends=[MASS]; }; drLumi = derive2 { name="drLumi"; version="0.1.2"; sha256="09ps8rcqrm6a1y8yif2x82l0k4jywq60pkndh9nzfpbsw4ak2lby"; depends=[chron gdata ggplot2 Hmisc irr minpack_lm msm plyr reshape rootSolve stringr]; }; - drake = derive2 { name="drake"; version="2.1.1"; sha256="0z85q0snwqs027g52d23q2diy4ff4cmds9sm49gkc9ns3pk2gw4v"; depends=[base64url codetools crayon digest eply igraph magrittr plyr R_utils storr stringi stringr testthat]; }; + drake = derive2 { name="drake"; version="3.0.0"; sha256="1c7kfwj9wjmxf66zd8fr9lk6ym5zsca70r725g6g9w3v76015mgb"; depends=[base64url codetools crayon digest eply igraph magrittr plyr R_utils storr stringi stringr testthat]; }; drat = derive2 { name="drat"; version="0.1.2"; sha256="14nmbxy2y51bi258fmx24pkwmga791hnwzbx6jy2sl55g3vrxjpz"; depends=[]; }; drawExpression = derive2 { name="drawExpression"; version="1.0"; sha256="0c2daicqrjlqf7s788cknzvw9c6rm500lgmwfr7z03bq7bd2ah90"; depends=[]; }; drc = derive2 { name="drc"; version="3.0-1"; sha256="0c8xn8ripzq270hy8d16fcnx02l02alddznd7fqwk3jyi6113h1y"; depends=[car gtools MASS multcomp plotrix scales]; }; @@ -4920,14 +5138,17 @@ in with self; { dslice = derive2 { name="dslice"; version="1.1.5"; sha256="0qwz9rlgpgx0k28hca2m40ab0qad9rfp1gxswygchv7rcnl4f6ml"; depends=[ggplot2 Rcpp scales]; }; dsm = derive2 { name="dsm"; version="2.2.14"; sha256="1zcm4111qzl7mf160z7ax9gvvs627nig4zimxagzm2jdp004w10r"; depends=[ggplot2 mgcv mrds nlme numDeriv statmod]; }; dsmodels = derive2 { name="dsmodels"; version="1.0.0"; sha256="094kif1ffbqlznsfig1rqkpgjd6r7dnlwwmjnlhwax05xvv3dl92"; depends=[shape]; }; + dsrTest = derive2 { name="dsrTest"; version="0.2.1"; sha256="1kljlfi7jf6fa8b5f3wxjsa9rlmzcp4qix3m2qyapz2lqd85mbb7"; depends=[asht exactci loglognorm]; }; dst = derive2 { name="dst"; version="0.3"; sha256="1gdf4sjk2svywx2m6z22d383xppsm6dm108w93pcwfs8fpcdwxb9"; depends=[]; }; dtables = derive2 { name="dtables"; version="0.2.0"; sha256="0ikgip3p4b7q97b2dshlx0fq09xsk304gfk5prw4rk95w9wck3qs"; depends=[psych]; }; + dtangle = derive2 { name="dtangle"; version="0.1.0"; sha256="1i9wjg31ldhiyl01znzcalhwsi6yfqzxi1xdpivkzxhf25bp932r"; depends=[]; }; dti = derive2 { name="dti"; version="1.2-6.1"; sha256="1p88k7qkmas49niq618jhddc0h4mwh5gd267v6rlzzpmv5f98fkb"; depends=[adimpro awsMethods gsl oro_dicom oro_nifti quadprog rgl]; }; - dtplyr = derive2 { name="dtplyr"; version="0.0.1"; sha256="05p51dnvx2ldjkipbhi0ia3lq6l4xv55sqnqjhlnqc4p4hfc7wwf"; depends=[data_table dplyr lazyeval]; }; + dtplyr = derive2 { name="dtplyr"; version="0.0.2"; sha256="1q75xnk52zfxnphj095dppcqdmk9v1n32069rffpnvr39nnik565"; depends=[data_table dplyr lazyeval]; }; + dtree = derive2 { name="dtree"; version="0.2.3"; sha256="03kma2hb373gd87yr10yn76i20r0yncxjfamgpnijr2yf6b5fq20"; depends=[caret evtree party partykit rpart]; }; dtt = derive2 { name="dtt"; version="0.1-2"; sha256="0n8gj5iylfagdbaqirpykb01a9difsy4zl6qq55f0ghvazxqdvmn"; depends=[]; }; dtw = derive2 { name="dtw"; version="1.18-1"; sha256="1b91vahba09cqlb8b1ry4dlv4rbldb4s2p6w52gmyw31vxdv5nnr"; depends=[proxy]; }; - dtwSat = derive2 { name="dtwSat"; version="0.2.2"; sha256="083jld6fd10fk2nif806m7vmckii9h9mm32vyw5z63fvnx7l0yxg"; depends=[caret dtw ggplot2 lubridate mgcv plyr proxy raster RColorBrewer reshape2 rgdal scales sp xtable zoo]; }; - dtwclust = derive2 { name="dtwclust"; version="3.1.2"; sha256="18m85nfkipmvbsdknkp50d75bl6wg8zhs5ksp71n622z1lzfx132"; depends=[caTools clue dtw flexclust foreach ggplot2 proxy Rcpp reshape2 rngtools]; }; + dtwSat = derive2 { name="dtwSat"; version="0.2.3"; sha256="10b0hs9kn5ljfv28iz62h966zb1pxsfrr6fx45d4427gr6fg8ncz"; depends=[caret dtw ggplot2 lubridate mgcv plyr proxy raster RColorBrewer reshape2 rgdal scales sp xtable zoo]; }; + dtwclust = derive2 { name="dtwclust"; version="4.0.1"; sha256="1avm9s54690rmhk8aihv1761rdmd1ymqcbzchqbacp9wrsyz1558"; depends=[clue dtw flexclust foreach ggplot2 Matrix plyr proxy Rcpp reshape2 rngtools RSpectra]; }; dualScale = derive2 { name="dualScale"; version="0.9.1"; sha256="11hqxprai0s5id6wk4n2q174r1sqx9fzw3fscvqd2cgw8cjn1iwl"; depends=[ff lattice Matrix matrixcalc vcd]; }; duckduckr = derive2 { name="duckduckr"; version="1.0.0"; sha256="1wki8xvqp5hr27iafd9jbryl9faywfkdkpn0pa0afywbic39k2cm"; depends=[crul jsonlite]; }; dummies = derive2 { name="dummies"; version="1.5.6"; sha256="01f84crqx17xd6xy55qxlvsj3knm8lhw7jl26p2rh2w3y0nvqlbm"; depends=[]; }; @@ -4936,24 +5157,25 @@ in with self; { dupiR = derive2 { name="dupiR"; version="1.2"; sha256="0p649yw7iz6hnp7rqa2gk3dqkjbqx1f6fzpf1xh9088nbf3bhhz3"; depends=[plotrix]; }; dvfBm = derive2 { name="dvfBm"; version="1.0"; sha256="0gx11dxkbnh759ysd1lxdarlddgr3l5gwd5b0klwvwsgck6jv529"; depends=[wmtsa]; }; dvn = derive2 { name="dvn"; version="0.3.5"; sha256="04di2gpdacivvd9bi96w6145k280s8blavdhi1w3rw4c7sc3hag2"; depends=[RCurl XML]; }; + dwapi = derive2 { name="dwapi"; version="0.1.1"; sha256="1pr1ja7663skyr7mzvn1ap33l5xsng91xiylg02c5wdcg8clv66a"; depends=[httr readr rjson xml2]; }; dygraphs = derive2 { name="dygraphs"; version="1.1.1.4"; sha256="0vwg9q7xrwxkm92d55ik9gdky42bj3jlh6fi4jzwyl5nfdswklb9"; depends=[htmltools htmlwidgets magrittr xts zoo]; }; dyn = derive2 { name="dyn"; version="0.2-9.3"; sha256="00h75kqfpr77jhppnpxvykbdcmsmsb2vl2527xzq10wkvm7gfpvv"; depends=[zoo]; }; dynBiplotGUI = derive2 { name="dynBiplotGUI"; version="1.1.5"; sha256="0fvyn33mzjcc3sis05phc6412y25m406il2wzdfw8caa8dafj0yw"; depends=[tcltk2 tkrplot]; }; - dynCorr = derive2 { name="dynCorr"; version="0.1-2"; sha256="0qzhhfhkwpq6mwg7y6sxpqvcj8klvivnfv69g7x3ycha1kw2xk3w"; depends=[lpridge]; }; + dynCorr = derive2 { name="dynCorr"; version="1.0.0"; sha256="0qx8kwa6jnqb2qxwvhh509sylwdrv684dsjd9w13lafyjxgvdnlj"; depends=[lpridge]; }; dynOmics = derive2 { name="dynOmics"; version="1.0"; sha256="10aw362hhwqdnjf7xxzy25fdxq2zznzvg6xwvl25a9ppj76nm1rh"; depends=[ggplot2 gplots snow]; }; dynRB = derive2 { name="dynRB"; version="0.9"; sha256="0ysdlcchsszrgp2cizmli0l86ym2jz9addc21wxgdlz0vdfn7fn4"; depends=[caTools corrplot]; }; dynaTree = derive2 { name="dynaTree"; version="1.2-10"; sha256="1ng672mlv98xnsbd4xq70hxc8j158la4n63y46rw74granaz29ya"; depends=[]; }; dynamicGraph = derive2 { name="dynamicGraph"; version="0.2.2.6"; sha256="1xnsp8mr3is4yyn0pyrvqhl893gdx2y1zv8d2d55aah2xbfk0fjj"; depends=[ggm]; }; dynamicTreeCut = derive2 { name="dynamicTreeCut"; version="1.63-1"; sha256="1fadbql7g5r2vvlkr89nlrjxwp4yx4xrdqmv077qvmnx9vv0f4w3"; depends=[]; }; - dynamichazard = derive2 { name="dynamichazard"; version="0.2.0"; sha256="1ikl69c4hb1b4nv0zm6n3aaw928zihxzcbnwid29zdxl5ybg3bfd"; depends=[boot Rcpp RcppArmadillo stringr survival]; }; + dynamichazard = derive2 { name="dynamichazard"; version="0.3.4"; sha256="173br7i0p9q4c2v6bmj7mnyjwjiv5ahfvll8vxjb82aa6i48w4dx"; depends=[boot data_table Rcpp RcppArmadillo stringr survival]; }; dynatopmodel = derive2 { name="dynatopmodel"; version="1.1"; sha256="100g131jmgb3by9j3v2n7f7jh9623vd7xf5frjkwrxvwzf0q1i3k"; depends=[deSolve lubridate maptools raster rgdal rgeos sp topmodel xts zoo]; }; dynetNLAResistance = derive2 { name="dynetNLAResistance"; version="0.1.0"; sha256="018y3m648ni31rlisjfnrx1d10mm48wpxanlnnxxpnqxjcywg2x8"; depends=[doParallel foreach igraph]; }; dynia = derive2 { name="dynia"; version="0.2"; sha256="1swip4kqjln3wsa9xl0g92zklqafarva923nw7s44g4pjdy73d5l"; depends=[]; }; dynlm = derive2 { name="dynlm"; version="0.3-5"; sha256="1sjhhlvvcgmayb9dfwacv1g75c4lhbpzyczj6h7gkd19bcfbdhqp"; depends=[car lmtest zoo]; }; dynpanel = derive2 { name="dynpanel"; version="0.1.0"; sha256="073kfl5g4d7v8wd2qnpixqrxbac3cqj35z03ax2zlb8h2afa7j62"; depends=[gtools]; }; dynpred = derive2 { name="dynpred"; version="0.1.2"; sha256="111ykasaiznn3431msj4flfhmjvzq7dd1mnzn1wklc5ndix1pvf9"; depends=[survival]; }; - dynr = derive2 { name="dynr"; version="0.1.9-20"; sha256="0pdlbnrxj4jzfy1ycm7k2jdwckgzdjmgkrkhak43d0bgcp1wh8qv"; depends=[ggplot2 latex2exp MASS Matrix numDeriv plyr reshape2 xtable]; }; - dynsbm = derive2 { name="dynsbm"; version="0.3"; sha256="0wgpcilqfy5jjqw5sk0jwgi5ryf4d52308fgcx133059n9i1k3rz"; depends=[RColorBrewer Rcpp riverplot]; }; + dynr = derive2 { name="dynr"; version="0.1.11-2"; sha256="0rfcmdsghrmk4cxxdwbm2bygcdbvknj5ndj8ppfxi0a1hsvb9k7g"; depends=[ggplot2 latex2exp magrittr MASS Matrix mice numDeriv plyr reshape2 xtable]; }; + dynsbm = derive2 { name="dynsbm"; version="0.4"; sha256="036m5gcwfcdjj5xkrbvnnx1a6i31n9j3q2mcijc7qimbld31pfj6"; depends=[RColorBrewer Rcpp riverplot]; }; dynsim = derive2 { name="dynsim"; version="1.2.1"; sha256="0nkxn9v4f353fhcn1vsdrh29mrms10zid63b84flg3c6hvc0x4qr"; depends=[ggplot2 gridExtra MASS]; }; dynsurv = derive2 { name="dynsurv"; version="0.3-5"; sha256="0rvwnssg876sng53viiqfcm7mxvilpds9yahj6bwgs90chnkjz4g"; depends=[BH ggplot2 nleqslv plyr reshape survival]; }; e1071 = derive2 { name="e1071"; version="1.6-8"; sha256="08n6i26nfckjpxjkzi8phhanc3ahsrirkv5rz38y2jcv7ds031pn"; depends=[class]; }; @@ -4963,18 +5185,19 @@ in with self; { eLNNpaired = derive2 { name="eLNNpaired"; version="0.2.3"; sha256="08nck2p5npyw264kgcqmgx5rx7c3h9v892f90xlcd1dnb7dqlan3"; depends=[Biobase globaltest GSEAlm iCheck samr]; }; eMLEloglin = derive2 { name="eMLEloglin"; version="1.0.1"; sha256="087zw48lykls2jcsmpqd5jkrlpr0j423snp00liszjhdpdh59saq"; depends=[lpSolveAPI]; }; eRm = derive2 { name="eRm"; version="0.15-7"; sha256="0x8cqcwgn8znd9w9vkxcacf097rziyb511wzcfmhhadidiilk0x3"; depends=[lattice MASS Matrix]; }; - eVenn = derive2 { name="eVenn"; version="2.3.4"; sha256="1nwbqk2hqdi7y4ys3h6nrjv1pjzyx96w7643l8nbcdg5i4bbvvls"; depends=[]; }; + eVenn = derive2 { name="eVenn"; version="2.3.5"; sha256="1lg3700wbc2f5gbyiwjfgkv6v2b8zswwrnbcv0bgwqpq236hx69g"; depends=[]; }; eaf = derive2 { name="eaf"; version="1.07"; sha256="0310lrqfm1l0lifak7wa6xn21bzzn27kbrrx0bidj4hibwv7sa4l"; depends=[modeltools]; }; earlywarnings = derive2 { name="earlywarnings"; version="1.0.59"; sha256="06j5g5lrzl4p5pb1pp79h00iqpbwralzhpzxmaiymv7j8kz87nr0"; depends=[fields ggplot2 Kendall KernSmooth lmtest moments nortest quadprog som spam tgp tseries]; }; - earth = derive2 { name="earth"; version="4.4.9.1"; sha256="1h7rakv1qgyz6ccbrb7njdvgkplbn0bmj8r0ff0cbncgw1hkhbrm"; depends=[plotmo TeachingDemos]; }; + earth = derive2 { name="earth"; version="4.5.0"; sha256="1gz5szpwzf5p18h9cmcmqivm5ql2qmbck9s7hqmimmgknjc1qscj"; depends=[plotmo TeachingDemos]; }; earthtones = derive2 { name="earthtones"; version="0.1.0"; sha256="1phl50bgd40i36fdkfs9xkqm703vgwxlnpyik6lk8ssip0m4rn9j"; depends=[ggmap]; }; easyDes = derive2 { name="easyDes"; version="3.0"; sha256="1z4ynd1ck2vxsshygjgnhyzg8i41kpnwsfix96nmgwm3861n0phb"; depends=[multcomp PMCMR]; }; - easyNCDF = derive2 { name="easyNCDF"; version="0.0.1"; sha256="0yc084ns5gnyifcll6by7lmy0jnigg66i7rmx3y0fx9fhn3xq7xr"; depends=[abind ncdf4]; }; + easyNCDF = derive2 { name="easyNCDF"; version="0.0.4"; sha256="1hd7b6pdm5j41a4v0jxhbqdy2bz5gj86fsfwj0l7gg7h32d6hkhq"; depends=[abind ncdf4]; }; easyPubMed = derive2 { name="easyPubMed"; version="2.3"; sha256="148ga6flgv74sfzz5kvvnqhfdkx6zhpl6ydzcd32lz3cq24ckli9"; depends=[XML]; }; easySdcTable = derive2 { name="easySdcTable"; version="0.3.0"; sha256="1dyj66vd1g06s2fs6xqrf7b4sr2p55azhzdjhazvkm9h8j55ai02"; depends=[sdcTable shiny SSBtools]; }; - easyVerification = derive2 { name="easyVerification"; version="0.4.1"; sha256="1n086cbwsayhsflisy0x4ym1232z9n4896bdw0kyvydz9fwf3sw4"; depends=[pbapply Rcpp SpecsVerification]; }; + easyVerification = derive2 { name="easyVerification"; version="0.4.2"; sha256="1qj560gjhgjrj28yl4pwbgp32h3ix6hcx85r3z70hv0cks653zwf"; depends=[pbapply Rcpp SpecsVerification]; }; easyanova = derive2 { name="easyanova"; version="4.0"; sha256="1d8fkgyqzphipvla7x8ipcf0by07iqx8xran15d2q82yq9iik5g9"; depends=[car nlme]; }; easyformatr = derive2 { name="easyformatr"; version="0.1.2"; sha256="0mrpd21hyafn82apclxmhs2jbd87sdw0g6lwc3h6gl5cbm213nxb"; depends=[dplyr knitr lazyeval magrittr stringi tibble tidyr]; }; + easyml = derive2 { name="easyml"; version="0.1.0"; sha256="1ngfai9i2v9hn09c7z48b43113kz2jkq7qvz22z25qdrav42hs1c"; depends=[caret corrplot darch dummies e1071 futile_logger ggplot2 glinternet glmnet nnet pbapply pbmcapply pROC randomForest scales scorer]; }; easynls = derive2 { name="easynls"; version="4.0"; sha256="1j2crqvgsf84bpwzf4qh5xkzn5mhxhfx9c0y3p8dbyn8bg7zc2rf"; depends=[]; }; easypackages = derive2 { name="easypackages"; version="0.1.0"; sha256="00paxdwz4bw3imqhcsw6hj1h0gmnpishlxcj79n826vhdy23jc4y"; depends=[assertthat devtools]; }; easypower = derive2 { name="easypower"; version="1.0.1"; sha256="1vf0zv55yf96wjxja6ifdjvgc9nw0jl0hnc1ygyjd8pmwbgdz9bl"; depends=[pwr]; }; @@ -4998,50 +5221,52 @@ in with self; { ecoengine = derive2 { name="ecoengine"; version="1.10.0"; sha256="0k24m03qpqbcdwsf6xawrh0x43b97w2pba3h4pcwl7j2p0ls91pi"; depends=[assertthat data_table dplyr httr jsonlite lubridate magrittr plyr whisker]; }; ecolMod = derive2 { name="ecolMod"; version="1.2.6"; sha256="1n30faldfhpm2jkaw793vr220kgn3bmn8hxhw32rax294krmwn4v"; depends=[deSolve diagram rootSolve shape]; }; ecoreg = derive2 { name="ecoreg"; version="0.2.1"; sha256="1v3n5nbabw6qmwcq3sx759k6c8q4pxbffl227rv0lnnfbq77zlmc"; depends=[]; }; - ecoseries = derive2 { name="ecoseries"; version="0.1.1"; sha256="165vc00nhlff91dry51q9agm01b9ikqs1zgwfc7xw1rq59cqbz47"; depends=[magrittr RCurl readr rjson rvest tibble xml2]; }; + ecoseries = derive2 { name="ecoseries"; version="0.1.3"; sha256="1m9yb15gdbif15nqxa81bgl6h0w8yl8425yv4vgc6p9yrsrpgymn"; depends=[magrittr RCurl readr rjson rvest tibble xml2]; }; ecosim = derive2 { name="ecosim"; version="1.3"; sha256="00arz8j2az1nn4p96pshw0p9xxq2qfgkyrf4ahvl1hp1h3k68jfn"; depends=[deSolve stoichcalc]; }; ecospace = derive2 { name="ecospace"; version="1.1.3"; sha256="01nxjbx638s8pk1ybsz9zbk35cg27x35fam419b9rjj9kspxz49s"; depends=[FD]; }; ecospat = derive2 { name="ecospat"; version="2.1.1"; sha256="1b0bmqvspg2qxnr07lj2qlwp2i90q1bjym9rjc8jdzqbmaz9gxyr"; depends=[ade4 adehabitatHR adehabitatMA ape biomod2 classInt dismo doParallel ecodist foreach gbm gtools iterators maptools MigClim PresenceAbsence randomForest raster rms sp spatstat vegan]; }; ecotoxicology = derive2 { name="ecotoxicology"; version="1.0.1"; sha256="084xkr59d7x9zxmsnsyym2x8jshz6ag6rvnmhd1i6fzar8ypwccb"; depends=[]; }; ecoval = derive2 { name="ecoval"; version="1.1"; sha256="0ihig6nq3lrz6lzix92lrlzywnqkzsp5lrbccn5slhxdj5llird2"; depends=[rivernet utility]; }; ecp = derive2 { name="ecp"; version="3.0.0"; sha256="0v07ak7fbiph058rlbhmgx0f230mnpi39ib8vx9bdzhx5g5lrp0j"; depends=[Rcpp]; }; - ecr = derive2 { name="ecr"; version="1.0.1"; sha256="0vyv0ik8a9wa5cv2yd66935hn1i390lm6l6g0hnaycz07rfh8rlg"; depends=[BBmisc checkmate ggplot2 gridExtra parallelMap ParamHelpers reshape2 smoof]; }; + ecr = derive2 { name="ecr"; version="2.0.0"; sha256="0651fi9fwgxlzv9m1yx1i58sa1yvkfqxy7p8nmfr13my6hz3k8pr"; depends=[BBmisc checkmate ggplot2 parallelMap ParamHelpers reshape2 smoof]; }; edarf = derive2 { name="edarf"; version="1.1.1"; sha256="0f27hs7vn4v2jis3d66s48hr0ki8m8ndspcw1cwns5vjwb77iqwm"; depends=[data_table ggplot2 mmpf]; }; edcc = derive2 { name="edcc"; version="1.0-0"; sha256="036fi6mnn9480hkb378xb5jilkfvdydjmkyw4mcc9s1lz195f62w"; depends=[spc]; }; edci = derive2 { name="edci"; version="1.1-2"; sha256="10rqkimvmyb7hxp4wkpj8bq07q3yaimm058d4mmr09fw25lqyz1q"; depends=[]; }; edeR = derive2 { name="edeR"; version="1.0.0"; sha256="1dg0aqm5c4zyf015hz1hhn3m4lfvybc4gc1s7sp8jcsk46rxz0cc"; depends=[rJava rjson rJython]; }; - edeaR = derive2 { name="edeaR"; version="0.5.0"; sha256="0r1k7lyc6hp2akdlbdahlxp8xa1h11hmfanki1pqxkllqzx9d1q1"; depends=[bupaR data_table dplyr XML xml2]; }; + edeaR = derive2 { name="edeaR"; version="0.6.0"; sha256="1042yy8hfh78ybwg1h35dx65hsawlrbcnnqq6ccvdww78amlrhkz"; depends=[bupaR data_table dplyr ggplot2 ggthemes glue lubridate miniUI shiny shinyTime tibble tidyr XML xml2]; }; edesign = derive2 { name="edesign"; version="1.0-13"; sha256="0fc3arr8x9x9kshp6jq4m4izzc5hqyn5vl0ys6x0ph92fc6mybp3"; depends=[]; }; edf = derive2 { name="edf"; version="1.0.0"; sha256="14ikm6j0ndxrk7c7lh5mbd2aci46d4j9a30mvcgnxy3kq6046a7b"; depends=[]; }; - edfReader = derive2 { name="edfReader"; version="1.1.1"; sha256="1si123kn66z2h8rrp5ck6hbjp11q0p3ja2h7xim4sqglbwca3fjw"; depends=[]; }; + edfReader = derive2 { name="edfReader"; version="1.1.2"; sha256="02cclg549z6samhkraaknsmqvk0yxxcf4s9qpbcxb2cl9fcj1cjr"; depends=[]; }; edfun = derive2 { name="edfun"; version="0.2.0"; sha256="1wxx6bgy03z7c1d6556bbjl1cb49n2vn734fw2d5c1jk0zsh3fmz"; depends=[]; }; - edgar = derive2 { name="edgar"; version="1.0.8"; sha256="1sy4v3nw66z96mbgqfx2bkk085virilyrx03sqjp8p37v08x9yg1"; depends=[ggplot2 R_utils RColorBrewer tm wordcloud XML]; }; + edgar = derive2 { name="edgar"; version="1.0.9"; sha256="1jh0aaizirj4i4kc6gq9kkpa1xdqxbjhj7fys8ap1xxxx6nfpcnf"; depends=[ggplot2 R_utils RColorBrewer tm wordcloud XML]; }; edgeCorr = derive2 { name="edgeCorr"; version="1.0"; sha256="19n67yc58ksin7xydrnfsyyw7fqawm5xli67cz4lv4wb62w6r6ld"; depends=[]; }; edgeRun = derive2 { name="edgeRun"; version="1.0.9"; sha256="0d5nc8fwlm61dbi00dwszj1zqlij4gfds3w1mpcqnnfilr2g3di1"; depends=[data_table edgeR]; }; edgebundleR = derive2 { name="edgebundleR"; version="0.1.4"; sha256="0pajr95qqppk2m4l7rfi46rll32z8a7lmq0vmb3p8n0aks5ajn1n"; depends=[htmlwidgets igraph rjson shiny]; }; editrules = derive2 { name="editrules"; version="2.9.0"; sha256="14mfa8flkym2rx9n7bq9icc9fsrk3szib3amx5l0008rxll9qnxm"; depends=[igraph lpSolveAPI]; }; + edpclient = derive2 { name="edpclient"; version="0.1.0"; sha256="05wv6sf3kbzjs4ka6qi8acjm15l54kw0wgahh82w8nibw1fzv03n"; depends=[httr ini jsonlite plyr]; }; edrGraphicalTools = derive2 { name="edrGraphicalTools"; version="2.1"; sha256="09y63xj3gqrz66mym20g4pmfwrb0wnc2n67692hnqq8dz31q7p3i"; depends=[lasso2 MASS mvtnorm rgl]; }; edstan = derive2 { name="edstan"; version="1.0.6"; sha256="1gm1rxwywigyfdlcm2yj1m9qjb4s6w7chr1ck7b32x1pdxdl3ns5"; depends=[ggplot2 rstan]; }; educineq = derive2 { name="educineq"; version="0.1.0"; sha256="0qd6kvcy280glv3q6lcrawmnsfvp90as95chgi3hav0yj2dpakn6"; depends=[flexsurv ineq]; }; - eechidna = derive2 { name="eechidna"; version="0.1"; sha256="17z3nay7dcys5hwfmm7wgsidz6pim97xlw8hlyh5bns57s10nwx7"; depends=[dplyr ggplot2 ggthemes plotly shiny shinyjs tidyr]; }; + eechidna = derive2 { name="eechidna"; version="1.1"; sha256="01c1b41fzkq1hgg7705n96m1ji74gbfy9fisdj5pl0kgjhjiq24w"; depends=[dplyr ggplot2 ggthemes plotly rgdal rmapshaper rvest shiny shinyjs tidyr xml2]; }; eefAnalytics = derive2 { name="eefAnalytics"; version="1.0.6"; sha256="07wpz8zlgkbzkhmv569w7rnz3i830391arrh17sg2gc4fx9h1559"; depends=[geoR lme4 metafor mvtnorm]; }; eegkit = derive2 { name="eegkit"; version="1.0-2"; sha256="10dksmc5lrl0ypifvmmv96xnndl2zx191sl79qif0gfs3wq3w4s0"; depends=[bigsplines eegkitdata ica rgl]; }; eegkitdata = derive2 { name="eegkitdata"; version="1.0"; sha256="1krsadhamv1m8im8sa1yfl7injvrc4vv3p88ps1mpn8hibk5g51m"; depends=[]; }; eel = derive2 { name="eel"; version="1.1"; sha256="0cv6dhw57yy140g73z94g9x1s42fpyfliv9cm2z1alm7xwap1l0x"; depends=[emplik rootSolve]; }; - eemR = derive2 { name="eemR"; version="0.1.4"; sha256="15b612z3h4alqv34wz28mgkg9m31r872pxbxayzqinf0pam8x08y"; depends=[dplyr fields pracma R_matlab readr rlist stringr viridis]; }; - eeptools = derive2 { name="eeptools"; version="1.0.0"; sha256="009ygzdqlvff4gichigy38878x60iqs4gr31ddrgildbrpq38hrd"; depends=[arm data_table ggplot2 maptools memisc vcd]; }; + eemR = derive2 { name="eemR"; version="0.1.5"; sha256="13c5k2si8aq2461iz9413hlqzgkb25zrdfvizzk8s2nn60npyaw9"; depends=[dplyr pracma R_matlab readr rlist stringr viridis]; }; + eeptools = derive2 { name="eeptools"; version="1.1.0"; sha256="161gxaqkab9bl915xspqrnm9r4r7ydki482s4axsb0wsqpf2jr13"; depends=[arm data_table ggplot2 maptools memisc vcd]; }; + eesim = derive2 { name="eesim"; version="0.1.0"; sha256="0ljj1jp9cl0im8k7sfjd28ggj4q9a14df3554kwxkssr1vsn1wbc"; depends=[dplyr lubridate purrr viridis]; }; effectFusion = derive2 { name="effectFusion"; version="1.0"; sha256="1nx61n4lgnj6wh4arqm62p9xwxqvz4g7bs4b5k3ybkhmh6ns9v5l"; depends=[bayesm cluster ggplot2 MASS Matrix]; }; effects = derive2 { name="effects"; version="3.1-2"; sha256="1fwkz6z3rya4qn476w9vni15rfvjp2ix87qk0naszn3n1k8bf0l0"; depends=[colorspace lattice lme4 nnet]; }; efflog = derive2 { name="efflog"; version="1.0"; sha256="1sfmq7xrr6psa6hwi05m44prjcpixnrl7la03k33n0bksj8r1w6b"; depends=[]; }; effsize = derive2 { name="effsize"; version="0.7.1"; sha256="0l0ja7qcknn8r5hf7nrjk5cy0ajw0z60ggbyj8qvjzf8qah4mlss"; depends=[]; }; - efreadr = derive2 { name="efreadr"; version="0.1.1"; sha256="1fkifml8g7hgg3qb19b9ljljzx9sbbpnb9xa18mvkxgmbw41qsy7"; depends=[dplyr ensurer magrittr readr]; }; + efreadr = derive2 { name="efreadr"; version="0.2.2"; sha256="1h27by1m451wrnw017005avs5yj3fjzrm2lq5153aqm1mbbxxwvs"; depends=[dplyr ensurer magrittr readr]; }; ega = derive2 { name="ega"; version="2.0.0"; sha256="04kwh24aap22yclmcrix3vi553qb30hd43mgfzpdl0cw3ibrh7xg"; depends=[ggplot2 mgcv]; }; egcm = derive2 { name="egcm"; version="1.0.8"; sha256="1mrbm0yzqw344fzgcbwc6bgdn8fv8id80jnfp3jaqjfslfhlpzx7"; depends=[fArma ggplot2 MASS tseries TTR urca xts zoo]; }; eggCounts = derive2 { name="eggCounts"; version="1.3"; sha256="1yak67k1c13rx6ghm78585k2rdsgg9ajr3zaihjk8widavb3m23g"; depends=[BH boot coda numbers Rcpp RcppEigen rstan StanHeaders testthat]; }; egonet = derive2 { name="egonet"; version="1.2"; sha256="1f0fbqyk2ilmhirxvf1iwgfappi5r7807ag77r89lbaf5jq8akl0"; depends=[sna]; }; - eha = derive2 { name="eha"; version="2.4-4"; sha256="1sp1v3jmidj4ynjq7q7y28j9f483yhbzaz1jnxjc4hqk8398cxii"; depends=[survival]; }; + eha = derive2 { name="eha"; version="2.4-5"; sha256="0c1fqvnijsaqsa4c4ss7c6lb9mr5p49bg2y4gmpc0wwyjm8xj0lx"; depends=[survival]; }; ei = derive2 { name="ei"; version="1.3-3"; sha256="0i8pvpal23zwsqldhmm3iis4vw9s08mlydpshaig2dsd9549gn11"; depends=[cubature eiPack ellipse foreach MASS mnormt msm mvtnorm plotrix sp tmvtnorm ucminf]; }; - eiCompare = derive2 { name="eiCompare"; version="1.9"; sha256="0y4b1w4klsx63xllq32mb7z57wldxvwv9ria5zgnrqwygvnxvk0j"; depends=[cubature data_table ei eiPack ellipse foreach ggplot2 magrittr mnormt msm mvtnorm plotrix plyr R_utils stringr tidyr tmvtnorm ucminf]; }; + eiCompare = derive2 { name="eiCompare"; version="2.1"; sha256="0kv4k1zk1gz3fapy2i2ydy0n38hy95i10r3hr3dx8mkkf3nsj46h"; depends=[cubature data_table ei eiPack ellipse foreach ggplot2 magrittr mnormt msm mvtnorm plotrix plyr R_utils stringr tidyr tmvtnorm ucminf]; }; eiPack = derive2 { name="eiPack"; version="0.1-7"; sha256="1cxk31bj012ijm85sf6l4rjrwayw94j2d6aav8p9g1f0raha2s6y"; depends=[coda MASS msm]; }; eigeninv = derive2 { name="eigeninv"; version="2011.8-1"; sha256="18dh29js824d7mrvmq3a33gl05fyldzvgi8mmmr477573iy9r30g"; depends=[]; }; eigenmodel = derive2 { name="eigenmodel"; version="1.01"; sha256="0p9n28x5gg46nszzd2z9ky5fhv6qa070673i1df6bhjh962aqgaf"; depends=[]; }; @@ -5055,7 +5280,7 @@ in with self; { elasticsearchr = derive2 { name="elasticsearchr"; version="0.2.0"; sha256="0hw2pwfh6k8q1646cprg3d84acwgw5bi7vmp7wrnxkxg7npz5pyz"; depends=[httr jsonlite]; }; elec = derive2 { name="elec"; version="0.1.2"; sha256="0f7ahrjb52w8a8l5v00xla6z9afpz2zrckl9v04xalp34snhdwan"; depends=[]; }; elec_strat = derive2 { name="elec.strat"; version="0.1.1"; sha256="09196k5c3jsikh98d33bn70izwcbx0wb5ki9fv1ij0dw9mnv4c3p"; depends=[elec]; }; - electionsBR = derive2 { name="electionsBR"; version="0.2.0"; sha256="1mcnmrnjkb9qwnbh79kfl90dqji2imq9s9jsx6h8d5ccmjfdmzl7"; depends=[dplyr magrittr]; }; + electionsBR = derive2 { name="electionsBR"; version="0.3.0"; sha256="18aq1yz2l2g4cjbmk18n5vl8x8lkp90xwm82l0bg1z1smyv3agan"; depends=[data_table dplyr haven magrittr]; }; elementR = derive2 { name="elementR"; version="1.3.1"; sha256="0cpff04inl9jxsr1nwfsl9lidsaz3gb090hf18aab2x0x6bjr18c"; depends=[abind climtrends colourpicker devtools EnvStats gdata gnumeric lmtest outliers R6 reader readODS readxl shiny shinydashboard shinyjs stringr tcltk2 zoo]; }; elevatr = derive2 { name="elevatr"; version="0.1.3"; sha256="1fs34gaak0sdxpvbgszrwd833nd03p19m6fawaard1waylxsgscg"; depends=[httr jsonlite prettyunits progress raster ratelimitr rgdal sp]; }; elexr = derive2 { name="elexr"; version="1.0"; sha256="1xmrzlp55z6k3psdg4a3x3rsilvq3k37v9r7ydfn80ahvqjz0fqh"; depends=[]; }; @@ -5068,19 +5293,20 @@ in with self; { emIRT = derive2 { name="emIRT"; version="0.0.8"; sha256="17igda5phgfapjzg7dkid5jj49gmwgpadjr27z7s21365i7md9mz"; depends=[pscl Rcpp RcppArmadillo]; }; embryogrowth = derive2 { name="embryogrowth"; version="6.5"; sha256="1gbmrcjm8zwm01xq62wrkibmqnig904bnzrpar4d4qb98b6b3gp6"; depends=[deSolve HelpersMG numDeriv optimx]; }; emdbook = derive2 { name="emdbook"; version="1.3.9"; sha256="09xbdyw8a4pvrsg3ryr8drby0njy4avc5wsjj4ffibdaicpchy69"; depends=[bbmle coda lattice MASS plyr]; }; - emdi = derive2 { name="emdi"; version="1.0.0"; sha256="0mldd0b8mh4q72r968kc2lyy97abkw1b7sm50za7ip3m2khzcrj8"; depends=[FNN ggmap ggplot2 gridExtra HLMdiag maptools moments MuMIn nlme openxlsx parallelMap reshape2 simFrame]; }; + emdi = derive2 { name="emdi"; version="1.1.0"; sha256="0830lmmdr529x461z15v88b69q59c2dp1c7wl55mygsn5scydj7k"; depends=[boot FNN ggmap ggplot2 gridExtra HLMdiag Hmisc maptools MASS moments MuMIn nlme openxlsx parallelMap reshape2 rgeos simFrame]; }; emdist = derive2 { name="emdist"; version="0.3-1"; sha256="1z14pb9z9nkd0f2c8pln4hzkfqa9dk9n3vg8czc8jiv0ndnqi7rq"; depends=[]; }; emg = derive2 { name="emg"; version="1.0.6"; sha256="1kzmxs224m6scmk8gg5ckx5c7is99hwgwv28yl26hnrbkm59skyh"; depends=[]; }; emil = derive2 { name="emil"; version="2.2.6"; sha256="182grlb90nsqs17mi09srzlrflf3kzaj5swcgfdyalhlmsgrfrnd"; depends=[data_table dplyr ggplot2 lazyeval magrittr Rcpp tidyr]; }; emma = derive2 { name="emma"; version="0.1-0"; sha256="0psd8lrbcqla8mkhp0wlassaaimgwlmqy5yv2wwcq59mc5k1v27f"; depends=[clusterSim earth]; }; emme2 = derive2 { name="emme2"; version="0.9"; sha256="035s4h95ychqb14wib0dqbg4sjy9q01fsryr0ri25g1hsi5f8lpm"; depends=[reshape]; }; emoa = derive2 { name="emoa"; version="0.5-0"; sha256="1wcnsnkdmpcn21dyql5dmj728n794bmfr6g9hgh9apzbhn4cri8p"; depends=[]; }; - emojifont = derive2 { name="emojifont"; version="0.4.1"; sha256="1hq66sq5g7nmmakxbd2pdv62j1qsd3nq516pkz00i76fyrky8369"; depends=[ggplot2 proto showtext sysfonts]; }; + emojifont = derive2 { name="emojifont"; version="0.5.0"; sha256="0vmfkhvf4icaq2wgf0wv331a1ay0driywln158977fzrd9z3h0q4"; depends=[ggplot2 proto showtext sysfonts]; }; emon = derive2 { name="emon"; version="1.3.2"; sha256="19khjjpyxvzhzihqq15w02l5v5ryyvxlklz1ch2gkmqcpnvyga32"; depends=[MASS mgcv]; }; emov = derive2 { name="emov"; version="0.1.1"; sha256="04w0bjyxvfb4ky573byp7j9b7x4gqycr5pgpnsl6rzag00zsf45a"; depends=[]; }; empiricalFDR_DESeq2 = derive2 { name="empiricalFDR.DESeq2"; version="1.0.3"; sha256="0h2mcdw4v3ac6dn0s4z37l4sdzbi12sxrnn0f0gc9z207dyyf6w3"; depends=[DESeq2 GenomicRanges]; }; emplik = derive2 { name="emplik"; version="1.0-3"; sha256="0b52383m2djdcg9b1a7r10k5pkzljz6dalvbg2gg962ckvpndb11"; depends=[quantreg]; }; emplik2 = derive2 { name="emplik2"; version="1.20"; sha256="0qdsfmnvds01qa4f112knv905k0fzccrqj9fwaqrqcy48cigm8pd"; depends=[]; }; + ems = derive2 { name="ems"; version="0.3.1.6"; sha256="0swa1jxc52m695ankkn0kv9l012wh48ajy8n4yzssj4w8l4c4pyi"; depends=[]; }; emuR = derive2 { name="emuR"; version="0.2.2"; sha256="0g2448bx3p7brkzaj25wh96kv720ckbvqz6x6zc5vnsbg7rdl9il"; depends=[base64enc data_table DBI dplyr httpuv jsonlite MASS RCurl RSQLite stringr uuid wrassp]; }; emulator = derive2 { name="emulator"; version="1.2-15"; sha256="1rp7q7zs8b49jzdkbzm4s1g8554h41hcabf4d78k9jhhys2z28g2"; depends=[mvtnorm]; }; enRich = derive2 { name="enRich"; version="3.0"; sha256="1ni2hkw0pq0mjjqd11qqrc3lbzyif84ljh9zrn2yil1qk2882r1n"; depends=[]; }; @@ -5088,7 +5314,7 @@ in with self; { encode = derive2 { name="encode"; version="0.3"; sha256="0s2xva9yadk0s9x6kiwmh6bbq79aa1zx4gb5d1m7nbp2z8x4z77i"; depends=[]; }; endogMNP = derive2 { name="endogMNP"; version="0.2-1"; sha256="0maxcp321ngbxrg0i23nlwhj849v771xahh53367x928ss4f8v7i"; depends=[]; }; endogenous = derive2 { name="endogenous"; version="1.0"; sha256="079fmfxl9gf080zq5m1ixmgry9dawg2y6ixbfyc5da5jxf3zk9h8"; depends=[mvtnorm]; }; - endorse = derive2 { name="endorse"; version="1.5.2"; sha256="15yq3r3mdzyhn18b6z8lrad6flxsmwv8pl3ax26ggm4c8a5f54is"; depends=[coda]; }; + endorse = derive2 { name="endorse"; version="1.6.0"; sha256="1j75sb2di2c092dilbjj5qsvb52h3zmm7wxflf9kg7xw227wq3zw"; depends=[coda]; }; endtoend = derive2 { name="endtoend"; version="1.0"; sha256="0x8f6h0mznmncqdwvsp2f0x524g5clgvk64qflf373lyn6h1v0ap"; depends=[]; }; energy = derive2 { name="energy"; version="1.7-0"; sha256="1g4hqi6mgsnd1w4q7dd2m40ljh2jdmvad91ksbq9fscnrqpvji1x"; depends=[boot Rcpp]; }; energyr = derive2 { name="energyr"; version="0.1.1"; sha256="1mid5f8l6v55pjzfx304a303mkn9b5r3jzmjl2fi2pz4v2jsdw04"; depends=[RgoogleMaps]; }; @@ -5098,7 +5324,7 @@ in with self; { enpls = derive2 { name="enpls"; version="5.8"; sha256="1cgpwfv4xrnikkxxrswzvlzlr8dbwrx53wax3bdn14a3fivv1fgk"; depends=[doParallel foreach ggplot2 plotly pls reshape2 spls]; }; enrichR = derive2 { name="enrichR"; version="1.0"; sha256="0lfdr45sdyqhvgz8q4qdbk12mpv86d6id665kq6aaslgr8jggfmn"; depends=[httr rjson]; }; enrichvs = derive2 { name="enrichvs"; version="0.0.5"; sha256="0x91s03hz1yprddm6mqi75bm45ki3yapfrxmap7d4qc0hi06h22k"; depends=[]; }; - enrichwith = derive2 { name="enrichwith"; version="0.0.3"; sha256="161xlcsfzxf5l0wbswzc3ddl9vs13cmig90qfjrwi2f4f94v4pnb"; depends=[]; }; + enrichwith = derive2 { name="enrichwith"; version="0.0.4"; sha256="0fzj93zzs7a2qcwnw83iry6ybr3wnnnl4bpkpp6fczgmxrl0m0cw"; depends=[]; }; ensembleBMA = derive2 { name="ensembleBMA"; version="5.1.4"; sha256="14zq22h8nna7j403c1x9py90fwas8fg0vq3im2zh31dyrk1j8d7k"; depends=[chron]; }; ensembleMOS = derive2 { name="ensembleMOS"; version="0.7"; sha256="0g5qzdic5jvgn6wv7zh0jnz8malfgfxn26l7lg30y96vcmi4hk54"; depends=[chron ensembleBMA]; }; ensembleR = derive2 { name="ensembleR"; version="0.1.0"; sha256="0xvq1jlsp7gsk46i847nfvadxwlh09gi2rgwss2wf2xmh1855ray"; depends=[caret]; }; @@ -5114,10 +5340,11 @@ in with self; { envlpaster = derive2 { name="envlpaster"; version="0.1-2"; sha256="11a5n40k1ln5gxxvwq1vh4dhmhifhlm89hkhf36qnhj4bjh3v3y0"; depends=[aster aster2 caTools MASS]; }; epade = derive2 { name="epade"; version="0.3.8"; sha256="1alvsifc6i71ilm1xxs1d7sqlapb48bqd6z2n4wi6pqcjvwp7bif"; depends=[plotrix]; }; epandist = derive2 { name="epandist"; version="1.1.1"; sha256="0hxgbjns5bk82rgcmykxifnnxcnqdzmkimkkmpdif64zr5g3gjdg"; depends=[]; }; - epanetReader = derive2 { name="epanetReader"; version="0.4.0"; sha256="0pa44wp8cq8xf2835k3gch0m40s7l7r9f0scyizk54nv6cdq88cx"; depends=[]; }; + epanetReader = derive2 { name="epanetReader"; version="0.5.1"; sha256="19w4cckdhc8qjvncymznd9jnwj16gklpp2fb96x4rf9qnmh8zdvq"; depends=[]; }; epiDisplay = derive2 { name="epiDisplay"; version="3.2.2.0"; sha256="1f9kifjgdwxs7c236nsr369ij71rj7l5ady88h4n5p5pjw2h451a"; depends=[foreign MASS nnet survival]; }; epiR = derive2 { name="epiR"; version="0.9-82"; sha256="0qsi5m39hkh1m3sk341cbd8gafr0rxy688vgkcxdk4wxfxvh3yrf"; depends=[BiasedUrn survival]; }; epibasix = derive2 { name="epibasix"; version="1.3"; sha256="0d0087sa8lqw35pn7gdg2qqzw3dvz57sgavymwl1ybcj5d4lsbyk"; depends=[]; }; + epicontacts = derive2 { name="epicontacts"; version="1.0.1"; sha256="1q58ryyxffddrz6s3081hx0q6f6izwlvglbdswqq8ndx9ml693jy"; depends=[colorspace dplyr igraph magrittr threejs visNetwork]; }; epidata = derive2 { name="epidata"; version="0.1.0"; sha256="1lp6hnjzga787abq94k8v48wlikpp5hj1xwmxc8nj1imyr4r8a4h"; depends=[dplyr httr jsonlite purrr readr rvest stringi tidyr xml2]; }; epifit = derive2 { name="epifit"; version="0.1.2"; sha256="1i1ngb5kh03gyx1702fwav3dc3mqry1wjzc7ry36hdw0ngawid34"; depends=[MASS]; }; epinet = derive2 { name="epinet"; version="2.1.7"; sha256="10mqc3xy24mjbk9np5mp41216hj6yc9jqxl3ybgysmd80y3qgf39"; depends=[network]; }; @@ -5132,9 +5359,9 @@ in with self; { epxToR = derive2 { name="epxToR"; version="0.2-0"; sha256="0rivlyvvj09ahph22aq8b7xabvagjjvwb9h908zwddzhh2hljj3h"; depends=[httr XML]; }; eqs2lavaan = derive2 { name="eqs2lavaan"; version="3.0"; sha256="1lj6jwkfd84h9ldb6l74lrx2pnsl1c0d7mnrcrjkska87djb2nzd"; depends=[lavaan stringr]; }; eqtl = derive2 { name="eqtl"; version="1.1-7"; sha256="0xfr8344irhzyxs9flnqn4avk3iv1scqhzac5c2ppmzqhb398azr"; depends=[qtl]; }; - equSA = derive2 { name="equSA"; version="1.1.1"; sha256="101kvrna8pk1bv8zjih4f6v5chgypxc7nrwic6cwavdk49ihg8mk"; depends=[huge igraph mvtnorm speedglm XMRF ZIM]; }; + equSA = derive2 { name="equSA"; version="1.1.2"; sha256="13iva2iwliav3dd3cis0583d4z2ywwy7rnx73x7h0n0769rvnkg5"; depends=[huge igraph mvtnorm XMRF ZIM]; }; equate = derive2 { name="equate"; version="2.0.6"; sha256="0fkgz4747wf2n1sfkskpbp20zdmxvykqhncr7a8wl5lp314r48x3"; depends=[]; }; - equateIRT = derive2 { name="equateIRT"; version="2.0-2"; sha256="0dv7iszdmmx3hf7qhawlnx0lqf97k8y4zx8bmxyzmgj96k7db4h1"; depends=[mirt statmod]; }; + equateIRT = derive2 { name="equateIRT"; version="2.0-3"; sha256="10n296hs2x20lpqhzwjs1fsfyrdyv1xnns5drdl4qpyp32a3ayq7"; depends=[mirt statmod]; }; equivalence = derive2 { name="equivalence"; version="0.7.2"; sha256="170l5gnk0dkjkfsx7qyrw56ircwsjzz9cvhakgyrqh7bj5734i79"; depends=[boot lattice PairedData]; }; erah = derive2 { name="erah"; version="1.0.5"; sha256="00vygdrngbp53wip2x6dni3ygwax309i9si3gyqkxxbbkpv24b7i"; depends=[caTools HiClimR igraph ncdf4 nnls osd quantreg Rcpp signal XML]; }; erboost = derive2 { name="erboost"; version="1.3"; sha256="09hlpn6mqsmxfrrf7j3iy8ibb2lc4aw7rxy21g3pgqdmd9sbprim"; depends=[lattice]; }; @@ -5151,9 +5378,10 @@ in with self; { errint = derive2 { name="errint"; version="1.0"; sha256="1ya7fsvwhmgxw87r32m4345n8pw2pbpv026xvml03s1kiam8qwbw"; depends=[rootSolve VGAM]; }; errorizer = derive2 { name="errorizer"; version="0.2.1"; sha256="10p7ydm81x2gls0wn692llgj2rxhg4s96rv7gvihmgi5dflraypq"; depends=[]; }; errorlocate = derive2 { name="errorlocate"; version="0.1.2"; sha256="1qlwdvy7i62hpnfrryzmqwmygxa8mjc7q92g6k5n9r2r179q7h09"; depends=[lpSolveAPI validate]; }; + errors = derive2 { name="errors"; version="0.0.2"; sha256="1gpzhadlk34vaqlldgsh2sknb8ff2qf5lxfmh5dfs057gjp1p83d"; depends=[]; }; esaBcv = derive2 { name="esaBcv"; version="1.2.1"; sha256="0hgjcdbiy1a71vsb2vcyp0xmhy6wi4nlh1sqsfb2vxckc95i9i21"; depends=[corpcor svd]; }; esaddle = derive2 { name="esaddle"; version="0.0.3"; sha256="04imppwls6a485kdfwykk4s0pyxas3i92ccghi780ys29y0nggmy"; depends=[doParallel mvnfast plyr Rcpp RcppArmadillo]; }; - esc = derive2 { name="esc"; version="0.3.0"; sha256="1wn4dy6xyxvdwfkwihq02lja6dd8wn9diypyrbkw3qvilb23hg4v"; depends=[dplyr purrr readr sjmisc tibble]; }; + esc = derive2 { name="esc"; version="0.3.1"; sha256="0ihld8sklgr2waif3n8ca96x7z5zi1wi4ygf50x5n8h47p0hrj3v"; depends=[dplyr purrr readr sjmisc tibble]; }; eshrink = derive2 { name="eshrink"; version="0.1.0"; sha256="0s1jl652za7qwv70kmc1h3vbwlijl49527pwpm0z347lz2jdcigj"; depends=[glmnet MASS]; }; esmisc = derive2 { name="esmisc"; version="0.0.3"; sha256="1d6xrdxwn85c8s60s7vzaymh7wa9f7fzd79hq5spzd12fr3zisvj"; depends=[ggplot2 raster readr]; }; estatapi = derive2 { name="estatapi"; version="0.3.0"; sha256="0gjc5x1b2l5qnwdg77nzy6d7bf9q93ll39sfy89izqm8wsydwwkp"; depends=[dplyr httr purrr readr]; }; @@ -5167,13 +5395,13 @@ in with self; { etrunct = derive2 { name="etrunct"; version="0.1"; sha256="0ayazgyqlc8jcqr03cwfmfhm4pck6xri1r6vkgqy4arqkrrnrcqr"; depends=[]; }; etseed = derive2 { name="etseed"; version="0.1.0"; sha256="1kqbhvryqzmckk91ynn68yd7msqdsl6h818r164180f10flszr37"; depends=[httr jsonlite R6]; }; eulerian = derive2 { name="eulerian"; version="1.0"; sha256="0yhpnx9vnfly14vn1c2z009m7yipv0j59j3s826vgpczax6b48m0"; depends=[graph]; }; - eulerr = derive2 { name="eulerr"; version="1.1.0"; sha256="00pblvyfhqcvbjwjkq237b7kj99vvkyclam9mpmgrd72wx6ryzr7"; depends=[assertthat lattice latticeExtra Rcpp RcppArmadillo]; }; + eulerr = derive2 { name="eulerr"; version="2.0.0"; sha256="16hnplwpv38zk22y1d503hcdq406ry6x11kq4i9dsrlvw9l64j80"; depends=[assertthat lattice Rcpp RcppArmadillo]; }; euroMix = derive2 { name="euroMix"; version="1.1.1"; sha256="13ia6j0iwxhcfv17b5dsq1pk7v1kxaq6njxilxq0hvd57hv0b2a8"; depends=[Familias forensim paramlink]; }; europepmc = derive2 { name="europepmc"; version="0.1.4"; sha256="0kh61jmr2y0wjqch0jzk594anpwq56x9lhx6sx54y2pqjqw68b0i"; depends=[dplyr httr jsonlite plyr urltools xml2]; }; europop = derive2 { name="europop"; version="0.3.1"; sha256="1ym257bxr4a0dmln1j8x3pf87wrryzgqyzhvk61whc6n2bj62x1s"; depends=[]; }; eurostat = derive2 { name="eurostat"; version="3.1.1"; sha256="0k896b6q8cd9yh25czf7nswlzhrswl63qrybw27r4acp9kg91n2k"; depends=[classInt httr jsonlite RColorBrewer readr sp stringi stringr tibble tidyr]; }; eva = derive2 { name="eva"; version="0.2.4"; sha256="03jsiz6bkavwxpgllxaw8czahmm2rh5h8hhk5j7i9clcjx244vvj"; depends=[EnvStats Matrix]; }; - evaluate = derive2 { name="evaluate"; version="0.10"; sha256="0mwna7rjyrmc76651a1fm7c76ippdsc2wsp3sj3iwb1c73mvlqv1"; depends=[stringr]; }; + evaluate = derive2 { name="evaluate"; version="0.10.1"; sha256="070vvmnbdlp7sz2zhza7fhd2a6mlwiln8fn4hyzhsiizbn4n79y9"; depends=[stringr]; }; evaluator = derive2 { name="evaluator"; version="0.1.0"; sha256="00811idj3vx7x627dyw0i8qlbkscrdkxknwph4d4j8m49flh9j36"; depends=[dplyr extrafont ggalt ggplot2 magrittr mc2d pander psych purrr readr readxl scales stringi tibble tidyr viridis]; }; evclass = derive2 { name="evclass"; version="1.1.1"; sha256="00lbhcgswpv0amz0mb93kx9p91sf0d7zvxfw9i8x1zpmpfd6nhcj"; depends=[FNN]; }; evclust = derive2 { name="evclust"; version="1.0.3"; sha256="0cd0a8w0ixd9ilcqlxiaql4l2r49qrqnllb9qpg3xgnlxka3yb5m"; depends=[FNN limSolve Matrix R_utils]; }; @@ -5181,8 +5409,9 @@ in with self; { evdbayes = derive2 { name="evdbayes"; version="1.1-1"; sha256="0lfjfkvswnw3mqcjsamxnl8hpvz08rba05xcg0r47h5vkgpw5lgd"; depends=[]; }; event = derive2 { name="event"; version="1.1.0"; sha256="1nq34bz9dsixidym3n255vmap3gjx9nfk8pc5s7w026faf96dr2v"; depends=[rmutil]; }; eventInterval = derive2 { name="eventInterval"; version="1.3"; sha256="0nybzy2mpmazcvz06mkv7l9741mjm3i2q2sindq0777vb2k4504v"; depends=[MASS]; }; + eventdataR = derive2 { name="eventdataR"; version="0.1.0"; sha256="1097938qw4xmv949zjjcj5cjixmngpszjcspqb52dv373a0sgd25"; depends=[]; }; events = derive2 { name="events"; version="0.5"; sha256="1zka4ygymifs8snd7cabl11b5lg3f8g8370dkm9ybl40bn8vvqq2"; depends=[]; }; - eventstudies = derive2 { name="eventstudies"; version="1.1"; sha256="13l2yhmlpiid9r3njnmvja231l00ym7gvwfbv0m9fk2k5j6gm5id"; depends=[boot xts zoo]; }; + eventstudies = derive2 { name="eventstudies"; version="1.2"; sha256="0z449j7yrd6j6hhacz6f048ibilib6m97684cz2wc4pqq2wlj8hg"; depends=[boot sandwich testthat xts zoo]; }; evidenceFactors = derive2 { name="evidenceFactors"; version="1.00"; sha256="12wndimbygn7h57f3q0xmxmvqrcdj98f0a58m22z2l0vmym53rhb"; depends=[sensitivitymv]; }; evir = derive2 { name="evir"; version="1.7-3"; sha256="1kn139vvzdrx5r9jayjb4b0803b0bbppxk68z00gdb50mxgvi593"; depends=[]; }; evmix = derive2 { name="evmix"; version="2.7"; sha256="0x3m4lwpwcavr950q66p7bkimshnvav4842dr505g5rc9vkw9xxg"; depends=[gsl MASS SparseM]; }; @@ -5200,6 +5429,7 @@ in with self; { exactmeta = derive2 { name="exactmeta"; version="1.0-2"; sha256="1v807ns799qajffky4k18iah0s3qh2ava6sz5i85hwx9dhkz19h4"; depends=[]; }; exampletestr = derive2 { name="exampletestr"; version="0.4.0"; sha256="1ywr9v7h1ghpkm51p06rlr88ihpaqj0d6j57aj95x808ykhlkkp5"; depends=[BBmisc devtools filesstrings formatR magrittr purrr roxygen2 stringr]; }; exams = derive2 { name="exams"; version="2.2-1"; sha256="0dz1ijdfikmxyrz33mz8qkf5kn9796c078ndqk5gfyyxl2jsj6jw"; depends=[]; }; + excerptr = derive2 { name="excerptr"; version="1.3.0"; sha256="0znp2i1gnzcnk20bk88384fwzm3xa04pmkxnrg7g0kvslbb7ndjw"; depends=[git2r rprojroot rPython]; }; excursions = derive2 { name="excursions"; version="2.2.2"; sha256="1f6vvv33205lj6hsmmhx3q82mkhh0shzyk5hrwzf2nh1cn61w1x0"; depends=[Matrix sp]; }; exif = derive2 { name="exif"; version="0.1.0"; sha256="12phqn5x1x0xs2xczl3064q983dalm261vqpyafhdcndm1y3gwbc"; depends=[Rcpp]; }; exifr = derive2 { name="exifr"; version="0.1.1"; sha256="0cxi8rcig03qwahdilawg4j3i9a8sv8sxgy0a68pxxmg556dwk0j"; depends=[foreach plyr]; }; @@ -5209,8 +5439,8 @@ in with self; { expectreg = derive2 { name="expectreg"; version="0.39"; sha256="1mxhv6phc3lgp0zz20wszx4nr3by9p6492wcb0x8wn8p8p1sy1b3"; depends=[BayesX mboost quadprog]; }; experiment = derive2 { name="experiment"; version="1.1-1"; sha256="07yaf5k5fpymz2yvr52zbbi60g0v84qryvqqjq3sjq2mb1fjfz1p"; depends=[boot MASS]; }; expert = derive2 { name="expert"; version="1.0-0"; sha256="0y9vcigvzhymalpv31b9nvmr86z1dz7x29yj838vks0dsv23rgrf"; depends=[]; }; - expint = derive2 { name="expint"; version="0.1-3"; sha256="1gysdlr752f6caanhh1j6jhnplxb73qslink6n4fsv2qdxz0pfvf"; depends=[]; }; - explor = derive2 { name="explor"; version="0.3.1"; sha256="11qc96m0wapsmw9i1z4vgcjwnb5g8zr8mc3m1diiipb9hld4yn7x"; depends=[dplyr DT ggplot2 highr scatterD3 shiny tidyr]; }; + expint = derive2 { name="expint"; version="0.1-4"; sha256="17vp7znbxlf5zb944snmnml2w42avj9k70fisb8az047i3kdbvfh"; depends=[]; }; + explor = derive2 { name="explor"; version="0.3.2"; sha256="09ws8dy6pskhx23zpa1m1cx56zb3j6q4rkk7nc6jzdxdmf322fhb"; depends=[dplyr DT ggplot2 highr scatterD3 shiny tidyr]; }; exploreR = derive2 { name="exploreR"; version="0.1"; sha256="154j5wiiy9vqdvh1qvdkz2fdp2phcygbbjl7nj5nkn07xwxbsc77"; depends=[ggplot2]; }; expm = derive2 { name="expm"; version="0.999-2"; sha256="1mihl67kvv1xv0figp25jkmwfn4iwkcx15cng2348y8gm6zybw9q"; depends=[Matrix]; }; expoRkit = derive2 { name="expoRkit"; version="0.9"; sha256="0raf0m2nfbdbd1pc4lincyp8y8lgn3bfi4hn0p04plc5p40l1gvc"; depends=[Matrix SparseM]; }; @@ -5229,7 +5459,7 @@ in with self; { extfunnel = derive2 { name="extfunnel"; version="1.3"; sha256="162w5b2wjs3yqy8jisamsapav6swa8sskf1b6x5hglnrv3i4qyyy"; depends=[rmeta]; }; extlasso = derive2 { name="extlasso"; version="0.2"; sha256="05774y0i01lrbyws6zx5ymhcglllv1wc7gzrnyx8i5d1lxdinsyd"; depends=[]; }; extraBinomial = derive2 { name="extraBinomial"; version="2.1"; sha256="0qmvl35f7n78kghszwyaz4wzbswqy4p98c3b6alzrc2ldsq6pq5z"; depends=[]; }; - extraDistr = derive2 { name="extraDistr"; version="1.8.5"; sha256="021sg4jkn817nvsi9z69pd96flk7az7qi8amgwfcpr15kjb8655n"; depends=[Rcpp]; }; + extraDistr = derive2 { name="extraDistr"; version="1.8.6"; sha256="1bklj9d1m4wzbqq6nj80szzdilkcfb90wps19q77nrp8bhhhplqk"; depends=[Rcpp]; }; extraTrees = derive2 { name="extraTrees"; version="1.0.5"; sha256="1rvvp2p9j8ih8fid1n17606pa23bjg3i2659w1l6w0jkb1p23zcx"; depends=[rJava]; }; extracat = derive2 { name="extracat"; version="1.7-4"; sha256="1dply8sx9r9vshi5dycxs7bchf5g33qbq7w6i5w830glfy0lk3i5"; depends=[colorspace data_table ggplot2 hexbin plyr reshape2 scales TSP]; }; extrafont = derive2 { name="extrafont"; version="0.17"; sha256="0b9k2n9sk23bh45hjgnkxpjyvpdrz1hx7kmxvmb4nhlhm1wpsv9g"; depends=[extrafontdb Rttf2pt1]; }; @@ -5268,10 +5498,10 @@ in with self; { fRegression = derive2 { name="fRegression"; version="3011.81"; sha256="1qyacwwa2mjq9szwwwfdnny4np68bj1j4bvfkywl7q7x44p4n5b4"; depends=[fBasics lmtest mgcv nnet polspline timeDate timeSeries]; }; fSRM = derive2 { name="fSRM"; version="0.6.4"; sha256="1n91gzjx9r3r3xl400w38miva0b69c0f23h2056kq9p1bax2nm86"; depends=[foreign ggplot2 gridExtra lavaan plyr reshape2 scales tcltk2]; }; fTrading = derive2 { name="fTrading"; version="3010.78"; sha256="0qakjxnr5nslw06ywlj65m3w7pjgn5hixxc2rnqhvvvmjpdxybz7"; depends=[fBasics timeDate timeSeries]; }; - fUnitRoots = derive2 { name="fUnitRoots"; version="3010.78"; sha256="04nwwazd8jvzds6p4njzq4wpcsrvvvs0y9z8v8r402myd4856ssm"; depends=[fBasics timeDate timeSeries urca]; }; fabCI = derive2 { name="fabCI"; version="0.1"; sha256="123bc56nnx6hcj257imsd8sc6d0pggw08lf4m0lr90631gcm1mkn"; depends=[]; }; - face = derive2 { name="face"; version="0.1-2"; sha256="06rpjr588yh5v4z33j4lc1m5r1jj2zsaxfmx1h6h2z4cqlgrvxax"; depends=[Matrix matrixcalc mgcv]; }; + face = derive2 { name="face"; version="0.1-3"; sha256="0l4sp79p72n6iqbgi5aqif1669rwx3pka7l91d8dsw7x60bhikxj"; depends=[Matrix matrixcalc mgcv]; }; factoextra = derive2 { name="factoextra"; version="1.0.4"; sha256="1lzf99184sbc9x3skp8hp8cjlj0w8mvm4vnwj03smfgm9sh01874"; depends=[abind cluster dendextend FactoMineR ggplot2 ggpubr ggrepel reshape2 tidyr]; }; + factorMerger = derive2 { name="factorMerger"; version="0.3"; sha256="1cnghkf091b8an1yz34a18i32aqzh2phi6ni0rffvgf1m31c67ff"; depends=[agricolae colorRamps dplyr forcats ggplot2 ggpubr ggrepel gridExtra Hotelling knitr magrittr MASS mvtnorm proxy reshape2 scales survival survminer vegan]; }; factorQR = derive2 { name="factorQR"; version="0.1-4"; sha256="1vl01fm5qfyhnqbl5y86vkr50b8cv07vzlqs3v6smqaqq6yp4lv4"; depends=[lattice]; }; factorcpt = derive2 { name="factorcpt"; version="0.1.2"; sha256="17hwlsrj0fx4x05p6xvs6kl43a24icmnrzyvpf2vam5imwvmpvmm"; depends=[doParallel fields foreach iterators Rcpp RcppArmadillo]; }; factorplot = derive2 { name="factorplot"; version="1.1-2"; sha256="025lfk122w66yxym3njcpzwnbhg40xi7p1c9vnxczcb8kz31745s"; depends=[multcomp nnet]; }; @@ -5288,31 +5518,33 @@ in with self; { fancycut = derive2 { name="fancycut"; version="0.1.1"; sha256="1vnxn5zl1j8209dyrwq3919hivab09f0jq4v9h7v0wlqk1hy5ich"; depends=[]; }; fanovaGraph = derive2 { name="fanovaGraph"; version="1.4.8"; sha256="1da7yskh2gn4arrrnalkl3izqyyrm0yf0il4v2izs7di7qlw3m6v"; depends=[DiceKriging igraph sensitivity]; }; fanplot = derive2 { name="fanplot"; version="3.4.1"; sha256="1xj1hdz3i9c9wdx7ryiqag69khh3544v4474ilxxiyahxg2r6m45"; depends=[]; }; - faoutlier = derive2 { name="faoutlier"; version="0.6.1"; sha256="02a93jswrq10r09kawxzvdb795bs0sym0yllb30697f9gd7bvyqz"; depends=[lattice lavaan MASS mirt mvtnorm sem]; }; + faoutlier = derive2 { name="faoutlier"; version="0.7.1"; sha256="01525b5s8jdfj796pk0yrcb3zfr0ag1x5912jp3pyfy5jj080ajs"; depends=[lattice lavaan MASS mirt mvtnorm pbapply sem]; }; far = derive2 { name="far"; version="0.6-5"; sha256="18lj2mgnn9s59ypkr19zzv0sffwpx9mgk975xmpvw4kkl84dykis"; depends=[nlme]; }; faraway = derive2 { name="faraway"; version="1.0.7"; sha256="0lalf52y9rb4zdb4kpscwddb4zy0af7r5sm7lx8s9jaqykrwrfq6"; depends=[lme4 nlme]; }; farff = derive2 { name="farff"; version="1.0"; sha256="1w3mi0vsw7mpqznaf3rnzf7va7ax07n5rrpm2hnjh0q25lsv55hk"; depends=[BBmisc checkmate readr stringi]; }; farsi = derive2 { name="farsi"; version="1.0"; sha256="0y14f86bccwjirdx33383wa605y7l7lr0w7ygvg8r7f7izkv7r3n"; depends=[]; }; + fasjem = derive2 { name="fasjem"; version="1.1.0"; sha256="0m3iblc88vqqc8hnlw9kmbkfrraq7l3ymhv6zfjhllysqg7fjizb"; depends=[igraph]; }; fast = derive2 { name="fast"; version="0.64"; sha256="098rk6kszdx3szcwvwzcv7zlcd6qvqvbqch7q8ilas6vbki81ba4"; depends=[zoo]; }; fastAdaboost = derive2 { name="fastAdaboost"; version="1.0.0"; sha256="1pv1y6znvc37pgwk99v4r0hljhipq8v6r3r5cb5vhgyl0bfi8g38"; depends=[Rcpp rpart]; }; + fastDummies = derive2 { name="fastDummies"; version="0.1.1"; sha256="0h2xqhsiwm0palkdckkh3k38yw3sf775w3vzysz9msrgf1nnasxl"; depends=[data_table]; }; fastGHQuad = derive2 { name="fastGHQuad"; version="0.2"; sha256="0yv3wdyj7hs1gr3rq08k520v0ldmv5zzng709xjx2kchhwhmy8ah"; depends=[Rcpp]; }; fastGraph = derive2 { name="fastGraph"; version="1.1"; sha256="1vbi5yssnh8hcbmrq1r437vpvj8hqd3vc8wmcy0nbyvnmyjaxkvb"; depends=[]; }; fastHICA = derive2 { name="fastHICA"; version="1.0.2"; sha256="1h794ybbii0k7v3x0r1499zxdqa1i1dpi3i7idzqdrffnb5kmwlv"; depends=[energy fastICA]; }; fastHorseshoe = derive2 { name="fastHorseshoe"; version="0.1.0"; sha256="1f9glz7zcarn4jdr6ssy41d2g6b6cqcry9mqchcq6zx576qn2irs"; depends=[lars Rcpp RcppArmadillo]; }; - fastICA = derive2 { name="fastICA"; version="1.2-0"; sha256="0ykk78fsk5da2g16i4wji85bvji7nayjvkfp07hyaxq9d15jmf0r"; depends=[]; }; - fastJT = derive2 { name="fastJT"; version="1.0.2"; sha256="1k59qvc43adh07lyz1dznghqd6nbmnx5pciyg8da89yy3zw2dvgx"; depends=[Rcpp]; }; + fastICA = derive2 { name="fastICA"; version="1.2-1"; sha256="108z2ymby5y4h8l4l2krqwm28rya93gq09yylgilnm3afvfrfabg"; depends=[]; }; + fastJT = derive2 { name="fastJT"; version="1.0.3"; sha256="0v7clj6wv3gzrcq64wkyxx0kppv26m085gwj8ca4aj5n1k23nnzh"; depends=[Rcpp]; }; fastLSU = derive2 { name="fastLSU"; version="0.1.0"; sha256="0clsd4kphlw62n7skqd0ralz3ymgxyvzn8bn06ljiwjqalzyhzhz"; depends=[]; }; fastM = derive2 { name="fastM"; version="0.0-2"; sha256="0q5dz47sqj6d4r3k6l6q34l5ajb8fjbf7xam75scp0mg3czswnfn"; depends=[Rcpp RcppArmadillo]; }; fastR = derive2 { name="fastR"; version="0.10.2"; sha256="0xh3pfcln8xp42zvq3kv03xf9kc5gqafnhdnq6r4rx7xhl9n5dw0"; depends=[lattice mosaic mosaicData]; }; fastSOM = derive2 { name="fastSOM"; version="1.0.0"; sha256="1x4kxys7mxlxz7cfbjig44za8m8p19xgzcs5y2wn9320sx8b0wc0"; depends=[]; }; + fastTextR = derive2 { name="fastTextR"; version="1.0"; sha256="0l0f9jvsa68a3vd6mwbhsqd12729nd6nwsnlzrhsg9wj9rx8kpmi"; depends=[Rcpp]; }; fastclime = derive2 { name="fastclime"; version="1.4.1"; sha256="0zcir8r11b2hxr9vvkmvxlzmhfcaxbr0wbjy86ysr912mp8fs9i3"; depends=[igraph lattice MASS Matrix]; }; fastcluster = derive2 { name="fastcluster"; version="1.1.22"; sha256="006k9isra5biyavqwci61avladw19mhp6kmkjj3777rl1r4r8b9z"; depends=[]; }; fastcmh = derive2 { name="fastcmh"; version="0.2.7"; sha256="0hib3r3pkfdi67bdy4pf1pw6869vq4b3pg1pq1zwpyy76nbnq9vl"; depends=[bindata Rcpp]; }; - fastcox = derive2 { name="fastcox"; version="1.1.1"; sha256="1a5i0ragl0r6p29iamkn04igakiwyysykfbs2p6ybgy8pfdq69sv"; depends=[Matrix]; }; fastdigest = derive2 { name="fastdigest"; version="0.6-3"; sha256="02csl261v7nassi5119ygw6jglm8q6rssg7lgyxzj73mkyilm832"; depends=[]; }; fasteraster = derive2 { name="fasteraster"; version="1.1.1"; sha256="1ycr2h046jds2758xvxn00rhglx3zarbzn3r38j66j5pnz2iiq4f"; depends=[Rcpp]; }; fastmatch = derive2 { name="fastmatch"; version="1.1-0"; sha256="0z80jxkygmzn11sq0c2iz357s9bpki548lg926g85gldhfj1md90"; depends=[]; }; - fastnet = derive2 { name="fastnet"; version="0.1.2"; sha256="124nbvxhrx2nnyzcbr602fpay1zq9fibg1k33f2pkl8pwk87s14q"; depends=[doParallel foreach igraph]; }; + fastnet = derive2 { name="fastnet"; version="0.1.3"; sha256="06nxfwv85gm93bcgq53a6z929sqcij0adkg55g5y03hcm8v8v3aa"; depends=[doParallel foreach igraph]; }; fastpseudo = derive2 { name="fastpseudo"; version="0.1"; sha256="0paag4pjh3gs270j663bsl65sfrq43gk2zzqmalr03fmcckp6aaj"; depends=[]; }; fastqcr = derive2 { name="fastqcr"; version="0.1.0"; sha256="0hzlp66as7k0bh3biqkngacpkq1hi3y3gp6wg4c5476ywzm83gra"; depends=[dplyr ggplot2 gridExtra magrittr readr rmarkdown rvest scales tibble tidyr xml2]; }; fasttime = derive2 { name="fasttime"; version="1.0-2"; sha256="11i4c0zrkvvqsax0az1fvmc0jxfsjyx28434k1qgzhj9g2j9m9cf"; depends=[]; }; @@ -5326,6 +5558,7 @@ in with self; { fbroc = derive2 { name="fbroc"; version="0.4.0"; sha256="0bxi027iqqn50mn5nrlgx3z4qdlfkrq88s0dqyaxdl8rsrwp3d2w"; depends=[ggplot2 Rcpp]; }; fcd = derive2 { name="fcd"; version="0.1"; sha256="091wbf5iskcgyr7jv58wrf590qijb0qcpninmvm3xrwxi34r37xr"; depends=[combinat glmnet MASS]; }; fclust = derive2 { name="fclust"; version="1.1.2"; sha256="08gi7w74215r44qbysg233s5n8r905b66gsi4i66xf5r7zgaqsm0"; depends=[]; }; + fcm = derive2 { name="fcm"; version="0.1.1"; sha256="1amxyn19f99ir05h0pbxa2k53zvig1vzzqwfs391bv73fmwxhzgv"; depends=[ggplot2 reshape2]; }; fcros = derive2 { name="fcros"; version="1.5.4"; sha256="112mgs69p3642rfk1w3dkkyn72icvda0asllanmgjym1lrzdp0lj"; depends=[]; }; fda = derive2 { name="fda"; version="2.4.4"; sha256="05rvrp29ip1wrk2wly06wdry2a2riynkx677nx5lg240lz12d6yw"; depends=[Matrix]; }; fda_usc = derive2 { name="fda.usc"; version="1.3.0"; sha256="1ask7g6mqwx8r1hd9vxzdl96z0gyqprswjpfcl7l5l3611m7mzdm"; depends=[fda MASS mgcv nlme rpart]; }; @@ -5333,7 +5566,7 @@ in with self; { fdaPDE = derive2 { name="fdaPDE"; version="0.1-4"; sha256="0n72x5h00n17yxjniim2qxz2phy1srk04dn6ivvc58k3x252fzkh"; depends=[RcppEigen rgl]; }; fdakma = derive2 { name="fdakma"; version="1.2.1"; sha256="0j9qgblrl7v4586dd6v0hjicli6jh8pkk5lzn8afpl75xfs24six"; depends=[]; }; fdapace = derive2 { name="fdapace"; version="0.3.0"; sha256="1r4s20spsiags7z8hyvbvi9gxjxs4v8hfnrqya872shagk9iadyl"; depends=[Hmisc Matrix numDeriv pracma Rcpp RcppEigen]; }; - fdasrvf = derive2 { name="fdasrvf"; version="1.8.0"; sha256="1q38wbvpd8bp3dycvb476g92r9wdsms1h036li2c8z546f271jip"; depends=[coda doParallel fields foreach matrixcalc mvtnorm Rcpp RcppArmadillo viridisLite]; }; + fdasrvf = derive2 { name="fdasrvf"; version="1.8.1"; sha256="189yr8y2wypqsyd3smzm852k7da9ssd3gv5y8jy1f1rs501m7pnb"; depends=[coda doParallel fields foreach matrixcalc mvtnorm Rcpp RcppArmadillo viridisLite]; }; fdatest = derive2 { name="fdatest"; version="2.1"; sha256="0zdnmssir5jz2kbfz4f4xshjfv4pivqx7cbh2arlx6ypkjrjws8n"; depends=[fda]; }; fdcov = derive2 { name="fdcov"; version="1.0.0"; sha256="1m6yk6ngsxrz5mywp3vqhfjpkskrzgdyvqw7j8k2jgy4l0x04g5g"; depends=[corrplot matlab]; }; fdq = derive2 { name="fdq"; version="0.2"; sha256="1iyplxm6niywfhmdnliy9nvvax1w6sijar8gpsj853cdfvn6kz5m"; depends=[data_table Fgmutils ggplot2 plyr randomcoloR sqldf]; }; @@ -5345,24 +5578,25 @@ in with self; { feather = derive2 { name="feather"; version="0.3.1"; sha256="1q6dbkfnkpnabq8lb6bm9ma44cfcghx2lm23pyk3vg7943wrn1pi"; depends=[hms Rcpp tibble]; }; feature = derive2 { name="feature"; version="1.2.13"; sha256="07hkw0bv38naj2hdsx4xxrm2dngi6w3rbvgr7s50bjic8hlgy1ra"; depends=[ks misc3d rgl]; }; features = derive2 { name="features"; version="2015.12-1"; sha256="0rd8r1dxzddb6718hcm8ck7531c9wdrjfy8n67875bbxgzcvds61"; depends=[lokern]; }; + featurizer = derive2 { name="featurizer"; version="0.2"; sha256="05jvwsvpbdj94q3wl7ld6xmfc9p7ff9zsmryd3mmxz0hzbq2cnkc"; depends=[]; }; fecR = derive2 { name="fecR"; version="0.0.1"; sha256="0w31hr2j80ppzwgpnbalkgrxz7ijfr43yw7xk9rjkl8gw2nq4kg6"; depends=[lubridate plyr]; }; fechner = derive2 { name="fechner"; version="1.0-3"; sha256="0bassigcipwlr2g8cdjh8jyhmb903k3hla9gnigcbz7qwzlfwa86"; depends=[]; }; federalregister = derive2 { name="federalregister"; version="0.2.0"; sha256="0qr8nd3ylnwcv1wxspw5i7ray5sh30zr648spg0lpqq8dp2b8p7b"; depends=[curl httr jsonlite]; }; feedeR = derive2 { name="feedeR"; version="0.0.7"; sha256="08mnfi96qkr1fj53ywqmya957swcwrfd3hqk0qaf2ni96sxxnp98"; depends=[digest dplyr lubridate RCurl XML]; }; fermicatsR = derive2 { name="fermicatsR"; version="1.4"; sha256="1587f67fypj22rdi1319zq765lcc9z518bzl1jr4lz6c8lrzfm9i"; depends=[]; }; - fetchR = derive2 { name="fetchR"; version="2.0-0"; sha256="1fwyv7wynchgyn7s0b4xdld5hk6clsfxhf33zk99vasgm615iizx"; depends=[plotKML rgdal rgeos sp]; }; + fetchR = derive2 { name="fetchR"; version="2.1-0"; sha256="1rrmky1wg2wz4m8nmvdxwbs4yxnwgdchddvh1dhp171364as3536"; depends=[plotKML rgdal rgeos sp]; }; ff = derive2 { name="ff"; version="2.2-13"; sha256="1nvd6kx46xzyc99a44mgynd94pvd2h495m5a7b1g67k5w2phiywb"; depends=[bit]; }; ffbase = derive2 { name="ffbase"; version="0.12.3"; sha256="1nz97bndxxkzp8rq6va8ff5ky9vkaib1jybm6j852awwb3n9had5"; depends=[bit fastmatch ff]; }; ffmanova = derive2 { name="ffmanova"; version="0.2-2"; sha256="0sw8br73mx552m4b5zi4qgjcrwxflmgsnvs4mlnxh8g2gaf5bx4j"; depends=[]; }; ffstream = derive2 { name="ffstream"; version="0.1.5"; sha256="1q07b1wdyhbvn3784lwwz3jk591cz1rv1jnf36q1piscsb3v7ayk"; depends=[Rcpp]; }; - fftw = derive2 { name="fftw"; version="1.0-3"; sha256="01nncrf2p0yq49lhd5aq4hvhp87f25r0x7siqnaldv5zq24krl30"; depends=[]; }; + fftw = derive2 { name="fftw"; version="1.0-4"; sha256="0172kpxzjx8239r2jbcqqbpcpqygrxk36a2kmh00f73mrq0kjhc0"; depends=[]; }; fftwtools = derive2 { name="fftwtools"; version="0.9-8"; sha256="1nqvpzda281rxi1cmwajxxsn3sc3gz7scv8bvs5jm34kf36whha6"; depends=[]; }; fgac = derive2 { name="fgac"; version="0.6-1"; sha256="0paddf5a4w0g2i0ay7my0bppwh534d8ghy6csfxl5jj034xjgwkk"; depends=[]; }; fgof = derive2 { name="fgof"; version="0.2-1"; sha256="0bclkb3as0fl2gyggqxczndfyj9pfnni5pa3inpn5msrnjg4g2j2"; depends=[mvtnorm numDeriv]; }; fgpt = derive2 { name="fgpt"; version="2.3"; sha256="1d0qzsn4b68jhk07k97iv765jpmzzh1gwqpid0r76vg4cwqfs3n7"; depends=[]; }; fgui = derive2 { name="fgui"; version="1.0-5"; sha256="0gzwxzvf2y9p5rlfk862d7l1dm2sdwjhjpcb8p494cj4g1xshazg"; depends=[]; }; - fields = derive2 { name="fields"; version="8.10"; sha256="1vr0iil04jcqgsm2s3cgcldg8p4jc6avwwp0zrsdixbr9rgqcz20"; depends=[maps spam]; }; - fiery = derive2 { name="fiery"; version="0.2.2"; sha256="1dinlrxal5rm16xvfripj8l3q15yfxkgj2qn2hihf03k0pj50lb2"; depends=[assertthat future httpuv R6 stringi uuid]; }; + fields = derive2 { name="fields"; version="9.0"; sha256="0fjk1gcgmmra38f574smv2grk3vkd81gldic85liaws1nqvb0z4w"; depends=[maps spam]; }; + fiery = derive2 { name="fiery"; version="0.2.3"; sha256="19g1r2p6dxzz7baqmhl8xpg5kwymrrxgpmpmih0v6073gxxy3310"; depends=[assertthat future httpuv R6 stringi uuid]; }; fifer = derive2 { name="fifer"; version="1.1"; sha256="1gcv8ns4c1y3pjmixdm16raa5h6jqmc3i4m37ahj97l720j1f2ya"; depends=[fields Hmisc MASS party plotrix randomForest randomForestSRC rpart xtable]; }; fiftystater = derive2 { name="fiftystater"; version="1.0.1"; sha256="1nri9vsqif03xrmm3g5llasqm49hj169mgv046f2l0mh9vp0fqpc"; depends=[]; }; filehash = derive2 { name="filehash"; version="2.4-1"; sha256="1x7an7rsy5pz2qr86m511rsv297vacxwk3y1a71754yq739qgq6h"; depends=[]; }; @@ -5371,35 +5605,35 @@ in with self; { filenamer = derive2 { name="filenamer"; version="0.2.1"; sha256="0xahzjgwfpyln6i2szr985csw11w8wwk644sgclwly9l2yqzsi3i"; depends=[]; }; fileplyr = derive2 { name="fileplyr"; version="0.2.0"; sha256="15rxls0njd6j2vxdahf4fx2nxmsa3rc41812v3wlaqas99naaxxr"; depends=[assertthat datadr tibble]; }; files = derive2 { name="files"; version="0.0.1"; sha256="1vhhawqjjbb6fadkn3l10mvz63w3vmcwvl93fk0q9mhkifzlj9kc"; depends=[]; }; - filesstrings = derive2 { name="filesstrings"; version="0.4.0"; sha256="0n3h8ggbk44k08xnziq7rfwn0xx50izblxlhpv68bp6aaq1hs0by"; depends=[dplyr magrittr matrixStats ore Rcpp readr stringr tibble]; }; + filesstrings = derive2 { name="filesstrings"; version="1.0.0"; sha256="0ga2gp0azcpdfws4cnwsnxsclc8i6c19a9hyygniv4ck8v23b8mm"; depends=[magrittr matrixStats ore Rcpp readr stringr tibble]; }; financial = derive2 { name="financial"; version="0.2"; sha256="1v6jgs3rq57byin5mynslfjk3zrx91qz36558nn17mv6z0qsf10v"; depends=[]; }; finch = derive2 { name="finch"; version="0.1.0"; sha256="0pqli6l049s9pdk0gphch1pw8i0f1fr3562akms1x7hvdkn9c0i9"; depends=[data_table digest EML plyr rappdirs xml2]; }; findpython = derive2 { name="findpython"; version="1.0.2"; sha256="1x38dbxr6yvxy2z2fvv00y263g66ljbzf3a8znl2fywj462i92xk"; depends=[]; }; findviews = derive2 { name="findviews"; version="0.1.3"; sha256="1l1yhw5hvrn0rpkdsch8m69d2q5284jwccvv7r4ia4m0iqjfipj7"; depends=[ggplot2 gridExtra scales shiny]; }; fingerprint = derive2 { name="fingerprint"; version="3.5.4"; sha256="0raxsyni8kbq7q2sfkp4bx6mh8wdk9mxplzi4fbqcf78cxk9bla7"; depends=[]; }; + fingertipsR = derive2 { name="fingertipsR"; version="0.1.0"; sha256="0l19ipmi4zdbckyzz38y8lvq3wfw67aqm8rk6fjyfmr9xbfx5vjc"; depends=[dplyr jsonlite tidyjson]; }; finiteruinprob = derive2 { name="finiteruinprob"; version="0.6"; sha256="0z4l0crymh58chxniqq70fqmvi6f5jkgvz72vbc7s3l9lrrapgr3"; depends=[numDeriv sdprisk]; }; finreportr = derive2 { name="finreportr"; version="1.0.1"; sha256="1mansiyl4p4zqc1h2aw9zgzb3fy4mppgmshdm8mcf4nbm340g4vk"; depends=[curl dplyr httr rvest XBRL xml2]; }; fishMod = derive2 { name="fishMod"; version="0.29"; sha256="0pbs4z27vwa3c42xdw3mr6l2i581bgvn2pk52kawbcnnlsff92ar"; depends=[]; }; fisheyeR = derive2 { name="fisheyeR"; version="0.9"; sha256="1w6va7gakqq2q8hsvdszpn8s2ysdfc648bk5p5v3wbl5s403bci8"; depends=[tkrplot]; }; fishkirkko2015 = derive2 { name="fishkirkko2015"; version="1.0.0"; sha256="1s8vsf604rc6qk0gahn61p3q8p9dhsbq14wsmrin7icq2xgl3y81"; depends=[]; }; - fishmethods = derive2 { name="fishmethods"; version="1.10-1"; sha256="0578z2qpm3bi7wsh1f9ssvxjwc2k34rvagaxcg574rsw973pmsm5"; depends=[boot bootstrap lme4 MASS]; }; + fishmethods = derive2 { name="fishmethods"; version="1.10-2"; sha256="0ik2l8441f2gpli4dbkwf7389b6awz7kalsziv9300fq5yljgg1r"; depends=[boot bootstrap lme4 MASS]; }; fishmove = derive2 { name="fishmove"; version="0.3-3"; sha256="1knbv087cg0czjcgdbrlpg69pp1dxb57b7ak5j1mcy7ay3a41a9h"; depends=[boot ggplot2 MASS plyr]; }; fit_models = derive2 { name="fit.models"; version="0.5-14"; sha256="0vjbzmx0ambm6yzidb4vbgmhclwzwv2iz2cwl54ccdkvx4cx3fck"; depends=[lattice]; }; fit4NM = derive2 { name="fit4NM"; version="3.3.3"; sha256="0k2194521yby6xxi77bpjp6ywz8kpnzws217m7n0hw6xwz5mqj1g"; depends=[cairoDevice gWidgets gWidgetsRGtk2 RGtk2 tkrplot]; }; fitDRC = derive2 { name="fitDRC"; version="1.1"; sha256="1f6avw8ia9ks17zdagpmh6yvcmi53h5cvm0wwv9hsb92x5zfhxn9"; depends=[]; }; fitTetra = derive2 { name="fitTetra"; version="1.0"; sha256="0ia6wk4gicpmn6kclsd28p7v1npwfv2blagiz0cxzwfw3njv103g"; depends=[]; }; fitbitScraper = derive2 { name="fitbitScraper"; version="0.1.8"; sha256="0b4d7xw6inp6l1dkfwyrzxwg4vspp4vzlwrhv14ajxrqz6irj8a0"; depends=[httr jsonlite stringr]; }; - fitcoach = derive2 { name="fitcoach"; version="1.0"; sha256="1nnd7g093qjlbyrdai78gpbs0xjqlfdjn1v786v7966rzp83xfkg"; depends=[caret dplyr gbm ggplot2 httr jsonlite plyr R6 reshape2]; }; fitdc = derive2 { name="fitdc"; version="0.0.1"; sha256="1b1abib7jkl7a6r686r53qjw2ywb9q2h67is8691kkaqxpawg30p"; depends=[]; }; fitdistrplus = derive2 { name="fitdistrplus"; version="1.0-9"; sha256="18x9454g598d54763k3hvi33iszifk7sxvhd1zg5r8z1vpixx3z6"; depends=[MASS survival]; }; fitplc = derive2 { name="fitplc"; version="1.1-7"; sha256="1dffgqsml6cj6ayqdpr0330kj8v57jwi3pgchb8v98rainygsyfw"; depends=[car nlme]; }; - fitur = derive2 { name="fitur"; version="0.2.0"; sha256="01jljffkfpzfhasywf1xslas5gsls5b864xjczws28ahy61jnz5b"; depends=[actuar fitdistrplus]; }; + fitur = derive2 { name="fitur"; version="0.3.0"; sha256="0k39bh715563v47v2p2kqxqwxn7qsd8an71gjfzsn0az7jv1h4d1"; depends=[actuar fitdistrplus]; }; fivethirtyeight = derive2 { name="fivethirtyeight"; version="0.2.0"; sha256="0w8m9g2y6282xlnais922n0jymv4zsh21z5lgqk8dzh1gpw3wbi2"; depends=[]; }; fixedTimeEvents = derive2 { name="fixedTimeEvents"; version="1.0"; sha256="0z7ji8yzp4pj76ad64l7ivknkbi82ijx6abd3a18wicqhrh433sj"; depends=[]; }; fizzbuzzR = derive2 { name="fizzbuzzR"; version="0.1.1"; sha256="119gbi9y4n8r52hk9vj7zf795dv9xnk7lnngljjcd7ydnhygwd4h"; depends=[]; }; - flacco = derive2 { name="flacco"; version="1.4"; sha256="1hfh71s1qb0v7ip1v5gibgdpqq4sa3cz22kwszj1pprlfp711vvg"; depends=[BBmisc checkmate mlr]; }; + flacco = derive2 { name="flacco"; version="1.7"; sha256="1w77smmbrwglayr2rj88b00x7wan9f3x1fq8h6xyhybfvrw7vr0r"; depends=[BBmisc checkmate mlr]; }; flam = derive2 { name="flam"; version="3.1"; sha256="12dkxisi56fg5720mh58jqrjvkqllqgzynafd44xalswkk4ahaak"; depends=[MASS Rcpp]; }; - flan = derive2 { name="flan"; version="0.4"; sha256="1h1i0gvq29gl0xla77vwd09vj5szrvxw2fmmzg5y2ys9lhjjjifw"; depends=[lbfgsb3 Rcpp RcppArmadillo RcppGSL]; }; + flan = derive2 { name="flan"; version="0.5"; sha256="0nzsn26fgj458h8za7drd78jqx3az8kx742d69j49pylxixblvxy"; depends=[lbfgsb3 Rcpp RcppArmadillo RcppGSL]; }; flare = derive2 { name="flare"; version="1.5.0"; sha256="03bq40lwwq49vvbarf37y7c3smm29mxqfxsc66gkg8l5pak4l38i"; depends=[igraph lattice MASS Matrix]; }; flars = derive2 { name="flars"; version="1.0"; sha256="06qma1ar1nj7n6g9alk1qydm5bkj6lsjx0pqkikxpb41d91civqk"; depends=[fda MASS Matrix Rcpp RcppEigen]; }; flashClust = derive2 { name="flashClust"; version="1.01-2"; sha256="0l4lpz451ll7f7lfxmb7ds24ppzhfg1c3ypvydglcc35p2dq99s8"; depends=[]; }; @@ -5407,10 +5641,11 @@ in with self; { flexPM = derive2 { name="flexPM"; version="2.0"; sha256="0h3qs9w9pc2nc24q1diz7j3s93y40ijpmgq2l0xg9mzcgjz9kz8c"; depends=[survival]; }; flexclust = derive2 { name="flexclust"; version="1.3-4"; sha256="1x9gyg69kb3wn02w885kl6hcwpf2ki66gzfayvc83jisrwxvdfvv"; depends=[lattice modeltools]; }; flexdashboard = derive2 { name="flexdashboard"; version="0.5"; sha256="1dv1h32diff7174mxw2n3l2216crnyb6c38qbrramhj5w72zf3da"; depends=[htmltools htmlwidgets jsonlite knitr rmarkdown shiny]; }; - flexmix = derive2 { name="flexmix"; version="2.3-13"; sha256="1i205yw3kkxs27gqcs6zx0c2mh16p332a2p06wq6fdzb20bazg3z"; depends=[lattice modeltools nnet]; }; - flexrsurv = derive2 { name="flexrsurv"; version="1.3.3"; sha256="0dkm2fdr76k2l6b02r9gxqm585x243cddvj14rw1gck570z6grnf"; depends=[Epi matrixcalc orthogonalsplinebasis survival]; }; + flexmix = derive2 { name="flexmix"; version="2.3-14"; sha256="0sl4zxh1sb2sr5q7svjw9ihrm219jzn82yrc9d43q6r1b8bpyz43"; depends=[lattice modeltools nnet]; }; + flexrsurv = derive2 { name="flexrsurv"; version="1.4.1"; sha256="13jq7yk7rz2148wkf7dv28l79zwdf1gpfkd5khgacb8hl5kml3p0"; depends=[Epi formula_tools matrixcalc orthogonalsplinebasis survival]; }; flexsurv = derive2 { name="flexsurv"; version="1.1"; sha256="1vj8zsfgq2rv6v7na4w7n7z3farc69qsavm7pnmnhkaylz61gq26"; depends=[deSolve mstate muhaz mvtnorm quadprog Rcpp survival]; }; - flextable = derive2 { name="flextable"; version="0.1.0"; sha256="05mhfpn99sn6gzrcmdx4xrrd6kwklfqvm8ckvp1zi0fxm5illw8q"; depends=[dplyr gdtools htmltools htmlwidgets lazyeval magrittr officer purrr tibble tidyr]; }; + flexsurvcure = derive2 { name="flexsurvcure"; version="0.0.1"; sha256="1zryxawknf15d113c46k2068wddj4v3wa0n8apvjgk5ikhbg9d2v"; depends=[flexsurv gtools survival]; }; + flextable = derive2 { name="flextable"; version="0.2.0"; sha256="0541vawawdvxym5prya2nahsr2v6wyxqq2n4b3rm39wvz5c0gp4y"; depends=[dplyr gdtools htmltools htmlwidgets lazyeval magrittr officer purrr R6 stringr tibble tidyr]; }; flifo = derive2 { name="flifo"; version="0.1.4"; sha256="1yilfnblarimc8mlvvwsgib5sxcfgvgsvgpyzddxb39g6fb7lffs"; depends=[bazar pryr]; }; flip = derive2 { name="flip"; version="2.4.3"; sha256="04zf2gnk5w57gxnlnh26pn1ir1wfrzxhfhchr33ghk7prhc7k4b8"; depends=[cherry e1071 Rcpp RcppArmadillo someMTP]; }; flippant = derive2 { name="flippant"; version="1.1.0"; sha256="06aj90y7c33c1q0nw1c67vr1pfmp9fw78az6ivrbq110f2k1m12w"; depends=[assertive_files assertive_numbers assertive_properties assertive_strings assertive_types data_table ggplot2 magrittr minpack_lm plyr RcppRoll stringi withr wmtsa]; }; @@ -5425,16 +5660,16 @@ in with self; { flsa = derive2 { name="flsa"; version="1.05"; sha256="07z2b1pnpnimgbzkjgjl2b074pl9mml7nac2p8qvdgv7aj070cmh"; depends=[]; }; flux = derive2 { name="flux"; version="0.3-0"; sha256="0pc9cab2pwrfl0fnz29wp7a398r49hvbi50jp8i2fk2rfvck21a7"; depends=[caTools]; }; fma = derive2 { name="fma"; version="2.3"; sha256="1z7shh9ng3q7ax22cwg86y79jzz5gbchdny2rppzzm0lkvvyy5pm"; depends=[forecast]; }; - fmbasics = derive2 { name="fmbasics"; version="0.1.0"; sha256="1nf3s59qjiylrr293dzrnrza6q7xywsgczyb1d07x85bb9gcxkih"; depends=[assertthat fmdates lubridate]; }; + fmbasics = derive2 { name="fmbasics"; version="0.2.0"; sha256="0ni3gyacga9wwmqbgxjndxl6jv62m8r18wxb91by9plmqabb4yqs"; depends=[assertthat fmdates lubridate tibble]; }; fmdates = derive2 { name="fmdates"; version="0.1.2"; sha256="0j79a6dc9bxhfxki77fmvn36x73kgpqym1m46pj74jzyz32sb05h"; depends=[assertthat lubridate]; }; fmri = derive2 { name="fmri"; version="1.7-2"; sha256="1ifp0fkmr0bj5vkg9vh0lk74f04fk0zc90vknmjmxd2hbdb5kh4r"; depends=[awsMethods metafor nlme]; }; fmrs = derive2 { name="fmrs"; version="1.0-9"; sha256="1x9g67701kcnz3p97iynr74sn0mfpxpp16mv1l4zxlhhfn2v5lwx"; depends=[survival]; }; - fmsb = derive2 { name="fmsb"; version="0.6.0"; sha256="1dn5a7pvfy0mil5f0wspaqiaq90ylhxw36cr42lk60irdgmmrsfj"; depends=[]; }; + fmsb = derive2 { name="fmsb"; version="0.6.1"; sha256="1kdw0j1jl76dzsk56lpl5vvrx5l0w9rc94kmj1dhbqb5yh64xai7"; depends=[]; }; fmt = derive2 { name="fmt"; version="1.0"; sha256="13gsywnyvf9zy5n644g2xyd60f92w2dp7vil2dncjvjcqsib22a0"; depends=[]; }; foba = derive2 { name="foba"; version="0.1"; sha256="1af8whgl66v0vwzdf03b6141k3dysdc0svymlgifcga5gqkwzsl0"; depends=[]; }; focusedMDS = derive2 { name="focusedMDS"; version="1.3.3"; sha256="18s86dbbpyajscqr9frprf2vp1zif7vh4lw5m0cjskfc6gmsdp2p"; depends=[htmlwidgets]; }; - foghorn = derive2 { name="foghorn"; version="0.4.2"; sha256="0wskaky1jb9yqz0ds1hjrvdfdxdsmbfx730257z9xsyip1fwlic4"; depends=[clisymbols crayon curl dplyr httr lazyeval magrittr rvest tibble tidyr xml2]; }; - fold = derive2 { name="fold"; version="0.1.1"; sha256="0n4wd918xbcjinf6bzjpq6afvdj1a965m17q96khr5yk0blc3qyd"; depends=[csv dplyr encode lazyeval tidyr]; }; + foghorn = derive2 { name="foghorn"; version="0.4.4"; sha256="19cabq0ffc03x2p9jjsnfh1bpkdlqa8lnf7qr6cvd3sczj4n1pdl"; depends=[clisymbols crayon curl dplyr httr lazyeval magrittr rvest tibble tidyr xml2]; }; + fold = derive2 { name="fold"; version="0.1.2"; sha256="132179lsjcsbx1xcz161ajphm1j1wmvj18xasp2biiwbjpj43hyv"; depends=[csv dplyr encode lazyeval tidyr]; }; fontBitstreamVera = derive2 { name="fontBitstreamVera"; version="0.1.1"; sha256="0nipdlmhjv1wr3aidcl97nk6mppdkd65krgwqnhdsnv0jpfv761j"; depends=[]; }; fontHind = derive2 { name="fontHind"; version="0.1.1"; sha256="0qz3bj8vdy6jayy84p3vyxfwqll4v4qlklwq9wl981ii2k7g0vxf"; depends=[extrafont ggplot2 hrbrthemes]; }; fontLiberation = derive2 { name="fontLiberation"; version="0.1.0"; sha256="1w1rl0g4ayyp8lwppmz9yzj9cizg7i50g07216jkm1q5w0is9pmc"; depends=[]; }; @@ -5446,25 +5681,25 @@ in with self; { forcats = derive2 { name="forcats"; version="0.2.0"; sha256="1mvwkynvvgz2vi8dyz11x7xrp53kadjawjcja34hwk1d89qf7g5m"; depends=[magrittr tibble]; }; foreach = derive2 { name="foreach"; version="1.4.3"; sha256="10aqsd3rxz03s1qdb6gsb1cj89mj4vmh491zfpin4skj1xvkzw0y"; depends=[codetools iterators]; }; forecTheta = derive2 { name="forecTheta"; version="2.2"; sha256="1a7ip3czm8k82kb8dx95m8q47kjhifdj51gzavd1zj9ni3vwbhfn"; depends=[forecast tseries]; }; - forecast = derive2 { name="forecast"; version="8.0"; sha256="0hmdas2vybv2057d33vqqsb4w9npn15a5kqcg2rvy0m2p0c66ibm"; depends=[colorspace fracdiff ggplot2 lmtest magrittr nnet Rcpp RcppArmadillo timeDate tseries zoo]; }; - forecastHybrid = derive2 { name="forecastHybrid"; version="0.4.0"; sha256="0gjjrq12b6r86asrawf4v7r13k1hv5q9km0g7fcjjinq3b32pn9r"; depends=[forecast ggplot2 reshape2 zoo]; }; - forecastSNSTS = derive2 { name="forecastSNSTS"; version="1.1-1"; sha256="1rmar6qfiw9hszwqp988csvwsq8q72d39a2xmr9yq36llnbg6i5p"; depends=[Rcpp]; }; + forecast = derive2 { name="forecast"; version="8.1"; sha256="1f49rxrls2721p9jb6krq6d4qnhdjm4z76kwr1k45sgh2km27s61"; depends=[colorspace fracdiff ggplot2 lmtest magrittr nnet Rcpp RcppArmadillo timeDate tseries zoo]; }; + forecastHybrid = derive2 { name="forecastHybrid"; version="0.4.1"; sha256="1mavwk6jk70im9zl9lv3i02w5k5mijgyq7nn333xfynb9z6iqh3v"; depends=[forecast ggplot2 reshape2 zoo]; }; + forecastSNSTS = derive2 { name="forecastSNSTS"; version="1.2-0"; sha256="1rnf2a7sri52sm976iicab660qk07pmz8jmd3q71dg4hmc30yf9j"; depends=[Rcpp]; }; forega = derive2 { name="forega"; version="1.0"; sha256="0xf9almfikfkxq8mm09lzrvav2v5cg0avpz99i6h5i9qliix1q6r"; depends=[forecast Rcpp robfilter]; }; - foreign = derive2 { name="foreign"; version="0.8-67"; sha256="1mcrm2pydimbyjhkrw5h380bifj1jhwzifph1xgh90asf3lvd1xd"; depends=[]; }; + foreign = derive2 { name="foreign"; version="0.8-69"; sha256="0s1lxmd85dd0kxx8hwk02w9l7pmpk4bpy7787fbyh2dbq5g9ys0k"; depends=[]; }; forensic = derive2 { name="forensic"; version="0.2"; sha256="0kn8wn6p3fm67w88fbarg467vfnb42pc2cdgibs0vlgzw8l2dmig"; depends=[combinat genetics]; }; forensim = derive2 { name="forensim"; version="4.3"; sha256="1jhlv9jv832qxxw39zsfgsf4gbkpyvywg11djldlr9vav7dlh3iw"; depends=[tcltk2 tkrplot]; }; - forestFloor = derive2 { name="forestFloor"; version="1.9.5"; sha256="09xwk42qkwq47bpybnxbr1flraadmxp7bp9r1ii1zvmcp3zgxqcl"; depends=[kknn Rcpp rgl]; }; - forestinventory = derive2 { name="forestinventory"; version="0.1.0"; sha256="1hd56w1lzq6mfsikvcxdyh1l51fhw5wy9fy99v48i1hy87qx7p3d"; depends=[plyr]; }; + forestFloor = derive2 { name="forestFloor"; version="1.11.1"; sha256="1sslxq44qmmmdhr7800bz8lj9w2l7f7x1vly3w2z7j1qdijc7nw7"; depends=[kknn randomForest Rcpp rgl]; }; + forestinventory = derive2 { name="forestinventory"; version="0.2.0"; sha256="09r5m0nal3ac2aiyqm7ppkcipnjhls5197lmg5xbnllw4icvpfy0"; depends=[plyr]; }; forestmodel = derive2 { name="forestmodel"; version="0.4.3"; sha256="1v1m8dvird2r1jqig492msqpp9sb4s79bhgnrs9y2c0ba46jzykh"; depends=[broom dplyr ggplot2 lazyeval]; }; forestplot = derive2 { name="forestplot"; version="1.7"; sha256="0sxbh7chmy3aixvwks2mzzx0n6h9zkk6c4nsw3ihll213x8pph4q"; depends=[checkmate magrittr]; }; - formatR = derive2 { name="formatR"; version="1.4"; sha256="1fvynq0fj1r9grg9vvfdh5fl2riv6qki9f2rfpyvbvqq3xxpmi3f"; depends=[]; }; + formatR = derive2 { name="formatR"; version="1.5"; sha256="19sd23vgs4ac0fwlw40j3676k6mramb0ajlq8hdw23kjwdx1jk47"; depends=[]; }; formattable = derive2 { name="formattable"; version="0.2.0.1"; sha256="1s7jjgm0j24vdwm39933ygh6xnxcfvzy4kl2mmfgas4czfcmd4rf"; depends=[htmltools htmlwidgets knitr rmarkdown]; }; formula_tools = derive2 { name="formula.tools"; version="1.6.1"; sha256="14n89fljl5x24fka2jab41hwqmjq3a2yl02n58n1li20wrl3zagj"; depends=[operator_tools]; }; fortunes = derive2 { name="fortunes"; version="1.5-4"; sha256="109ly9kpfn6hy294ava8795wy5z9l1bnl98hhhv8kn9naf4camdg"; depends=[]; }; forward = derive2 { name="forward"; version="1.0.3"; sha256="0swn5ysp3f660kl9jpmkck9324j1g3yhj2hl238rfrcr5wihxifc"; depends=[MASS]; }; fossil = derive2 { name="fossil"; version="0.3.7"; sha256="188hyb3r1dnxkmqf2czh1kdzmk4mjc0v1kn1zml2yvxaxk7adsrz"; depends=[maps shapefiles sp]; }; - fourPNO = derive2 { name="fourPNO"; version="1.0.3"; sha256="1354rlrq7a748430v9kp7m896z1xz43fggy0nzsh9wq5r9kc9az2"; depends=[Rcpp RcppArmadillo]; }; - fourierin = derive2 { name="fourierin"; version="0.1.2"; sha256="0pr7207w7hv6wjmmzfxwf584nnymg2jyxjb7003ljh2bdiqp1y7z"; depends=[Rcpp RcppArmadillo]; }; + fourPNO = derive2 { name="fourPNO"; version="1.0.4"; sha256="08l359fj39sdbq48qk05805kv25rw1wq93db0b7rvsi3iyi2lngk"; depends=[Rcpp RcppArmadillo]; }; + fourierin = derive2 { name="fourierin"; version="0.2.2"; sha256="0hy033bzybdc214z10wnbqph5f83fsr13admnzwb1d2drpbljnc8"; depends=[Rcpp RcppArmadillo]; }; fpCompare = derive2 { name="fpCompare"; version="0.2.1"; sha256="0vva60xixlx6l8623qvj2sdn5w3gjscrv5g8hqmgir4f211lzg38"; depends=[]; }; fpa = derive2 { name="fpa"; version="1.0"; sha256="0kgpl9qq0l10h0vdd2f8vnir0kdylh1jvvv5z4d9ygj1pl9qywhk"; depends=[fields reshape]; }; fpc = derive2 { name="fpc"; version="2.1-10"; sha256="15m0p9l9w2v7sl0cnzyg81i2fmx3hrhvr3371544mwn3fpsca5sx"; depends=[class cluster diptest flexmix kernlab MASS mclust mvtnorm prabclus robustbase trimcluster]; }; @@ -5472,7 +5707,7 @@ in with self; { fpest = derive2 { name="fpest"; version="0.1.1"; sha256="013r8295spm02j558aqvnrnbkg2g73gl5vi4lqzngbw8yr8qlkri"; depends=[]; }; fpow = derive2 { name="fpow"; version="0.0-2"; sha256="0am3nczimcfrm9hi02vl2xxsh703qjmr2j11y014mll3f2v1l8cy"; depends=[]; }; fpp = derive2 { name="fpp"; version="0.5"; sha256="1jqnx6bgpvnbbj2fa2b6m6aj8jd5cb9kz877r8kp7a5qj62xv1ww"; depends=[expsmooth fma forecast lmtest tseries]; }; - fpp2 = derive2 { name="fpp2"; version="2.0"; sha256="1fpph63rzchy98v4skc396swbmmnpjmfkfidk9xs5mfibs66594b"; depends=[expsmooth fma forecast ggplot2]; }; + fpp2 = derive2 { name="fpp2"; version="2.1"; sha256="1plnp946r48f058g3i31865jmlxh6xn4yfbwwdfiqqxvsk7jz66l"; depends=[expsmooth fma forecast ggplot2]; }; fptdApprox = derive2 { name="fptdApprox"; version="2.1"; sha256="00vxwcwca7zfm4fr0x9898snr6j0474ci1bahjmpj2jxiclwnhzs"; depends=[]; }; fracdiff = derive2 { name="fracdiff"; version="1.4-2"; sha256="03l5dqpqwwi5c8fwc2vissfawcsignai60h2zalknkibvk782dwq"; depends=[]; }; fracprolif = derive2 { name="fracprolif"; version="1.0.6"; sha256="1cpb71yk1245j6qz4mqvpqc3s3lrmav4blp5wlxasjizn3ilwh66"; depends=[emg numDeriv]; }; @@ -5481,10 +5716,10 @@ in with self; { fractalrock = derive2 { name="fractalrock"; version="1.1.0"; sha256="15f4w8hq3d8khgq269669ri16qxhar9646w40cw7wzh79r9gpf00"; depends=[futile_any futile_logger quantmod timeDate]; }; fractional = derive2 { name="fractional"; version="0.1.3"; sha256="1jz83y53s0xdphh1z3v3z7xhcmhx7rp0iiazw2vdsx2747r3rirn"; depends=[Rcpp]; }; fragilityindex = derive2 { name="fragilityindex"; version="0.0.8"; sha256="07d7rx2iymp3w1rmzd9n2r8ydjldxxfpp8a56pw6srlnjj4xi80a"; depends=[pbapply stringr survival]; }; - frailtyEM = derive2 { name="frailtyEM"; version="0.5.4"; sha256="0bc3cd5clk6mxrq8kra50bkj6wgl3q1mvbf1s5kz40xbra1kk5nn"; depends=[magrittr msm optimx Rcpp survival]; }; + frailtyEM = derive2 { name="frailtyEM"; version="0.7.0-1"; sha256="1h8ygph0b7w623wf0r7zvq70lk6z2y96j608hxxiqslpnssicx9h"; depends=[expint ggplot2 magrittr msm Rcpp survival]; }; frailtyHL = derive2 { name="frailtyHL"; version="1.1"; sha256="1xjdph0ixanf9w4b6hx6igfhkcp8h93sclrg0pgqgmbvm41lhb1x"; depends=[Matrix numDeriv survival]; }; frailtySurv = derive2 { name="frailtySurv"; version="1.3.2"; sha256="0qsq96p29rxlfkhbmg8cfqdnpzh8wq2nadpiim9d6l0bs20r51gl"; depends=[ggplot2 nleqslv numDeriv Rcpp reshape2 survival]; }; - frailtypack = derive2 { name="frailtypack"; version="2.11.1"; sha256="1gw0kpkf4a47j6m651nqqdrxxbcqfhy78623pfw1ag06w0kwip1p"; depends=[boot MASS nlme survC1 survival]; }; + frailtypack = derive2 { name="frailtypack"; version="2.12.1"; sha256="1ly2951rmvi3im9pjvd25hrxz1q3iiq5w2y4wyvlcmzb0fszyh31"; depends=[boot MASS nlme statmod survC1 survival]; }; frair = derive2 { name="frair"; version="0.5.100"; sha256="1j557dqvc5xiz7xbl4h7vp55pc3hly8ci01qy36p02vlxhzf4hj3"; depends=[bbmle boot lamW]; }; franc = derive2 { name="franc"; version="1.1.1"; sha256="0agrzdrgfw4a3jn6a2867rf99a87ngv6wi73ys2l7gr7mkpq54v5"; depends=[jsonlite]; }; frbs = derive2 { name="frbs"; version="3.1-0"; sha256="0ngvi7lg6aviwic8f4ya03khyzh3ksglpmsnrdjjznwj874y2wim"; depends=[]; }; @@ -5495,7 +5730,9 @@ in with self; { freqdist = derive2 { name="freqdist"; version="0.1"; sha256="1pb45jabv9s3qa7v1isd5wm9b0g9p04q5h18spcaax8397s0d2fv"; depends=[]; }; freqdom = derive2 { name="freqdom"; version="1.0.4"; sha256="0flx4316q8m9v5zy8bxjp18a25p1vwq6wvfs81r0g609ag54vy5b"; depends=[mvtnorm]; }; freqparcoord = derive2 { name="freqparcoord"; version="1.0.1"; sha256="011p8xh0i0x0w5rv5qz5a7fxwdhxd8l2bqi9bxv5almxd0y7ajqx"; depends=[FNN GGally ggplot2 mvtnorm]; }; - freqweights = derive2 { name="freqweights"; version="1.0.3"; sha256="1yp1msb9mmndi0snchmbi3ssqnshjmn3sllmq7l5ipk9si6h3062"; depends=[biglm data_table dplyr FactoMineR fastcluster plyr]; }; + frequencies = derive2 { name="frequencies"; version="0.1.1"; sha256="0d52kf4r13n59990xhra9i6gfvs4sn7ix54d0c0g56p1rj7hnh79"; depends=[dplyr]; }; + frequencyConnectedness = derive2 { name="frequencyConnectedness"; version="0.1.6"; sha256="06lqy1w3j0k3wddazk9a8pj076sjpr986756cx2z11s6a9j4pkfx"; depends=[urca vars]; }; + freqweights = derive2 { name="freqweights"; version="1.0.4"; sha256="1iy2vzv4wc2883yq8r31wpspa7gm7cd4wkgvbh7mwafll463zni2"; depends=[biglm data_table dplyr FactoMineR fastcluster plyr]; }; frm = derive2 { name="frm"; version="1.2.2"; sha256="1dl0vca9r2dams99sc13pfpi0b3yb02x59f4c1jz07zz005c8l23"; depends=[]; }; frmhet = derive2 { name="frmhet"; version="1.1.3"; sha256="07sgsfhzrci8g1b0gicjfca1mgd8ppfqpkpp4q9bdxnjvdvlf45s"; depends=[]; }; frmpd = derive2 { name="frmpd"; version="1.1.0"; sha256="0irgqdr0vr8k408lsxcrjkjbjvqvmy5mnjw9c1ghs86isrp5mciz"; depends=[]; }; @@ -5505,30 +5742,31 @@ in with self; { frontiles = derive2 { name="frontiles"; version="1.2"; sha256="08qq25wbylvhvmq34wggyj0hwdlxfs9rfs8gjqsrg50xccchniqi"; depends=[classInt colorspace rgl sp]; }; frt = derive2 { name="frt"; version="0.1"; sha256="1qy76a1wkznaqzlyj1nq74mf1pnyly1s8gnff8q30zfccqk68cxv"; depends=[]; }; fscaret = derive2 { name="fscaret"; version="0.9.4.1"; sha256="19g0vcgbq3l9b9x264jg5q17lrky7xrznc8wjxkvnjqdykjmzjhp"; depends=[caret gsubfn hmeasure]; }; - fsia = derive2 { name="fsia"; version="1.1"; sha256="18pblp22rfaklv283515qrx8liaqf84mm8gw9pj70qi068nw36x8"; depends=[]; }; + fsia = derive2 { name="fsia"; version="1.1.1"; sha256="0id7cnswrqylgpwjil1zfn89ryrdpl20fim8x1srl8s1hm5bg35r"; depends=[]; }; fslr = derive2 { name="fslr"; version="2.12"; sha256="1ivjza08qxa8dfgyvcikrggivzd1kb2anqj907hj5g8rsqfjdrrs"; depends=[matrixStats neurobase oro_nifti R_utils]; }; fso = derive2 { name="fso"; version="2.0-1"; sha256="02dr12bssiwn8s1aa1941hfpa4007gd65f3l4s74gs2vgjzdxf8s"; depends=[labdsv rgl]; }; fst = derive2 { name="fst"; version="0.7.2"; sha256="1y2yzx8bwn747vibi0dds1m1rwyy588nppvbgp4bars1w3h4pps5"; depends=[data_table Rcpp]; }; + ftDK = derive2 { name="ftDK"; version="1.0"; sha256="1xs2rr2afjza97kpym5zkas3k78pilxjlh7lp1gc66banldr71g2"; depends=[dplyr httr pbapply purrr tibble]; }; ftnonpar = derive2 { name="ftnonpar"; version="0.1-88"; sha256="0df9zxwjpfc939ccnm1iipwhpf76b34v0x74nsi1mm1g927dfl0i"; depends=[]; }; fts = derive2 { name="fts"; version="0.9.9"; sha256="1qgp8xdwr5pp2b7nd8r717a6p8b6izwqrindx2d1d0lhhnqlcwhv"; depends=[BH zoo]; }; - ftsa = derive2 { name="ftsa"; version="4.7"; sha256="0n31vd73r2zm7mzlkd4bjpz9p61qq35jld06bv9p9dg0y883xnig"; depends=[colorspace fda forecast MASS pcaPP rainbow sde]; }; + ftsa = derive2 { name="ftsa"; version="4.8"; sha256="1qwz3mk9dnf44016dy2dgpq0ivs2wzi5kq24jw3lbkgdjig2h6f5"; depends=[colorspace fda forecast MASS pcaPP rainbow sde]; }; ftsspec = derive2 { name="ftsspec"; version="1.0.0"; sha256="12f9yws1r26i240ijq0xqprl3pgbw50wv68jsm75ycplbs2jsyhs"; depends=[sna]; }; fueleconomy = derive2 { name="fueleconomy"; version="0.1"; sha256="1svy5naqfwdvmz98l80j38v06563vknajisnk596yq5rwapl71vj"; depends=[]; }; fugeR = derive2 { name="fugeR"; version="0.1.2"; sha256="0kd90s91vzv0g3v9ii733h10d8y6i05lk21p5npb3csizqbdx94l"; depends=[Rcpp snowfall]; }; fullfact = derive2 { name="fullfact"; version="1.2"; sha256="13729m2s8b32d9i9c6g2r0zkcqsw9p7nhdig8isarfn4bjzqhf71"; depends=[afex lme4]; }; fulltext = derive2 { name="fulltext"; version="0.1.8"; sha256="14gvhjc9433hnb5dh88svxyahbcv968njxjfwgc5ii9lpcpw5935"; depends=[aRxiv digest httr jsonlite magrittr R_cache rcrossref rentrez rplos rredis tm whisker xml2]; }; fun = derive2 { name="fun"; version="0.1-0"; sha256="0z4nq2w1wz1clc7cf87pf870hayxq5mpzhllfgwj4mmh2xpphnrf"; depends=[]; }; - funData = derive2 { name="funData"; version="1.0"; sha256="13f6jlw3g7glz5anlwmj7g64kia18ldm3nfj55qybjfh4b6rh7v3"; depends=[abind fields foreach]; }; + funData = derive2 { name="funData"; version="1.1"; sha256="0qr3rwa4z6173px9wqb17wcdfsnjgfqvfwwpzi8sldgmvq3l7dfg"; depends=[abind fields foreach]; }; funFEM = derive2 { name="funFEM"; version="1.1"; sha256="08798lvryykrxfvp2297anzl4gi81gwvc1qyyzq16nafjf65kwfy"; depends=[elasticnet fda MASS]; }; funHDDC = derive2 { name="funHDDC"; version="1.0"; sha256="038m64yv27wz7ki2gcn94q011p8mv0ggmli5n27y0f5bnkfh6d6w"; depends=[fda]; }; - funModeling = derive2 { name="funModeling"; version="1.6.2"; sha256="1ivsh5ilzxjsi8365cpvz72kh4vk4cg842bmc1dxazyrnwanilbv"; depends=[dplyr ggplot2 gridExtra Hmisc lazyeval pander RColorBrewer reshape2 ROCR scales]; }; + funModeling = derive2 { name="funModeling"; version="1.6.4"; sha256="15xfgz4200w54phbrv79n9df9p7l0m60xv1zfqb08kx5jfd996dc"; depends=[dplyr ggplot2 gridExtra Hmisc lazyeval moments pander RColorBrewer reshape2 ROCR scales]; }; funchir = derive2 { name="funchir"; version="0.1.4"; sha256="1mbsy65628q117c2k01wvibpjd3ibigy4yc1c8m0rf9jwsc67qjb"; depends=[data_table]; }; functional = derive2 { name="functional"; version="0.6"; sha256="120qq9apg6bf39n9vnp68db5rdhwvnj2vi12a8j8243vq8kqxdqr"; depends=[]; }; functools = derive2 { name="functools"; version="0.2.0"; sha256="0g62jdia3n09vq8mx1m2r4nl3jfcadzpym0wkldzzzjcfs90vl6b"; depends=[]; }; funcy = derive2 { name="funcy"; version="0.8.6"; sha256="0wlcwwmv92djj35i7nnfns5l79fca6hsfrjxgsqmwgjb28gy19bs"; depends=[calibrate car caTools cluster fda fields flexclust kernlab MASS Matrix plyr sm wavethresh]; }; fungible = derive2 { name="fungible"; version="1.5"; sha256="1f4q26rfl7d35ng5nx11mzzv9fhk4zg62j63c59i649wcx1xsan9"; depends=[e1071 lattice MASS mvtnorm nleqslv R2Cuba stringr]; }; funr = derive2 { name="funr"; version="0.3.2"; sha256="11mjd1ba9kwawh7k5py54mkq4g1df79d7qivan8fj11qfwfzm679"; depends=[]; }; - funrar = derive2 { name="funrar"; version="1.0.2"; sha256="0qxhlqc1i0w91xmqawbsqk7gh8fdxq165qrjkbprsw548p5jbdbn"; depends=[cluster dplyr]; }; + funrar = derive2 { name="funrar"; version="1.1.1"; sha256="03226824ax6p9dfzrb512q340cagsxmqia974dba575gf8b19x9a"; depends=[cluster dplyr]; }; funreg = derive2 { name="funreg"; version="1.2"; sha256="199zvqali0sb0z4yp20rm5da0kd7z3rgv47g1cb1apsbcw0cq51n"; depends=[MASS mgcv mvtnorm]; }; funtimes = derive2 { name="funtimes"; version="4.0"; sha256="0a0xpybalk38p3n0fd5f3g4yav99j6ck03d1pkx0w2yqqxnviqhw"; depends=[dbscan Jmisc Kendall]; }; furniture = derive2 { name="furniture"; version="1.5.0"; sha256="1x0r22hblqlbialpp9vr41ngyrcffqy86d79vhazk3lcdks5hh1s"; depends=[knitr]; }; @@ -5537,14 +5775,15 @@ in with self; { futile_matrix = derive2 { name="futile.matrix"; version="1.2.6"; sha256="10v7ffjm8az75lb39526p3y8b1zhmmzx07pybiy20zydznhyvv2p"; depends=[futile_logger lambda_r lambda_tools RMTstat]; }; futile_options = derive2 { name="futile.options"; version="1.0.0"; sha256="1hp82h6xqq5cck67h7lpf22n3j7mg3v1mla5y5ivnzrrb7iyr17f"; depends=[]; }; futile_paradigm = derive2 { name="futile.paradigm"; version="2.0.4"; sha256="14xsp1mgwhsawwmswqq81bv6jfz2z6ilr6pmnkx8cblyrl2nwh0v"; depends=[futile_options RUnit]; }; - future = derive2 { name="future"; version="1.4.0"; sha256="05lbagy57bazm991pm3p76d5w627cxhyrsjl18h001xvqv7k1hix"; depends=[digest globals listenv]; }; - future_BatchJobs = derive2 { name="future.BatchJobs"; version="0.14.0"; sha256="155dvfrw94bki0z5aavyxahw3ks70aadw47gi9a9432dfxr2fmjg"; depends=[BatchJobs future R_utils]; }; + future = derive2 { name="future"; version="1.5.0"; sha256="1c47dn6zvhls2mqhfpg3554bjnm8kjj1c23dnd00kipkqa59i2kb"; depends=[digest globals listenv]; }; + future_BatchJobs = derive2 { name="future.BatchJobs"; version="0.14.1"; sha256="0wa97z4mkip29mqaj0hp9iscvnmphidrp0l637qv53m2cfvmg62z"; depends=[BatchJobs future R_utils]; }; + future_batchtools = derive2 { name="future.batchtools"; version="0.5.0"; sha256="1agv44cwf3l0ax7nra83j96l17lyvrbxzyssrggilafxla3bfzrp"; depends=[batchtools future]; }; futureheatwaves = derive2 { name="futureheatwaves"; version="1.0.3"; sha256="122b2z86bzxfch67y6cpq8wj62mw0dgkzbmnpwi247kdx7w5mw1f"; depends=[data_table dplyr ggplot2 ggthemes leaflet Rcpp stringr tidyr]; }; - fuzzr = derive2 { name="fuzzr"; version="0.2.0"; sha256="0m5x3khps7mk43xvk76jqylcxs9581y1ppr58bq68j4rqraq3r1s"; depends=[assertthat progress purrr]; }; + fuzzr = derive2 { name="fuzzr"; version="0.2.1"; sha256="10f9qd7cn0sqk02b5p1iq9prf5kjdivn0fkky4lb7chqvk2cwbv5"; depends=[assertthat progress purrr]; }; fuzzyFDR = derive2 { name="fuzzyFDR"; version="1.0"; sha256="0zd8i9did0d9gp42xjmwrccm32glabvvy08kl8phhwb1yaq53h7w"; depends=[]; }; fuzzyRankTests = derive2 { name="fuzzyRankTests"; version="0.3-10"; sha256="1xj5xsm2s4ylv3b8v80qny201iddjym07h8d50asas7xy1k7945z"; depends=[]; }; - fuzzyforest = derive2 { name="fuzzyforest"; version="1.0.2"; sha256="11lgv9faq1avgvb58br2dbd46k7449v3y5cv0cjmlj63a6357lqw"; depends=[doParallel doRNG foreach ggplot2 randomForest]; }; - fuzzyjoin = derive2 { name="fuzzyjoin"; version="0.1.2"; sha256="1anipzcr5j5vp9p8hy16vdc7rf8kd0nm5r72j9998npad7k5xj8d"; depends=[dplyr geosphere purrr stringdist stringr tidyr]; }; + fuzzyforest = derive2 { name="fuzzyforest"; version="1.0.3"; sha256="046iifjaz0nmf4l2y97myyx8rb47m90qgs3mklpisqi9l6x3d8np"; depends=[doParallel doRNG foreach ggplot2 mvtnorm randomForest]; }; + fuzzyjoin = derive2 { name="fuzzyjoin"; version="0.1.3"; sha256="16l2vwx5yxwbm7lhb4a1ypgx8kl2rrdc02qkh59lblhzya1jiid8"; depends=[dplyr geosphere purrr stringdist stringr tidyr]; }; fuzzywuzzyR = derive2 { name="fuzzywuzzyR"; version="1.0.0"; sha256="1ihbj0ydzy9lb79irgnfbgcnvxlhif8b02bdp5ajahg12brghvkb"; depends=[R6 reticulate]; }; fwdmsa = derive2 { name="fwdmsa"; version="0.2"; sha256="0p0kh8am6gajfaixkvq61f12hfbm6chl9372yzn1yilhiyvqdxgp"; depends=[]; }; fwi_fbp = derive2 { name="fwi.fbp"; version="1.7"; sha256="1wk9cr0kk6zkbf111bv87n7b1wwx1qrsbjxydvbjvy8bgz0nfa62"; depends=[]; }; @@ -5581,38 +5820,43 @@ in with self; { gaiah = derive2 { name="gaiah"; version="0.0.2"; sha256="1qc3crjxramyxl86dp8mcmvskixny7x6ji0jqf5dqf5r5qc7zrs9"; depends=[dplyr geosphere ggplot2 lazyeval magrittr maptools raster rgeos sp stringr tidyr]; }; gains = derive2 { name="gains"; version="1.1"; sha256="1mn8db8yxgkf8z6nm6k76g5l3i3vnw750ksg3w9ysd2pcabb65g1"; depends=[]; }; galts = derive2 { name="galts"; version="1.3"; sha256="0b18hsdcsx43rn8l4x9nhy9hgggjr5b8kvjnbxrf6r23qsdk43mn"; depends=[DEoptim genalg]; }; - gam = derive2 { name="gam"; version="1.14"; sha256="1z31anm8c4aly7wd9j4zl34pfc0i8cr3p2yjhhf4x3850a1sjlv6"; depends=[foreach]; }; + gam = derive2 { name="gam"; version="1.14-4"; sha256="13ma6zkqf1xlyrjlp228b2kq6pgh3fg9a7xmy3r3p0y40zvxfrba"; depends=[foreach]; }; gamCopula = derive2 { name="gamCopula"; version="0.0-2"; sha256="19sx0n9mavjwdzi5ii7n2mcrcrm1k1pbsdmvwnrsqvbvaz9r8vbg"; depends=[copula doParallel foreach gsl igraph MASS mgcv numDeriv VineCopula]; }; + gamRR = derive2 { name="gamRR"; version="0.1.0"; sha256="1hry7y9mx7yv4ai3hgg6ic91dzd5mqf0yp12d5jkxjlqy9c1xwd3"; depends=[mgcv]; }; gamair = derive2 { name="gamair"; version="1.0-0"; sha256="13n2n4b7givzvia93awy7ym0gihl4lr08w3a6ny2pq0f3zbhzw97"; depends=[]; }; gambin = derive2 { name="gambin"; version="1.4"; sha256="11k5y400d8ghaagvd1wrisjsid5zn4qgv07qf60a6f4ynsfbigca"; depends=[]; }; - gamboostLSS = derive2 { name="gamboostLSS"; version="1.2-2"; sha256="1np2pb47pv1jgg1gl9k728bfxaq10yghnmgx2ahi2a86b6pzff2s"; depends=[mboost]; }; + gamboostLSS = derive2 { name="gamboostLSS"; version="2.0-0"; sha256="0z9wzvxjhnjl2bjnd5pxqzvv43hak7x5m23j76qnm05j12vw4bz1"; depends=[mboost stabs]; }; gamboostMSM = derive2 { name="gamboostMSM"; version="1.1.87"; sha256="0if0x92lch57ksll8d5i3jzk0kh40593b20c17g3hvc33920c7r0"; depends=[mboost]; }; gamclass = derive2 { name="gamclass"; version="0.56"; sha256="13gy8ys69dkhm54x3vcpqblq4j2hkbsnaswzcq0v0saqd9b1shcs"; depends=[ape car DAAG KernSmooth lattice latticeExtra MASS mgcv randomForest rpart]; }; games = derive2 { name="games"; version="1.1.2"; sha256="01hbbr2hsxi5j9axpdl0jihpd55pa9hacjxmab8p7cixk3xqqqbf"; depends=[Formula MASS maxLik stringr]; }; + gamesGA = derive2 { name="gamesGA"; version="1.1.3.2"; sha256="0srxsm1zhrx1dpm94mkcsds6rwkx9gi9yfbrkzylhrxgi4g8pvwp"; depends=[shiny]; }; gamlr = derive2 { name="gamlr"; version="1.13-3"; sha256="05hxmhmgs83q6d5jhq9y5b5llk1pi2jf61286pmnwbzmdwdhrbr2"; depends=[Matrix]; }; - gamlss = derive2 { name="gamlss"; version="5.0-1"; sha256="1ai7zgsbxx7hdz4qq87dwk94zwzvzpjkmvlzi4hwwjpk350xpwcj"; depends=[gamlss_data gamlss_dist MASS nlme survival]; }; + gamlss = derive2 { name="gamlss"; version="5.0-2"; sha256="1l77ng3hrlw59qzs1543p62c3sqx9b5n7fs82hrnb9dxjsgvkgd4"; depends=[gamlss_data gamlss_dist MASS nlme survival]; }; gamlss_add = derive2 { name="gamlss.add"; version="5.0-1"; sha256="1agk6pfm04hf9dp5r6dvxqkj1hykx23a16q7vch2sg752z0dadgk"; depends=[gamlss gamlss_dist mgcv nnet rpart]; }; gamlss_cens = derive2 { name="gamlss.cens"; version="4.3-5"; sha256="06baf94kpprj03dggnyvvmi4nw3qa23cyy1crsa0zfnaqj915ypv"; depends=[gamlss gamlss_dist survival]; }; gamlss_data = derive2 { name="gamlss.data"; version="5.0-0"; sha256="1mqz7m4iksmx939bz1lq05cxz3bfcksn2ggw3cv7b0k98cykgg1s"; depends=[]; }; gamlss_demo = derive2 { name="gamlss.demo"; version="4.3-3"; sha256="01p6abppwbnh2a2ks1g08z4iwq2fxf125y9s4qzssybsn76a3gf3"; depends=[gamlss_dist gamlss_tr rpanel]; }; - gamlss_dist = derive2 { name="gamlss.dist"; version="5.0-0"; sha256="1k1bn7a3kiasab27p21bgwacrz5z7ha3prl8m2gfnqx1i3z2kmci"; depends=[MASS]; }; + gamlss_dist = derive2 { name="gamlss.dist"; version="5.0-2"; sha256="0cqc590r2wx94igyvflgds8hxvj4banpkanx6x9mjg6ax382gygr"; depends=[MASS]; }; + gamlss_inf = derive2 { name="gamlss.inf"; version="1.0-0"; sha256="0n8d8q7ibin4q80js9b8qvxwjkb52xf9y33mmysq2sbl9652b22x"; depends=[gamlss gamlss_dist]; }; gamlss_mx = derive2 { name="gamlss.mx"; version="4.3-5"; sha256="1jfs3ib2imwgazf8v23fa12iaflv0pm944bkqklx8qcljxp1lcs7"; depends=[gamlss gamlss_dist nnet]; }; gamlss_nl = derive2 { name="gamlss.nl"; version="4.1-0"; sha256="083l5lsb0csxcp4vffvdv2nr7jk3s2gkcavx66m8inzw16j7xilz"; depends=[gamlss survival]; }; - gamlss_spatial = derive2 { name="gamlss.spatial"; version="1.3.1"; sha256="0gfayygwqiahmcpnwdpiaj8p323624cclcrpkip6gc08ddfbr377"; depends=[gamlss gamlss_dist mgcv spam]; }; + gamlss_spatial = derive2 { name="gamlss.spatial"; version="1.3.2"; sha256="05dq6m7a8f9lyhp3g26pf5fl5l5rvrlzb2g4llif96x7j8gbcm50"; depends=[gamlss gamlss_add gamlss_dist mgcv spam]; }; gamlss_tr = derive2 { name="gamlss.tr"; version="5.0-0"; sha256="02akydpvwl1qkhxpr72lv9qp4z2ra69abyq51b57rh4p60g78vhm"; depends=[gamlss gamlss_dist]; }; gamlss_util = derive2 { name="gamlss.util"; version="4.3-4"; sha256="0p8lnwrn7cx97qnxls1x532f3ywszdyib2qiwx5qc7sam59h9c8j"; depends=[gamlss gamlss_dist zoo]; }; + gamlssbssn = derive2 { name="gamlssbssn"; version="0.1.0"; sha256="1l8d4qwmq9dklm9imb3cvlncwa6jygf8kg2j1599h1nfhyyhj2vv"; depends=[gamlss gamlss_dist MASS]; }; gamm4 = derive2 { name="gamm4"; version="0.2-4"; sha256="0jssi97kmad1fmnjlymx6sjv1qcfyslhwfcx8bfzl8x15fqj1v9v"; depends=[lme4 Matrix mgcv]; }; gammSlice = derive2 { name="gammSlice"; version="1.3"; sha256="1vw8d0v0awyflh4gmbcf1g9nfx52cys8gpqvag5djri59p0y945a"; depends=[KernSmooth lattice mgcv]; }; gamreg = derive2 { name="gamreg"; version="0.2"; sha256="0k6npl5m1i22lgdvfjnv00pxaxh7qfd6sddy6raf4j33i6hp6ff6"; depends=[doParallel foreach glmnet Rcpp RcppArmadillo robustHD]; }; gamsel = derive2 { name="gamsel"; version="1.7-3"; sha256="02j94va7srdb2wzj4f1b63qx9mlck0harsq140ndjgf9d9c44h01"; depends=[foreach mda]; }; gaoptim = derive2 { name="gaoptim"; version="1.1"; sha256="04igpn73k6f6652y496igwypfxmz4igg4jgxx6swqyi37182rqhm"; depends=[]; }; gap = derive2 { name="gap"; version="1.1-17"; sha256="0pkimpjrdbz04yh2z9n3hbhn4gkpwgx5w9nkj8zqv773qsdj8h5c"; depends=[]; }; - gapfill = derive2 { name="gapfill"; version="0.9.5-2"; sha256="1qmkr0yvc9akjaj30lxq2b4xrkxvdlmbkpk5zy89xvj6qnpdpb47"; depends=[fields foreach ggplot2 quantreg Rcpp]; }; + gapfill = derive2 { name="gapfill"; version="0.9.5-3"; sha256="1hwccvshz9z1zgjjrdk6iri272ih11cwpz91rldkpcwly6pqcwhk"; depends=[fields foreach ggplot2 quantreg Rcpp]; }; gapmap = derive2 { name="gapmap"; version="0.0.4"; sha256="0xz19n0vvdzbfg6afp3y0qfbs3f2nfxib1cyya3cax5wqqfbzw3i"; depends=[ggplot2 reshape2]; }; gapminder = derive2 { name="gapminder"; version="0.2.0"; sha256="1fxjz8lr3bsj3vml4yvm8pm72wpmw7c97bgp7acjf0q7l9x0d4vq"; depends=[]; }; gaselect = derive2 { name="gaselect"; version="1.0.5"; sha256="0xzx00n46x6x7w1xbx8nvabkkrna45pv1i70787m8h05q1yrjjij"; depends=[Rcpp RcppArmadillo]; }; gasfluxes = derive2 { name="gasfluxes"; version="0.2-1"; sha256="0cdqyyqb5dcn5978jmwmf06d9jcga5ma72zf3cdz72hbcil4f93k"; depends=[AICcmodavg data_table MASS sfsmisc]; }; - gaston = derive2 { name="gaston"; version="1.4.9"; sha256="13fb67lq30rv91q5ffwijm011dqflrvywlcd0s2caims6zsarbvz"; depends=[Rcpp RcppEigen RcppParallel WhopGenome]; }; + gastempt = derive2 { name="gastempt"; version="0.4.01"; sha256="0jfk82yw7a95ih1s8ir432j79ix8vjbprwzr5fkzgykk07lfwm68"; depends=[assertthat BH dplyr ggplot2 nlme Rcpp RcppEigen rstan shiny StanHeaders stringr tibble]; }; + gaston = derive2 { name="gaston"; version="1.5"; sha256="1vlp0jfg35v79dya78h55a3pk6hj93i9hgb7x1mm6f54im0qzims"; depends=[Rcpp RcppEigen RcppParallel]; }; gatepoints = derive2 { name="gatepoints"; version="0.1.3"; sha256="02qxxf4a6rl3l0jdgqxmzxfnqd9lh5i0q2knaxxsiz0nd74c1jg5"; depends=[]; }; gaussDiff = derive2 { name="gaussDiff"; version="1.1"; sha256="0fqjdxp2ibbami75ba16d02dz4rz5sk8mni45di9anydx44g9d45"; depends=[]; }; gaussfacts = derive2 { name="gaussfacts"; version="0.0.2"; sha256="095x7k7m7sy1gqkbm6wiqn26252dclz62sbnkv6cjvmbdxajl7m9"; depends=[]; }; @@ -5630,12 +5874,13 @@ in with self; { gcbd = derive2 { name="gcbd"; version="0.2.6"; sha256="1dvnly0aljv2c4x7sn3q55ncvfdfjfgp7w0k2900p77h4w8nixia"; depends=[DBI lattice Matrix plyr reshape RSQLite]; }; gcdnet = derive2 { name="gcdnet"; version="1.0.4"; sha256="0fmy0li06rahch4ir0xa81yilvrd0zqyhmpl4hfxjahhl3npw370"; depends=[Matrix]; }; gcerisk = derive2 { name="gcerisk"; version="16.1.3"; sha256="0bjd3paxf1jrirv2grq20rk40l7izbw2y2dnj687hwcgah5021gv"; depends=[cmprsk ggplot2 survival]; }; + gcite = derive2 { name="gcite"; version="0.6"; sha256="1dy3asc2029mci0nixg56pvykl825ajnpw4ybhr66a4jixnrn880"; depends=[data_table httr pbapply rvest tm wordcloud xml2]; }; gclus = derive2 { name="gclus"; version="1.3.1"; sha256="02ba6zj9bjwrzykamjp40ajynx9xjx9h2i85n0ym0r5lcki4x6fn"; depends=[cluster]; }; - gcmr = derive2 { name="gcmr"; version="0.7.5"; sha256="1z1hdgdasmw3drld8nmkw6cc1xls1gaaym1mlr8lyida4gb3giv8"; depends=[betareg car Formula geoR lmtest nlme sandwich sp]; }; + gcmr = derive2 { name="gcmr"; version="1.0.0"; sha256="13xja7rh2wkmi2j7yxrkj99sl96mlcgkp3v5aagnz140jx3jibsx"; depends=[betareg car Formula geoR lmtest nlme sandwich sp]; }; gconcord = derive2 { name="gconcord"; version="0.41"; sha256="1n3pfwk6vip19q1zhbz1n164f9vi7mig8pcd07c4wxnm5ir9dagy"; depends=[]; }; gcookbook = derive2 { name="gcookbook"; version="1.0"; sha256="0hb52zfi5bl2j0h8lazz4gzhhcvpicb4ld6xm2vkvi4cj47piyy8"; depends=[]; }; gdalUtils = derive2 { name="gdalUtils"; version="2.0.1.7"; sha256="0n8c72m7dapy8agqcglagb8bwf0rpajdq9qsli3qyrrp7fh3h4ck"; depends=[foreach R_utils raster rgdal sp]; }; - gdata = derive2 { name="gdata"; version="2.17.0"; sha256="0kiy3jbcszlpmarg311spdsfi5pn89wgy742dxsbzxk8907fr5w0"; depends=[gtools]; }; + gdata = derive2 { name="gdata"; version="2.18.0"; sha256="0zwdj7lscgxr8r62ii8hbdh4mb7sa9w4f5nv32zzrxdvymcpya2b"; depends=[gtools]; }; gdimap = derive2 { name="gdimap"; version="0.1-9"; sha256="0ksbpcy739bvsiwis0pzd03zb4cvbd8d5wdf8whfn9k6mkj4x9rs"; depends=[abind colorspace geometry gridExtra gsl movMF oro_nifti rgl]; }; gdistance = derive2 { name="gdistance"; version="1.2-1"; sha256="1wygcx0iki7g10f9gjbycrjjadmsw3153ha9rnqvc9hwwf34m9y1"; depends=[igraph Matrix raster sp]; }; gdm = derive2 { name="gdm"; version="1.3.2"; sha256="1fr9cgsw158zkvw5dsabyf5jhgrwp8k4qk43g9mhdp82szma759k"; depends=[doParallel foreach raster Rcpp reshape2 vegan]; }; @@ -5674,16 +5919,17 @@ in with self; { geneSignatureFinder = derive2 { name="geneSignatureFinder"; version="2014.02.17"; sha256="1s9jj87wnzzgm9hnws09yhrxdlb6jw56i3ddwznvmh8vpzrspv4h"; depends=[class cluster survival]; }; genemodel = derive2 { name="genemodel"; version="1.1.0"; sha256="1x6n6k9ifv2swhyrghvm6fsz5vh85cdik8225175i9msvmkh928n"; depends=[stringr]; }; genepi = derive2 { name="genepi"; version="1.0.1"; sha256="1whhdlq9p8gmygv7464hvfz6dhm65gqq1dqls6hgpmw822zxgbd5"; depends=[]; }; - generalCorr = derive2 { name="generalCorr"; version="1.0.3"; sha256="10gg89b423dncmcvk6ysifb26m99ywsbwb6x8injghgnjjibjq1k"; depends=[meboot np psych xtable]; }; - generalhoslem = derive2 { name="generalhoslem"; version="1.2.4"; sha256="043p40kldfs1r4p140cq7pzshv6y6adipfsfg8vyr1s2bd16ffvs"; depends=[epiR MASS reshape]; }; + genepop = derive2 { name="genepop"; version="1.0"; sha256="1wcy29sa9x2csxcddkw7by939jpnsnl9xd45770vrkmp5yaxp4m2"; depends=[Rcpp]; }; + generalCorr = derive2 { name="generalCorr"; version="1.0.5"; sha256="08s2br4isjbx4x9ldm6a0z9x907f1n7gmr76pidf3s66yxlypiar"; depends=[meboot np psych xtable]; }; + generalhoslem = derive2 { name="generalhoslem"; version="1.2.5"; sha256="1kx2yzaawagxd0vx29h74ik1zccasikr6qzks3m09hgmc6g4kf2p"; depends=[epiR MASS reshape]; }; generator = derive2 { name="generator"; version="0.1.0"; sha256="0xjvnmnpdms8rrxxcz6pd8w4rnbv3ghzqv4m63zxia2l98x7z4rf"; depends=[]; }; genetics = derive2 { name="genetics"; version="1.3.8.1"; sha256="0gfbrpz0zp5bgw3s21wrhjfy70laif47wcrjrm6mjgs6xapiw790"; depends=[combinat gdata gtools MASS mvtnorm]; }; - genie = derive2 { name="genie"; version="1.0.2"; sha256="1sh6xlj347fqrgsxn5xgn4h8wfr58xd20idsfzhlywabkhkfbf6i"; depends=[Rcpp]; }; + genie = derive2 { name="genie"; version="1.0.4"; sha256="0ymrn42ik0rfildmyq4z0gsd7injda0dsjgx69nqb6hq0x8s5hqa"; depends=[Rcpp]; }; genlasso = derive2 { name="genlasso"; version="1.3"; sha256="1q4ybg8xzphnqwywwdb7i2q94dlxwpggvisjqqdj39jh2cabda57"; depends=[igraph MASS Matrix]; }; - genoPlotR = derive2 { name="genoPlotR"; version="0.8.4"; sha256="06c4flddv83nwjagnszl0sv92mbxf91qml8awhhxnrs1bna04f1p"; depends=[ade4]; }; + genoPlotR = derive2 { name="genoPlotR"; version="0.8.6"; sha256="0n92d60sccx0gfakskmvan6z20v9nl0fsxsixrqmrfzp64d1n01d"; depends=[ade4]; }; genomeplot = derive2 { name="genomeplot"; version="1.0"; sha256="15v01ngxq7kxav1bhw1mvqradrmvwsad5xh9l5skivb5smh9795w"; depends=[ggplot2]; }; genomicper = derive2 { name="genomicper"; version="1.6"; sha256="12msl6syw5a3dvxg9fr1yprcpb9qwn8v2dvkpxgagal11p9q1kx7"; depends=[DBI]; }; - genpathmox = derive2 { name="genpathmox"; version="0.2"; sha256="1m08j10mrvkrnlgxbhjn3qmjz29p121fc4haww5qrici06nipfdm"; depends=[diagram mice plspm quantreg]; }; + genpathmox = derive2 { name="genpathmox"; version="0.3"; sha256="0r1iqwm5jh93lbh87ks5qm4qqsp98928vg7qmv1pkahdlvl3ramw"; depends=[diagram mice plspm quantreg]; }; genridge = derive2 { name="genridge"; version="0.6-5"; sha256="0ms8n1yrga5qqg9ni41ifyw6320aajyrwvjh6d27q1k96j2dicp4"; depends=[car]; }; gensemble = derive2 { name="gensemble"; version="1.0"; sha256="0yyi7djzqx4yhxp6yy1rjgvzidjlna79ds89bgj6m6zj3aav6yw2"; depends=[]; }; gensphere = derive2 { name="gensphere"; version="1.0"; sha256="184ky31l42k6x2di21hr2x1l35ksvr5yq8sr35mn642zckxx2y6g"; depends=[geometry mvmesh rgl SphericalCubature]; }; @@ -5696,21 +5942,24 @@ in with self; { geoSpectral = derive2 { name="geoSpectral"; version="0.17.3"; sha256="13638j70j30icydcb0rydmdnmswf15skk646zra5y68n46mjvl68"; depends=[dplyr leaflet maps plotly rbokeh rgdal sp spacetime xts]; }; geoaxe = derive2 { name="geoaxe"; version="0.1.0"; sha256="043y7kb24hp66j7pnpqsdixvdmppwp72y8i4f8q7xrkhaqlfb93v"; depends=[jsonlite rgeos sp]; }; geoelectrics = derive2 { name="geoelectrics"; version="0.1.5"; sha256="0zy9m5k4b359mn29cd62cnwjm4fc19hy3l8p587yrrhsi20nbyna"; depends=[fields lattice rgl]; }; + geofacet = derive2 { name="geofacet"; version="0.1.4"; sha256="1vb6d18jfw2ibvz586czsnck2kx00bqs0azq09znzn3zv5p0plz6"; depends=[ggplot2 gtable]; }; geofd = derive2 { name="geofd"; version="1.0"; sha256="16312g9mgw52mpsfky1j20zcqkkv91ihl0xhvv1bl80diffzf0zi"; depends=[fda geoR]; }; - geohash = derive2 { name="geohash"; version="0.1.2"; sha256="1vwalnf5cbpbq5b68zc6qa8mm84v5zlb8s2pwg7j2f7s43y0mgwz"; depends=[Rcpp]; }; + geohash = derive2 { name="geohash"; version="0.2.0"; sha256="09m6vhlacsxr6minq4cz110d8rkarhmm3gqxjrq06ld70gd02l8q"; depends=[Rcpp]; }; geojson = derive2 { name="geojson"; version="0.1.2"; sha256="0f8zimw50ryi776l5yxx5pi11559sa2278plvx289v3lfb20f7ii"; depends=[jqr jsonlite lazyeval magrittr protolite sp]; }; geojsonR = derive2 { name="geojsonR"; version="1.0.1"; sha256="0jjn1pknvg0kkq1jw4blf4ykfps4gcmhaz9piwmrg1hzfdfvf2zm"; depends=[R6 Rcpp RcppArmadillo]; }; geojsonio = derive2 { name="geojsonio"; version="0.3.2"; sha256="10rnp4ws3465p8jv6b15zbl662swd373nmlbxxk3n8dy7049qwpj"; depends=[httr jsonlite magrittr maptools readr rgdal rgeos sp V8]; }; geojsonlint = derive2 { name="geojsonlint"; version="0.2.0"; sha256="05j7059s1hs8i2fkmkv0mqmda3bgk5zbyi865ab0vl361wiwmdya"; depends=[httr jsonlite jsonvalidate V8]; }; - geoknife = derive2 { name="geoknife"; version="1.5.4"; sha256="09b3i67x6mr6wd4wrhyn7bngjqlsp4wv27dqsb4a4xv76kfxv30j"; depends=[curl httr sp XML]; }; + geoknife = derive2 { name="geoknife"; version="1.5.5"; sha256="0azb98zk4ayfm0z9vz5h59490xvng16p3gpdn60ca9mwdikyxks3"; depends=[curl httr sp XML]; }; geomapdata = derive2 { name="geomapdata"; version="1.0-4"; sha256="1g89msnav87kim32xxbayqcx1v4439x4fsmc8xhlvq4jwlhd5xxw"; depends=[]; }; + geomedb = derive2 { name="geomedb"; version="0.1"; sha256="1kx6775ms9if8v4k7mm47l6dic6m3d1dlnw2dyqjlzmip4d70zfc"; depends=[adegenet httr]; }; + geometa = derive2 { name="geometa"; version="0.1-0"; sha256="1p030v19851pp9x7d4rz51qpfr7vdk3zfihm4vx5yvn5r3ls3fr8"; depends=[R6 XML]; }; geometry = derive2 { name="geometry"; version="0.3-6"; sha256="0s09vi0rr0smys3an83mz6fk41bplxyz4myrbiinf4qpk6n33qib"; depends=[magic]; }; geomnet = derive2 { name="geomnet"; version="0.2.0"; sha256="0xanzx8p34bac4zcf9j69nivwhllvsrw7x70mzgl95jhg3gvv96a"; depends=[dplyr ggplot2 network plotly readr sna tidyr]; }; - geomorph = derive2 { name="geomorph"; version="3.0.3"; sha256="0nxbd2gsi9nd61blslq9jdg1y7n14yhdgkrnjg9cxqsmjg9d9gf4"; depends=[ape geiger jpeg Matrix rgl]; }; + geomorph = derive2 { name="geomorph"; version="3.0.4"; sha256="1smbrkhy9c0z0izr4hg1v2maxv6bpnsbl78a5m0ln10fvynzrnl3"; depends=[ape geiger jpeg Matrix rgl]; }; geonames = derive2 { name="geonames"; version="0.998"; sha256="1p0x260i383ddr2fwv54pxpqz9vy6vdr0lrn1xj7178vxic1dwyy"; depends=[rjson]; }; - geoparser = derive2 { name="geoparser"; version="0.1.0"; sha256="0gz808bab1axncccigs0ahvk3h2d3b77dwfhw2631fp6l706r839"; depends=[digest dplyr httr jsonlite lazyeval purrr stringr tidyr]; }; + geoparser = derive2 { name="geoparser"; version="0.1.1"; sha256="0rk2wcig79r28a974bc181p8vypxzbgxcb9rsp24qj9mg02rn5n5"; depends=[digest dplyr httr jsonlite lazyeval purrr stringr tidyr]; }; geophys = derive2 { name="geophys"; version="1.3-9"; sha256="05q42b1pqfihamxbh5s5kxkrslr84j5p6y1cybmcl31z9dg92ccl"; depends=[cluster GEOmap RFOC RPMG RSEIS]; }; - georob = derive2 { name="georob"; version="0.3-3"; sha256="0a4v0ik05bxzg9rxzwa1s2adm9ja9mzxh897kjxdk5qv9y5pgrkm"; depends=[constrainedKriging fields lmtest nleqslv nlme quantreg RandomFields robustbase snowfall sp]; }; + georob = derive2 { name="georob"; version="0.3-4"; sha256="1nr7jryfil3rdh3jb4rhb2lccll97fg1y5xz8ab3zxg0npg5a1b9"; depends=[constrainedKriging fields lmtest nleqslv nlme quantreg RandomFields robustbase snowfall sp]; }; geosapi = derive2 { name="geosapi"; version="0.1-0"; sha256="04qab7qs22f1havziv5ynmrmdvi8539gjyfl83x5w5l44rjrx7lb"; depends=[httr openssl R6 XML]; }; geoscale = derive2 { name="geoscale"; version="2.0"; sha256="0gisds0in32xhw54fxfyxvwxgrfjs871wmqf6l915nr896rlx0bm"; depends=[]; }; geospacom = derive2 { name="geospacom"; version="0.5-8"; sha256="14qyjbq0n43c2zr9gp11gdqgarvmicx3gpq2ql2vjfzrmirxwjgg"; depends=[classInt geosphere maptools rgeos sp]; }; @@ -5725,18 +5974,20 @@ in with self; { gepaf = derive2 { name="gepaf"; version="0.1.0"; sha256="0ld7r0dkap7bpmb2fc8x0pzffvnlzp2q1bndx4l2ffiyygsq6f72"; depends=[bitops]; }; gesca = derive2 { name="gesca"; version="1.0.3"; sha256="1xr9kls6wdd1lnk4nrwix5p0dl93rl1zd3x88c0qyxzp11m2pcsf"; depends=[]; }; gesis = derive2 { name="gesis"; version="0.2.1"; sha256="1cdmhfdjiwsp48a7b0r1mnagnymz606mkzpam9fsvfl72vzji2w7"; depends=[httr rvest xml2]; }; - getCRUCLdata = derive2 { name="getCRUCLdata"; version="0.1.5"; sha256="0zbazv0xy8gx3cmhi9dbm01lgw0l3snawa2x0bmmxmv2dsxym9y9"; depends=[data_table dplyr httr plyr rappdirs raster tibble tidyr]; }; + getCRUCLdata = derive2 { name="getCRUCLdata"; version="0.1.7"; sha256="19iiyq0dni12syry7lirga1qil4pqm68vcdzrsp6i3fxaqqr06x5"; depends=[data_table dplyr httr purrr rappdirs raster tibble tidyr]; }; getMet = derive2 { name="getMet"; version="0.3.2"; sha256="0j1h1vy8rd7czpnb4msdb9k560pnh7kjkmpqqwzwin2ms1c0mggb"; depends=[EcoHydRology jsonlite]; }; getPass = derive2 { name="getPass"; version="0.1-1"; sha256="14s8s3zrl5iwr7pw000b8mwxy17caf42yl0lf56b3qa71ifzxbnc"; depends=[rstudioapi]; }; getlandsat = derive2 { name="getlandsat"; version="0.1.0"; sha256="0h2520r5sqyzsajqw2i86byw9zm5za27mhjkrzzw5vr5sh1vdiwb"; depends=[data_table httr rappdirs readr tibble xml2]; }; + getmstatistic = derive2 { name="getmstatistic"; version="0.1.1"; sha256="14w0n658s624anvxv7sqcgy6vfaaxcc7fj4xi1k2qrxd9rdh6dza"; depends=[ggplot2 gridExtra gtable metafor psych stargazer]; }; getopt = derive2 { name="getopt"; version="1.20.0"; sha256="00f57vgnzmg7cz80rjmjz1556xqcmx8nhrlbbhaq4w7gl2ibl87r"; depends=[]; }; gets = derive2 { name="gets"; version="0.12"; sha256="0prq1w5z2cfkg0k8hj2i660yrky8l74rrf7bcjpivc5ml2ssh9z7"; depends=[zoo]; }; gettingtothebottom = derive2 { name="gettingtothebottom"; version="3.2"; sha256="1cz2vidh7k346qc38wszs2dg6lvya249hvcsn6zdpbx0c0qs3y72"; depends=[ggplot2 Matrix]; }; gettz = derive2 { name="gettz"; version="0.0.3"; sha256="1i06nfm824131q8lwwhrbzg2g9lbnmyp8k57w2vag7v8jj5rdrda"; depends=[]; }; gfcanalysis = derive2 { name="gfcanalysis"; version="1.4"; sha256="1hjgbiakf01mmaa2jhlnymcsjsj1zssay44p4sdxxxzpx4szs3vv"; depends=[animation geosphere ggplot2 plyr raster rasterVis RCurl rgdal rgeos sp stringr]; }; gfer = derive2 { name="gfer"; version="0.1.6"; sha256="1lg6r4ymiaix24vg8jz3a4yb07fib9cxmyfblmvwxgdmflbswxad"; depends=[data_table httr jsonlite rvest stringi V8 xml2]; }; + gfmR = derive2 { name="gfmR"; version="1.0-1"; sha256="1irzkiq93wh4yphq8x1v2a7plcrskb8fs36qjaa0qhyhvhn0f57i"; depends=[faraway nnet]; }; ggCompNet = derive2 { name="ggCompNet"; version="0.1.0"; sha256="1199n4s2rh5zg001l3j8wmc6fxkbkk5vzp4q5kg661k3khgx0hd5"; depends=[dplyr geomnet GGally ggmap ggnetwork ggplot2 gridExtra igraph network progress readr scales sna tidyr tnet]; }; - ggExtra = derive2 { name="ggExtra"; version="0.6"; sha256="1f91hvay4r0ikn87n6grxl0s7c542rxg2h61s3k8qzrzshy1wnkj"; depends=[colourpicker ggplot2 gtable miniUI shiny shinyjs]; }; + ggExtra = derive2 { name="ggExtra"; version="0.7"; sha256="0vygac13cjcq63f57zd28jyla09za58r77kq1mmsa4qx4dxyfsbl"; depends=[colourpicker ggplot2 gtable miniUI shiny shinyjs]; }; ggQC = derive2 { name="ggQC"; version="0.0.1"; sha256="0sf7hq69nzdhbrx3rhw92mxqq3cm2wqa79csp9lsvx97gwb60sfl"; depends=[ggplot2 plyr reshape2]; }; ggROC = derive2 { name="ggROC"; version="1.0"; sha256="0p9gdy7ia59d5m84z9flz5b03ri7nbigb3fav2v2wrml300d24vn"; depends=[ggplot2]; }; ggRandomForests = derive2 { name="ggRandomForests"; version="2.0.1"; sha256="0f8m0j79d8wbac14zk1s8812rz6vgf04bz1iqq8p4d3sxwnvaj7q"; depends=[ggplot2 randomForest randomForestSRC survival tidyr]; }; @@ -5746,16 +5997,18 @@ in with self; { ggcorrplot = derive2 { name="ggcorrplot"; version="0.1.1"; sha256="04jq1qpsgy8bgpilp1a02va4vz0adkjwrz9znmhv54q81qiv7h51"; depends=[ggplot2 reshape2]; }; ggdendro = derive2 { name="ggdendro"; version="0.1-20"; sha256="1zzq1hxd0d1qa5hrzwfkdw6fzscpcafbwbpkrb62dm559y8awp0j"; depends=[ggplot2 MASS]; }; ggdmc = derive2 { name="ggdmc"; version="0.1.3.9"; sha256="07a9g6kwq4hg5zlcxndwmyprl3di7fzsn2960qyixn5bzrfk7sh2"; depends=[coda ggmcmc ggplot2 ggthemes gridExtra loo Rcpp RcppArmadillo rtdists]; }; - gge = derive2 { name="gge"; version="1.1"; sha256="04212spczyr2vqxki0n82ml26mgiq29i6mxyh06v42lqpg39sx19"; depends=[reshape2]; }; + gge = derive2 { name="gge"; version="1.2"; sha256="00kwm4xsr8796qm98b00rlznaicgn0aagkqn2h1qmdw70scifg8l"; depends=[Rcpp reshape2 rgl]; }; ggedit = derive2 { name="ggedit"; version="0.2.1"; sha256="0l2ryp8xcyqsgfcywr3y6c2y8j42c15dyrcmfhfimbzy52bmnqxy"; depends=[colourpicker dplyr ggplot2 miniUI plyr reshape2 rstudioapi scales shiny shinyAce shinyBS]; }; + ggeffects = derive2 { name="ggeffects"; version="0.1.2"; sha256="0nkgvdlgl8bin77n25dn0rk9g03bhza8krwbapzp9m64vybwqccr"; depends=[dplyr effects ggplot2 magrittr Matrix prediction purrr scales sjlabelled sjmisc sjstats tibble tidyr]; }; ggenealogy = derive2 { name="ggenealogy"; version="0.3.0"; sha256="169zkcp13g0ll9941a7hh31fll0mavnkb6fd3kvkibdjm621ymyh"; depends=[ggplot2 igraph plotly plyr reshape2 tibble]; }; ggforce = derive2 { name="ggforce"; version="0.1.1"; sha256="0y49anv5sj1qn1ifcxg1krkkv4z3dlan5lya36vfmzzdamfgq5p6"; depends=[dplyr ggplot2 gtable lazyeval MASS Rcpp scales tweenr units]; }; + ggformula = derive2 { name="ggformula"; version="0.4.0"; sha256="1nrbapxz4nmg2ic9qii7lyqc7mmibl1mwzwrx70smg3k627iycwh"; depends=[ggplot2 glue magrittr mosaic rlang stringr tibble]; }; ggfortify = derive2 { name="ggfortify"; version="0.4.1"; sha256="19jwcz1z6g7l65l6cj8zspypfb86pn3x18vzdcgf932n14g646d2"; depends=[dplyr ggplot2 gridExtra scales tibble tidyr]; }; ggghost = derive2 { name="ggghost"; version="0.2.1"; sha256="0kvsjadxxdf6yvzk4a6yqkg02q1ysslvf3m0a369bdim396z4hnv"; depends=[animation ggplot2]; }; ggguitar = derive2 { name="ggguitar"; version="0.1.1"; sha256="1lmfs54h91gzcxin37v4flkywbq3fs648mm1h9ak03xlj5nagzsi"; depends=[dplyr ggplot2 gridExtra lazyeval readr tibble]; }; - gghalfnorm = derive2 { name="gghalfnorm"; version="1.1.1"; sha256="1h8qkagsfhk5gba7jgzwrvc6hrc492pp34kmzgr3n8d8bjzj45a3"; depends=[ggplot2 ggrepel]; }; + gghalfnorm = derive2 { name="gghalfnorm"; version="1.1.2"; sha256="1sy0m6pqmnjbqv60rljyblhis0dxwkhw751jhlad5arcgrcwf4k8"; depends=[ggplot2 ggrepel]; }; ggimage = derive2 { name="ggimage"; version="0.0.4"; sha256="1r9rl3sw5frncsq091924p5lk9z11inpvdk39byzabz2ybi6wzp8"; depends=[EBImage ggplot2 gridGraphics scales tibble]; }; - ggiraph = derive2 { name="ggiraph"; version="0.3.3"; sha256="0jiz51c9pzs7q8m2gnv3dzkiakr640bg61wayfbd4rq5y9b4ghan"; depends=[ggplot2 htmltools htmlwidgets plyr rvg xml2]; }; + ggiraph = derive2 { name="ggiraph"; version="0.4.0"; sha256="1q69621928skb2kvms5i73a4rmha4nrgbhdq0bb7p150c7ni3lvi"; depends=[ggplot2 htmltools htmlwidgets plyr rvg uuid xml2]; }; ggiraphExtra = derive2 { name="ggiraphExtra"; version="0.1.0"; sha256="09fiwkaai4sy5kxy4p0c4ldb8ya63czff53hbm6d8fm858fw2byw"; depends=[ggiraph ggplot2 mapproj mgcv moonBook mycor plyr reshape2 scales XML]; }; gglasso = derive2 { name="gglasso"; version="1.3"; sha256="0qqp5zak4xsakhydn9cfhpb19n6yidgqj183il1v7yi90qjfyn66"; depends=[]; }; gglogo = derive2 { name="gglogo"; version="0.1.3"; sha256="1dq0bixz44p32kpma5wrqjqklal2ipjmqdwqap0xch542drlpqbn"; depends=[dplyr ggplot2 jpeg knitr magrittr plyr purrr reshape2]; }; @@ -5768,15 +6021,17 @@ in with self; { ggparallel = derive2 { name="ggparallel"; version="0.2.0"; sha256="0zxaff0jbqkbavsmh1yyp3vdrxsam6a66hjw8lamv9pksdw1s2wf"; depends=[ggplot2 plyr reshape2]; }; ggplot2 = derive2 { name="ggplot2"; version="2.2.1"; sha256="0543782ddv2hp6s0l702mnxfg8n7a6qlbm8bm55x22hnqgz8kg2z"; depends=[digest gtable lazyeval MASS plyr reshape2 scales tibble]; }; ggplot2movies = derive2 { name="ggplot2movies"; version="0.0.1"; sha256="067ld6djxcpbliv70r2c1pp4z50rvwmn1xbvxfcqdi9s3k9a2v8q"; depends=[]; }; - ggpmisc = derive2 { name="ggpmisc"; version="0.2.14"; sha256="0747jmf8zvqc6zzglbpr2vizcy905zgc9hgdabgdkg4zhhmlcqys"; depends=[broom dplyr ggplot2 lubridate MASS plyr polynom splus2R tibble xts zoo]; }; + ggpmisc = derive2 { name="ggpmisc"; version="0.2.15"; sha256="00a909bdzkh28b7jkllxxqd1avcspny12y5rqpxddj90xv34zjah"; depends=[broom dplyr ggplot2 lubridate MASS plyr polynom splus2R tibble xts zoo]; }; ggpolypath = derive2 { name="ggpolypath"; version="0.1.0"; sha256="0g9zfal3vqcx16fi4abxm6l5sam475lk1f6bdik487wc2v0dkq83"; depends=[ggplot2]; }; - ggpubr = derive2 { name="ggpubr"; version="0.1.2"; sha256="1zh3c2w95s7pcnrlzawm7wjk9vab3dycb1x50594q3kf3bz4jiwv"; depends=[ggplot2 ggrepel ggsci plyr]; }; + ggpubr = derive2 { name="ggpubr"; version="0.1.4"; sha256="0nzqsm3jbhp2fvzs9lvmgn7y51ia7zi6qx1m3sm5b45b2ff3rk5x"; depends=[cowplot dplyr ggplot2 ggrepel ggsci ggsignif gridExtra magrittr purrr scales tidyr]; }; + ggpval = derive2 { name="ggpval"; version="0.1.0"; sha256="143fbxgsy9h37zyqbd1xknzdalmchdsfq753piikp2p8hqhmmpva"; depends=[data_table ggplot2]; }; ggraph = derive2 { name="ggraph"; version="1.0.0"; sha256="0xkhqkckqz201601aqznrgnlgqzs7is1nfpdyalag58q5wl934j8"; depends=[digest dplyr ggforce ggplot2 ggrepel gtable igraph MASS plyr Rcpp scales viridis]; }; ggraptR = derive2 { name="ggraptR"; version="0.1"; sha256="060ksjq790rvv9kyyf6v6z0irawlw3hxaq8n0dvzmfkw58pk5fpd"; depends=[dplyr DT futile_logger ggplot2 ggthemes shiny shinyBS shinyjs]; }; ggrepel = derive2 { name="ggrepel"; version="0.6.5"; sha256="0lm78662p1iajkcvq82g08zsv3s4lfmkpggg1wk9wpvmk78yj2in"; depends=[ggplot2 Rcpp scales]; }; - ggsci = derive2 { name="ggsci"; version="2.4"; sha256="003gnm9kbip6days1rrkv3a31xmfia8yqql0qq4fis7yfs0w30ln"; depends=[ggplot2 scales]; }; + ggsci = derive2 { name="ggsci"; version="2.7"; sha256="15ay3dgdzaxxyspdai50i66r44v2qz3y2am3wkazg3afcs2qszk4"; depends=[ggplot2 scales]; }; ggseas = derive2 { name="ggseas"; version="0.5.1"; sha256="1r23j701rvia49si42fbi6zws7x9r92h1bcp0a15h28hpl7zlp7l"; depends=[ggplot2 seasonal zoo]; }; - ggsignif = derive2 { name="ggsignif"; version="0.1.0"; sha256="0dxb6rh1i7c72lfyvcimian8pnryarh19wprxxzm3lv3812jgsyp"; depends=[ggplot2]; }; + ggseqlogo = derive2 { name="ggseqlogo"; version="0.0.1"; sha256="1qb6rr7q3makrv5qqa0d0r8ak8c9k3g05hzgyfhsgggz1g90036d"; depends=[ggplot2]; }; + ggsignif = derive2 { name="ggsignif"; version="0.3.0"; sha256="0kj8fg7vns8a2izmq41mqwac420dsqzpr4dxyvzgscd0dzd8xd7h"; depends=[ggplot2]; }; ggsn = derive2 { name="ggsn"; version="0.4.0"; sha256="0si3llqlb0dg482cqxhv5lm6raawqwpcd5ymjicw3780xq7d7mrk"; depends=[ggplot2 maptools png]; }; ggspatial = derive2 { name="ggspatial"; version="0.2.1"; sha256="11vminz4kwv1ny4v9h23sp7j7d45q6v4804xv9fp04qgzbzi9lv8"; depends=[abind ggplot2 maptools plyr raster reshape2 rgdal rosm scales sp]; }; ggspectra = derive2 { name="ggspectra"; version="0.2.1"; sha256="1q8l5zfkv4jzacb8pp7b2yp99ack4by4z2iw9l4j2n689v9wjs40"; depends=[dplyr ggplot2 ggrepel lubridate photobiology photobiologyWavebands reshape2 scales tidyr]; }; @@ -5785,22 +6040,23 @@ in with self; { ggtern = derive2 { name="ggtern"; version="2.2.0"; sha256="0ddcbbgp8ni3zbz4ailqx79i16aa2x4z4gvz55f0b731bilczw86"; depends=[compositions ggplot2 gridExtra gtable latex2exp lattice MASS plyr proto scales]; }; ggthemes = derive2 { name="ggthemes"; version="3.4.0"; sha256="1jj8lp7jbk3489kpgbw4b5phpn01gkfmksc21c6sn3x6wmzyn6hs"; depends=[assertthat colorspace ggplot2 scales]; }; ggvis = derive2 { name="ggvis"; version="0.4.3"; sha256="1p7c8f83da30grj5n0v80p5djp6z0r62z5zqpv2a3ahn61w1gm9l"; depends=[assertthat dplyr htmltools jsonlite lazyeval magrittr shiny]; }; - ghit = derive2 { name="ghit"; version="0.2.17"; sha256="16vhfv0j8f07p8dzqh93gws2zpb86h1glh062l8riar0gfpc34ia"; depends=[git2r]; }; + ghit = derive2 { name="ghit"; version="0.2.18"; sha256="117dn7j4nsdbdj1c1zndfikih3gxgxnkdxi3z0qmrbpsb9l4h1ic"; depends=[git2r]; }; ghyp = derive2 { name="ghyp"; version="1.5.7"; sha256="195hsskh2ykafqr93f675xqsmhbrki3abi61hk78bzy09n1d4jfk"; depends=[gplots numDeriv]; }; giRaph = derive2 { name="giRaph"; version="0.1.2"; sha256="137c39fz4vz37lpws3nqhrsf4qsyf2l0mr1ml3rq49zz4146i0rz"; depends=[]; }; gibbs_met = derive2 { name="gibbs.met"; version="1.1-3"; sha256="1yb5n8rkphsnxqn8rv8i54pgycv9p7x1xhinx4l5wzrds3xhf2dc"; depends=[]; }; - gimme = derive2 { name="gimme"; version="0.2-1"; sha256="0h00hf27pbn7p1cp7n5j4nsdh8d372xkwian48xxpb1a7800afw3"; depends=[gWidgets igraph lavaan qgraph]; }; + gifti = derive2 { name="gifti"; version="0.7.1"; sha256="0nvsk7403378yaam9349420w9abixcg6a18m63m1s2a6zd3jyj2y"; depends=[base64enc xml2]; }; + gimme = derive2 { name="gimme"; version="0.2-2"; sha256="1fx6vh0zzrn2vqbaprv0iyihx4y93qshi82jgi9lrjhaaqw3dmfh"; depends=[gWidgets igraph lavaan qgraph]; }; gimms = derive2 { name="gimms"; version="1.0.0"; sha256="0f959gr4nzf9p2gpvdrzlndp24g2hhzc0wbkgpbs056wp8ij0mws"; depends=[Kendall raster RCurl zyp]; }; - giphyr = derive2 { name="giphyr"; version="0.1.0"; sha256="0qwhsggqpd88vgifw6nab255cvkqq2bjp2ngfl0wl4ify2dxxwmh"; depends=[httr miniUI purrr rstudioapi shiny tibble]; }; - gistr = derive2 { name="gistr"; version="0.3.6"; sha256="1rajdfb8zkx444v89iapzrdad8y81rhd9q9nwcxw03jig4xm48mb"; depends=[assertthat dplyr httr jsonlite knitr magrittr rmarkdown]; }; + giphyr = derive2 { name="giphyr"; version="0.1.1"; sha256="0q5gkx2qmdn2z00fyd25q7n5izvhqa6b70cjzarxisjn2f07jdvj"; depends=[dplyr httr miniUI purrr rstudioapi shiny tibble]; }; + gistr = derive2 { name="gistr"; version="0.4.0"; sha256="1q1wp3q3ppkclvw9fsc9pr5raqv2r9rdm2n8s197b8brfcjilxsi"; depends=[assertthat dplyr httr jsonlite knitr magrittr rmarkdown]; }; git2r = derive2 { name="git2r"; version="0.18.0"; sha256="0bgzdsdi9n6l8pchivs6a2g4ksa56qs8hygpyv2c0ndqmx4jxcwi"; depends=[]; }; gitgadget = derive2 { name="gitgadget"; version="0.2.1"; sha256="02jmp5lnk156sfqlv91jn42xds98ihya1x2f97cfwpzlas5qrxky"; depends=[curl dplyr jsonlite miniUI rstudioapi shiny]; }; githubinstall = derive2 { name="githubinstall"; version="0.2.1"; sha256="0vcc1s4ywaz8fjsg99knlxms4505wpvl08g48ndxcp3fqzvfc8i7"; depends=[curl data_table devtools httr jsonlite]; }; - gitlabr = derive2 { name="gitlabr"; version="0.7"; sha256="17l9y7ci4zl4r2j3g6m2jwl0wh5bi0w2pikrayhyda5137hf5lws"; depends=[base64enc dplyr httr magrittr purrr stringr tibble yaml]; }; + gitlabr = derive2 { name="gitlabr"; version="0.9"; sha256="0i9sqqvn9xzknybsj9nmi6kclw8c35shy658li17455d28gv4653"; depends=[base64enc dplyr httr magrittr purrr stringr tibble yaml]; }; gitter = derive2 { name="gitter"; version="1.1.1"; sha256="10m4rs6mhg7xn8dfd41ai0bnn5bnxn6cgqip22hrrpj0i2lzky6l"; depends=[EBImage ggplot2 jpeg logging PET tiff]; }; givitiR = derive2 { name="givitiR"; version="1.3"; sha256="0y2slhxhj7k413kjaydin9hq3x2xgx4cgjshdplwnmg3x2nakn31"; depends=[alabama rootSolve]; }; - gjam = derive2 { name="gjam"; version="2.1.1"; sha256="12r7amkzvklj4b52199hwwxgimvqgnbnylzdkxgfql9n8zcbgx3j"; depends=[MASS RANN Rcpp RcppArmadillo]; }; - gk = derive2 { name="gk"; version="0.4.0"; sha256="0nm7aam78mn0a7mvqk1cy7kw4aps7rbx26c85jlklknjyic99cav"; depends=[]; }; + gjam = derive2 { name="gjam"; version="2.1.4"; sha256="13w64sk99db1rncq2qsd30ql8lhn9la2ilxhhb7qgqly929c6ywl"; depends=[MASS RANN Rcpp RcppArmadillo]; }; + gk = derive2 { name="gk"; version="0.5.0"; sha256="0ixkl9jrmd4bcd3m34whfcikvwqbcdnzcd6gf5bdv81r0ygc5jml"; depends=[Ecdat lubridate progress]; }; gkmSVM = derive2 { name="gkmSVM"; version="0.71.0"; sha256="1zpxgxmf2nd5j5wn00ps6kfxr8wxh7d1swr1rr4spq7sj5z5z0k0"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges IRanges kernlab Rcpp ROCR rtracklayer S4Vectors seqinr]; }; glamlasso = derive2 { name="glamlasso"; version="2.0.1"; sha256="1x87nv29r309l539qccbcll4kn889sdds6gvrhyvw68rs370pn2l"; depends=[Rcpp RcppArmadillo]; }; glarma = derive2 { name="glarma"; version="1.5-0"; sha256="1afcccjayz6sj39mcg9h54d7dd1as8l63nxfw17bdh18zidr6ghi"; depends=[MASS]; }; @@ -5808,24 +6064,27 @@ in with self; { glba = derive2 { name="glba"; version="0.2"; sha256="0ckcz6v6mfbv34s8sp086czhb5l58sky79k84332rrz6wj47p3md"; depends=[]; }; glcm = derive2 { name="glcm"; version="1.6.1"; sha256="0xzfhafc7326v3g1xngp584039iknw3q3bcx8f0j4ig125in7sxk"; depends=[Rcpp RcppArmadillo]; }; gld = derive2 { name="gld"; version="2.4.1"; sha256="0ycm3w8s5bm5w2lqy0qa877cwjcwc9x1zyyyrknwwjjxip250iaw"; depends=[e1071 lmom]; }; - glinternet = derive2 { name="glinternet"; version="1.0.3"; sha256="1f3c4c8jjfslp5wc4mc3sc64qpin8bswz1fnv5zqg8dr4j8afq10"; depends=[]; }; + gldrm = derive2 { name="gldrm"; version="1.1"; sha256="0ixvxlgfvn7dbwd3nr27qr1x3lh0spynmkl9qprk8blvf68lsrvp"; depends=[]; }; + glinternet = derive2 { name="glinternet"; version="1.0.4"; sha256="0h96ydwp6rygwcbwmwbbggz3dl2zg5d4zp0cs9n1p9ji7h6af95f"; depends=[]; }; gllm = derive2 { name="gllm"; version="0.35"; sha256="1m9asamh2yha9q8mrllvvc9qj2im6cspvfpafzc8krmh17zq4ins"; depends=[]; }; glm_ddR = derive2 { name="glm.ddR"; version="0.1.1"; sha256="123xqyw73l5lv746zvy2wjwr8xx6gpmwi5n86m8d05dj3bx02dzm"; depends=[ddR Matrix]; }; - glm_predict = derive2 { name="glm.predict"; version="2.4-0"; sha256="10cpbl25csfs2ng7jj7hcfwl58akbx5dsdv1qlgbnvhf9rmlblww"; depends=[iterpc MASS nnet]; }; + glm_predict = derive2 { name="glm.predict"; version="2.5-1"; sha256="0q3mi89zc7386bcx0ysii5vf4viqdc933k4fhdwqfm9c2z3rzpcy"; depends=[MASS nnet]; }; glm2 = derive2 { name="glm2"; version="1.1.2"; sha256="1x9pq2ddsz9al8w044qch34s3fahca63dz85lvm5qn16945ccw1s"; depends=[]; }; glmBfp = derive2 { name="glmBfp"; version="0.0-48"; sha256="1r8mc55v717g4666f07hkc13v9vhj96n7xvn2r3crjndq3w5x3yn"; depends=[coda Rcpp RcppArmadillo rms Runuran statmod survival]; }; - glmbb = derive2 { name="glmbb"; version="0.2"; sha256="1ifiiixj2ip8mqdk3riaf1y60sv1asr0kmcmbjnhpwxd46k8kkpw"; depends=[digest]; }; + glmbb = derive2 { name="glmbb"; version="0.3"; sha256="12yabwswps0fmprh8nb9jdny9xrm13jvc0d9m3w04ppmsvalrmwl"; depends=[digest]; }; glmc = derive2 { name="glmc"; version="0.2-4"; sha256="03m1ym9w0b0gqib13pnh1yrjijlcwsn5lijg0nsr4hd6gxw29cla"; depends=[emplik]; }; glmdm = derive2 { name="glmdm"; version="2.60"; sha256="09vljki24fccqkvxkmg2i6a8pxqhfwm155b41m2q51lqaq29bfw7"; depends=[]; }; + glmertree = derive2 { name="glmertree"; version="0.1-1"; sha256="0wfpx7y6x9ll86av399i7vaycjjbgmmmh78wy77cbq0gkp1rzb47"; depends=[Formula lme4 partykit]; }; glmgraph = derive2 { name="glmgraph"; version="1.0.3"; sha256="16sq6i7kbw20nvwikpa02z3pb7wqw3270j6ss7f8sgf548skhmx0"; depends=[Rcpp RcppArmadillo]; }; glmlep = derive2 { name="glmlep"; version="0.1"; sha256="0jnm3cf2r9fyncxzpk87g4pnxbryqcxxrc5y2a80pv48al3sxlzk"; depends=[]; }; glmm = derive2 { name="glmm"; version="1.1.1"; sha256="0jswwrdc2k99kcqnbh1dg5j3z98l4x8v5kfdlxk5yxfi1ik6r3p5"; depends=[Matrix mvtnorm trust]; }; glmmBUGS = derive2 { name="glmmBUGS"; version="2.4.0"; sha256="1clnnf0ja2xiqdgi2f1xs04hhi13rnp8jzzdjncbqbdzk2ic3ynl"; depends=[abind MASS sp]; }; - glmmLasso = derive2 { name="glmmLasso"; version="1.4.4"; sha256="0f03zj1hbxp4cpn0ffwisf52gcfdyp7sbm49zxi7g7xpv7v87pja"; depends=[Matrix minqa]; }; - glmmML = derive2 { name="glmmML"; version="1.0.1"; sha256="0lfxhx0mr0ph8fg28nnb37p2lndjayzhv07wksx9ic8gpi0cm6my"; depends=[]; }; + glmmLasso = derive2 { name="glmmLasso"; version="1.5.1"; sha256="1az9vdnyqyrfn1q7zrn6x4ywx77b0vg65cni45x37b0ybkwpis39"; depends=[Matrix minqa]; }; + glmmML = derive2 { name="glmmML"; version="1.0.2"; sha256="0ndvp7a7dxq6ygdwzq783ci1y0zb4xwnj6g4w1cm8zvqak8dxjdb"; depends=[]; }; glmmTMB = derive2 { name="glmmTMB"; version="0.1.1"; sha256="1ckij5jrqijwljqkj624q6li0bv8vxb3aglwbfi034zc0iwiba1b"; depends=[lme4 Matrix nlme RcppEigen TMB]; }; glmmsr = derive2 { name="glmmsr"; version="0.1.1"; sha256="07z4j7845hz3hcv438njnqf1yfp8prqby03h3s1ql1w8d342670i"; depends=[BH lme4 Matrix R6 Rcpp RcppEigen]; }; - glmnet = derive2 { name="glmnet"; version="2.0-5"; sha256="1cbpzmbv837fvq88rgn6mgzgr9f1wqp9fg8gh2kkmngvr1957a9c"; depends=[foreach Matrix]; }; + glmnet = derive2 { name="glmnet"; version="2.0-10"; sha256="07n2hz4fvjyv0siai8z8wqwfj8d58i8n1vzf1ckdfzp4kxa3z08d"; depends=[foreach Matrix]; }; + glmnetUtils = derive2 { name="glmnetUtils"; version="1.0.2"; sha256="1v270hfw72x42r6m3nv28fp0s7snqnak6ilbijl9cfqnmxb642q8"; depends=[glmnet Matrix]; }; glmnetcr = derive2 { name="glmnetcr"; version="1.0.2"; sha256="1pyg23hdqksiaqdcrsaqz9vb7mgclm41hh0vb7ndkdv284bzzlbz"; depends=[glmnet]; }; glmpath = derive2 { name="glmpath"; version="0.97"; sha256="054v188ffjl6x11cld5s9py22kxcs0iq58x4yhxb0ny7mbma5hkn"; depends=[survival]; }; glmpathcr = derive2 { name="glmpathcr"; version="1.0.3"; sha256="0qa63c7kwpxf6smczgzf4fmvczw1ynqq5vgcw3bxdbs37q4ypj8n"; depends=[glmpath mvtnorm]; }; @@ -5836,22 +6095,23 @@ in with self; { globalOptTests = derive2 { name="globalOptTests"; version="1.1"; sha256="0yf4p82dpjh36ddpfrby7m3fnj2blf5s76lncflch917sq251h4f"; depends=[]; }; globalboosttest = derive2 { name="globalboosttest"; version="1.1-0"; sha256="1k7kgnday27sn6s1agzlj94asww81655d2zprx6qg7liv677bxvf"; depends=[mboost survival]; }; globals = derive2 { name="globals"; version="0.10.0"; sha256="1vxp4lliihjd9p5d5yaf4dqvj0hmr8nzpxayscdckcxq6jr2p34i"; depends=[codetools]; }; - globe = derive2 { name="globe"; version="1.1-2"; sha256="11y3dbi3x3idlwhzr5s2g976myci91l1qlsfyny732gb7q32c79w"; depends=[]; }; + globe = derive2 { name="globe"; version="1.2-0"; sha256="0xa0q5dac0g7xdlr679f3km8nqxlm7gi4msp9fbfivfvy0rmri96"; depends=[]; }; glogis = derive2 { name="glogis"; version="1.0-0"; sha256="19h0d3x5lcjipkdvx4ppq5lyj2xzizayidx0gjg9ggb1qljpyw9m"; depends=[sandwich zoo]; }; glpkAPI = derive2 { name="glpkAPI"; version="1.3.0"; sha256="0173wljx13jali2jxz4k5za89hc64n2j9djz5bcryrqhq4rmkp87"; depends=[]; }; glrt = derive2 { name="glrt"; version="2.0"; sha256="0p2b0digndvnn396ynv56cdg436n3ll7pxkb81rs3dhwbyqyc948"; depends=[survival]; }; - glue = derive2 { name="glue"; version="1.0.0"; sha256="03xvs0xana2hwk5di3pydllw0jdvdmjgxv26rx2fm97glcgnk8hk"; depends=[]; }; + glue = derive2 { name="glue"; version="1.1.1"; sha256="01awmqby7rwzhzr51m7d87wqibx7ggl6xair8fi3z3q1hkyyv7ih"; depends=[]; }; glycanr = derive2 { name="glycanr"; version="0.3.0"; sha256="1s3xhg31xc3x4gzxjpn9mbb7dw4m49na2mdlgr5wh1z9gxdc06pa"; depends=[coin dplyr ggplot2 tidyr]; }; gmDatabase = derive2 { name="gmDatabase"; version="0.5.0"; sha256="0prap4a8pvylmvakd2ii87jz9bqf0vvfsxdi4iwa40nx444hqhx2"; depends=[DBI digest foreach RMySQL shiny]; }; gmailr = derive2 { name="gmailr"; version="0.7.1"; sha256="1gniwwl0ci0wm7a3ai2lqrr590smmkdgyf3aarw6bdygn8hr3s3y"; depends=[base64enc crayon httr jsonlite magrittr mime]; }; gmapsdistance = derive2 { name="gmapsdistance"; version="3.1"; sha256="1hsijd1ahsppmxpnx690s27lry1w3c8r9jynhj0rsr4w6jmxikc2"; depends=[RCurl XML]; }; gmatrix = derive2 { name="gmatrix"; version="0.3"; sha256="0ni5scx48m99jg9a5l93qvfkz6v5m7d5c0fwhp14mgiw32ff1s1r"; depends=[]; }; + gmediation = derive2 { name="gmediation"; version="0.1.1"; sha256="0md4h298vqw67qrjcaia6xz8s7akdpcmxa83irm12qgbh56a5rpr"; depends=[MASS plyr VGAM]; }; gmeta = derive2 { name="gmeta"; version="2.2-6"; sha256="1zq5prig4mq6i8gkaynv8p786dbwh670bv0mapwmyns1r0yarzkm"; depends=[BiasedUrn binom]; }; - gmm = derive2 { name="gmm"; version="1.5-2"; sha256="1phd8mmfyhjb72a45gavckb3g8qi927hdq0i8c7iw1d28f04lc70"; depends=[sandwich]; }; + gmm = derive2 { name="gmm"; version="1.6-1"; sha256="0giq0ic7gdvglkjby217r70dbz9v0xnvzvzv6icqj0m3rxwarmn1"; depends=[sandwich]; }; gmnl = derive2 { name="gmnl"; version="1.1-1"; sha256="0pdbky9gm8s3dvyg6z7pvn7wzqlbvdg7y0py9kcwfxxjvwcp1qwh"; depends=[Formula maxLik mlogit msm plotrix truncnorm]; }; gmodels = derive2 { name="gmodels"; version="2.16.2"; sha256="0zf4krlvdywny5p5hnkr0r0hync6dvzc9yy4dfywaxmkpna8h0db"; depends=[gdata MASS]; }; gmp = derive2 { name="gmp"; version="0.5-13.1"; sha256="0xh9dli4i7hyjywsn2h780cxl3k7v0q421djyr1wshk7l9s5701g"; depends=[]; }; - gmt = derive2 { name="gmt"; version="1.2-0"; sha256="09az2iwwhyrls4mr619vwzhzmaks6klm67lnir48bh40hynsvibp"; depends=[]; }; + gmt = derive2 { name="gmt"; version="2.0-0"; sha256="146rdvfi7f1s28zvy6h11myq61jy4di2ghzxlvwy04q3hphm1nj7"; depends=[coda Hmisc lattice]; }; gmum_r = derive2 { name="gmum.r"; version="0.2.1"; sha256="127h76nm99ldpaznys5y4rnrvq0kh5pcsjmw21hz79a8rjni7r16"; depends=[BH ggplot2 httr igraph Matrix Rcpp RcppArmadillo SparseM]; }; gnlm = derive2 { name="gnlm"; version="1.1.0"; sha256="0fv89cvbnp9n3lgg6y4sqmz9jzcgwj7vd92rwg7hixwrjyqpan4z"; depends=[rmutil]; }; gnm = derive2 { name="gnm"; version="1.0-8"; sha256="1581lzkb1v3y0arrq7x1bg7c91cii87bifxcdi1jzyc5rxj261la"; depends=[MASS Matrix nnet qvcalc relimp]; }; @@ -5865,17 +6125,20 @@ in with self; { gofastr = derive2 { name="gofastr"; version="0.2.1"; sha256="1a291bddhzk0wxrmk9dpiiv93h6si8s19v00wmypw0jfbrjhlc53"; depends=[data_table quanteda slam SnowballC tm]; }; goft = derive2 { name="goft"; version="1.3.1"; sha256="079p0l4w630j87h0xwk3wxpnd5779by507mffkwgj4qx4ljjfnqr"; depends=[fitdistrplus]; }; goftest = derive2 { name="goftest"; version="1.1-1"; sha256="183imn6dy28ama8bywxgyh32vgakv7bsbz4k5qbhnlhqdvzv2v6v"; depends=[]; }; + goftte = derive2 { name="goftte"; version="1.0.3"; sha256="158cz6x57fhcnfg1gqmv2zd6i9lnglhwwpipiia98yz9gjfnkwh0"; depends=[survival]; }; gogamer = derive2 { name="gogamer"; version="0.4.3"; sha256="0p11pxwc4vnmf2hh0zxv99qlqkqiszqawh8scw4v861i8ihp84iz"; depends=[dplyr ggplot2 gridExtra magrittr Rcpp scales stringr]; }; gogarch = derive2 { name="gogarch"; version="0.7-2"; sha256="03gpl73zc6kx4gni59xbg7b38dkpd7p4c7kvlqm46f58j257viik"; depends=[fastICA fGarch]; }; - googleAnalyticsR = derive2 { name="googleAnalyticsR"; version="0.4.0"; sha256="01dl76ggzkcik4jq0q3fmy9jnbd6ly7npbrffph2ir7cqnpzvyl2"; depends=[bigQueryR dplyr googleAuthR httr jsonlite magrittr shiny testthat tidyjson]; }; + goldi = derive2 { name="goldi"; version="1.0.1"; sha256="191ac02bwrxr3khq6qirhxzfhv7pqfhqyg7jb473p5vwygpvc53l"; depends=[dplyr futile_logger magrittr Rcpp RcppArmadillo SnowballC tm]; }; + gomms = derive2 { name="gomms"; version="1.0"; sha256="1i9d5y28wrhal990x7xxy99v3z9y2pzlakj7wnynd3dpx5pqr0jj"; depends=[]; }; + googleAnalyticsR = derive2 { name="googleAnalyticsR"; version="0.4.1"; sha256="0qd0r04yh1w58zgm9fyw1dsl6v7cmgrmmj9wpxanpdsjx8yvd3hk"; depends=[assertthat dplyr googleAuthR httr magrittr purrr tidyr]; }; googleAuthR = derive2 { name="googleAuthR"; version="0.5.1"; sha256="1ba8a4yc6l3ycamcqqq7mwqi9bw4y1xb29svww9gzha3yngy3740"; depends=[devtools formatR httr jsonlite miniUI R6 shiny testthat]; }; - googleCloudStorageR = derive2 { name="googleCloudStorageR"; version="0.2.0"; sha256="02l3jml2sqw4m7fralr3dzyk06h8jinn6bi54gwc02f1y84j8qfh"; depends=[googleAuthR httr jsonlite readr testthat]; }; + googleCloudStorageR = derive2 { name="googleCloudStorageR"; version="0.3.0"; sha256="1r5sg2r94wxwvk7cg7vlv4gf2a2ccl31b069y370kjwlk26q7k4s"; depends=[assertthat googleAuthR httr jsonlite]; }; googleComputeEngineR = derive2 { name="googleComputeEngineR"; version="0.1.0"; sha256="173y7m2j6iw848djjawkiy22fg56hnpx0m0q1halzwycqx6z08vc"; depends=[future googleAuthR jsonlite]; }; googlePublicData = derive2 { name="googlePublicData"; version="0.15.7.28"; sha256="1bkfj88rn8ai0kbjbd0s3zih6iz018xybr13w2h9i6wdi3dhs75s"; depends=[XLConnect XML]; }; googleVis = derive2 { name="googleVis"; version="0.6.2"; sha256="1idnp9ndgg2dwybdpw7q3pkaw9kw2vy2xkls9qykrpz1p6nf3mn1"; depends=[jsonlite]; }; googleformr = derive2 { name="googleformr"; version="0.0.3"; sha256="0smykcjyqmk61ws5jk462l8x5hg0h9nwq55q5pqfgcq1j3yfniqh"; depends=[httr rvest xml2]; }; - googlesheets = derive2 { name="googlesheets"; version="0.2.1"; sha256="0ps13h1cv7fj5dh8s4nvwi64wnnyqdsadcaa4iizq1c5s615cwk3"; depends=[cellranger dplyr httr jsonlite purrr readr stringr tidyr xml2]; }; - googleway = derive2 { name="googleway"; version="1.0.0"; sha256="01gzpb48iffir57cqw9hs2s4rxdllvdjf5hkmrf5zkjxhbzw7w14"; depends=[curl jsonlite Rcpp]; }; + googlesheets = derive2 { name="googlesheets"; version="0.2.2"; sha256="18q0xmxn09b52rmky7gr5flp0awndcnsgb7zcvkzvkrkvmwad52b"; depends=[cellranger dplyr httr jsonlite purrr readr stringr tidyr xml2]; }; + googleway = derive2 { name="googleway"; version="2.2.0"; sha256="11x8h5amczydh8d7wrqqwyk386k63kxhbbivb2gw1fi7ffyi24jb"; depends=[curl htmltools htmlwidgets jpeg jsonlite magrittr Rcpp shiny]; }; goric = derive2 { name="goric"; version="0.0-95"; sha256="05sbsnjjlpy1z0mfbsrihrp2gp4d66cvprhgzxy76lipgm5mmvqi"; depends=[MASS Matrix mvtnorm nlme quadprog]; }; govStatJPN = derive2 { name="govStatJPN"; version="0.1"; sha256="03sywa7rl5rblvv370mfszz5ngp850qf32yydy1fdx10lv5amrfl"; depends=[]; }; gower = derive2 { name="gower"; version="0.1.2"; sha256="1mbrj1lam3jfbby2j32shmmj5cn09zx3rkxbamq7q8sdg39b54gb"; depends=[]; }; @@ -5891,7 +6154,8 @@ in with self; { gptk = derive2 { name="gptk"; version="1.08"; sha256="0fk6c8f8fni4y2n2cbfwywlfyz74xlb8lx25wajsxr2v4x74pa7l"; depends=[fields Matrix]; }; gpuR = derive2 { name="gpuR"; version="1.2.1"; sha256="1k9nxsz4grjl8lyf9108vj94g2gpi6h0pbf5l63y2h5rn0lmpw8s"; depends=[assertive BH Rcpp RcppEigen RViennaCL]; }; gputools = derive2 { name="gputools"; version="1.1"; sha256="0np1lndvppdi409a1kfbbl0z5hr8wg2q473jch58zd16d2ickwkb"; depends=[]; }; - gquad = derive2 { name="gquad"; version="2.1-0"; sha256="0s7crpirscbij2y25scwzb9fyp9ych1n80fij2ajda9zaqcyyin8"; depends=[ape seqinr]; }; + gqlr = derive2 { name="gqlr"; version="0.0.1"; sha256="0qvyvy514ma5wi2qm6a8praqa7js9wl0hh0ack1hknw33g2gyqhy"; depends=[graphql jsonlite magrittr pryr R6]; }; + gquad = derive2 { name="gquad"; version="2.1-1"; sha256="19k7cqp2j5vb6m9hxdm951wfjh6nsswb64pdz9g93ypcqrg02wa4"; depends=[ape seqinr]; }; grImport = derive2 { name="grImport"; version="0.9-0"; sha256="1d8fd7502qj7cirjqdkr1qj51rylw2fz5hs06avfvc2dxs2xwfw1"; depends=[XML]; }; gradDescent = derive2 { name="gradDescent"; version="2.0.1"; sha256="0kxyvr30hygg82s5m7nng02fvn6nak43y2v18445xbb05y6f5gmx"; depends=[]; }; grade = derive2 { name="grade"; version="0.2-1"; sha256="085hfvqn880yk19axdjv3z9jr33kls212vs172a8mzhnkallph1r"; depends=[]; }; @@ -5903,20 +6167,21 @@ in with self; { graphicalVAR = derive2 { name="graphicalVAR"; version="0.2"; sha256="0z1qjvyqlalplmwz898rhbjkj6fg1dsgpxn6828qmw3is36g74xg"; depends=[dplyr glasso glmnet igraph Matrix mvtnorm qgraph Rcpp RcppArmadillo]; }; graphicsQC = derive2 { name="graphicsQC"; version="1.0-8"; sha256="12vg93xfmkv73i19vkb10q2qngmsxd3y42z3l6izdywbdc3cdfkg"; depends=[XML]; }; graphkernels = derive2 { name="graphkernels"; version="1.2"; sha256="06lh4w0xw1apz70s9qzlhlayzh6nyd6v512lc90a0g7n6xw1fqvg"; depends=[igraph Rcpp RcppEigen]; }; - graphql = derive2 { name="graphql"; version="1.2"; sha256="03rmxpd1g9r1hgv9r3mrwf5pp4013cpqvbg385ywfm8l1c3j0a3z"; depends=[jsonlite Rcpp]; }; + graphql = derive2 { name="graphql"; version="1.3"; sha256="14abyr4h49i75aq5x49f6jv6053hyq9a77v7wad88zcbcs3p1n9p"; depends=[jsonlite Rcpp]; }; graphscan = derive2 { name="graphscan"; version="1.1.1"; sha256="1dgjb0grdymhimdgwnddjcivgy2i9r1i1nni4v9mx0447skcahk9"; depends=[ape rgl snowfall sp]; }; graticule = derive2 { name="graticule"; version="0.1.2"; sha256="1yvrijvyjilfql72dxj32b3sczqv065zj61729wrrzn63xcifvmb"; depends=[raster sp]; }; - grattan = derive2 { name="grattan"; version="1.4.1.2"; sha256="0b4sj4zz432m288jv9y6xx1isw84j23gjkdwpxxv6ny29j3xw361"; depends=[assertthat data_table dplyr forecast lazyeval lubridate magrittr purrr Rcpp rsdmx zoo]; }; + grattan = derive2 { name="grattan"; version="1.5.0.0"; sha256="13zrkn2hb3cnaijmvmhgfrw1aib6vhk66vmkn4vx8srrbglr3m56"; depends=[assertthat data_table dplyr forecast lazyeval lubridate magrittr purrr Rcpp rsdmx zoo]; }; gravity = derive2 { name="gravity"; version="0.3"; sha256="0makhi5hfs2x891ss6whq49rp73j6h5x5m4dvd0d175y06n4hg3s"; depends=[lmtest multiwayvcov sandwich]; }; greport = derive2 { name="greport"; version="0.7-1"; sha256="1h1g3khb30n3y8l1sxpas2s6s667az4yxvsq42x5dfx8fic42p6n"; depends=[data_table Formula ggplot2 Hmisc lattice latticeExtra rms survival]; }; - grex = derive2 { name="grex"; version="1.4"; sha256="0jj0473q06ym410glnma7sbqn9z0l0j0i5kw3mqynjs3blr03d7w"; depends=[]; }; + greta = derive2 { name="greta"; version="0.2.0"; sha256="0fp540an93h4a1bkmc42gj7j8hxdkw5zrcaj0mg64rahx0xn2dvq"; depends=[coda progress R6 reticulate tensorflow]; }; + grex = derive2 { name="grex"; version="1.5"; sha256="1wy2f61z1mrzb487h4s97larpyygf6gqm1r9i9bmabhjakzk3qyd"; depends=[]; }; greyzoneSurv = derive2 { name="greyzoneSurv"; version="1.0"; sha256="115i0d4fy4p4g4vd419hj9f23hi8cbiyfilgpgmag91ilr1xpcdp"; depends=[Hmisc survAUC survival]; }; gridBase = derive2 { name="gridBase"; version="0.4-7"; sha256="09jzw4rzwf2y5lcz7b16mb68pn0fqigv34ff7lr6w3yi9k91i1xy"; depends=[]; }; gridDebug = derive2 { name="gridDebug"; version="0.5-0"; sha256="12zrl7p8p7071w5viymdipycja7a2arvy0aahgahd5nlx1k1gha0"; depends=[graph gridGraphviz gridSVG]; }; gridExtra = derive2 { name="gridExtra"; version="2.2.1"; sha256="0638ihwl00j76ivaxxhxvi8z573lwy1jym3srr78mx6dbdd4bzj4"; depends=[gtable]; }; - gridGraphics = derive2 { name="gridGraphics"; version="0.1-5"; sha256="1fsw699xk56iiwscrf98a1b0m2xpmvfqqsb7aja49fhv8qam6szf"; depends=[]; }; + gridGraphics = derive2 { name="gridGraphics"; version="0.2"; sha256="1lxqr257gqyasln8j0538jyb9q0s6i72cxx8i6sya7w7dwgrv1xp"; depends=[]; }; gridGraphviz = derive2 { name="gridGraphviz"; version="0.3"; sha256="1jz0d6kc8ci55ffm6dns8bhak9xnaq7mg5mpv3fk53lircn7mwl5"; depends=[graph Rgraphviz]; }; - gridSVG = derive2 { name="gridSVG"; version="1.5-0"; sha256="15d35066213hwsxsvmnqxqm4wim850645jwajw4pa190v8sapl89"; depends=[RJSONIO XML]; }; + gridSVG = derive2 { name="gridSVG"; version="1.5-1"; sha256="13l7mn8kx36g74f39nq6c39d7l0zkkkgnmfmy5g8qnydw5qn5bkq"; depends=[jsonlite XML]; }; gridsample = derive2 { name="gridsample"; version="0.2.0"; sha256="0hpfhkma60h59z3akjqs7igs6zg00xs3jlq3sm48gxbjrk7fb5sm"; depends=[data_table deldir geosphere maptools raster rgdal rgeos sp spatstat spatstat_utils]; }; gridsampler = derive2 { name="gridsampler"; version="0.6"; sha256="0wqpqg9c372sv8zqks6v93gawiyfghw58hn7m8q45dxpqm16ss3k"; depends=[BiasedUrn ggplot2 plyr reshape2 shiny shinyBS shinythemes]; }; grnn = derive2 { name="grnn"; version="0.1.0"; sha256="1dxcmar42g9hz4zlyszlmmnnsnja0gxfggav5jxv0gkp32rkd0wh"; depends=[]; }; @@ -5938,7 +6203,7 @@ in with self; { grpSLOPE = derive2 { name="grpSLOPE"; version="0.2.1"; sha256="1r9irf83f7szhkdqis2rakil8fsr3rqsfrj4dmbg3r3rnr8wl8nh"; depends=[SLOPE]; }; grplasso = derive2 { name="grplasso"; version="0.4-5"; sha256="15bqckq9qjdlllhfpb21vzgi9msbl544alkrz01w1vvb3hk1847y"; depends=[]; }; grppenalty = derive2 { name="grppenalty"; version="2.1-0"; sha256="12hbghmg96dwlscjy6nspgkmqqj4vwq2qcwcz1gp50a08qbmdcrk"; depends=[]; }; - grpreg = derive2 { name="grpreg"; version="3.0-2"; sha256="1w6q7n1z585abs7kb2yq95dr6rycan0rkiial9q415s5rf71s48j"; depends=[Matrix]; }; + grpreg = derive2 { name="grpreg"; version="3.1-1"; sha256="16wg95iw935k8gqm53pi29244gg28yzvaqhq72p3m0xfqj5aq885"; depends=[Matrix]; }; grpregOverlap = derive2 { name="grpregOverlap"; version="2.2-0"; sha256="1kq8wxpx21irwckndgfkzdy5jgzf7pmcwpclmjzjxznv6cyaikd0"; depends=[grpreg Matrix]; }; grpss = derive2 { name="grpss"; version="3.0.1"; sha256="01bjjhv3vkvn5h363g5a9dlm7kzq10q7ixmrc0kkq5hsbs31vl3x"; depends=[doParallel foreach grpreg MASS]; }; grr = derive2 { name="grr"; version="0.9.5"; sha256="0arbcgrvhkwb5xk4nry1ffg2qj0v8ivhjghdr505ib4357g0c9i9"; depends=[]; }; @@ -5953,8 +6218,10 @@ in with self; { gsheet = derive2 { name="gsheet"; version="0.4.2"; sha256="1mfpg91855qg0bi6wk0wy58b58lm06jw9fqdl6psqdvnmaf7n2w5"; depends=[httr stringr]; }; gskat = derive2 { name="gskat"; version="1.0"; sha256="19mbif7wr88vk5wlc7m2l4xghjmfj2qd3s8yvjlkawbnjk8x6ib0"; depends=[CompQuadForm e1071 gee geepack Matrix]; }; gsl = derive2 { name="gsl"; version="1.9-10.3"; sha256="00isw2iha5af4s7rr8svqka9mkl9l26l8h2rnk4r7fkhh7fc97sg"; depends=[]; }; + gsloid = derive2 { name="gsloid"; version="0.1.0"; sha256="1ma5si86ynfsis0pnw8hyv6xc4frbkhy5ks03mr0z16gasffkycg"; depends=[]; }; gsmoothr = derive2 { name="gsmoothr"; version="0.1.7"; sha256="00z9852vn5pj04dhl3w36yk0xjawniay6iifw1i7fd8g98mgspxp"; depends=[]; }; gsrc = derive2 { name="gsrc"; version="1.1"; sha256="12rrp9v0r5qzxcs1l29238nkc1haql1c4vva3vdm26kglpg7qj18"; depends=[Ckmeans_1d_dp dbscan DNAcopy illuminaio limma openxlsx preprocessCore R6]; }; + gsrsb = derive2 { name="gsrsb"; version="1.0.3"; sha256="1r4pc3zcmgwxbsmpwb6m24mmy0p78nq35bigjqvwcc32imyw4ls9"; depends=[ldbounds mvtnorm xtable]; }; gss = derive2 { name="gss"; version="2.1-7"; sha256="1nrs1yhf2h06pkkhkvaal92h0mzrwixs0pay6dkb8q2d9igbn184"; depends=[]; }; gsscopu = derive2 { name="gsscopu"; version="0.9-3"; sha256="0bvhhs5wn4y1dcff2g87f80jdn3i4mdbvdbydsbx80ng38rfxhhg"; depends=[gss]; }; gstat = derive2 { name="gstat"; version="1.1-5"; sha256="1wfzffl0wfimb93d5ln96yhv2g64aywzmh6hdaadl8qyqx6rx7q3"; depends=[FNN lattice sp spacetime zoo]; }; @@ -5973,7 +6240,7 @@ in with self; { guess = derive2 { name="guess"; version="0.1"; sha256="198pxi0yipgm9wccpj3y4a0gkibhyxcmb7v5dz7ipzrk44ha5g6j"; depends=[Rsolnp]; }; gumbel = derive2 { name="gumbel"; version="1.10-1"; sha256="12rkri8bvgjn0ylf1i4k9vpb8mvbasidvx2479kmis2rc1p07qq7"; depends=[]; }; gunsales = derive2 { name="gunsales"; version="0.1.2"; sha256="02vz16lhym72vvf48yai1g371wygdlmi63a6ylc147l0b69jgw31"; depends=[data_table dplyr ggplot2 seasonal x13binary zoo]; }; - gutenbergr = derive2 { name="gutenbergr"; version="0.1.2"; sha256="0agzc3ry8bm5fsn3pikr6hsmhdjrf8sln56c2wwl0vlm7p2gjca8"; depends=[dplyr lazyeval purrr readr rvest stringr urltools]; }; + gutenbergr = derive2 { name="gutenbergr"; version="0.1.3"; sha256="1x4db2dgnqi17w5rdx46v78j6055vqp8nnh7m87yq7j7b3d1r9gi"; depends=[dplyr lazyeval purrr readr stringr urltools]; }; gvc = derive2 { name="gvc"; version="0.5.2"; sha256="0cfvli6ap5kw3agv94d7g7rhmlxd66yyngc7c9pl4fsxf7sm6nx4"; depends=[decompr diagonals]; }; gvcm_cat = derive2 { name="gvcm.cat"; version="1.9"; sha256="1kwfcmnl1ivv1lh3zxccwls2xfyx3l8v71ngc0bg6441i81d4xp5"; depends=[MASS Matrix mgcv]; }; gvlma = derive2 { name="gvlma"; version="1.0.0.2"; sha256="0gj52hg665nmlwgbjh9yvz7a3sbzlbj41ksxchnnlxaxipdf6sl8"; depends=[]; }; @@ -5983,22 +6250,23 @@ in with self; { gwrr = derive2 { name="gwrr"; version="0.2-1"; sha256="1fjk217pimnmxsimqp9sn02nr1mwy3hw3vsr95skbfsd6vdda14d"; depends=[fields lars]; }; gym = derive2 { name="gym"; version="0.1.0"; sha256="0vcwzgawqwjsf65hr1mbjkz3px8zsibfkn42jpsg39n13jpfjq8v"; depends=[httr jsonlite]; }; gyriq = derive2 { name="gyriq"; version="1.0.2"; sha256="12vbnhianzi4l43czaxrbnbkz1h8lvmwjys0y3c2ml3g6dmwwfji"; depends=[CompQuadForm irlba mvtnorm survival]; }; - h2o = derive2 { name="h2o"; version="3.10.4.4"; sha256="11bbpwsx9pyf54v1w9j7sjdh8kins0kraqjmssghisp7q0gcz4dk"; depends=[jsonlite RCurl]; }; + h2o = derive2 { name="h2o"; version="3.10.5.2"; sha256="0r9fkgxld7n8344dc3s8ssagwm2xz96dhyxs98rxy873qbjghmg8"; depends=[jsonlite RCurl]; }; h5 = derive2 { name="h5"; version="0.9.8"; sha256="1i7ymbqcmv8b9v8jdaqs49638m7xib5k92d62jh6h4il8l10rykx"; depends=[Rcpp]; }; - hBayesDM = derive2 { name="hBayesDM"; version="0.3.0"; sha256="0ka7x55x04656cad9gyzfr2p0xf9gjyq56vw0ja9561vvbk2dynm"; depends=[BH ggplot2 loo mail modeest Rcpp RcppEigen rstan rstantools StanHeaders]; }; - hNMF = derive2 { name="hNMF"; version="0.2"; sha256="1lp4qcx48maa3iql8m862x32m7zxril0jizvf4d5pinjwki9d031"; depends=[NMF nnls oro_nifti R_matlab rasterImage spatialfil]; }; + hBayesDM = derive2 { name="hBayesDM"; version="0.4.0"; sha256="0x7lpfx3d559fzkmrj3fb057zb3jm2y5l55zaqy0w7pnzgdpqnh6"; depends=[ggplot2 loo mail Rcpp rstan rstantools]; }; + hNMF = derive2 { name="hNMF"; version="0.3"; sha256="1kil1dkh8yqm5z2krc6n73hpm5m0h2dwwz4fg2xzvk5hsbg9qff3"; depends=[NMF nnls oro_nifti R_matlab rasterImage spatialfil]; }; hSDM = derive2 { name="hSDM"; version="1.4"; sha256="1jq6hdnyv446ng62srip0b48kccf0qw3xqym3fprg74mjdy3inqr"; depends=[coda]; }; haarfisz = derive2 { name="haarfisz"; version="4.5"; sha256="1qmh4glwzqwqx3pvxc71rlcimp1l0plgdf380v9hk0b4gj7g3pkf"; depends=[wavethresh]; }; hail = derive2 { name="hail"; version="0.1.1"; sha256="1nrc9msqyy5iq2i6p8875anbqswxl2z6vdd4hvihnl22qh5fnbvh"; depends=[]; }; hamlet = derive2 { name="hamlet"; version="0.9.5"; sha256="1wnklaf46fpii10md3sp2cv7qqvrha2ihhrr1kxvpm7m8xzjfqc7"; depends=[]; }; - hansard = derive2 { name="hansard"; version="0.4.0"; sha256="11vs30lvs99l42qpqp6bc45frwnq6gmszkjqpcjlw26zxfd1kxps"; depends=[dplyr httr jsonlite]; }; + hansard = derive2 { name="hansard"; version="0.4.6"; sha256="1fnaw5zmj9r4hmkavpay2pi4409zq3496mvknln2mp43ig3640s6"; depends=[dplyr httr jsonlite lubridate tibble tidyr]; }; hapassoc = derive2 { name="hapassoc"; version="1.2-8"; sha256="0qs5jl0snzfchgpp6pabncwywxcmi743g91jvjiyyzw0lw85yv4s"; depends=[]; }; haplo_ccs = derive2 { name="haplo.ccs"; version="1.3.1"; sha256="0cs90zxxbvglz1af0lh37dw1gxa04k0kawzxamz2was3dbh19lbz"; depends=[haplo_stats survival]; }; haplo_stats = derive2 { name="haplo.stats"; version="1.7.7"; sha256="1rag22sqy8r87w5a1dww5cxknacm6975bpp74vw9zr04ldx4c64k"; depends=[rms]; }; - haploR = derive2 { name="haploR"; version="1.4.2"; sha256="1fiv8ybarna79xyhsbpql4l462g7q9x1mg37m4dgpmzp7xvzwx21"; depends=[httr XML]; }; + haploR = derive2 { name="haploR"; version="1.4.6"; sha256="0pd4jbf86hk8v8kv2acvi60chjcva6v3gza6zaxsgf1as43lcq8x"; depends=[httr RUnit tibble XML]; }; haploReconstruct = derive2 { name="haploReconstruct"; version="0.1.2"; sha256="17zdl9c3yy6jdzv1wp0ailbga456pmmybzxh3dldymhj8qf32cx0"; depends=[data_table dbscan foreach gplots igraph matrixStats stringi zoo]; }; haplotyper = derive2 { name="haplotyper"; version="0.1"; sha256="0pcshlh29c4zazhkcq4371kqh9inrbx494y5a1qb1k2c92fkax31"; depends=[]; }; haplotypes = derive2 { name="haplotypes"; version="1.0"; sha256="0pwihfi6g4jrnkha9s9rksq0fc8j04mlrwf0295rmy49y19rg84s"; depends=[network]; }; + hapsim = derive2 { name="hapsim"; version="0.31"; sha256="0jw6iw89d4y8wjy58biv40szp123ql7frz1mmdjdxljmwaby963h"; depends=[MASS]; }; harrietr = derive2 { name="harrietr"; version="0.2.2"; sha256="1h6i9ls33h0dgncq6i33ig04yq7i1wy1cl1xx2nvbp78ig02klng"; depends=[ape dplyr ggplot2 ggtree lazyeval magrittr tidyr]; }; harvestr = derive2 { name="harvestr"; version="0.7.1"; sha256="0xgxzbfbc33asfm8sl2y60ki6bwgd6vdh9nz466crkx7m9lsvll8"; depends=[digest foreach plyr]; }; hash = derive2 { name="hash"; version="2.2.6"; sha256="0mkx59bmni3b283znvbndnkbar85fzavzdfgmwrhskidsqcz34yz"; depends=[]; }; @@ -6010,6 +6278,7 @@ in with self; { haven = derive2 { name="haven"; version="1.0.0"; sha256="15ynk1qm4g9m6ng4lc1x3hwjb2xak6b795ifh5q1k4mmx07xz6dl"; depends=[BH hms Rcpp readr tibble]; }; hawkes = derive2 { name="hawkes"; version="0.0-4"; sha256="1ghwq3icxwmrai3xn9r8cnvlh3z3j18lznhw1bm31h9mkkp2dk0a"; depends=[Rcpp RcppArmadillo]; }; hazus = derive2 { name="hazus"; version="0.1"; sha256="1c0ahjdy9di1683nk5k4rmr6rhb66523ny039nyv842rgqdy625j"; depends=[reshape2]; }; + hbdct = derive2 { name="hbdct"; version="1.0.0"; sha256="1azyh12c648g8qr89n8sfrjj3svxx3lzr0ka3g7812x574iiv440"; depends=[]; }; hbim = derive2 { name="hbim"; version="1.0.3"; sha256="1480nydsi2xj7zbfk4zw24mhsjadf83d827kpqzbmn0yh6srp3ps"; depends=[mvtnorm]; }; hbm = derive2 { name="hbm"; version="1.0"; sha256="0qz28azm91a6pbss1mfc47a21d3q9rs3mmw0kgwc7i2a2m43mysm"; depends=[doParallel foreach Matrix]; }; hbmem = derive2 { name="hbmem"; version="0.3"; sha256="0ylxp77ack874sadwfnry84a6bg8gdl9xbw821lp5q05nnyg0dcj"; depends=[]; }; @@ -6029,18 +6298,21 @@ in with self; { hdr = derive2 { name="hdr"; version="0.1"; sha256="0dgp4442mfvri8vhicp02nrv55z13r6664x2nlcq6vh6xz9pqyl0"; depends=[httr]; }; hdrcde = derive2 { name="hdrcde"; version="3.1"; sha256="027nxpzk1g0yx8rns7npdz30afs5hwpdqjiamc7yjrsi0rzm71lw"; depends=[ash KernSmooth ks locfit mvtnorm]; }; hds = derive2 { name="hds"; version="0.8.1"; sha256="1smg5ixrl7f2x3wn7s5i26dyadn5sigpf4jsk236z1bhnz617ax4"; depends=[survival tensor]; }; - healthcareai = derive2 { name="healthcareai"; version="0.1.11"; sha256="05vh4ny7nb3fzfvs46hff4d2ay6q44bzgwx3s81dvdvkha2bmq4q"; depends=[caret data_table doParallel e1071 grpreg lme4 lubridate pROC R6 ranger ROCR RODBC]; }; + healthcareai = derive2 { name="healthcareai"; version="0.1.12"; sha256="1ipw5y7k0m33mnpqbcwdbqzhsh65fb10kym11wc4n2pfsml498w1"; depends=[caret data_table DBI doParallel e1071 grpreg lme4 odbc pROC R6 ranger ROCR RODBC RSQLite]; }; heatex = derive2 { name="heatex"; version="1.0"; sha256="0c7bxblq24m80yi24gmrqqlcw8jh0lb749adsh51yr6nzpap6i9n"; depends=[]; }; heatmap_plus = derive2 { name="heatmap.plus"; version="1.3"; sha256="0rzffm15a51b7l55k0krk6w7v8czy3vpwz1qmbybr7av0pln7wn3"; depends=[]; }; heatmap3 = derive2 { name="heatmap3"; version="1.1.1"; sha256="14zkij0gr9awzic71k2j7pniamkywfvwrifdk7jbds70zsi30ph5"; depends=[fastcluster]; }; heatmapFit = derive2 { name="heatmapFit"; version="2.0.4"; sha256="1rswp1wp58f21fpyjybcvvmnn53kr54ij83hp05qbvl7yn1fsnrb"; depends=[]; }; - heatmaply = derive2 { name="heatmaply"; version="0.9.1"; sha256="1havw3m01nc1ass48j6afz85pvklkgpbl9pip4mqzi2fp6q327y5"; depends=[assertthat colorspace dendextend ggplot2 gplots htmlwidgets magrittr plotly RColorBrewer reshape2 scales seriation viridis]; }; + heatmaply = derive2 { name="heatmaply"; version="0.10.1"; sha256="0lanin04lzsf0fzy0ap055yw1bl26nnkd0d08y20fprkgz2ykh48"; depends=[assertthat colorspace dendextend ggplot2 gplots htmlwidgets magrittr plotly RColorBrewer reshape2 scales seriation viridis]; }; heavy = derive2 { name="heavy"; version="0.38.1"; sha256="12s4g0m5qi4yg26p9l3qay1gfhixma66ls0kf8lkaswzgd7761hp"; depends=[]; }; - heemod = derive2 { name="heemod"; version="0.9.0"; sha256="184cqzj5paarswc5qbxrhh7h9g0fwwqagk9zv2rj361x8w5h2qbr"; depends=[dplyr ggplot2 lazyeval memoise mvnfast plyr pryr rgho tibble tidyr]; }; + heemod = derive2 { name="heemod"; version="0.9.1"; sha256="1ga1g9azhkbn716p0hrkm5k7ab9mnlc7w74rkd8qv4f05av0b4xv"; depends=[dplyr ggplot2 lazyeval memoise mvnfast plyr pryr tibble tidyr]; }; + heims = derive2 { name="heims"; version="0.2.4"; sha256="07w5qy0fn7f2lz6zq52fxa2zgjfddga4p3x3c7rmq83jilhasppl"; depends=[bit64 data_table dplyr fastmatch fst lubridate magrittr]; }; + helixvis = derive2 { name="helixvis"; version="0.1.0"; sha256="1ycvgjbcghbdaw65v3b81pxf33226lr4cbk5l943jg7m738qsfhd"; depends=[rJava]; }; hellno = derive2 { name="hellno"; version="0.0.1"; sha256="1j787rw9hh75bvkckmlz5xkgwc22gd7si3mgjd7v60dd6lykfa88"; depends=[]; }; helloJavaWorld = derive2 { name="helloJavaWorld"; version="0.0-9"; sha256="1a8yxja54iqdy2k8bicrcx1y3rkgslas03is4v78yhbz42c9fi8s"; depends=[rJava]; }; helsinki = derive2 { name="helsinki"; version="0.9.29"; sha256="0bn5iyxjn9qs6f0dmhv51ssayywbx1rayh80zbzk0gsm94nhs0d9"; depends=[maptools RCurl rjson sp]; }; heplots = derive2 { name="heplots"; version="1.3-3"; sha256="0j644a0r4ycfg57p9ymlb3jb9bd797vwlw1ps24injsz71wbhnh0"; depends=[car MASS]; }; + here = derive2 { name="here"; version="0.1"; sha256="1vb5dxqdpimy51q1gjsypyq14p2hhvj7wsvh6g35pj1g03cyg9av"; depends=[rprojroot]; }; hergm = derive2 { name="hergm"; version="3.1-0"; sha256="17mxn2ff7yzj95vjsppvz7c9a5g6a2z9zyf34xvvxp9031zhrf46"; depends=[ergm latentnet mcgibbsit network sna]; }; heritability = derive2 { name="heritability"; version="1.2"; sha256="18snrfsjj5jw5qicj92d5qch9v4ciqw1hbiwg6q8kfjka9nmqpma"; depends=[MASS]; }; hermite = derive2 { name="hermite"; version="1.1.1"; sha256="0ns8l1rf346qxalfdwc7ny0kjp212f6qnnlgillpyvd8k29kg8iy"; depends=[maxLik]; }; @@ -6048,7 +6320,7 @@ in with self; { hetmeta = derive2 { name="hetmeta"; version="0.1.0"; sha256="023bdjsv0ibisz47vaap9yamzjna4hhndk3haw2g1cm92wnrdra5"; depends=[metafor]; }; hett = derive2 { name="hett"; version="0.3-1"; sha256="1y0hr9g2pjwzc5azh095h33qidxhhmlvd1csamjnhwdphj5drzz0"; depends=[lattice MASS]; }; heuristica = derive2 { name="heuristica"; version="1.0.1"; sha256="1myivlqw6a8wh97ma9lrpgvaqb0vn4kj8yp9r4z5vc4pxgmm48g6"; depends=[Hmisc]; }; - hexSticker = derive2 { name="hexSticker"; version="0.1.0"; sha256="0c0879ka30lhfiyrq91aam2r351abirwigvv287v0cc76z21ih09"; depends=[ggforce ggimage ggplot2 gridGraphics showtext sysfonts]; }; + hexSticker = derive2 { name="hexSticker"; version="0.4.1"; sha256="1qp2rlvmf1qjq3sydl1lmlx4a6wmgsx9ja1dwbrl31ldp40n223m"; depends=[ggimage ggplot2 gridGraphics hexbin showtext sysfonts]; }; hexView = derive2 { name="hexView"; version="0.3-3"; sha256="0cx5hl70sk1wk24na21vjyv50b2358z1plvvcw604qf1zij4icwn"; depends=[]; }; hexbin = derive2 { name="hexbin"; version="1.27.1"; sha256="0xi6fbf1fvyn2gffr052n3viibqzpr3603sgi4xaminbzja4syjh"; depends=[lattice]; }; hextri = derive2 { name="hextri"; version="0.6"; sha256="05rvigi225npncbr1brc6apc7gsg9a5jzcbmhvflwp3hbcg3hn02"; depends=[FNN hexbin]; }; @@ -6074,7 +6346,7 @@ in with self; { highSCREEN = derive2 { name="highSCREEN"; version="0.1"; sha256="0g2pcxdg5fix63jqpddqnldalg95x7ghvmbfr1ijjwi9m3ki2bby"; depends=[gplots]; }; highTtest = derive2 { name="highTtest"; version="1.1"; sha256="18hgxlr0y8y1d4ldqmfcg4536lhyn5p6w88sq1vj74qr5wzydga1"; depends=[]; }; highcharter = derive2 { name="highcharter"; version="0.5.0"; sha256="1myypff80mxcgc3j0sflalhqz344c2zz2p90aarli1pbys9v8ynp"; depends=[assertthat broom dplyr htmltools htmlwidgets igraph jsonlite lubridate magrittr purrr quantmod rlist stringr tibble tidyr xts zoo]; }; - highfrequency = derive2 { name="highfrequency"; version="0.5"; sha256="1csyfvhll1pvqaw5g6iqm55raxlcflc2wf86g0m1gv3x5iw7qjsv"; depends=[BMS chron cubature FKF MASS mvtnorm numDeriv quantmod robustbase rugarch sandwich timeDate xts zoo]; }; + highfrequency = derive2 { name="highfrequency"; version="0.5.1"; sha256="15rzpddraz8a1qrbczf92jc99hb0a1538zzml6miqmmv5v7b02rj"; depends=[BMS chron cubature FKF MASS mvtnorm numDeriv robustbase rugarch sandwich timeDate xts zoo]; }; highlight = derive2 { name="highlight"; version="0.4.7.1"; sha256="02d507v599jmjggavgw94drfbk0cffj2m4zgl0hgq28n5fc9k1dm"; depends=[]; }; highlightHTML = derive2 { name="highlightHTML"; version="0.1.1"; sha256="0kjs01ml4v57956rk3ch8y8kxni36gymkf830skxh4fj4nsr8hs1"; depends=[]; }; highmean = derive2 { name="highmean"; version="3.0"; sha256="1lq7z0l1737j4wvsy7951405afylyywp7vf2i7girzh459fdfzpc"; depends=[MASS mnormt mvtnorm]; }; @@ -6095,17 +6367,19 @@ in with self; { hkevp = derive2 { name="hkevp"; version="1.1.4"; sha256="01m5yywi4vjnwhdayaqaqcp5lz70mllj5ifnwdb4c60wm9aby9pm"; depends=[Rcpp RcppArmadillo]; }; hkex_api = derive2 { name="hkex.api"; version="0.1"; sha256="0hqwihlrppchpaz2yaq92gf779yi5k8n7sxy1kbpjxs2qc18xvj2"; depends=[httr RCurl XML]; }; hmeasure = derive2 { name="hmeasure"; version="1.0"; sha256="0wr0xq956glmhvy4yis3qq7cfqv9x82ci9fzx3wjvaykd16h0sx9"; depends=[]; }; - hmi = derive2 { name="hmi"; version="0.6.3"; sha256="1jvbn8azpcgmg5kc9xkn6h2jznwg462wc2s3zhq7m6pn8p8faxyc"; depends=[boot coda linLIR lme4 MASS Matrix MCMCglmm mice msm mvtnorm pbivnorm Rcpp tmvtnorm tree]; }; + hmi = derive2 { name="hmi"; version="0.7.4"; sha256="00wq099sb3mqhvfirfrr6lqz1dh6ld08s474ijnf24xxgfbyl6ls"; depends=[boot linLIR lme4 MASS Matrix MCMCglmm mice msm mvtnorm nnet pbivnorm tmvtnorm]; }; hmm_discnp = derive2 { name="hmm.discnp"; version="0.2-4"; sha256="096flx2b9s66dasqj05zrkxsmg3lj6j5w0pwrw3b1qkpp9dvlrkb"; depends=[]; }; hmmm = derive2 { name="hmmm"; version="1.0-3"; sha256="0yjx5i13jbv7vzxn84m6305124ri7jnym0bxbdj46s6l7lw025a9"; depends=[MASS mvtnorm quadprog]; }; hms = derive2 { name="hms"; version="0.3"; sha256="127znf522r5mn3k6frhdd7pqh063bs3l85gn9h7cx50hpjf2as4k"; depends=[]; }; hnp = derive2 { name="hnp"; version="1.2-2"; sha256="0wcr472a6iq3zwzddqpjv649rx9c5ssrlj0qhbv4pn4sjfjv0pfx"; depends=[MASS]; }; hoa = derive2 { name="hoa"; version="2.1.4"; sha256="15klcpmja4afwmpfxrxgrfis0vj7fil8k15jc3p0lqz3dhvq0dvf"; depends=[statmod survival]; }; hoardeR = derive2 { name="hoardeR"; version="0.9.2"; sha256="0sss3ki2w0aqyp084pprycw8d8vgm60z41iq6g9nxhqhr9xy5kdw"; depends=[bamsignals Biostrings data_table GenomicRanges GenomicTools httr IRanges MASS R_utils RCurl Rsamtools seqinr stringr XML]; }; + hoardr = derive2 { name="hoardr"; version="0.2.0"; sha256="13bjycnr1v524c5wxigdd3kn8bx1sgwdqb10hbmbyjxffabacafr"; depends=[digest R6 rappdirs]; }; holdem = derive2 { name="holdem"; version="1.1"; sha256="07h4cbg7hx91hc6ypi6hbalzdd9qz9rfhjgk5sq1srnangwwnxlw"; depends=[]; }; homals = derive2 { name="homals"; version="1.0-6"; sha256="1xfpb6mxfk18ad2fggljr2g01gy4c290axc3vgwngmmimmcvh4cy"; depends=[ape rgl scatterplot3d]; }; homeR = derive2 { name="homeR"; version="0.3.0"; sha256="0gi383392rs7snb2l9760vkws5hqfikyaj3i7cyby9g1sc2s6yx8"; depends=[]; }; - homomorpheR = derive2 { name="homomorpheR"; version="0.1-1"; sha256="0bisbaglv6l8nzcvl9arly9ns2hwyjj6bwplaf6ynyac7fgmmd6j"; depends=[gmp R6 sodium]; }; + hommel = derive2 { name="hommel"; version="1.0"; sha256="1bsrwm3s4jiln7g30znmza4wl6q1mbpbpgb6zq4wbzicxddp1x7x"; depends=[Rcpp]; }; + homomorpheR = derive2 { name="homomorpheR"; version="0.2-1"; sha256="0qs4yimyfqx6rpxgh6h4z7vyb3qdxljnyvw1g8pxm4y75i0v6vz5"; depends=[gmp R6 sodium]; }; homtest = derive2 { name="homtest"; version="1.0-5"; sha256="1lnqlg3dwq174ic6dbjllysw5fjy5kvvgbl6gvabjmcs66z27fp0"; depends=[]; }; hopbyhop = derive2 { name="hopbyhop"; version="2.1"; sha256="0j4m1zz0ijf1kw2m12g7bww3418b8pyjvvrzkm8xcryjil2xfmim"; depends=[]; }; horizon = derive2 { name="horizon"; version="1.0"; sha256="1wrp5qr1qql21xwcjh415q67z2ym4790zfp0n81360v6bp2b3hyy"; depends=[raster]; }; @@ -6132,15 +6406,16 @@ in with self; { htmlTable = derive2 { name="htmlTable"; version="1.9"; sha256="0ciic1f4iczq14j81fg7kxibn65sy8z1zxkvk1yxnxxg6dzplj2v"; depends=[checkmate htmlwidgets knitr magrittr stringr]; }; htmltab = derive2 { name="htmltab"; version="0.7.1"; sha256="0lymagm7z6zn0ddygqxi831ikk74112lkqkbvs5j1djhmr359ajc"; depends=[httr XML]; }; htmltidy = derive2 { name="htmltidy"; version="0.3.1"; sha256="004a2wwsnx3mnm6v1mjlaq08gcgm60xahh520vfyrsp56b7j29ky"; depends=[htmltools htmlwidgets Rcpp XML xml2]; }; - htmltools = derive2 { name="htmltools"; version="0.3.5"; sha256="0j9bf80grd6gwh7116m575pycv87c0wcwkxsz3gzzfs4aw3pxyr9"; depends=[digest Rcpp]; }; + htmltools = derive2 { name="htmltools"; version="0.3.6"; sha256="18k8r1s8sz1jy7dkz35n69wj20xhmllr53xmwb4pdzf2z61gpbs4"; depends=[digest Rcpp]; }; htmlwidgets = derive2 { name="htmlwidgets"; version="0.8"; sha256="1df3pwl34rvdbr9sgr5h27q9bmqpckvpwq4frl3d1v614y3vfclj"; depends=[htmltools jsonlite yaml]; }; - hts = derive2 { name="hts"; version="5.0"; sha256="130kyc4ygym53gsr8r8n35wrhx2yb3slf1yjs9cdyrqzxwsggfp4"; depends=[forecast Matrix matrixcalc Rcpp RcppEigen SparseM]; }; - httk = derive2 { name="httk"; version="1.5"; sha256="1ndpjs4i3xiv3c3nmik8q463l01rp4ccn1yscc8g77i2fwnvpyy6"; depends=[classInt data_table deSolve EnvStats ks MASS msm mvtnorm RColorBrewer reshape2 survey TeachingDemos truncnorm]; }; + htree = derive2 { name="htree"; version="0.1.1"; sha256="1ns7yzzxapax5f355bpq81i581l1iwrfixp1k69n8mzsy106i988"; depends=[]; }; + hts = derive2 { name="hts"; version="5.1.4"; sha256="0n1gna2694yih5kaiw59crdlfcdfm9dqhjpkcwaskgrpmh08wnkd"; depends=[forecast Matrix matrixcalc Rcpp RcppEigen SparseM]; }; + httk = derive2 { name="httk"; version="1.6"; sha256="0zcgqaslmm5jkv5zagswgsilf29cvxpm0mpcj6v9cj667whznqlk"; depends=[data_table deSolve msm mvtnorm survey truncnorm]; }; httpRequest = derive2 { name="httpRequest"; version="0.0.10"; sha256="0f6mksy38p9nklsr44ki7a79df1f28jwn2jfyb6f9kbjzh98746j"; depends=[]; }; httpcache = derive2 { name="httpcache"; version="1.0.0"; sha256="0p0c2n1n5nrmnii9myp9blzwg996xgm15law9f073an4xvfg2kd2"; depends=[digest httr jsonlite]; }; httpcode = derive2 { name="httpcode"; version="0.2.0"; sha256="06k853ihwzkcx4z3jzazpb03p91frqkwz18jy4fwr8j2nwyqbhgv"; depends=[]; }; httping = derive2 { name="httping"; version="0.1.0"; sha256="1bhy5mh0hz83rjmvh7wl211nqkz58gxsgkwlkmjrdfzc2cparxjz"; depends=[httpcode httr jsonlite magrittr pryr]; }; - httptest = derive2 { name="httptest"; version="1.3.0"; sha256="0fvf1d44ijdi8rlhpy7d9wzfsakfjfgxwr3j82jxds0jzqdgbfkj"; depends=[digest httr jsonlite testthat]; }; + httptest = derive2 { name="httptest"; version="2.0.0"; sha256="1jq65hw3h6api2018fi9sa75xz9iqiry6xhxsa566wbpwkamr1hi"; depends=[digest httr jsonlite testthat]; }; httpuv = derive2 { name="httpuv"; version="1.3.3"; sha256="0aibs0hf38n8f6xxx4g2i2lzd6l5h92m5pscx2z834sdvhnladxv"; depends=[Rcpp]; }; httr = derive2 { name="httr"; version="1.2.1"; sha256="03kkjlhyvvi5znwaxfm6cmdsg3q7ivwsvkzgabhjdj2jxs80pfg7"; depends=[curl jsonlite mime openssl R6]; }; huge = derive2 { name="huge"; version="1.2.7"; sha256="134d951x42vy9dcmf155fbvik2934nh6qm2w5jlx3x2c6cf7faq4"; depends=[igraph lattice MASS Matrix]; }; @@ -6148,9 +6423,9 @@ in with self; { humaniformat = derive2 { name="humaniformat"; version="0.6.0"; sha256="0vaynjzz57pk4y1liag9lpn9jkag2033a6bkn28zzm7ndg3344l6"; depends=[Rcpp]; }; humarray = derive2 { name="humarray"; version="1.1"; sha256="1rzx53620nkicnkc41p6pzsiny8kfpw6n3y0mwvckz6ba6iyfl4w"; depends=[BiocGenerics BiocInstaller biomaRt GenomeInfoDb GenomicFeatures GenomicRanges genoset IRanges NCmisc Rcpp reader rtracklayer S4Vectors]; }; humidity = derive2 { name="humidity"; version="0.1.1"; sha256="0ifxjz7216ld5c4kc9vs83fcijbg5i2z0mwfzszch9j1s734yc8y"; depends=[]; }; - hunspell = derive2 { name="hunspell"; version="2.3"; sha256="1sgjsa9gfq12bf2ld3yqwa18cy8njhvjd1jihbrbzki8z4xl7pjj"; depends=[digest Rcpp]; }; + hunspell = derive2 { name="hunspell"; version="2.6"; sha256="02z7d3s9mc2gg6ha9hwvpnxrx9vjpppjpggg8cgj88c09y943fkq"; depends=[digest Rcpp]; }; hurricaneexposure = derive2 { name="hurricaneexposure"; version="0.0.1"; sha256="1j6srqnmdhmg1yg06nqxapdrd9p3yrfs01z0sk43dvjq4dmwmrjr"; depends=[data_table dplyr ggmap ggplot2 lazyeval lubridate maps purrr RColorBrewer stringr tidyr]; }; - huxtable = derive2 { name="huxtable"; version="0.1.1"; sha256="09x7xvnkkd9m3ycf5ia926fn4vsj6yqbzaqa3p6lzz789f1j26s7"; depends=[htmltools knitr lazyeval rmarkdown xtable]; }; + huxtable = derive2 { name="huxtable"; version="0.3.0"; sha256="1h74n8vkza0n6mfzliadm2dhjy154lzjp2n917r26rra4xwjknrx"; depends=[crayon dplyr htmltools knitr lazyeval rmarkdown tibble xtable]; }; hwde = derive2 { name="hwde"; version="0.67"; sha256="0wb2f9i5qi7w77ygh8bvydfpr7j5x8dyvnnhdkajaz0wdcpkyaqy"; depends=[]; }; hwriter = derive2 { name="hwriter"; version="1.3.2"; sha256="0arjsz854rfkfqhgvpqbm9lfni97dcjs66isdsfvwfd2wz932dbb"; depends=[]; }; hwwntest = derive2 { name="hwwntest"; version="1.3"; sha256="1b5wfbiwc542vlmn0l2aka75ss1673z8bcszfrlibg9wwqjxlwk5"; depends=[polynom wavethresh]; }; @@ -6165,11 +6440,12 @@ in with self; { hydrostats = derive2 { name="hydrostats"; version="0.2.5"; sha256="1n0wy8i1cfsgmqh898qi0qnqn4qx1srjvd05vmsf9qmhpnnyqw5m"; depends=[]; }; hyfo = derive2 { name="hyfo"; version="1.3.9"; sha256="03f3irmhndwfnv4i121gwxb2yv1868pggzyr80pgp4969qzddacm"; depends=[data_table ggplot2 lmom maps maptools MASS moments ncdf4 plyr reshape2 rgdal rgeos zoo]; }; hyper_fit = derive2 { name="hyper.fit"; version="1.0.3"; sha256="17f5i2i960796hl92y7ci9ffspway435r02kw1zk91lvfn927hng"; depends=[LaplacesDemon magicaxis MASS rgl]; }; + hyper2 = derive2 { name="hyper2"; version="1.0"; sha256="1lblc7kcgcgg65z9fa7wzd9962hbqdnp4mxm0m39g90lqpciy948"; depends=[partitions Rcpp]; }; hyperSMURF = derive2 { name="hyperSMURF"; version="1.1.2"; sha256="1jlcfwyqs2mfdixqik5dqb0sl3i9pjxcrwabbcr24z8wnq524zx8"; depends=[doParallel foreach iterators randomForest unbalanced]; }; hyperSpec = derive2 { name="hyperSpec"; version="0.98-20161118"; sha256="0343prdah83l45z6p2wafmipw2x3f0yshm5hm11wgkkm1cnv5905"; depends=[ggplot2 lattice latticeExtra svUnit]; }; - hyperdirichlet = derive2 { name="hyperdirichlet"; version="1.5-0"; sha256="01q5ri9p9nn7m1kgzyhn2d1rbwhjfz259cz2imhi9g1zpdry4kf2"; depends=[abind aylmer cubature mvtnorm]; }; hypergea = derive2 { name="hypergea"; version="1.3.3"; sha256="0spchrbb5y3yx63acs9ns256h7k3nd5wxg8vw258kqlvyapj50l6"; depends=[]; }; hypergeo = derive2 { name="hypergeo"; version="1.2-13"; sha256="13jdiy216znwhr91iqnh03mvkmyscw439syb3h4i67dd78sphnvd"; depends=[contfrac deSolve elliptic]; }; + hypersampleplan = derive2 { name="hypersampleplan"; version="0.1.1"; sha256="1sk3s1jm46ac4i7p433s3kyngj86kq2821zzhp30a3y8vi1j2psq"; depends=[]; }; hypervolume = derive2 { name="hypervolume"; version="1.4.1"; sha256="0gx9ing4h1sg4zzppfa386hllryf8vk1n013yv14c0k3sjjnz456"; depends=[fastcluster geometry ks MASS Rcpp RcppArmadillo rgl]; }; hyphenatr = derive2 { name="hyphenatr"; version="0.3.0"; sha256="0mv77njy0ha7bj3kw620fk9r8cdzqd0v3ipikihqxq47fr57ml0v"; depends=[Rcpp stringi]; }; hypoparsr = derive2 { name="hypoparsr"; version="0.1.0"; sha256="1bldiz5j6h9z499wwz8cbg5vshdmxgcd8qfxkz1a45q8b6nsd4vf"; depends=[data_tree readr RecordLinkage tibble]; }; @@ -6186,13 +6462,16 @@ in with self; { iCluster = derive2 { name="iCluster"; version="2.1.0"; sha256="09j36xv87d382m5ijkhmp2mxaajc4k97cf9k1hb11ksk7fxdqz6r"; depends=[caTools gdata gplots gtools lattice]; }; iDOS = derive2 { name="iDOS"; version="1.0.0"; sha256="1jj98ikzvfp6qbnh2j6msi0m89sbmjjafgry43rq7qmczzs81hl8"; depends=[VennDiagram]; }; iDynoR = derive2 { name="iDynoR"; version="1.0"; sha256="01702vl10191mbq2wby1m0y6h8i6y6ic4pa83d27cg3yccsrhziz"; depends=[vegan XML]; }; + iECAT = derive2 { name="iECAT"; version="0.8"; sha256="0kv8db7ss3vk21ccl8qfj4x69npfzwmm3piddj9l0vwrwd3ccl32"; depends=[MetaSKAT SKAT]; }; iFad = derive2 { name="iFad"; version="3.0"; sha256="0jrl9bayihp3wb4k5w9kc71qlsdxk7vl83ydfibx2bg79c4hf3cs"; depends=[coda MASS Rlab ROCR]; }; + iGSEA = derive2 { name="iGSEA"; version="1.2"; sha256="1xlz8mbxqnrwyqj7jwma7vmvjlaccajbfxf3hi4wp5qs2pch8806"; depends=[]; }; iGasso = derive2 { name="iGasso"; version="1.4"; sha256="17xxqncl5xcphdqclghcazygcgibf8ijdf4kkl3ga11xf70sahj2"; depends=[CompQuadForm lattice]; }; iJRF = derive2 { name="iJRF"; version="1.1-4"; sha256="1fgbc0z647vwybffzp4iips86pxakd25dlk5jqgm049s6pa8m73v"; depends=[ggplot2]; }; iLaplace = derive2 { name="iLaplace"; version="1.1.0"; sha256="1z752yw3nvqj1ckf23262phkw849cb5p4m14v108xf2dizyzggxg"; depends=[doParallel fastGHQuad foreach iterators Rcpp RcppArmadillo]; }; - iMediate = derive2 { name="iMediate"; version="0.2"; sha256="06s4qbynk551y8csa2ixscrs8srlmbi2dmb7dccl9cbnywisxi05"; depends=[mediation]; }; + iMediate = derive2 { name="iMediate"; version="0.3"; sha256="1w4bcy54k2dqgckcjnk9bi253cjij4rl603m4jw6x8ixpahgkcr1"; depends=[mediation]; }; iMessager = derive2 { name="iMessager"; version="1.0"; sha256="1w0l2qpcgglg13bnqdnz8xnfq2mxkk5g6cblvf2v5y03c2gpmm86"; depends=[]; }; iNEXT = derive2 { name="iNEXT"; version="2.0.12"; sha256="1041r5k0k3kzik5vwyd62s4yc85lnnxbg5gbbl0kl629kikymb6y"; depends=[ggplot2 reshape2]; }; + iNOTE = derive2 { name="iNOTE"; version="1.0"; sha256="1969xmgfv9405r09zpd2icvjd9vvzw4dx5qaqxk1a0jvbvhp3h88"; depends=[CompQuadForm mixtools plyr]; }; iNextPD = derive2 { name="iNextPD"; version="0.3.2"; sha256="06wka2qr1jm3hvi8j0b19fr21v72gmqknz8dg0l5wl91m0prqns3"; depends=[ade4 ggplot2 iNEXT Rcpp]; }; iRafNet = derive2 { name="iRafNet"; version="1.1-1"; sha256="0w9bry49apkrrrabglnv5w9l47jakmc30jh8q22a8gazwss293fb"; depends=[ROCR]; }; iRefR = derive2 { name="iRefR"; version="1.13"; sha256="17kjfga62xc4s1kii5clxszbag2dr1dyxfm7jasr20prx28ya6pp"; depends=[graph igraph RBGL]; }; @@ -6201,6 +6480,7 @@ in with self; { iSDM = derive2 { name="iSDM"; version="1.0"; sha256="1hzs187mwv3k2wx6dpvkizjhkcx63mznd06wiw6047lf5jrlif0a"; depends=[ade4 colorRamps geometry geosphere maptools MASS pdist raster rgdal rgl sp virtualspecies]; }; iWISA = derive2 { name="iWISA"; version="1.0-2"; sha256="0jqi1kh7jlc04nb9d1w711q4i8j1vgwbxjls09z7853kv22wxfyz"; depends=[fda ggplot2 waveslim]; }; iWeigReg = derive2 { name="iWeigReg"; version="1.0"; sha256="09ajbqllr4ajmpk8qs6qw019fx8a7vsabm37867zycssn77z9nc8"; depends=[MASS trust]; }; + iadf = derive2 { name="iadf"; version="0.1.0"; sha256="02zx9n4ncg10bbydrr05631vzc4w2b1jg3x6xiaffg7x5rh4mnyf"; depends=[dplR dplyr manipulate rlang tibble tidyr]; }; ibd = derive2 { name="ibd"; version="1.2"; sha256="0681v7lgx697yj2d60cw3p5axbbaxanzj291vdf7ailn7300p1ms"; depends=[car lpSolve lsmeans MASS multcompView]; }; ibdreg = derive2 { name="ibdreg"; version="0.2.5"; sha256="1kaa5q1byi30wzr0mw4w2cv1ssxprzcwf91wrpqwkgcsdy7dkh2g"; depends=[]; }; ibeemd = derive2 { name="ibeemd"; version="1.0.1"; sha256="115z13q02gzixziknix2l53mi12zzg30ra9h35pv6qzrr11ra1ic"; depends=[deldir fields rgeos sp spdep]; }; @@ -6208,36 +6488,40 @@ in with self; { ibm = derive2 { name="ibm"; version="0.1.0"; sha256="0g6wg2qpa4q142xw2vq5pca4ll6pb8hyll5g0c93kk8crddk51s7"; depends=[Rcpp]; }; ibmcraftr = derive2 { name="ibmcraftr"; version="1.0.0"; sha256="0zm5j0a1wjj5agibp38h73qxpq0njvrhfq3077xhhfizcb3v24sb"; depends=[Rcpp]; }; ibmdbR = derive2 { name="ibmdbR"; version="1.48.0"; sha256="0kz08p61v12kgv1k1zrgh8mimhvnffy2fgck21gxbsa03sdi144i"; depends=[arules ggplot2 MASS Matrix RODBC rpart rpart_plot]; }; - ibr = derive2 { name="ibr"; version="2.0-2"; sha256="1v4jn1izdc0cvm0yhr0anz2zjz66i25rg9039327kw8yrx8a34wx"; depends=[mgcv]; }; + ibr = derive2 { name="ibr"; version="2.0-3"; sha256="1plyz4sl0i8qhk9dh3h7zvh9h8wqr589jvasmvp7r3slp4ndhp1r"; depends=[mgcv]; }; ic_infer = derive2 { name="ic.infer"; version="1.1-5"; sha256="0nmx7ijczzvrv1j4321g5g5nawzll8srf302grc39npvv1q17jyz"; depends=[boot kappalab mvtnorm quadprog]; }; ic50 = derive2 { name="ic50"; version="1.4.2"; sha256="1a5ddmbdfr3ls132fvalbkh4yaawv9k58rgpy54s5qddrm6aas2s"; depends=[]; }; - icRSF = derive2 { name="icRSF"; version="1.0"; sha256="155lgak9jqsy398q5y4fl050gas5hppb25jhc1njglq2h98w3pl2"; depends=[icensmis Rcpp]; }; + icRSF = derive2 { name="icRSF"; version="1.1"; sha256="0yrlwf6p3k0i9vjm4zmf585cfv39ihchkyz9jfi4lzdh15msrzlx"; depends=[icensmis Rcpp]; }; ica = derive2 { name="ica"; version="1.0-1"; sha256="1bkl4a72l0k6gm82l3jxnib898z20cw17zg81jj39l9dn65rlmcq"; depends=[]; }; icaOcularCorrection = derive2 { name="icaOcularCorrection"; version="3.0.0"; sha256="1vmvarc2apipd0vlhprc5wpgh8i38m5myj1gqdymjrnky0azq17f"; depends=[fastICA mgcv]; }; icamix = derive2 { name="icamix"; version="1.0.6"; sha256="0jys9r7wjxlwsq5rssih2lvsar1192w8vigdhhrcmf3d5z5ic1kp"; depends=[Rcpp RcppArmadillo]; }; icapca = derive2 { name="icapca"; version="1.1"; sha256="131gdrk8vsbac0krmsryvsp21bn9hzxqxq847zn16cxjf6y5i3xb"; depends=[]; }; icarus = derive2 { name="icarus"; version="0.3.0"; sha256="1656bz0av59dpgndibn0bc5zr9zka9pmw7qmhjz2b956bh7sh4ag"; depends=[]; }; - iccbeta = derive2 { name="iccbeta"; version="1.0"; sha256="0zsf2b5nrv39pssi5walf82892fr8p1f802c96hjjknh78q7gh0h"; depends=[lme4 Rcpp RcppArmadillo]; }; - icd = derive2 { name="icd"; version="2.1"; sha256="1634mpv1cgka8n1ws4lsqw8114q50rjrxcjlw16bq8igi1l4hrwq"; depends=[checkmate magrittr Rcpp testthat]; }; + iccbeta = derive2 { name="iccbeta"; version="1.0.1"; sha256="1594kzxng679pjlfmf4b6b9ynskh43aahbr01d0fadxl38kh36sz"; depends=[lme4 Rcpp RcppArmadillo]; }; + icd = derive2 { name="icd"; version="2.2"; sha256="0yf7xyzwvgfcbccsz89nywkrfg9hp8m2l7pn28kwxn5k0jnm1cmw"; depends=[checkmate magrittr Rcpp testthat]; }; icd9 = derive2 { name="icd9"; version="1.3.1"; sha256="0yrgg1vf9jf0kv4qbvc0d8n26csxx79g2196ijgq43rhprrrm1y6"; depends=[checkmate fastmatch Rcpp]; }; icdGLM = derive2 { name="icdGLM"; version="1.0.0"; sha256="1mh9kwn21n19v4lrmj33ghpna7dl66fx19gi6lcjanmrpzrkwdnz"; depends=[Matrix]; }; icenReg = derive2 { name="icenReg"; version="2.0.1"; sha256="16a9v461gsyhx8hf938c17zx81383kmxkbmyb97q6z6gnkdy2ck0"; depends=[coda foreach MLEcens Rcpp RcppEigen survival]; }; icensmis = derive2 { name="icensmis"; version="1.3.1"; sha256="1c0j43wffb5h99chlj8j45lpan7dpn2i0r4rr6b2kq16p1zabfjw"; depends=[Rcpp]; }; - icesAdvice = derive2 { name="icesAdvice"; version="1.3-0"; sha256="1csyw7sav56vkgwjllixjbgpy3ka9xivhr9pgb26iihgwwpnhdds"; depends=[]; }; + icesAdvice = derive2 { name="icesAdvice"; version="1.3-1"; sha256="1afkb5f48f03l9hcjv7xgm6nindk4gn6f38k51pf31a7rxg0114x"; depends=[]; }; icesDatras = derive2 { name="icesDatras"; version="1.2-0"; sha256="0arkn9ma03qb21sv5chmz5fj65da5ivqhvrg8bqibbky8zkix1vh"; depends=[]; }; - icesSAG = derive2 { name="icesSAG"; version="1.2-1"; sha256="0qjqzqcd8hxv22jf7cw2w9vk6lazkcrnc84fz3vacbjmg3c93h1b"; depends=[png]; }; + icesSAG = derive2 { name="icesSAG"; version="1.3-2"; sha256="1w3v10qjs9jyn7dp6vsv8hyax8mn2b8y5afba4lcpzh0p8d2yzpm"; depends=[httr icesVocab openssl png xml2]; }; + icesTAF = derive2 { name="icesTAF"; version="1.3-2"; sha256="044n8jar0dx6zggd5nr9xvfc18yhcgj82643xnq6ymdfw3c57fav"; depends=[]; }; icesVocab = derive2 { name="icesVocab"; version="1.1-2"; sha256="15ha2visv44pphkahg766afafh6467lwznvppwkvqjrbfiijkc6l"; depends=[XML]; }; icosa = derive2 { name="icosa"; version="0.9.81"; sha256="05gpiksncdi536f4py7szfi6myny1gqj8i0hsgpma7cfcm3npn0l"; depends=[igraph raster Rcpp rgdal rgl sp]; }; icpsrdata = derive2 { name="icpsrdata"; version="0.3.0"; sha256="17sprbbi8fmvcp8d7hwrxl5amg0j036wq483cw62zbmni3p3fl82"; depends=[httr purrr rvest]; }; icsw = derive2 { name="icsw"; version="0.9"; sha256="0lmq9l9sy0fz3yjj2sj8f19iy26913caibf7d9zb9w9n6cqskvlx"; depends=[]; }; + idar = derive2 { name="idar"; version="1.0"; sha256="1yfv3na4rcldkpzybf7la227z4ynsl1scrziirl5gp072k7zrs01"; depends=[ape FD picante spatstat]; }; idbg = derive2 { name="idbg"; version="1.0"; sha256="1rxmj04hswxybrg7dfib3mjy8v8mdiv13zwbscp2q55z55hhf1m5"; depends=[]; }; idbr = derive2 { name="idbr"; version="0.2"; sha256="1hhwn93arkzqs5ns9ll7rwqq5gyngixbicly9asw0dgjn12n5p7x"; depends=[countrycode dplyr httr jsonlite]; }; - idem = derive2 { name="idem"; version="1.0"; sha256="1knb5m0rczga7j3a58z7fjjn3nva7pihg2w3vh82dqpi8wwcnznj"; depends=[coda sqldf survival]; }; + idefix = derive2 { name="idefix"; version="0.1.0"; sha256="04a74i71980ywbn6bbhkazaackd5c1417spv8nfvsam4isv2jdjv"; depends=[dplyr gtools MASS maxLik scales]; }; + idem = derive2 { name="idem"; version="2.0"; sha256="0skm5jax8z3wviw9cfsdi5jpxl9jv4y8w7j45sy9inax9hr706kg"; depends=[BH Rcpp RcppEigen rstan sqldf StanHeaders survival]; }; idendr0 = derive2 { name="idendr0"; version="1.5.3"; sha256="11c12d166bp2i498d8y6ipg5jhz1xsdsrmnhjqnrqqzp9avvrsjp"; depends=[tkrplot]; }; identity = derive2 { name="identity"; version="0.2-1"; sha256="1j5wb5cj5j49in2g6r1shdm4ri4cfzj22hpqazvcmq4dm291sdi9"; depends=[]; }; + ider = derive2 { name="ider"; version="0.1.0"; sha256="021s4fybki7a6mdsr6gkjrzfhaqdcg0m2a6r24y91jklxlxqxmws"; depends=[FNN]; }; idm = derive2 { name="idm"; version="1.8.1"; sha256="14cy1gv12wjpsv5jih7pgq5d36gfpdc56ih4mc6hx638qkkyk87z"; depends=[animation ca corpcor dummies ggplot2 ggrepel]; }; idr = derive2 { name="idr"; version="1.2"; sha256="05nvgw1xdg670bsjjrxkgd1mrdkciccpw4krn0zcgdf2r21dzgwb"; depends=[]; }; - ids = derive2 { name="ids"; version="1.0.0"; sha256="1wwp1phbgj1zcdgyq4fzca8hmgibcc01xmqlnm51nmm0n3ajki2v"; depends=[openssl uuid]; }; + ids = derive2 { name="ids"; version="1.0.1"; sha256="1s6ga94gds5ydr9f8qbjfgfpg2dvbnkcrlybqlb33hk3c0c2l8dn"; depends=[openssl uuid]; }; ie2misc = derive2 { name="ie2misc"; version="0.8.5"; sha256="1i59836a3kjsra5ibk66ic35yqk28p3biylall8gngjssiig92c1"; depends=[data_table gWidgets2 gWidgets2tcltk lubridate openxlsx qdap reader readxl stringi]; }; ieeeround = derive2 { name="ieeeround"; version="0.2-0"; sha256="0xaxrlalyn8w0w4fva8fd86306nvw3iyz44r0hvay3gsrmgn3fjh"; depends=[]; }; iemisc = derive2 { name="iemisc"; version="0.9.6"; sha256="0yr2pqklj3qjlmkk2sc5rgi8dfnm9jdaagzh2dhm05lharhfzy6d"; depends=[data_table fpCompare gsubfn iemiscdata pracma r_import zoo]; }; @@ -6258,13 +6542,14 @@ in with self; { ilc = derive2 { name="ilc"; version="1.0"; sha256="0hs0nxv7cd300mfxscgvcjag9f2igispcskfknb7sn7p8qvwr5ki"; depends=[date demography forecast rainbow survival]; }; imPois = derive2 { name="imPois"; version="0.1.4"; sha256="07350zly4fyx2sf9cqpfpyy8l5kn96z49kzym81p2bmhq66d408h"; depends=[geometry rgl]; }; imageData = derive2 { name="imageData"; version="0.1-26"; sha256="0r39bp33kki2ddvds2jkpk1r6afl8d1xbl447lnz25dxpzfcajn2"; depends=[dae GGally ggplot2 Hmisc RColorBrewer reshape XLConnect]; }; - imager = derive2 { name="imager"; version="0.40.1"; sha256="05k44k05grn3vhh46inlqcy1800implvxp10rjhcliy4xlmcyrx2"; depends=[Cairo downloader jpeg magrittr plyr png purrr Rcpp readbitmap stringr]; }; - imagine = derive2 { name="imagine"; version="1.1.1"; sha256="1pry74amgib4i5m0gly58ay61snmyw8h2v12clbhxmr7gn5z9v04"; depends=[Rcpp]; }; + imager = derive2 { name="imager"; version="0.40.2"; sha256="17awk431r37259c0yqs6c31kyiwhm9j80g2hw9hkk21jbi4jbghj"; depends=[Cairo downloader jpeg magrittr plyr png purrr Rcpp readbitmap stringr]; }; + imaginator = derive2 { name="imaginator"; version="0.1.1"; sha256="1xp5wsv570f1qy2fn99d8ijydmlapb6h6kinj07pilvv215dg93w"; depends=[assertthat dplyr lubridate magrittr stringi]; }; + imagine = derive2 { name="imagine"; version="1.2.2"; sha256="1b20dhgybw7ilkh6mg5acb3xywd7ms62hd7fmzbwrxz60jh0h1lg"; depends=[Rcpp]; }; imfr = derive2 { name="imfr"; version="0.1.4"; sha256="0q6iy6arq2c0gqcpnpr2safig3ki32m2gai1lmz19pwcfi9qkgf2"; depends=[dplyr httr jsonlite]; }; imguR = derive2 { name="imguR"; version="1.0.3"; sha256="14f7ghgc8rbrpqb21rinfbrj1wh80i6ii0awwi814152v5qzj4b3"; depends=[httr jpeg png]; }; - immer = derive2 { name="immer"; version="0.7-0"; sha256="0pf0chrx1qbri0pkiz30pc2qcdmld0ajm7fljadzlnczs3bnr1na"; depends=[CDM coda psychotools Rcpp RcppArmadillo sirt]; }; - imp4p = derive2 { name="imp4p"; version="0.3"; sha256="189bqj886bi4mgyj013cbqciafrzvz036m3cwkszv6j23d0mrb2r"; depends=[imputeLCMD Iso Rcpp truncnorm]; }; - implyr = derive2 { name="implyr"; version="0.1.0"; sha256="0g0zl5sp30xs9isvn8aspjicmx7wnai2b3780fjarlb5a4ng5fk0"; depends=[assertthat DBI dplyr]; }; + immer = derive2 { name="immer"; version="0.8-5"; sha256="181mp407vy2ij35ggr1vi80y8ak6vyjplyvps1fdpxnanp1mqpw3"; depends=[CDM coda psychotools Rcpp RcppArmadillo sirt]; }; + imp4p = derive2 { name="imp4p"; version="0.4"; sha256="1g5q6y8xxk9176172yvryfg6y33jnhvqicps8p7kljwq8k099dxn"; depends=[imputeLCMD Iso Rcpp truncnorm]; }; + implyr = derive2 { name="implyr"; version="0.2.1"; sha256="0f9raar2amkbgk7hr7zdzwls3nlkrml73vdzjz2ycmfi521gsp9y"; depends=[assertthat DBI dbplyr dplyr rlang]; }; r_import = derive2 { name="r_import"; version="1.1.0"; sha256="0blf9539rbfwcmw8zsb4k58slb4pdnc075v34vmyjw752fznhcji"; depends=[]; }; imprProbEst = derive2 { name="imprProbEst"; version="1.0.1"; sha256="09y8yd9sw0b79ca45ryi7p82vy5s8cx0gg603rlc39lgwcdv45i3"; depends=[inline lpSolve]; }; imputeLCMD = derive2 { name="imputeLCMD"; version="2.0"; sha256="10v3iv1iw6mnss6ry836crq9zdgid2y1h3pvigzjsrmnp5n89mfz"; depends=[impute norm pcaMethods tmvtnorm]; }; @@ -6273,8 +6558,8 @@ in with self; { imputeMulti = derive2 { name="imputeMulti"; version="0.6.4"; sha256="0ngjbj8pl5mwprrgy234a5p9dhf615z7ymfv8184hby1z6ib3mgl"; depends=[DBI gtools Rcpp RSQLite]; }; imputePSF = derive2 { name="imputePSF"; version="0.1.0"; sha256="0xfd2mybg0cbi3n35j28s4xq4iwr5rq4mqwgdqml7l2rlzidcwc8"; depends=[PSF]; }; imputeR = derive2 { name="imputeR"; version="2.0"; sha256="0xyvy785jb1mv06jq25cnsbgiywi3857sdiizcjck7bx970lk02n"; depends=[caret Cubist gbm glmnet mboost pls rda reshape2 ridge rpart]; }; - imputeTS = derive2 { name="imputeTS"; version="2.1"; sha256="1sw8b3jss4h5ns4dgp0r902v1vk9iavvc84rpkhgqkjxffr1c672"; depends=[forecast Rcpp stinepack]; }; - imputeTestbench = derive2 { name="imputeTestbench"; version="3.0.0"; sha256="082ps3r4priv3r5w8gydvkjxp8r3nsrss964hdsff2kc5dsmqn14"; depends=[dplyr forecast ggplot2 imputeTS reshape2 tidyr zoo]; }; + imputeTS = derive2 { name="imputeTS"; version="2.5"; sha256="1b0gpgg07hl4n5dnvqfjxk1zxgh93ykh7lz8l0szv5hbijidvqxp"; depends=[forecast Rcpp stinepack]; }; + imputeTestbench = derive2 { name="imputeTestbench"; version="3.0.1"; sha256="0yxvwk1bcsid116a4zqsagf2dl3vhzva559bfjjcqdgyniapcmcj"; depends=[dplyr forecast ggplot2 imputeTS reshape2 tidyr zoo]; }; imputeYn = derive2 { name="imputeYn"; version="1.3"; sha256="1b21w1aa5f7yiq8k0wa86wvbg4ij7f6ldwn6asfqwb0b90rvsgvs"; depends=[boot emplik mvtnorm quadprog survival]; }; in2extRemes = derive2 { name="in2extRemes"; version="1.0-3"; sha256="1lgsqm29zmjyf8kynyra2p3q7bs4fyd7ac4v6s3pbahzhhzdk94y"; depends=[extRemes]; }; inTrees = derive2 { name="inTrees"; version="1.1"; sha256="1b88zy4rarcx1qxzv3089gzdz1smga6ssj8cxxccyyzci6px85j1"; depends=[arules gbm RRF xtable]; }; @@ -6282,7 +6567,7 @@ in with self; { inbreedR = derive2 { name="inbreedR"; version="0.3.2"; sha256="09fr13ckyn2skiigkn4qdx5g080gcmyyrvzhcp0wrml9wpmy0h4z"; depends=[data_table]; }; inca = derive2 { name="inca"; version="0.0.2"; sha256="1wj8f1ga0km9k9zrjcd7g228kw2pp6y6pgnfwmgdd05bx4hzjhdw"; depends=[Matrix Rcpp RcppArmadillo]; }; incadata = derive2 { name="incadata"; version="0.5.3"; sha256="1mzwd9nida5spsqr5jayp3wn1h3cbv0amc5iyxx6h51gn0pwspkz"; depends=[backports decoder dplyr rccmisc sweidnumbr]; }; - incidence = derive2 { name="incidence"; version="1.1.2"; sha256="1xyln5zndqwg57snkpj676p8wj2mbzwb3fnc9hniq529mnr95qw3"; depends=[ggplot2 ISOweek]; }; + incidence = derive2 { name="incidence"; version="1.2.0"; sha256="1y731qaj9yj2sjqly0s6z4c4qi3ywvnzc3517y23zvzfxlsld8r3"; depends=[ggplot2 ISOweek]; }; inctools = derive2 { name="inctools"; version="1.0.10"; sha256="0ykkxlifh9gxflbk9786xbx2i5ja3pn01z9dj8dqwvrrq83npcfw"; depends=[cubature doParallel dplyr foreach ggplot2 glm2 magrittr MASS plyr pracma]; }; indelmiss = derive2 { name="indelmiss"; version="1.0.7"; sha256="1pm1yl7kbxrik5ghvsvp6irmzgawxb8v03kvrqm48mnbghkdh1lv"; depends=[ape numDeriv phangorn Rcpp]; }; indicspecies = derive2 { name="indicspecies"; version="1.7.6"; sha256="0a7s37k3bg4cnzkvn833nrwi6hnfa5f6jxa8ra954v4sp55g6i5d"; depends=[permute]; }; @@ -6290,9 +6575,9 @@ in with self; { ineq = derive2 { name="ineq"; version="0.2-13"; sha256="09fsxyrh0j7mwmb5hkhmrzgcy7kf85jxkh7zlwpgqgcsyl1n91z0"; depends=[]; }; inference = derive2 { name="inference"; version="0.1.0"; sha256="0j92isfkbhk13yx2hd3a5dd7ikcbgjc04zisd1n5kmg6ajw2aj6r"; depends=[sandwich]; }; inferference = derive2 { name="inferference"; version="0.4.62"; sha256="12iag6l2digxb056qc765xi27ayc4qyqdqzbhxscr8a5lxfkdn4p"; depends=[Formula lme4 numDeriv]; }; - inferr = derive2 { name="inferr"; version="0.1.0"; sha256="13wgjh5b03kyx6jvdgpavr9qjzvr7plgml2ickq2gxkxczc05r2m"; depends=[dplyr magrittr purrr Rcpp tibble tidyr]; }; - inflection = derive2 { name="inflection"; version="1.2"; sha256="13mlyfcw13z9y48ypycypp6m7s2d7yx3n13vr2br4kwwn74hqky8"; depends=[]; }; - influence_ME = derive2 { name="influence.ME"; version="0.9-8"; sha256="0fnc0hk50sh4fd5jfgs1kd61psk7mrc85s1ihmficayivvl7iklb"; depends=[lattice lme4 Matrix]; }; + inferr = derive2 { name="inferr"; version="0.1.1"; sha256="148n1dwfjzzcahsqy9s3wlgpf9p6jpcn692j7dvyaw6rdk3bq1i3"; depends=[dplyr magrittr purrr Rcpp tibble tidyr]; }; + inflection = derive2 { name="inflection"; version="1.3"; sha256="168ms6hfakr6wql45r9qvk7hpas6sgpaiqyxicihsq0j3dpzvys4"; depends=[]; }; + influence_ME = derive2 { name="influence.ME"; version="0.9-9"; sha256="0f6d2hvs9qllyfpsp2cgh7w8yjxafclbk47n8av7j9zpp7s5yg9v"; depends=[lattice lme4 Matrix]; }; influence_SEM = derive2 { name="influence.SEM"; version="2.1"; sha256="1qhv640lngwrbdfqvw2x0x4zwv0aqzxwyfdpnivzjf5pw58nya5s"; depends=[lavaan]; }; influenceR = derive2 { name="influenceR"; version="0.1.0"; sha256="12p9362hkndlnz1rd8j2rykg57kbm6l7ks60by3rd25xg50k5jag"; depends=[igraph Matrix]; }; infoDecompuTE = derive2 { name="infoDecompuTE"; version="0.6.0"; sha256="1gmsf4gw6xf70sh7y5hagkavknp80293sb7wgx6lycngq2acmi4w"; depends=[MASS]; }; @@ -6316,6 +6601,7 @@ in with self; { insuranceData = derive2 { name="insuranceData"; version="1.0"; sha256="0wryh8i1v3bnpbqn6d6dpxr9bwwl6mnh5cb5igz0yanh4m1rx96w"; depends=[]; }; intReg = derive2 { name="intReg"; version="0.2-8"; sha256="0cqf6lbn8aiyj5j7gg1qz80i477bfxbmxp7fjs25ish4bcdsbjja"; depends=[maxLik miscTools sets]; }; intRegGOF = derive2 { name="intRegGOF"; version="0.85-1"; sha256="0fyvhl6jmi6krfbimsq61dhixlz9h9jxk4yjvwbx2vl8d9fnnr54"; depends=[]; }; + intRvals = derive2 { name="intRvals"; version="1.0.0"; sha256="0391raj5wq6issvzqm8bfnv1ap2hh5nfsqi9r1x5ss37fvcq5fjm"; depends=[lme4 plyr]; }; intamap = derive2 { name="intamap"; version="1.4-1"; sha256="1shyxlps1rxqavrvg55gw0c9115q0j3yw78ilavig7036zx5lazv"; depends=[automap doParallel evd foreach gstat MASS mvtnorm rgdal sp]; }; intamapInteractive = derive2 { name="intamapInteractive"; version="1.1-10"; sha256="073k6sdds40fmlbw1xnp3x5sc9qdyq2s1bhp7av4jjm930hsvsrn"; depends=[automap gstat intamap spatstat spcosa]; }; interAdapt = derive2 { name="interAdapt"; version="0.1"; sha256="06ki36l1mrnd9lbm696a6gapr488dz8na4wvl9y1fif9hfv4zk25"; depends=[knitcitations knitr mvtnorm RCurl shiny]; }; @@ -6324,7 +6610,9 @@ in with self; { interferenceCI = derive2 { name="interferenceCI"; version="1.1"; sha256="19ky10nn6ygma6yy5h1krxx61aikh3yx5y39p68a944mz8f72vsn"; depends=[gtools]; }; interflex = derive2 { name="interflex"; version="1.0.3"; sha256="07a41rx553i6rlgcl4aa2xxkdql3y7bi84h2pgak9qbyxgw6mlmq"; depends=[doParallel foreach ggplot2 Lmoments lmtest mgcv pcse Rcpp RcppArmadillo sandwich]; }; intergraph = derive2 { name="intergraph"; version="2.0-2"; sha256="1ipxdrfxhcxhcbqvrzqh3impwk4xryqlqlgjl7f2mwrf365zs6ph"; depends=[igraph network]; }; + interim = derive2 { name="interim"; version="0.6.0"; sha256="1nvkc7qald6aw3b2dh9fc52bqkbx12bmwlyhfx7fm0c9077h316r"; depends=[]; }; internetarchive = derive2 { name="internetarchive"; version="0.1.6"; sha256="1cx9dxlrdz1xak4jrrjs2wsq6ml8n2xl0n0s6n9h3g247j4lfvnm"; depends=[dplyr httr]; }; + interp = derive2 { name="interp"; version="1.0-29"; sha256="08f8hg6jcz4k0fsj6sjdki3v3h6fl4597s5r7vm55mnnnzqqlaly"; depends=[deldir Rcpp RcppEigen]; }; interplot = derive2 { name="interplot"; version="0.1.5"; sha256="0svhs7mj987vravirhmp4788qvqm32v614qj7q06b2y4va477yj8"; depends=[abind arm dplyr ggplot2]; }; interpretR = derive2 { name="interpretR"; version="0.2.4"; sha256="0nfh3pyr7nn0r41xk0mfb4fs5rjkbh43lbw14x7pdmbgzpgsc22c"; depends=[AUC randomForest]; }; interval = derive2 { name="interval"; version="1.1-0.1"; sha256="1lln9jkli28i4wivwzqrsxvv2n15560f7msjy5gssrm45vxrxms8"; depends=[Icens MLEcens perm survival]; }; @@ -6333,13 +6621,13 @@ in with self; { intpoint = derive2 { name="intpoint"; version="1.0"; sha256="0zcv64a0clgf1k3ylh97q1w5ddrv227846gy9a68h6sgwc0ps88b"; depends=[]; }; introgress = derive2 { name="introgress"; version="1.2.3"; sha256="1j527gf7pmfy5365p2j2jbxq0fb0xh2992hj4d7dxapn4psgmvsk"; depends=[genetics nnet RColorBrewer]; }; intrval = derive2 { name="intrval"; version="0.1-1"; sha256="1p66cjpn43xib7rrnyv3jqr6bb49d3dxf888p8hxnr7kx9wfalkn"; depends=[]; }; - intsvy = derive2 { name="intsvy"; version="1.9"; sha256="080vklwfrnm5gfcympwi1llipkk5a3qh2xw6m91k9p6xyvnl3rrz"; depends=[foreign ggplot2 Hmisc memisc plyr reshape]; }; + intsvy = derive2 { name="intsvy"; version="2.0"; sha256="0vc12nkqqx6560dh6lzf28ynarcqpqhyr8vw03qp1nk7ijawq6jm"; depends=[foreign ggplot2 Hmisc memisc plyr reshape]; }; intubate = derive2 { name="intubate"; version="1.0.0"; sha256="03ikqwai7wdahdfyzdy42xs8qpdhl9gmbak2qd82yxjl62956i8c"; depends=[]; }; inum = derive2 { name="inum"; version="0.9-2"; sha256="0bqk9hh3ps0ria52fh3xfpis9wazh04fj9bbdd3ydj7inwj2lxxs"; depends=[]; }; invGauss = derive2 { name="invGauss"; version="1.1"; sha256="0l93pk2sh74dd6a6f3970nval5p29sz47ynzqnphx0wl3yfmmg9c"; depends=[optimx survival]; }; invLT = derive2 { name="invLT"; version="0.2.1"; sha256="0dcr2cclgzkvsw1lysmjrkwgahas96rjc328yc7a1a56pf62kw2v"; depends=[]; }; investr = derive2 { name="investr"; version="1.4.0"; sha256="0l47bfwxssfr3maprkpwnmgxnxccl3ch4grc7f968iiqk83mcxw9"; depends=[nlme]; }; - invgamma = derive2 { name="invgamma"; version="1.0"; sha256="1himzbglmf0w5a4bz62qq26z7kd07ljz98ybgcqxsmdagdd9jl55"; depends=[]; }; + invgamma = derive2 { name="invgamma"; version="1.1"; sha256="12ga2y4wc9bc5zz6vimvxwgjpsx3ys3209nq63gscbw559ydxa5a"; depends=[]; }; io = derive2 { name="io"; version="0.2.4"; sha256="1y2va6hcsdzsak6ljgj4sxin5zfr4azrqc8b9qlxcaajyyji2crx"; depends=[filenamer stringr]; }; ioncopy = derive2 { name="ioncopy"; version="1.0"; sha256="1idk899zxvpvnswdwlpkhy5v8id6xmrbp6hg4rmrlpp3wfxw3ad5"; depends=[multtest]; }; ionflows = derive2 { name="ionflows"; version="1.1"; sha256="1k9yz82hbjwljyg4cmi675ppykrc2yq9md8x1hhkfxmp070whcxl"; depends=[Biostrings]; }; @@ -6349,20 +6637,20 @@ in with self; { iosmooth = derive2 { name="iosmooth"; version="0.94"; sha256="06xgzhjgb6pznjzfli193q7kn8sh5jmqsssgymwj98bw7iwn4q3z"; depends=[]; }; iotools = derive2 { name="iotools"; version="0.1-12"; sha256="1b2crnhx84h1gp10sy2mkhi9vylp9z97ld16jijddzlf4v23bmlx"; depends=[]; }; ipdmeta = derive2 { name="ipdmeta"; version="2.4"; sha256="0k9wqpmrvqdh73brmdzv86a2dbyddjyyyqzqgp1vqb3k48k009s2"; depends=[nlme]; }; - ipdw = derive2 { name="ipdw"; version="0.2-5"; sha256="1a0xlhzmnc3l3fvn1v3rgxwg0va0418yq62i2dlq0l5djcfbxyc3"; depends=[gdistance raster sp]; }; + ipdw = derive2 { name="ipdw"; version="0.2-6"; sha256="1jfixvywxdhnpqz62ld2c8n6yacg88q3y1n1aisqqb7szz0zf23z"; depends=[gdistance raster sp]; }; ipflasso = derive2 { name="ipflasso"; version="0.1"; sha256="12cyn7wpkrjqrjccb26mi375ijqplps4216ldj7w3az9g8pzihv3"; depends=[glmnet survival]; }; ipfp = derive2 { name="ipfp"; version="1.0.1"; sha256="12aklhf9p70r9b2wi0qgbl835b4lil805c31n1ka4kdix4b4cpr4"; depends=[]; }; - ipft = derive2 { name="ipft"; version="0.5"; sha256="1xjpvbcp040zsqgmbj67www9zl5ibh554qzpcp02h1q9yzs59ill"; depends=[apcluster cluster dplyr ggplot2 Rcpp]; }; + ipft = derive2 { name="ipft"; version="0.6"; sha256="0xp9ab801yavxq8pvcabx1grhq2hrhnx6lvkv9k02qvyrgp3jkwp"; depends=[apcluster cluster dplyr ggplot2 Rcpp]; }; iplots = derive2 { name="iplots"; version="1.1-7"; sha256="052n8jdhj8gy72xlr23dwd5gqycqnph7s1djg1cdx2f05iy693y6"; depends=[png rJava]; }; ipred = derive2 { name="ipred"; version="0.9-6"; sha256="1vrw1pqcpnc04x1r2h9grdfm6bivs358sww5gg90jwlvxcw69lxq"; depends=[class MASS nnet prodlim rpart survival]; }; - iprior = derive2 { name="iprior"; version="0.6.4"; sha256="1cpp0cp6cfdrh23wjjqvng9dszjmp5a90bgd6sbgcfckn2si0ly1"; depends=[RColorBrewer Rcpp RcppEigen]; }; + iprior = derive2 { name="iprior"; version="0.6.5"; sha256="11zb8vs8pv5cbdvfd4s70l2ars3f78lasrvp691s5hvkv882lq51"; depends=[RColorBrewer Rcpp RcppEigen]; }; ips = derive2 { name="ips"; version="0.0-7"; sha256="0r4394xbchv6czad9jz4ijnfz8ss3wfdvh7ixrdxic2xrw0ic90v"; depends=[ape colorspace XML]; }; iptools = derive2 { name="iptools"; version="0.4.0"; sha256="0c3j5sl129xl75p14qr880ll1y3yss3zqg39zbj2jp6wcv9rvafx"; depends=[AsioHeaders BH ISOcodes Rcpp]; }; ipw = derive2 { name="ipw"; version="1.0-11"; sha256="11a34j6lp329ran2r9kxn8184kfmibkdig74lsy6lj4w4w0d71cm"; depends=[geepack MASS nnet survival]; }; iqLearn = derive2 { name="iqLearn"; version="1.4"; sha256="0vgnfr6x6f6qlnag63brnkdymlmm2vbkl8fg02w98qsc48lal454"; depends=[]; }; - iqspr = derive2 { name="iqspr"; version="1.0"; sha256="18kld8w1qwgyvs61irk80n56lj6mcy0mlrnvsq3940hhbcpmx61k"; depends=[rcdk]; }; - irace = derive2 { name="irace"; version="2.2"; sha256="10bxi508qvm97kljpwlnwypvlrzjdzliv0qq92wxjxyyi8pqgfvc"; depends=[]; }; - irlba = derive2 { name="irlba"; version="2.1.2"; sha256="1qbcn0ix85pmk296jhpi419kvh06vxm5cq24yk013ps3g7fyi0si"; depends=[Matrix]; }; + iqspr = derive2 { name="iqspr"; version="1.1"; sha256="0s04q8imfgxxx4rizcwax2hnyxl4pb8s883nbk62db4hp6g3v1a5"; depends=[rcdk]; }; + irace = derive2 { name="irace"; version="2.3"; sha256="1jblrhcvbp8krk51df9qnm0q2rnvjc4mmmrhv3jcfihq3f49h3xk"; depends=[]; }; + irlba = derive2 { name="irlba"; version="2.2.1"; sha256="0zfb7x1701n6gask0f8y2yq0vmb82xkxf6limp43ivx551hx600s"; depends=[Matrix]; }; irr = derive2 { name="irr"; version="0.84"; sha256="0njxackqj8hyf9j1yszwxbnaxgp27fc2bwyyf7dip72wc12f81n5"; depends=[lpSolve]; }; irtDemo = derive2 { name="irtDemo"; version="0.1.2"; sha256="1kbab06lwldyp5ra71rgn4habq6yl6ggl5km1sj9bbqa6n4gqvwz"; depends=[fGarch shiny shinydashboard]; }; irtProb = derive2 { name="irtProb"; version="1.2"; sha256="12wnvbzkh0mx9i3iyh1v2n2f2wjsjj7ad3dgv9xj949x4nbz16j0"; depends=[lattice moments]; }; @@ -6377,12 +6665,13 @@ in with self; { isocir = derive2 { name="isocir"; version="2.0-6"; sha256="0dkxdx2g1c579q97r45shws2gylkwqlvrhmc14ddmzi45xhxlql6"; depends=[circular combinat TSP]; }; isopam = derive2 { name="isopam"; version="0.9-13"; sha256="0y1yy0922kq5jxyc40gz8sk9vlzwfkfg5swmc6lk4007g9mgc8fm"; depends=[cluster vegan]; }; isopat = derive2 { name="isopat"; version="1.0"; sha256="0fznvgycyd35dh7pbq1xhp667gsficlmycn5pcrqcbs89069xr1s"; depends=[]; }; - isoph = derive2 { name="isoph"; version="0.5"; sha256="1a3brp8w3xs3l25x1nn5213jj5mrzzfl4fm34l7ry97g4s9d8sh3"; depends=[Iso Rcpp survival]; }; + isoph = derive2 { name="isoph"; version="1.1.1"; sha256="1sm03lr03w5zhbi4dl27sid9wxil9891317aichipkyrvqbkkri1"; depends=[Iso survival]; }; isotone = derive2 { name="isotone"; version="1.1-0"; sha256="0alk0cma5h3yn4w2nqcahprijsm89b0gby9najbngzi5vnxr6nvn"; depends=[nnls]; }; isotonic_pen = derive2 { name="isotonic.pen"; version="1.0"; sha256="1lgw15df08f4dhrjjfr0jqkcvxwad92kflj2px526pcxwkj7cj3i"; depends=[coneproj Matrix]; }; + issueReporter = derive2 { name="issueReporter"; version="0.1.0"; sha256="18s35f5d30vivmlcg0ycni3r8mrf4gnn7x10qdcnpisrlsjx6jbd"; depends=[httpuv httr jsonlite rmarkdown tint]; }; isva = derive2 { name="isva"; version="1.9"; sha256="05qx9q0kg4ma23v4abhihw0vz017nq6hv2jzsiqx4d20ngh1dl4z"; depends=[fastICA JADE qvalue]; }; itan = derive2 { name="itan"; version="1.0"; sha256="082vh5gvh8hgyhk8nswll16ldhnp0pfpxnz1yx05zsc4nzvm92cf"; depends=[ggplot2 reshape]; }; - itcSegment = derive2 { name="itcSegment"; version="0.4"; sha256="06bdh8dw9ddmy27jnpy3x1z27kygdh32rcxjff1kx4lhfyj1bkid"; depends=[maptools raster rgeos sp]; }; + itcSegment = derive2 { name="itcSegment"; version="0.5"; sha256="130bvpx23yl7mp64salqwhgfzixxdvwsrpyl7qvmdya9lg8sn8y0"; depends=[maptools raster rgeos sp]; }; iteRates = derive2 { name="iteRates"; version="3.1"; sha256="1dycmlm3vldc60wz2jjdfbla14383911zfahgal5mx8whxwq95c5"; depends=[ape apTreeshape geiger gtools MASS partitions VGAM]; }; iterLap = derive2 { name="iterLap"; version="1.1-2"; sha256="0ixh9aw115496ib0iswfsj97rjcd2f02z116dg57vl9hhzh28f13"; depends=[quadprog randtoolbox]; }; iterators = derive2 { name="iterators"; version="1.0.8"; sha256="1f057pabs7ss9h1n244can26qsi5n2k3salrdk0b0vkphlrs4kmf"; depends=[]; }; @@ -6395,7 +6684,7 @@ in with self; { ivbma = derive2 { name="ivbma"; version="1.05"; sha256="0d7kg6pkdx1aj1i6kqs2r7j1klxxwymml63qnrq6a6fia3ck9kk9"; depends=[]; }; ivfixed = derive2 { name="ivfixed"; version="1.0"; sha256="0a26zrkvz0ffq4zxdx5vhr1nvsi9c15s6gvc1zy2pddjz31x2xi5"; depends=[Formula]; }; ivlewbel = derive2 { name="ivlewbel"; version="1.1"; sha256="0ykcfikm2i28s3fm6zzx8cjvpwhksg8an0rfr0b35gf7p69brgag"; depends=[gmm lmtest plyr]; }; - ivmodel = derive2 { name="ivmodel"; version="1.2"; sha256="0jpvkk33ihxsla2j4b4spp2dv7b7rq49x46m9lc9zp6020w91b3a"; depends=[Formula Matrix]; }; + ivmodel = derive2 { name="ivmodel"; version="1.6"; sha256="109jazvzbwvxr12f2377pmvfcccgyq27vxsfb3lzkfjwyvn6sr96"; depends=[Formula Matrix]; }; ivpack = derive2 { name="ivpack"; version="1.2"; sha256="0cr5acjrn41d3q0b77hlg2jmsbf1msvys9gcavm1blsryg2bc03c"; depends=[AER lmtest sandwich]; }; ivpanel = derive2 { name="ivpanel"; version="1.0"; sha256="0irjmkw3nnd8ssidvj23lr0hihlhd9acsbaznh88lknx53ijc2qv"; depends=[Formula]; }; ivprobit = derive2 { name="ivprobit"; version="1.0"; sha256="1kijq7k6iv2ybaxb08kqzm2s2k6wp2z50r01kxcq023pmyfjczwy"; depends=[]; }; @@ -6406,8 +6695,8 @@ in with self; { jacpop = derive2 { name="jacpop"; version="0.5"; sha256="056c82d4a10rgq0p4p63y9i94dy1kqp3yh7xms9nx9q2xb940xb5"; depends=[]; }; jagsUI = derive2 { name="jagsUI"; version="1.4.4"; sha256="0jfziaxxrlf1izp7s61d7xckdx33hnbq1cs2zlp7c9bcpp4mdkzv"; depends=[coda lattice rjags]; }; james_analysis = derive2 { name="james.analysis"; version="1.0.1"; sha256="1b2n4ds4ivfk564z87s2rxjl9j0y4drd3cmyv8jqpccmdvx1137d"; depends=[naturalsort rjson]; }; - janeaustenr = derive2 { name="janeaustenr"; version="0.1.4"; sha256="1yxk94acscq43gs3m0n0x3805dr71kn4wf3ws7rg62p2bd22b09i"; depends=[]; }; - janitor = derive2 { name="janitor"; version="0.2.1"; sha256="14jb3viyrmxc0grrkkw86z6s7c3sq0a07mhpyzw1xsy5gfda29yi"; depends=[dplyr tidyr]; }; + janeaustenr = derive2 { name="janeaustenr"; version="0.1.5"; sha256="1wyn4qc28a3sval8shmyi2d7s4nl3jh96s8pzq871brxcmrncbwr"; depends=[]; }; + janitor = derive2 { name="janitor"; version="0.3.0"; sha256="1x2598yv6r2z4q13vbzsqns6d4q0bki97sqsm67pp77djpw8wkay"; depends=[dplyr magrittr tidyr]; }; jetset = derive2 { name="jetset"; version="3.4.0"; sha256="0c99h5npsv2gf5d59s4qhkaqmjhbwa3prcykk24wzhnpfq6y6xhp"; depends=[AnnotationDbi org_Hs_eg_db]; }; jiebaR = derive2 { name="jiebaR"; version="0.9.1"; sha256="1qv4k5fgi40ppivdk3mxkhawyf2443h2lz5b9gvai9sqj6vf0s8k"; depends=[jiebaRD Rcpp]; }; jiebaRD = derive2 { name="jiebaRD"; version="0.1"; sha256="1wadpcdca4pm56r8q22y4axmqdbb2dazsh2vlhjy73rpymqfcph4"; depends=[]; }; @@ -6415,17 +6704,17 @@ in with self; { jmetrik = derive2 { name="jmetrik"; version="1.0"; sha256="0xnbvby03fqbxgg0i0qxrrzjv98783n6d7c1fywj81x487qlj77j"; depends=[]; }; jmotif = derive2 { name="jmotif"; version="1.0.2.900"; sha256="0zgj1g8vy2cj2kyschbr1xb1mb862gniva0sa8qr9p8vvb03ja4v"; depends=[Rcpp RcppArmadillo]; }; jmuOutlier = derive2 { name="jmuOutlier"; version="1.3"; sha256="1lzqpdy2987szihsjaq6l1iggjhji0li4cj7914myj3vzfcif8gw"; depends=[]; }; - jmv = derive2 { name="jmv"; version="0.7.0.6"; sha256="0x9p984nka3a4lv5bj1lhqn8rns9rmfjsfrvcaxj3ihrbvy0sawb"; depends=[afex BayesFactor car GGally ggplot2 GPArotation jmvcore lsmeans lsr multcomp PMCMR psych R6 vcd vcdExtra]; }; - jmvcore = derive2 { name="jmvcore"; version="0.5.1"; sha256="0sxypfcxnc31ak39rgc8ck8x1l7723qgskfmxhp1x07lcqx9b433"; depends=[base64enc R6 rjson]; }; - jocre = derive2 { name="jocre"; version="0.3.1"; sha256="01mnd2dzm3bnbdxg0grj10ashpxzgsk68lfx7ssxk7pnfxnbc39h"; depends=[boot KernSmooth plyr]; }; + jmv = derive2 { name="jmv"; version="0.7.3.5"; sha256="0bkdcygpc8xdc07p4sjrsf9gzc5617cybdh7xhaxdy44niykppnc"; depends=[afex BayesFactor car GGally ggplot2 GPArotation jmvcore lavaan lsmeans multcomp mvnormtest PMCMR psych R6 vcd vcdExtra]; }; + jmvcore = derive2 { name="jmvcore"; version="0.5.5"; sha256="1i9pvv1yvz05grxxm2cccz092mk3asmrvq194pa99vq7g68hwn3c"; depends=[base64enc R6 rjson]; }; + jocre = derive2 { name="jocre"; version="0.3.3"; sha256="1i9n3r16pq6r4sy3fc1rxpil5ws8v2is0xdxafinvwr1hzkv1gz6"; depends=[boot KernSmooth plyr TSP]; }; joinXL = derive2 { name="joinXL"; version="1.0.1"; sha256="1l76bckjz5r1kdsh0s10i0gpca12rkfkp14346fn7avdcw73v23i"; depends=[data_table openxlsx R_utils rChoiceDialogs Rcpp readxl rJava timeDate timeSeries]; }; - joineR = derive2 { name="joineR"; version="1.1.0"; sha256="13b3syh20d0wrfh8gama16ajc73nzd5rq4pgyrdw8m94ybmg559v"; depends=[lattice MASS nlme statmod survival]; }; - joineRML = derive2 { name="joineRML"; version="0.2.0"; sha256="198xrls5bdslrdl7j90asm8daqls78axy486gpnq03scw81cj4qn"; depends=[ggplot2 lme4 MASS Matrix nlme Rcpp RcppArmadillo survival]; }; - joint_Cox = derive2 { name="joint.Cox"; version="2.11"; sha256="0k1hpg0i1prxzvjfsndbgw4g2k0lli0niql8b79z91api472hjf9"; depends=[survival]; }; + joineR = derive2 { name="joineR"; version="1.2.0"; sha256="0zqzl4f8bl5qgvcfydkb0mm4cw0jzp8pbbixa7rivxvby4vwqmyx"; depends=[lattice MASS nlme statmod survival]; }; + joineRML = derive2 { name="joineRML"; version="0.2.2"; sha256="1hrimz7iw74343f0frlhm6mxrsi5vnng5g14x6bvzlh53s2r4x8z"; depends=[ggplot2 lme4 MASS Matrix nlme Rcpp RcppArmadillo survival]; }; + joint_Cox = derive2 { name="joint.Cox"; version="2.12"; sha256="1g79afhrs6xf4rk2h00v11pw6r9539ds7qhsy5vra4sa79qqfa1g"; depends=[survival]; }; jointDiag = derive2 { name="jointDiag"; version="0.2"; sha256="0y1gzrc79vahfhn4jrj5xys8pmkzxj4by7361730gi347f0frs0a"; depends=[]; }; jointNmix = derive2 { name="jointNmix"; version="1.0"; sha256="0ibh7hqkpzlfk3bk4d2dd64jhr8cvw563k082vwnljiam7k5nj4b"; depends=[]; }; jointPm = derive2 { name="jointPm"; version="2.3.1"; sha256="1c2cn9sqwfyv9ksd63w8rrz0kh18jm2wv2sfdkgncjb7vfs4hbv9"; depends=[]; }; - jomo = derive2 { name="jomo"; version="2.3-1"; sha256="0qwg5aank84w2jwlni470v9s7x0xnnpb1bib9r2y6j32fikyd09a"; depends=[]; }; + jomo = derive2 { name="jomo"; version="2.4-1"; sha256="0hjpvxm8zbvbnhjhk959fd3wrx4igqgzlxphv1hcc2iyz2975fl8"; depends=[lme4]; }; jose = derive2 { name="jose"; version="0.1"; sha256="1cvrjcx902pbh9xryph1kilmyf0rmbk671jvqd19a2kfwpcw7gqc"; depends=[jsonlite openssl]; }; jpeg = derive2 { name="jpeg"; version="0.1-8"; sha256="05hawv5qcb82ljc1l2nchx1wah8mq2k2kfkhpzyww554ngzbwcnh"; depends=[]; }; jpmesh = derive2 { name="jpmesh"; version="0.3.0"; sha256="0sv199f72l5wczqlvyykpcjap68lw11pdv6lwl47ynz350vxdzlm"; depends=[broom dplyr foreach geojsonio leaflet magrittr miniUI purrr readr rgdal shiny sp tibble tidyr]; }; @@ -6434,49 +6723,53 @@ in with self; { jrvFinance = derive2 { name="jrvFinance"; version="1.03"; sha256="16mki26ns593xn1p1la2ihkddlwvzwdvjr3h2vz71bq5db11iffq"; depends=[]; }; js = derive2 { name="js"; version="0.2"; sha256="1dxyyrmwwq07l6pdqsvxscpciy4h1021h9ymx8hi2vqvv0mdrz76"; depends=[V8]; }; jsonld = derive2 { name="jsonld"; version="1.2"; sha256="1y4574ai4m31x4yjx5bp9i8wfgcgjgfr8jn5nn0x6qzlnjg58gyz"; depends=[curl jsonlite V8]; }; - jsonlite = derive2 { name="jsonlite"; version="1.4"; sha256="11rgkjp5qir79niad0aizjxvjzyvkl6l9nsrv3ikv446vllmrasn"; depends=[]; }; + jsonlite = derive2 { name="jsonlite"; version="1.5"; sha256="00lfg464jhf7k01bal9pcjvbdf5cxk6xi2h46hccp1x3h883g434"; depends=[]; }; jsonvalidate = derive2 { name="jsonvalidate"; version="1.0.0"; sha256="08c1s8fk95np4l6km077dmd1nibhhggi80f5465hhbq521gm0awl"; depends=[V8]; }; jtGWAS = derive2 { name="jtGWAS"; version="1.5"; sha256="01f1wrbgj7v6pzrx5vd8pgpm78fanyx59s84m5a5732q5g39shlk"; depends=[Rcpp]; }; - jtools = derive2 { name="jtools"; version="0.4.4"; sha256="17y5v24zn2sin9yxyyp42kp40fzq8967jfssi3fi4vf66vny4p2s"; depends=[]; }; + jtools = derive2 { name="jtools"; version="0.4.5"; sha256="0mqw9i0191kszw4qw9jkb8y26v2x2c9sx9gz7hccd015nl6vra4s"; depends=[]; }; jtrans = derive2 { name="jtrans"; version="0.2.1"; sha256="18zggqdjzjhjwmsmdhl6kf35w9rdajpc2nffag4rs6134gn81i3m"; depends=[]; }; jug = derive2 { name="jug"; version="0.1.7"; sha256="01m6hyr26f6zih49pz2bmmr8ypdl1qiz0wv3padcy68kaccf44a4"; depends=[base64enc httpuv infuser jsonlite magrittr mime R6 webutils]; }; junr = derive2 { name="junr"; version="0.1.1"; sha256="1rkr6kyf2p3rr39w0nqfvcrcd2b0r411if7812zijnn20vrmsmda"; depends=[httr jsonlite]; }; jvnVaR = derive2 { name="jvnVaR"; version="1.0"; sha256="0zh0dc6wqlrxn5r2yv9vkpyfb8xsbdidkjv9g6qr94fyxlbs4yci"; depends=[]; }; jwutil = derive2 { name="jwutil"; version="1.1.1"; sha256="114vph86722v89iwyla7skl06cv87ymfy6nmca5iyxwx1z78zddz"; depends=[checkmate Rcpp]; }; - kSamples = derive2 { name="kSamples"; version="1.2-4"; sha256="1k026wbzcrzzr3ji3gdnhbj13nrmbp6ybbcki3v3gk6s0xk6f2rx"; depends=[SuppDists]; }; - kableExtra = derive2 { name="kableExtra"; version="0.1.0"; sha256="0sgk2sdjnlip9pl2wd2gn53hwz60wyc0926iy69swnv48vhaa6c6"; depends=[knitr magrittr rmarkdown rvest stringr xml2]; }; + kSamples = derive2 { name="kSamples"; version="1.2-6"; sha256="1pbam0zqq44slpxdgl2s2fsfdgl7i0pgm8bzlvnm0fy0na24bgdj"; depends=[SuppDists]; }; + kableExtra = derive2 { name="kableExtra"; version="0.2.1"; sha256="1ralhjxf3rhjf40kqpxgz6i75fscjdk3h8xvz7i4mp5cmig7lpp0"; depends=[knitr magrittr rmarkdown rvest stringr xml2]; }; kamila = derive2 { name="kamila"; version="0.1.1.1"; sha256="06jl868i8a6zg3pyaf1r6ccd33ya5f83apc5w6d3m111dzdqqlcy"; depends=[abind gtools KernSmooth mclust plyr Rcpp]; }; + kangar00 = derive2 { name="kangar00"; version="1.0"; sha256="0q717pp9iip77fclhrancmp3z711qipj6030l67k1h52vylvnp2c"; depends=[bigmemory biomaRt CompQuadForm data_table igraph KEGGgraph lattice sqldf]; }; kantorovich = derive2 { name="kantorovich"; version="2.0.0"; sha256="0y965nkhgk0z2q2j3sycfg76aqqi3ry8avg0bz9xggpd60bhh5vd"; depends=[gmp lpSolve rcdd Rglpk]; }; kappaSize = derive2 { name="kappaSize"; version="1.1"; sha256="0jrjal8cvy2yg0qiyilmv3jl3ib5k9jg8gp2533kdsx4m0sack04"; depends=[]; }; kappalab = derive2 { name="kappalab"; version="0.4-7"; sha256="16bwbwwqmq2w7vy8p3wg0y80wfgc8q5l1ly1mqh51xi240z1qmq0"; depends=[kernlab lpSolve quadprog]; }; kaps = derive2 { name="kaps"; version="1.0.2"; sha256="0jg4smbq51v88i3815icb284j97iam09pc52rv3izxa57nv9a0gz"; depends=[coin Formula survival]; }; karaoke = derive2 { name="karaoke"; version="1.0"; sha256="1kx11lijdffhhh8prjgsamshgg2v29b2i129fjqi079waa335352"; depends=[seewave tuneR]; }; + kazaam = derive2 { name="kazaam"; version="0.1-0"; sha256="0j7vysnmiv9sggcxdn3nrgfvyl52pza4kkjnsa0xlb3fzq9qpwlz"; depends=[pbdMPI]; }; kcirt = derive2 { name="kcirt"; version="0.6.0"; sha256="1gm3c89i5dq7lj8khc12v30j1c0l1gwb4kv24cyy1yw6wg40sjig"; depends=[corpcor mvtnorm snowfall]; }; - kdecopula = derive2 { name="kdecopula"; version="0.8.1"; sha256="0rn533dzgq6c3cbmiz9f7qzp0yj9fzsmi8y1vabqzrn63dgckvkv"; depends=[lattice locfit qrng quadprog Rcpp RcppArmadillo]; }; + kdecopula = derive2 { name="kdecopula"; version="0.9.0"; sha256="0jiy2kmjnngl1lhjzgq6x3qdzrbnwnk7azfj52jr92rv8psdyhxc"; depends=[lattice locfit qrng quadprog Rcpp RcppArmadillo]; }; kdetrees = derive2 { name="kdetrees"; version="0.1.5"; sha256="1plf2yp2vl3r5znp5j92l6hx1kgj0pzs7ffqgvz2nap5nf1c6rdg"; depends=[ape distory ggplot2]; }; - kdevine = derive2 { name="kdevine"; version="0.3.0"; sha256="0imi8n70xw8bmxnqw4fam6d85ib7bhaygg3q56xrml7mn2wik4gc"; depends=[doParallel foreach kdecopula ks qrng Rcpp VineCopula]; }; + kdevine = derive2 { name="kdevine"; version="0.4.1"; sha256="0ci51dn7jhz9swlywiqj3inkk4329argm63lhkyvcbj2kd2rjay1"; depends=[cctools doParallel foreach kdecopula KernSmooth MASS qrng Rcpp VineCopula]; }; kedd = derive2 { name="kedd"; version="1.0.3"; sha256="17rwz3yia95xccbxwn43wr6c9b3062094yfahnnnk3wfijyhlxiq"; depends=[]; }; keep = derive2 { name="keep"; version="1.0"; sha256="12803hhrs9v94rv6qaihk1f1ls7lx4cy2pa30v4p1r2z9afx9bjf"; depends=[]; }; kehra = derive2 { name="kehra"; version="0.1"; sha256="1cc0bmbg0dncay50ap7cs2516qngzz3ddaab0jk5r6lwfq87h8qx"; depends=[Hmisc raster reshape2 sp stringr xts zoo]; }; kelvin = derive2 { name="kelvin"; version="2.0-0"; sha256="04xdgpmysksm79m3vqmb4zra3pq09nv99w4fbdla1lmy7z8pkdrk"; depends=[Bessel]; }; kequate = derive2 { name="kequate"; version="1.6.1"; sha256="1rjya1rnlfk2ziiwhkgshlyk3g0388591q3q01a3vgmgsb3cpxl6"; depends=[equateIRT ltm mirt]; }; - kerasR = derive2 { name="kerasR"; version="0.4.1"; sha256="07xnkfp4mpgw2m3z7qzv4m3r4jnb0lwaz5li67shpr3zdvhj4m4s"; depends=[reticulate]; }; + kerasR = derive2 { name="kerasR"; version="0.6.1"; sha256="1yi7710vgcwz0jhishbga41sc6qyk83a0avmq01dvqjsz3cdfsfc"; depends=[reticulate]; }; kerdiest = derive2 { name="kerdiest"; version="1.2"; sha256="16xj2br520ls8vw5qksxq9hqlpxlwmxccfk5balwgk5n2yhjs6r3"; depends=[chron date evir]; }; kergp = derive2 { name="kergp"; version="0.2.0"; sha256="1xamj19v84m1f9ls8ac8xbm6airyjf96i1l48yy4l2rvjdmx6m9l"; depends=[doParallel MASS numDeriv Rcpp testthat]; }; - kernDeepStackNet = derive2 { name="kernDeepStackNet"; version="2.0.1"; sha256="1ypyb6i64jskq2agbpb6wc6y3fn4i7z4fjjfpl97q8f0rif1lpfj"; depends=[caret DiceKriging DiceOptim GA GenSA glmnet globalOptTests lhs matrixStats mvtnorm Rcpp RcppEigen]; }; - kerndwd = derive2 { name="kerndwd"; version="1.1.2"; sha256="1d55qrayay3d5p7lxj50mv1yj3l1xh10i3j937lmjn83ffhdq40a"; depends=[]; }; + kernDeepStackNet = derive2 { name="kernDeepStackNet"; version="2.0.2"; sha256="04bdggxvggmppp289n2zw6ijdm7y05gws6z7bp6fr8n1zsxy2w3c"; depends=[caret DiceKriging DiceOptim GA GenSA glmnet globalOptTests lhs matrixStats mvtnorm Rcpp RcppEigen]; }; + kerndwd = derive2 { name="kerndwd"; version="2.0.0"; sha256="17zys29ybfgqlgp65yzj339qgpnwr668f82iiv4ap6w7ry40r2l1"; depends=[]; }; kernelFactory = derive2 { name="kernelFactory"; version="0.3.0"; sha256="001kw9k3ivd4drd4mwqapkkk3f4jgljiaprhg2630hmll064s89j"; depends=[AUC genalg kernlab randomForest]; }; + kernelboot = derive2 { name="kernelboot"; version="0.1.1"; sha256="0pg05k87x97bpjnxi1dvfik5kykmgyy7njmn03mmrcrqwfl79kdz"; depends=[future Rcpp]; }; kernlab = derive2 { name="kernlab"; version="0.9-25"; sha256="0qnaq9x3j2xc6jrmmd98wc6hkzch487s4p3a9lnc00xvahkhgpmr"; depends=[]; }; + kernplus = derive2 { name="kernplus"; version="0.1.0"; sha256="0wibp4bbzxmjdyhp643v76accjy1w8jixmwgsdfrq2yjxacgnwcb"; depends=[circular KernSmooth mixtools]; }; kernscr = derive2 { name="kernscr"; version="1.0.3"; sha256="0h3xv76dxch8kv4z7cgx60iaikk6906n75c4kc1mccpw0jvyxrvb"; depends=[MASS mvtnorm]; }; keyplayer = derive2 { name="keyplayer"; version="1.0.3"; sha256="0j4n46r9ivkbzqz8g22dq2bpmx7bs05yb5qp27p9jnfh5x19v2ds"; depends=[igraph matpow sna]; }; keypress = derive2 { name="keypress"; version="1.1.1"; sha256="0w8hcxxx47zyz2cbz2s8va2rfb6s2ziw9ck1slq9kh3aqsx3i9g0"; depends=[]; }; keyringr = derive2 { name="keyringr"; version="0.4.0"; sha256="04f0z6mqj75l5qhiab0zvjsvz3jz1bp6dfazkpgihjmls5k11dnh"; depends=[stringr]; }; kfigr = derive2 { name="kfigr"; version="1.2"; sha256="0hmfh4a95883p1a63lnziw8l9f2g0fn0xzxzh36x9qd9nm7ypmkw"; depends=[knitr]; }; + kgschart = derive2 { name="kgschart"; version="1.2.3"; sha256="0rphi8jl3x7lh3d7xix9fhprcia3ix99pvg7pkb7gyaynvw2z3l9"; depends=[abind deepnet ggplot2 gridExtra magrittr nnet png shiny stringr]; }; kimisc = derive2 { name="kimisc"; version="0.3"; sha256="1cdjhfdfidilvz0w92xfjwwnp2h73y8l1n7fxnh5jsv6wnx491l4"; depends=[plyr pryr]; }; kin_cohort = derive2 { name="kin.cohort"; version="0.7"; sha256="0wijsjz0piz5j9rm2nr3d5dfpiyba740mbfbkmfll9pz72s58wz8"; depends=[survival]; }; kineticF = derive2 { name="kineticF"; version="1.0"; sha256="1k54zikgva9fw9c4vhkc9b0kv8sq5pmc962s8wxr6qv97liv9p46"; depends=[circular lqmm MASS plotrix sp splancs]; }; kinfit = derive2 { name="kinfit"; version="1.1.14"; sha256="0gb43pghgllb9gzh8jzzpfmc46snv02ln4g3yqsdah3cyqnck0ih"; depends=[]; }; - kinn = derive2 { name="kinn"; version="0.2"; sha256="14vckrk3sppxswccy4qiyc7pbzkwncwag4acbkbqfnm84pxblh3m"; depends=[caret caTools igraph KRLS mclust stringr]; }; kinship2 = derive2 { name="kinship2"; version="1.6.4"; sha256="19r3y5as83nzk922hi4fkpp86gbqxdg1bgng798g1b073bp6m9yj"; depends=[Matrix quadprog]; }; kirby21_base = derive2 { name="kirby21.base"; version="1.5.1.1"; sha256="0gvxvwqwn5bhmwr632gbvh2ikkygqw4vqyn6jbwgnkaxqq127p11"; depends=[git2r]; }; kirby21_fmri = derive2 { name="kirby21.fmri"; version="1.5.1"; sha256="1hifxp6ilzgakbdz067lmpz1wrq8ah9a8kv542717z1pn6bmw69w"; depends=[kirby21_base kirby21_t1]; }; @@ -6490,22 +6783,22 @@ in with self; { km_ci = derive2 { name="km.ci"; version="0.5-2"; sha256="1l6kw8jppaa1802yc5pbfwwgac56nhwc9p076ivylhms4w7cdf8v"; depends=[survival]; }; kmc = derive2 { name="kmc"; version="0.2-2"; sha256="0ldyhlqdrbygvhpy4b9xp52zjvjmb0gaph0v9fhla707f63i21m5"; depends=[emplik Rcpp rootSolve]; }; kmconfband = derive2 { name="kmconfband"; version="0.1"; sha256="10n5w8k57faqcclwshs4m66i2i5b70i6f3xq5nqlgsi2ldkysbc9"; depends=[survival]; }; + kmcudaR = derive2 { name="kmcudaR"; version="1.0.0"; sha256="1adixf4nsgnk8rgvcv37aznh8gxrfwn19ihh3c6siss51hlmhln2"; depends=[Rcpp RcppEigen]; }; kmeans_ddR = derive2 { name="kmeans.ddR"; version="0.1.0"; sha256="1i87cxakjbq1xwyjyyzv1xiqbrncsqx6baviidcdm3n0pakrqdsg"; depends=[ddR Rcpp]; }; kmi = derive2 { name="kmi"; version="0.5.2"; sha256="0w440r3daksghvimbm0avp6c3rjvxaxsawvn7ig5bwnw60kry9il"; depends=[mitools survival]; }; kml = derive2 { name="kml"; version="2.4.1"; sha256="1my9gcripiqc6iphycjr3srj8qxy05yvd0648vblygrx2qym5hy2"; depends=[clv longitudinalData]; }; - kml3d = derive2 { name="kml3d"; version="2.4.1"; sha256="1xp95fm7ncmf5mpcc9zkqf6h89g4a7qdgc2snrsy16znsjmncssq"; depends=[clv kml longitudinalData misc3d rgl]; }; kmlShape = derive2 { name="kmlShape"; version="0.9.5"; sha256="1p35ihjq84jnzq78yksdblc0c1qcn13f8n4khddsxcqvk3a44xb1"; depends=[class kml lattice longitudinalData]; }; kmlcov = derive2 { name="kmlcov"; version="1.0.1"; sha256="09s9ganfsnwp22msha78g6pjr45ppyfyqjf6ci64w3w15q5qlcd9"; depends=[]; }; kmodR = derive2 { name="kmodR"; version="0.1.0"; sha256="1y1pqrrralklflyb1dw8bslfcyqrw8ryijfbhkwba7ykpxcf9fda"; depends=[]; }; knitLatex = derive2 { name="knitLatex"; version="0.9.0"; sha256="1igacc2sx8897wmnhh8kngd0fq6zqbi30chy5c8jw60zc38mi3wi"; depends=[knitr]; }; knitcitations = derive2 { name="knitcitations"; version="1.0.7"; sha256="0sx7sxrmm9x01sh3bcp9qqpvljfss9f1hr6h4dcfns8x6f60s5v6"; depends=[digest httr RefManageR]; }; - knitr = derive2 { name="knitr"; version="1.15.1"; sha256="1pbxd3k7kv5sa1a5gxm0zc2bhjxdgx2nfch9xap5k85djmgsfqc1"; depends=[digest evaluate highr markdown stringr yaml]; }; + knitr = derive2 { name="knitr"; version="1.16"; sha256="02balmhvc955rkqv4v0wkxbw4vjphydajgcpy4ml0s3b4sziyj0h"; depends=[digest evaluate highr markdown stringr yaml]; }; knitrBootstrap = derive2 { name="knitrBootstrap"; version="1.0.0"; sha256="0pshn2slzqwpryklslsxwh1dmqcnwv6bwi7yfm6m342wjybpk0wl"; depends=[knitr markdown rmarkdown]; }; knnGarden = derive2 { name="knnGarden"; version="1.0.1"; sha256="1gmhgr42l6pvc6pzlq5khrlh080795b0v1l5xf956g2ckgk5r8m1"; depends=[cluster]; }; knnIndep = derive2 { name="knnIndep"; version="2.0"; sha256="1fwkldgs2994svf3sj90pwsfx6r22cwwa22b30hdmd24l8v9kzn7"; depends=[]; }; knncat = derive2 { name="knncat"; version="1.2.2"; sha256="1d392910y3yy46j8my1a7m0xkij2rc6vwq5fg22qk00vqli8drz2"; depends=[]; }; knockoff = derive2 { name="knockoff"; version="0.2.1"; sha256="197icnyxxmi6f0v0p2zm4910grbgkfjkd3xql79ny04ik047v0kp"; depends=[glmnet RJSONIO]; }; - knotR = derive2 { name="knotR"; version="1.0-1"; sha256="02mr950150m2gzagxf5yzps8fnwspagh3k8prh9zww2jss0471rm"; depends=[]; }; + knotR = derive2 { name="knotR"; version="1.0-2"; sha256="0kd1b9wibpwyaanz9ny61qgfvcg4d3rzpy05sfshlpp0b1y8d3xj"; depends=[]; }; kntnr = derive2 { name="kntnr"; version="0.4.0"; sha256="0vcmm4vjawmyaqpqv0g6y5dfcixn0rjhcfr3nfc2781a4w7ydnc9"; depends=[base64enc dplyr httr jsonlite lazyeval lubridate purrr rstudioapi stringr]; }; koRpus = derive2 { name="koRpus"; version="0.10-2"; sha256="1ykaky10zkj76w44fhk6kb6dqz1pgncmdnz4r2amcm08a8h96gsr"; depends=[data_table]; }; kobe = derive2 { name="kobe"; version="1.3.2"; sha256="1z64jwrq6ddpm22cvk2swmxl1j7qyz0ddk3880c7zfq6gk7f9bxl"; depends=[coda emdbook ggplot2 MASS plyr reshape]; }; @@ -6526,17 +6819,17 @@ in with self; { ktsolve = derive2 { name="ktsolve"; version="1.1"; sha256="0b5myr093v3qaj9gzbw1w728i5ij418whxxpicj51w657dcy647k"; depends=[]; }; ktspair = derive2 { name="ktspair"; version="1.0"; sha256="1v63982jidxlcf2syahcb29myv34kc790l7lwyfxx9l50ssb812n"; depends=[Biobase]; }; kulife = derive2 { name="kulife"; version="0.1-14"; sha256="070ayy6fr9nsncjjljikn2i5sp2cx3xjjqyc64y2992yx74jgvvd"; depends=[]; }; - kutils = derive2 { name="kutils"; version="0.93"; sha256="18p6cxvzfp3vq4058g6kjf0zgavs4yx69ppx6mxbazaqkjq2vysg"; depends=[lavaan openxlsx plyr xtable]; }; + kutils = derive2 { name="kutils"; version="1.0"; sha256="12rlvaqq0dgz9qvm7lnmr3x90gg5iz58jh3d1hf08lbj4s50a8d4"; depends=[lavaan openxlsx plyr xtable]; }; kwb_hantush = derive2 { name="kwb.hantush"; version="0.2.1"; sha256="0rjnhhzvjhhl0r2ixz9vkgnqkrnnk772253zy7xkpadj7ws69jsf"; depends=[hydroGOF lattice]; }; - kyotil = derive2 { name="kyotil"; version="2016.11-9"; sha256="02lcnljpj9yvxmk5drxgz94m6kw8nx8bh6n1wzivplw8cfqh6d5s"; depends=[]; }; + kyotil = derive2 { name="kyotil"; version="2017.6-1"; sha256="1ia4c9y7fk5myjxyfq1zfk6k80z7hwn0b034ks9hrnms8da21dv1"; depends=[]; }; kza = derive2 { name="kza"; version="4.0.0"; sha256="0yfn6ijbskdkcgbgk4fwhgiiy34cw9k9vy1psi779mqd9kyjf56j"; depends=[]; }; - kzfs = derive2 { name="kzfs"; version="1.0.1.5"; sha256="041cwg3sz5zfngm7qj9v2cx2023n8r8by08541573261ihca1inl"; depends=[digest kzft]; }; + kzfs = derive2 { name="kzfs"; version="1.5.0.1"; sha256="0gd945x1ppdw15iqcn5ijzmh07hs7zg8rjb85231bcqbh98djvfm"; depends=[digest kzft]; }; kzft = derive2 { name="kzft"; version="0.17"; sha256="1y6almhs1x21cr4bbf5fj3mnhp65ivzs869660cyg70sva853sv7"; depends=[polynom]; }; kzs = derive2 { name="kzs"; version="1.4"; sha256="1srffwfg0ps8zx0c6hs2rc2y2p01qjl5g1ypqsbhq88vkcppx1w9"; depends=[lattice]; }; l0ara = derive2 { name="l0ara"; version="0.1.3"; sha256="0igav0wxvnnjcrh1wqzgvn91ndq9a25yxhxyddnsfvn6f45rc0wn"; depends=[Rcpp RcppArmadillo]; }; l1kdeconv = derive2 { name="l1kdeconv"; version="1.1.0"; sha256="0dks5y49kpbw4iryjx5ai3sa052xk6vd8j729b43qjg2x08zdp34"; depends=[]; }; l2boost = derive2 { name="l2boost"; version="1.0"; sha256="1p0sbvlnax4ba4wjkh3r0bmjs601k590g7bdfk6wxvlj42jxcnkl"; depends=[MASS]; }; - laGP = derive2 { name="laGP"; version="1.3-2"; sha256="197mp5rlrfyp9aankbi1lw40vn7m9pkkq7rpr1a6y7x4sp3spr4m"; depends=[tgp]; }; + laGP = derive2 { name="laGP"; version="1.4"; sha256="186ab5j0r716jxk4gvaw78s2vafj24gy9qz0wbfhalkf1hp7yblw"; depends=[tgp]; }; labdsv = derive2 { name="labdsv"; version="1.8-0"; sha256="0rbf7cswnj534jdi5hfaai12nbxj6l96f02c73ynraqvdqxb1bnz"; depends=[cluster MASS mgcv]; }; label_switching = derive2 { name="label.switching"; version="1.6"; sha256="0k6f31gwcjfncsgd5cm9zygplif2wr8zjqrw4gmrnxcgp2z58a9w"; depends=[combinat lpSolve]; }; labeledLoop = derive2 { name="labeledLoop"; version="0.1"; sha256="0gq392h0sab8k7k8bzx6m7z5xpdsflldhwbpdf92zbmkbzxsz00m"; depends=[]; }; @@ -6548,9 +6841,10 @@ in with self; { labstats = derive2 { name="labstats"; version="1.0.1"; sha256="1780slp9l1rqwr5ika6hv606jzbaa3g1ywzkjkd3ff2gb0cby3ni"; depends=[]; }; laeken = derive2 { name="laeken"; version="0.4.6"; sha256="1rhkv1kk508pwln1d325iq4fink2ncssps0ypxi52j9d7wk78la6"; depends=[boot MASS]; }; laercio = derive2 { name="laercio"; version="1.0-1"; sha256="0la6fxv5k9zq4pyn8dxjiayx3vs9ksm9c6qg4mnyr9vs12z53imm"; depends=[]; }; + lagged = derive2 { name="lagged"; version="0.1-0"; sha256="0k6av8fk1i8kgpgcxcnxiik8zx1jibss9fj9br51rz4dkv7mhgmr"; depends=[]; }; lakemorpho = derive2 { name="lakemorpho"; version="1.1.0"; sha256="1qdh67a6a6iibvvba12z763xf989qfh08b3xgk1hy1irgc8myvll"; depends=[cluster geosphere maptools raster rgdal rgeos sp]; }; laketemps = derive2 { name="laketemps"; version="0.5.1"; sha256="04742r379bzgbfr4243wwkb26cvfmnw50jzgygq7vblq00grzska"; depends=[dplyr reshape2]; }; - lamW = derive2 { name="lamW"; version="1.2.0"; sha256="06kznvlrbllizw1byf5nrnpdk2hjjp0bf84wr9dcb5pph4pmnarl"; depends=[Rcpp RcppParallel]; }; + lamW = derive2 { name="lamW"; version="1.3.0"; sha256="00qa1sxyqb2r7f9yidg43cq2v1285f45xpm3z928jpi424mpg0fc"; depends=[Rcpp RcppParallel]; }; lambda_r = derive2 { name="lambda.r"; version="1.1.9"; sha256="1j6287iqvs3ill6r5g6ksf5809qp0l0nf20ib8266m1r09lc9j14"; depends=[]; }; lambda_tools = derive2 { name="lambda.tools"; version="1.0.9"; sha256="1wslxxh6rxny3n06y16dqwpczi3k42vrq4pbwwshl6kzhl56r45b"; depends=[lambda_r]; }; landest = derive2 { name="landest"; version="1.0"; sha256="1lp5sfqk0n7i23fmwjgzsabml1fsji1h9xq5khxzaz1bzqv1s08g"; depends=[survival]; }; @@ -6560,9 +6854,10 @@ in with self; { landscapeR = derive2 { name="landscapeR"; version="1.1.3"; sha256="0mgnm1gq19ybq7dwv5agxyrldiv4743np8b9r2ql2h6gwk8rp5f7"; depends=[raster]; }; languageR = derive2 { name="languageR"; version="1.4.1"; sha256="0grkhdjz9dcrgq6qwv7wpwmckn3mfv022c5wrx29b1dxafd0qzm0"; depends=[]; }; languagelayeR = derive2 { name="languagelayeR"; version="1.0.0"; sha256="0lca079nnqppbr7k5pfa7qfc879kws34hrxcs49y12qfv7hsk576"; depends=[httr magrittr rjson]; }; + lans2r = derive2 { name="lans2r"; version="1.0.5"; sha256="1m3hz85gl9m4vafdy7mj3z560d11mdwlwvnzy8n7d1cjqryn7a2b"; depends=[dplyr ggplot2 lazyeval R_matlab reshape2 tidyr]; }; lar = derive2 { name="lar"; version="0.1-2"; sha256="0qda0y4ag10kg83wxs3z754kc8c1dg2rwciy64klk7an4ln43i5b"; depends=[data_table treemap xlsx]; }; largeList = derive2 { name="largeList"; version="0.3.1"; sha256="0csijzlxajj0rh24w5n7fs6ss301zr6zfv5khyq4a9g437bwhc2i"; depends=[]; }; - largeVis = derive2 { name="largeVis"; version="0.2"; sha256="14rbgx68d9alxxm9w29mddh211d9ywdancyzwc2bg8862bqnsnqv"; depends=[ggplot2 Matrix Rcpp RcppArmadillo RcppProgress testthat]; }; + largeVis = derive2 { name="largeVis"; version="0.2.1"; sha256="0jzqkgs81xf3wgw8mx6mgvy2sgriakbhzbiizmbk24q177dw09bx"; depends=[ggplot2 Matrix Rcpp RcppArmadillo RcppProgress testthat]; }; lars = derive2 { name="lars"; version="1.2"; sha256="0blj44wqrx6lmym1m9v6wkz8zxzbjax2zl6swgdczci0ixb5nx34"; depends=[]; }; lasso2 = derive2 { name="lasso2"; version="1.2-19"; sha256="0zkwjsd42a6z4gylq9xbs4z8n1v7ncwvssjnn3h4yz1icjfzzlvk"; depends=[]; }; lassopv = derive2 { name="lassopv"; version="0.1.3"; sha256="07b7n74z4jvrirf0rc0sbvz9nm2s2s22mb8y973iwpf0i7fqxq2c"; depends=[lars]; }; @@ -6571,6 +6866,7 @@ in with self; { lasvmR = derive2 { name="lasvmR"; version="0.1.2"; sha256="1yzyfacr47wkpv9bblm7hvx1hgnzbhy1421bpnh95xfxxlzahy5n"; depends=[checkmate Rcpp]; }; latdiag = derive2 { name="latdiag"; version="0.2-3"; sha256="0i2mqk3ldg5kf4d8sfljgjsqbdin7v69anmc2rrxgy28bmvykf9d"; depends=[]; }; latentnet = derive2 { name="latentnet"; version="2.7.1"; sha256="0bjac9cid11pmhmi2gb4h3p4h9m57ngxx7p73a07afmfjk9p7h5m"; depends=[abind coda ergm mvtnorm network sna statnet_common]; }; + later = derive2 { name="later"; version="0.3"; sha256="18fm71bix5825a9aj40din0ij8c3bx9aq9j4cxb3if3m4gnwqvba"; depends=[BH Rcpp rlang]; }; latex2exp = derive2 { name="latex2exp"; version="0.4.0"; sha256="12nbcgfmv13k6sc6m326ras9bcvy380b7rxcxphn06r3cfkby0zw"; depends=[magrittr stringr]; }; lattice = derive2 { name="lattice"; version="0.20-35"; sha256="0pcnmaz3lr62ly0dcy5hnnqxshc4yqd43hrvlz3almgc9l7sna88"; depends=[]; }; latticeDensity = derive2 { name="latticeDensity"; version="1.0.7"; sha256="1y33p8hfmpzn8zl4a6zxg1q3zx912nhqlilca6kl5q156zi0sv3d"; depends=[spam spatstat spdep splancs]; }; @@ -6580,6 +6876,7 @@ in with self; { lavaan = derive2 { name="lavaan"; version="0.5-23.1097"; sha256="11wxzjg09q5wzvbp1lhi9sjnp4rrjpdxnmq3zf8npx08iwkw79ws"; depends=[MASS mnormt numDeriv pbivnorm quadprog]; }; lavaan_shiny = derive2 { name="lavaan.shiny"; version="1.2"; sha256="0qgswdpxb5af0l3v70sg0jrgsdwr88gz6zzwbk3pw5x6qnvnwb6r"; depends=[lavaan psych semPlot shiny shinyAce]; }; lavaan_survey = derive2 { name="lavaan.survey"; version="1.1.3.1"; sha256="133hpy8s00y6jzwwzl9brdh70w26jycdm3n1c6bcryghwh3ai4xr"; depends=[lavaan MASS survey]; }; + lavaanPlot = derive2 { name="lavaanPlot"; version="0.1.0"; sha256="13m4rsh0nbqfnyasbrf3bw844jg1l7bqd2drckrqwss2h7ks029q"; depends=[DiagrammeR lavaan]; }; lawn = derive2 { name="lawn"; version="0.3.0"; sha256="0rws76dzpi2gpn90la663r1g9ywvpvjicjmgb6z7k5xg1gspgs5c"; depends=[jsonlite magrittr V8]; }; lawstat = derive2 { name="lawstat"; version="3.1"; sha256="0sdsxh2h06d3maqd1pvmnnvphaxav0z2kv5wpiy7dg17cgwv35c2"; depends=[Hmisc Kendall mvtnorm VGAM]; }; lazy = derive2 { name="lazy"; version="1.2-15"; sha256="1pdqgvn0qpfg5hcg5159ccf5qj2nd1ibai9p85rwjpddfynk6jks"; depends=[]; }; @@ -6592,24 +6889,26 @@ in with self; { lbfgs = derive2 { name="lbfgs"; version="1.2.1"; sha256="0p99g4f3f63vhsw0s1m0y241is9lfqma86p26pvja1szlapz3jf5"; depends=[Rcpp]; }; lbfgsb3 = derive2 { name="lbfgsb3"; version="2015-2.13"; sha256="1jpy0j52w8kc8qnwcavjp3smvdwm1qgmswa9jyljpf72ln237vqw"; depends=[numDeriv]; }; lbiassurv = derive2 { name="lbiassurv"; version="1.1"; sha256="1i6l3y4rasqpqka7j39qjx22wjbilgc9pkp05an52aysfvfxy193"; depends=[actuar]; }; - lbreg = derive2 { name="lbreg"; version="1.0"; sha256="03pr5mjk3pfnlfafx6gk9xjsy4m5m7lj4zzvsngl95rr8hnnvvlf"; depends=[MASS]; }; + lbreg = derive2 { name="lbreg"; version="1.1"; sha256="13gzjkrnsdkxzinfzb0fvpijif8n66xxjmwfqpg99hgc13kn9y36"; depends=[MASS]; }; lcda = derive2 { name="lcda"; version="0.3"; sha256="1ximsyn6qw2gfn7b1hdpbjs6h6nk7hrignlii0np1lbf0k8l4xxl"; depends=[poLCA]; }; lclGWAS = derive2 { name="lclGWAS"; version="1.0.3"; sha256="03b6ijqvyirv96hc3dsqf4f0zzqlmq5451mcb14d2mw3s6xy1vmq"; depends=[BH Rcpp]; }; - lcmm = derive2 { name="lcmm"; version="1.7.7"; sha256="079673yy6ljk8nj06pcf1wh83j1dh3klp50zssvfgz1cxph8h471"; depends=[survival]; }; + lcmm = derive2 { name="lcmm"; version="1.7.8"; sha256="180xfx842sic5qnfr0zh2h4345zkzlf123pdw4q6gd0mi5smwwc7"; depends=[survival]; }; lcopula = derive2 { name="lcopula"; version="1.0"; sha256="07a9k5fp03s6jnjawg11j4458xrsrrqxv6kf3cs58ymv0j2s1qyd"; depends=[copula pcaPP Rcpp]; }; lctools = derive2 { name="lctools"; version="0.2-5"; sha256="02xbcmdz12vxi1hjrhibavnf792lqpjraknxz6sqz7fhfqrd8qbq"; depends=[MASS pscl reshape weights]; }; lda = derive2 { name="lda"; version="1.4.2"; sha256="03r4h5kgr8mfy44p66mfj5bp4k00g8zh4a1mhn46jw14pkhs21jn"; depends=[]; }; ldamatch = derive2 { name="ldamatch"; version="1.0.1"; sha256="1dmmjw7h0rrgwga7235bryzzvmx68gmkpy5v1pwvnkk4rxp8xamh"; depends=[car data_table entropy foreach gmp iterators iterpc kSamples MASS RUnit]; }; ldatuning = derive2 { name="ldatuning"; version="0.2.0"; sha256="18nm4hj7733c1cp03hyddnivhiiyv7ndnw9m6j3af019jjmvf215"; depends=[ggplot2 reshape2 Rmpfr scales slam topicmodels]; }; - ldbod = derive2 { name="ldbod"; version="0.1.1"; sha256="1c34k16d740b8xfb6b2igl12hzqll87dsgm631ksp53v7j3qg7pz"; depends=[mnormt RANN]; }; + ldbod = derive2 { name="ldbod"; version="0.1.2"; sha256="1ylzkswnhf4jnjx2ijasy49pj78ffx333za0bx2fnf3g85kicqiv"; depends=[mnormt RANN]; }; ldbounds = derive2 { name="ldbounds"; version="1.1-1"; sha256="15ixrq615x64zmi6dryq3ww0dqxd0qf5xx1bs3w934sf99l46bhs"; depends=[lattice]; }; - ldhmm = derive2 { name="ldhmm"; version="0.1.0"; sha256="19m1zdbksxx0f6zkky38kym0qba76p51zgc0i9rjn20ql41w8fdb"; depends=[ecd moments xts zoo]; }; + ldhmm = derive2 { name="ldhmm"; version="0.4.1"; sha256="1bg41nw5pab5lrhqashdzyqsqx7al4fbfz3vvl7wbk0hlf4r9mi6"; depends=[ecd ggplot2 moments optimx scales xts zoo]; }; ldlasso = derive2 { name="ldlasso"; version="3.2"; sha256="0ij68zvgm8dfd2qwx6h6ygndac29qa0ddpf11z959v06n8jsnk11"; depends=[GenABEL quadprog]; }; ldr = derive2 { name="ldr"; version="1.3.3"; sha256="1c48qm388zlya186qmsbxxdcg1mdv3nc3i96lqb40yhcx2yshbip"; depends=[GrassmannOptim Matrix]; }; ldstatsHD = derive2 { name="ldstatsHD"; version="1.0.0"; sha256="1phz9hwhfw7lcvz5gg0l3w3j3jig0bw4wxbx6j4z7dlr4bisyng8"; depends=[camel cluster corpcor evd fExtremes huge igraph MASS Matrix RBGL robustbase VGAM]; }; leaderCluster = derive2 { name="leaderCluster"; version="1.2"; sha256="1lqhckarqffm2l3ynji53a4hrfn0x7zab7znddia76r2h6nr02zb"; depends=[]; }; leaflet = derive2 { name="leaflet"; version="1.1.0"; sha256="05faikqdlbsj9lvl1lvhmagys71597jvgah8b9f1fqhgyj0bwx7l"; depends=[base64enc crosstalk htmltools htmlwidgets magrittr markdown png raster RColorBrewer scales sp viridis]; }; - leaflet_minicharts = derive2 { name="leaflet.minicharts"; version="0.1.0"; sha256="0y7vyv245arr286j75yap6caq3bw0k147p3p5br0kw4nd6v85jgx"; depends=[htmltools leaflet]; }; + leaflet_esri = derive2 { name="leaflet.esri"; version="0.2"; sha256="18y3hzbn4apn209rww8hk4mkx5ix6b6z01ydr31d39bqlgg6n7zf"; depends=[htmltools htmlwidgets leaflet leaflet_extras magrittr shiny]; }; + leaflet_extras = derive2 { name="leaflet.extras"; version="0.2"; sha256="1baxcgcxizyf05w8gb5zjmvrsbrhpwvrxrblcv5vpy4vk73921v1"; depends=[htmltools htmlwidgets leaflet magrittr shiny stringr]; }; + leaflet_minicharts = derive2 { name="leaflet.minicharts"; version="0.4.0"; sha256="0k3wv2n6vwj5wcls0jr95n2lckvmigz3j57ynn8fp2ycdf8k1y8i"; depends=[htmltools leaflet]; }; leafletCN = derive2 { name="leafletCN"; version="0.2.1"; sha256="1rg39n4bjacwss9nbdnz8y2zh8hxlc7a5ygndhjbmzajnbxfh09b"; depends=[htmltools jsonlite leaflet magrittr rgeos sp]; }; leafletR = derive2 { name="leafletR"; version="0.4-0"; sha256="0j1i971dl3smq8rcsa5s4rfmmk936k2q6xa4hppfzwhrxs3xkkkx"; depends=[brew jsonlite]; }; leapp = derive2 { name="leapp"; version="1.2"; sha256="1yiqzmhgl5f3zwpcc5sz3yqrvp8p6r4w2ffdfyirirayqc96ar17"; depends=[corpcor MASS sva]; }; @@ -6617,37 +6916,43 @@ in with self; { learNN = derive2 { name="learNN"; version="0.2.0"; sha256="0q0j25vi7hrwaf38y10m24czf3rsvj937jvkz3ns12bd8srlflah"; depends=[]; }; learningCurve = derive2 { name="learningCurve"; version="1.1.1"; sha256="1rvh6i3vmwrff491k9w551402m3i9sra8rzkljgk9b5fmw7hk5ki"; depends=[ggplot2 gridExtra scales tidyverse]; }; learningr = derive2 { name="learningr"; version="0.29"; sha256="1nr4ydcq2mskv4c0pmf0kxv5wm8pvjqmv19xz5yaq0j834b0n5q7"; depends=[plyr]; }; + learnr = derive2 { name="learnr"; version="0.9"; sha256="0iz2wr999h7wamjfkg8frrm3y088hvfj7nswh9ya6amly0adglcr"; depends=[evaluate htmltools htmlwidgets jsonlite knitr markdown rappdirs rmarkdown rprojroot shiny withr]; }; + learnrbook = derive2 { name="learnrbook"; version="0.0.2"; sha256="1k17dk8ahn1ifwid1hhx0k7fpgc62zg82y66bbf6nhd4dgdbbv2p"; depends=[]; }; learnstats = derive2 { name="learnstats"; version="0.1.1"; sha256="1sa064cr7ykl4s1ssdfmb3v1sjrnkbwdh04hmwwd9b3x0llsi9vv"; depends=[ggplot2 Rcmdr shiny]; }; lefse = derive2 { name="lefse"; version="0.1"; sha256="1zdmjxr5xa5p3miw79mhsswsh289hgzfmn3mpj1lyzal1qgw1h5m"; depends=[ape fBasics geiger picante SDMTools vegan]; }; leiv = derive2 { name="leiv"; version="2.0-7"; sha256="15ay50886xx9k298npyksfpva8pck7fhqa40h9n3d7fzvqm5h1jp"; depends=[]; }; + lemon = derive2 { name="lemon"; version="0.3.0"; sha256="1ivam4b4sgvadazqn9f3dr5ffal723yk3l5rw35p8rmc3kmlhn7z"; depends=[ggplot2 gridExtra gtable knitr lattice RCurl]; }; lero_lero = derive2 { name="lero.lero"; version="0.1"; sha256="1jndsgy48fn085ilkh8dfc3w76kfnfj0x70d1m3h59zxi3x9lb82"; depends=[stringr]; }; - lessR = derive2 { name="lessR"; version="3.6.0"; sha256="0a2l1gmpfbwkxavih4h1w7rzibgf6zql7k2nzck05f0pyzd0bvvx"; depends=[ellipse foreign lattice latticeExtra leaps png readxl sas7bdat triangle]; }; + lessR = derive2 { name="lessR"; version="3.6.2"; sha256="12da2iv56m58b4a26b01xlcbklkmgvwhjlxr7nk53yd6n21byzzz"; depends=[ellipse foreign lattice latticeExtra leaps png readxl sas7bdat triangle]; }; lestat = derive2 { name="lestat"; version="1.8"; sha256="12w3s5yr9lsnjkr3nsay5sm4p241y4xz0s3ir56kxjqw23g6m80v"; depends=[MASS]; }; - letsR = derive2 { name="letsR"; version="2.6"; sha256="19gs0xlbjvx95047pzzl36x42898qkc61qgr1isavf7hph41ak46"; depends=[fields geosphere maps maptools raster rgdal rgeos sp XML]; }; + letsR = derive2 { name="letsR"; version="3.0"; sha256="1mm0d7v29d594w2xxv6h1k6dsav2cs31hi64lyxjar1bi4snp6hj"; depends=[fields geosphere maps maptools raster rgdal rgeos sp XML]; }; lettercase = derive2 { name="lettercase"; version="0.13.1"; sha256="0s2s42v6a3mlz6084sk5wcbap3czgbd53f9p64pxwd1yfj18lbyx"; depends=[stringr]; }; - lexRankr = derive2 { name="lexRankr"; version="0.4.0"; sha256="149q96yyag375ggflrginim9phbmqaap3hpgjx02rqmbdf38dywg"; depends=[dplyr igraph magrittr Rcpp SnowballC stringr tidyr tm]; }; + lexRankr = derive2 { name="lexRankr"; version="0.4.1"; sha256="09pqpa0ps7j3s86d9njfa2qpgiadlhz96pwvgdiad8ninwk1j8b0"; depends=[dplyr igraph magrittr Rcpp SnowballC stringr tidyr tm]; }; lexicon = derive2 { name="lexicon"; version="0.3.1"; sha256="1r4sjn2490f4df7bgivani0m1ghxfn1kxyc3bp82305kwj8y70sh"; depends=[data_table syuzhet]; }; lfactors = derive2 { name="lfactors"; version="1.0.1"; sha256="13vjafbss0860fi4qcf23g3cjs9dlr2k5f3majbnyvhwsbfs7cla"; depends=[]; }; lfda = derive2 { name="lfda"; version="1.1.2"; sha256="0y59iigcpmyrmsiwrpv5agja6vz3wxmxd9sl5hbf1ybm4d0lyky4"; depends=[plyr rARPACK]; }; lfe = derive2 { name="lfe"; version="2.5-1998"; sha256="0i1vs9m8a9dadansczwg7jbah73bnxvidrld9inf8xyi8x15265z"; depends=[Formula Matrix sandwich xtable]; }; - lfl = derive2 { name="lfl"; version="1.3"; sha256="14x731f4gnwisd0l14l03bpmn4m2rizdfrc36bjh3lvjbv0raqhs"; depends=[e1071 foreach forecast plyr Rcpp tseries zoo]; }; + lfl = derive2 { name="lfl"; version="1.4"; sha256="09ni0n7xqn3qw9jjh24j679cyzgf0cxxw535ap4z44jjk29bqngw"; depends=[e1071 foreach forecast plyr Rcpp tseries zoo]; }; lfstat = derive2 { name="lfstat"; version="0.9.4"; sha256="0lm9fyw45kdkkjldkmagykn9p3l3jlw2ky3h00f7j6rqkizjm6r0"; depends=[dygraphs lattice latticeExtra lmom lmomRFA plyr xts zoo]; }; lga = derive2 { name="lga"; version="1.1-1"; sha256="1nkvar9lmdvsc3c21xmrnpn0haqk03jwvc9zfxvk5nwi4m9457lg"; depends=[boot lattice]; }; lgarch = derive2 { name="lgarch"; version="0.6-2"; sha256="05xksc4d6dbf5ls4lf2gpk9xyi99fikr7dva88b84rfgads1yhrh"; depends=[zoo]; }; lgcp = derive2 { name="lgcp"; version="1.4"; sha256="10gnfqq5vx18w6f52fliyfnrjmyns9q5q59pn2m82q2fqwaz26d8"; depends=[fields iterators maptools Matrix ncdf4 RandomFields raster rgeos rpanel sp spatstat spatstat_utils]; }; lgtdl = derive2 { name="lgtdl"; version="1.1.4"; sha256="0y519hgrm2ynbhbs61vi8gkhwqgn69wpnd391wpgf4yrg2lx064b"; depends=[]; }; + lhmixr = derive2 { name="lhmixr"; version="0.1.0"; sha256="1c4ydgq1z2y0xk8xqdsim6xvgxdbl3gglfk5kcr9k4m01arvv0rf"; depends=[]; }; lhs = derive2 { name="lhs"; version="0.14"; sha256="1qnr3s9511nq3xqdbngllmw3mvnnpblma5dafyghxlpvydc2l481"; depends=[]; }; libamtrack = derive2 { name="libamtrack"; version="0.6.3"; sha256="0pdwrz19q1yls0rgr4579f31j86awizx3j31h7vdh6y70ngpmb82"; depends=[]; }; libcoin = derive2 { name="libcoin"; version="0.9-2"; sha256="0bya71i853vjg8wdbnm70c1fzx5az7a2bsf6s41ysd020ixdg1jj"; depends=[mvtnorm]; }; libsoc = derive2 { name="libsoc"; version="0.5"; sha256="0p01mcwnkb4g3dq0mx1gbwfbznp4b2dmhs8k8wmnh7wll16v9i6z"; depends=[]; }; - lidR = derive2 { name="lidR"; version="1.2.0"; sha256="177lqglhs4fmyf7818z1klirxjm5rrpghjkzrdi19sgw137w9ljm"; depends=[data_table geometry gstat lazyeval magrittr RANN raster Rcpp RcppProgress rgeos rgl rlas]; }; + libstableR = derive2 { name="libstableR"; version="1.0"; sha256="0qk70rl76lz2izgp2c1asx0yvi8xgfq1yg579kcygxk4pnxjdwv4"; depends=[Rcpp]; }; + lidR = derive2 { name="lidR"; version="1.2.1"; sha256="0kaz9v75raicrjjg4xwzm9qgljpa95ki716a78bj95kcqc556104"; depends=[data_table geometry gstat lazyeval magrittr RANN raster Rcpp RcppProgress rgeos rgl rlas settings sp]; }; lifecontingencies = derive2 { name="lifecontingencies"; version="1.2.3"; sha256="1gkvrzcmcic3rzbcfp5lif4zfc94bhfm36i3ajzaczwjhg2dwivs"; depends=[markovchain Rcpp]; }; lifecourse = derive2 { name="lifecourse"; version="2.0"; sha256="1m8ihqvzhzpq2m2pdvh37bpq9pdbj23r3y0jkl3q8farh3qj473d"; depends=[TraMineR]; }; + lifelogr = derive2 { name="lifelogr"; version="0.1.0"; sha256="1wygvw61ygpww0kahxhmjdncwg4zc2cshs0brzw18nfqaj8vpfav"; depends=[dplyr fitbitScraper ggplot2 lazyeval lubridate modelr plyr R6 shiny stringr tibble tidyr]; }; lift = derive2 { name="lift"; version="0.0.2"; sha256="0ynsyl6lw7z7bvwzk2idgxzzqji5ffnnc3bll9h4gwdw666g7fln"; depends=[]; }; liftLRD = derive2 { name="liftLRD"; version="1.0-5"; sha256="0v0aczf9s3vr9kk7n6z9spwc82hf418v9vjiyfri3npn3ib112b7"; depends=[adlift nlt]; }; liftr = derive2 { name="liftr"; version="0.5"; sha256="0pk1w9h83ixf3ia4qxcb85i0n4jr5hfry6rc3yx3pki3r7wlqyam"; depends=[knitr rmarkdown rstudioapi stringr yaml]; }; lightsout = derive2 { name="lightsout"; version="0.3"; sha256="0ypniqf9wk35dd9j57wd7gxchr5hy25fwhmkndz2z8b9ajhm3c9b"; depends=[magrittr shiny shinyjs]; }; - likeLTD = derive2 { name="likeLTD"; version="6.2.0"; sha256="14wyh46hk98jdmpmg1br4x7pc97zkh49k2pgq6yfsigax6l9vd8i"; depends=[DEoptim gdata ggplot2 gtools rtf]; }; + likeLTD = derive2 { name="likeLTD"; version="6.2.1"; sha256="1b5rg1nijc4vsl7xabq35ini84rpnd1yrxsk1vr7wd57yac25mmk"; depends=[DEoptim gdata ggplot2 gtools rtf]; }; likelihood = derive2 { name="likelihood"; version="1.7"; sha256="0q8lvwzlniijyzsznb3ys4mv1cqy7ibj9nc3wgyb4rf8676k4f8v"; depends=[nlme]; }; likelihoodAsy = derive2 { name="likelihoodAsy"; version="0.45"; sha256="0sl0q6w49l89i6s80scsr5lrr8jgdd0788i4b87w985zaxjqrh03"; depends=[alabama cond nleqslv pracma Rsolnp]; }; likert = derive2 { name="likert"; version="1.3.5"; sha256="0c4irxs7pp1z8nj4s8cq23daw4h94n3h7x4f6q1d85614qcl9l3p"; depends=[ggplot2 gridExtra plyr psych reshape2 xtable]; }; @@ -6656,15 +6961,16 @@ in with self; { linERR = derive2 { name="linERR"; version="1.0"; sha256="1mhiyqfpwagg161ncp5ndd22hlh12qzr360nms13rgyd8a077cq7"; depends=[survival]; }; linLIR = derive2 { name="linLIR"; version="1.1"; sha256="1v5bwki5j567x2kndfd5nli5i093a33in31025h9hsvkbal1dxgp"; depends=[]; }; linbin = derive2 { name="linbin"; version="0.1.2"; sha256="0shw976nlryjvmvnyyiycchqs7zcg5flalywm1ymnv62nw3n55xs"; depends=[]; }; + lindia = derive2 { name="lindia"; version="0.9"; sha256="1qma8wr0fkwx03x971crkh8cfc8z4374py1r1wvszj9wzi4vfp5r"; depends=[ggplot2 gridExtra MASS]; }; linear_tools = derive2 { name="linear.tools"; version="1.3.0"; sha256="14lp3gifzbid82lkr7rdqajz2abp8m7y8irpwx6s8w66djjfckda"; depends=[ggplot2 magrittr plyr pryr scales stringr]; }; lineup = derive2 { name="lineup"; version="0.37-6"; sha256="1xyvw00lwnx7j3cgk4aw69lam6ndjxx3wj14h4jpx1xn8l3w7652"; depends=[class qtl]; }; - lingtypology = derive2 { name="lingtypology"; version="1.0.3"; sha256="07xm01a9xw0k2kxl08b22182wxdrm16c2qlwbq3sphbq0zznfxb1"; depends=[leaflet magrittr rowr stringdist]; }; + lingtypology = derive2 { name="lingtypology"; version="1.0.5"; sha256="1k906zny4kz9jfv490fyg3mwhdkbfpravwviq4qlaqrmi1jk0wwb"; depends=[leaflet magrittr MASS rowr sp stringdist]; }; link2GI = derive2 { name="link2GI"; version="0.1-0"; sha256="1i16yf387izv8vn0z8f7wgk02hld83lhfb5c263mn1v3q5zj9kki"; depends=[gdalUtils raster rgdal rgrass7 sf sp]; }; linkR = derive2 { name="linkR"; version="1.1.1"; sha256="1748r7s5g0gvsmghrb7l5lmdbzb9f4vkbgj51v308jr64r1k7l93"; depends=[svgViewR]; }; linkcomm = derive2 { name="linkcomm"; version="1.0-11"; sha256="1w5sfmzvrk30fr161pk0cy5nj8kasqm6hqgyafq6r280b5s272cb"; depends=[dynamicTreeCut igraph RColorBrewer]; }; linkim = derive2 { name="linkim"; version="0.1"; sha256="0yvyid9x59ias8h436a202hd2kmqvn8k1zcrgja2l4z2pzcvfn91"; depends=[]; }; linprog = derive2 { name="linprog"; version="0.9-2"; sha256="1ki14an0pmhs2mnmfjjvdzd76pshiyvi659zf7hqvqwj0viv4dw9"; depends=[lpSolve]; }; - lintools = derive2 { name="lintools"; version="0.1.1.3"; sha256="0jxy7wp7jg02d59fb3cdhpmnqzdxrdvs858g3yfamx6fjgb6bd8i"; depends=[]; }; + lintools = derive2 { name="lintools"; version="0.1.1.4"; sha256="18rqpm0cg233hclcqskdh3mfpwpbawc582j800mjalii233jzr36"; depends=[]; }; lintr = derive2 { name="lintr"; version="1.0.0"; sha256="0d03lwr96pdvkdxgjlrzj591dkaxm2rbdk2n3jgr1k428v6jkzy0"; depends=[codetools crayon digest httr igraph jsonlite knitr rex rstudioapi stringdist testthat]; }; liqueueR = derive2 { name="liqueueR"; version="0.0.1"; sha256="0rpjib0dz39la63gy9bw9gmdfq2fcx40y4y4wcb6ky41qcjdp1nd"; depends=[itertools]; }; liquidSVM = derive2 { name="liquidSVM"; version="1.0.1"; sha256="1440zkna0l79q1klfl91gif90q9fp0g05lyrvbbslhvcynwkgj7y"; depends=[]; }; @@ -6673,21 +6979,21 @@ in with self; { lisp = derive2 { name="lisp"; version="0.1"; sha256="025sq46277q9i21189cbmx5dnrh5wfshc5k6la1wjilhr1iqf6nj"; depends=[]; }; lisrelToR = derive2 { name="lisrelToR"; version="0.1.4"; sha256="0zicq0z3hhixan1p1apybnf3v5s6v6ysll4pcz8ivygwr2swv3p5"; depends=[]; }; list = derive2 { name="list"; version="8.3"; sha256="1wffh7xmhdf4hqbpz4ij0759zk0y0zsm160kzfcr2n8s9wdgm5gj"; depends=[coda corpcor gamlss_dist magic MASS mvtnorm quadprog sandwich VGAM]; }; - listWithDefaults = derive2 { name="listWithDefaults"; version="1.1.0"; sha256="1fbip2rs82l4s85ag147clkwb5spwr07dyh2c7n6vw1i4h1w0v5x"; depends=[assertthat]; }; + listWithDefaults = derive2 { name="listWithDefaults"; version="1.2.0"; sha256="1rv9jq9zlr5dm08mimba6ni2p5vkfybrgrqk1alm7y6mqpx56byp"; depends=[assertthat]; }; listdtr = derive2 { name="listdtr"; version="1.0"; sha256="08drps03nndpdxswyv8bjm1bcckjav5pjj7fdx3dzyn0v4dfy619"; depends=[ggplot2]; }; listenv = derive2 { name="listenv"; version="0.6.0"; sha256="0kyq90mf7wv9qgw3s81iv0b8ah0ncc5kv15r7fv6ggdq4f0z0dx7"; depends=[]; }; listless = derive2 { name="listless"; version="0.0-2"; sha256="1gr6l4vih7j28kg2mj1xj2yhlpwjc4p894vsxri25vq0r9kgcdym"; depends=[magrittr tidyr]; }; listviewer = derive2 { name="listviewer"; version="1.4.0"; sha256="1273vk8pk393ciwahvpmdh9z4xdlhw3a7mlm7jsqxqnsrc6jrz3x"; depends=[htmltools htmlwidgets shiny]; }; liteq = derive2 { name="liteq"; version="1.0.0"; sha256="1r3rbn0a5nnwrhfdygn1hlvv0n3nd1ayddvkpdv5ibsp5fl5vjhy"; depends=[assertthat DBI rappdirs RSQLite]; }; littler = derive2 { name="littler"; version="0.3.2"; sha256="0anwlxyj82xgrccb3pf6glrkqbkw1871hj4b1qrkmd5ss2f3xq9j"; depends=[]; }; - liureg = derive2 { name="liureg"; version="1.0"; sha256="1xpk7fis8qmfc853nzqzbs6f9ibix0vrh3f6h96m33hmzyqr7pgi"; depends=[]; }; + liureg = derive2 { name="liureg"; version="1.01"; sha256="0qk1wgib4cljfq9qp99p5ls68d665m42cn4nkqmqjf1na96lq7ll"; depends=[]; }; livechatR = derive2 { name="livechatR"; version="0.1.0"; sha256="1k0z6q3s9iw962m1lwlx45p95flzl5jg1xh6ng426v9jh1yyrbb2"; depends=[data_table dplyr jsonlite magrittr purrr]; }; ljr = derive2 { name="ljr"; version="1.4-0"; sha256="0jby94ml8w6pwnxbmv6qfjww2myvvnn9vrmlqpdh71dhgp3z35py"; depends=[]; }; llama = derive2 { name="llama"; version="0.9.1"; sha256="1cvm58kivjw77a2fy1jwsajzl1d0i3i123p6glpwdlqn6rlharck"; depends=[BBmisc checkmate ggplot2 mlr parallelMap plyr rJava]; }; lle = derive2 { name="lle"; version="1.1"; sha256="09wq7mzw48czp5k0b4ij399cflc1jz876fqv0mfvlrydc9igmjhk"; depends=[MASS scatterplot3d snowfall]; }; lllcrc = derive2 { name="lllcrc"; version="1.2"; sha256="06n1fcd3g3z5rl2cyx8jhyscq9fb52mmh0cxg81cnbmai3sliccb"; depends=[combinat data_table plyr VGAM]; }; lm_beta = derive2 { name="lm.beta"; version="1.5-1"; sha256="0p224y9pm72brbcq8y1agkcwc82j7clsnszqzl1qsc0gw0bx9id3"; depends=[]; }; - lm_br = derive2 { name="lm.br"; version="2.8"; sha256="019j0ypl4cdnl29r9x17m62jnpp1p174zmy3zdy8bvp52kz4008r"; depends=[Rcpp]; }; + lm_br = derive2 { name="lm.br"; version="2.9.3"; sha256="1xadz0rygm58igk0ig0w45132gnsvjxvwqzca4m6v6i6lz9x55pf"; depends=[Rcpp]; }; lmPerm = derive2 { name="lmPerm"; version="2.1.0"; sha256="1ss2hcfxqvfq4n6hypv7jp0n0apby9payxzaswaysr5368lkidn3"; depends=[]; }; lmSupport = derive2 { name="lmSupport"; version="2.9.8"; sha256="1g96540krrvycy7m3avhwazkmnyngk9lrjggny4wxhzn49i8p4ga"; depends=[AICcmodavg car gplots gvlma lme4 pbkrtest psych pwr]; }; lme4 = derive2 { name="lme4"; version="1.1-13"; sha256="13j4a721rx0272pdxrz6nabjv56xb6srklq5w4z1abc82lyvda2z"; depends=[lattice MASS Matrix minqa nlme nloptr Rcpp RcppEigen]; }; @@ -6705,7 +7011,7 @@ in with self; { lmfor = derive2 { name="lmfor"; version="1.2"; sha256="1lad1sfrf6lsksix4nn2c2dc5fx0rfm4kdhvbmqf9dc55f98rla8"; depends=[MASS nlme]; }; lmm = derive2 { name="lmm"; version="1.0"; sha256="0x5ikb1db99dsn476mf4253dlznlxa1cwnykg1nwnm2vy5qym2fq"; depends=[]; }; lmmlasso = derive2 { name="lmmlasso"; version="0.1-2"; sha256="1mvd38k9npyc05a2x7z0908qz9x4srqgzq9yjyyggplqfrl4dgsz"; depends=[emulator miscTools penalized]; }; - lmmot = derive2 { name="lmmot"; version="0.1.3"; sha256="1wpqcyscbqv9l8kl4lg5xg6cs3vc496jwpyj5y4iqmks88hgi6il"; depends=[MASS maxLik]; }; + lmmot = derive2 { name="lmmot"; version="0.1.4"; sha256="1a8msh9yvvd7cv1zxlxdv8arlfvxqghxzcxls23v6ifl5jf4d1p3"; depends=[MASS maxLik]; }; lmms = derive2 { name="lmms"; version="1.3.3"; sha256="1gralhk9plmpmdya7cfzgzwzr8ab47pz4f76kvlp03sp5gcy4063"; depends=[gdata ggplot2 gplots gridExtra lmeSplines nlme reshape2]; }; lmodel2 = derive2 { name="lmodel2"; version="1.7-2"; sha256="0dyzxflr82k7ns824zlycj502jx3qmgrck125im2k2da34ir3m3q"; depends=[]; }; lmom = derive2 { name="lmom"; version="2.5"; sha256="0s2x8k6p71hxdqggy8ajk7p9p040b9xr3lm49g31z3kcsmzvk23q"; depends=[]; }; @@ -6713,7 +7019,7 @@ in with self; { lmomco = derive2 { name="lmomco"; version="2.2.7"; sha256="1xrw2a3iyp0i2kmcwgq0sr10v40q5c2n84xx8dxpvl3978vqidj8"; depends=[goftest Lmoments MASS]; }; lmridge = derive2 { name="lmridge"; version="1.0"; sha256="07zchmdcyz8agrs9q2ydcgicz3sxg893vv4rsynlpgyk2z5xnnjf"; depends=[]; }; lmtest = derive2 { name="lmtest"; version="0.9-35"; sha256="107br1l7p52wxvazs031f4h5ryply97qywg9dzrkw4ydnvqq4j9g"; depends=[zoo]; }; - lmvar = derive2 { name="lmvar"; version="1.1.0"; sha256="08m7z9mm4pk5x3a2kll9hvkxw3r7lzqpxwp0pgcyxxdygc6xgzjq"; depends=[Matrix matrixcalc maxLik]; }; + lmvar = derive2 { name="lmvar"; version="1.2.1"; sha256="0zgrrf8ilppzk030zqpqaw95fq0mh098qd5rgg4bpykzq1gfq58d"; depends=[Matrix matrixcalc maxLik]; }; loa = derive2 { name="loa"; version="0.2.38"; sha256="1k57n3j8nh0frgabhb5gh0scmgp5gzn2zc9l206mklbw06jkdp96"; depends=[lattice MASS mgcv png RColorBrewer RgoogleMaps]; }; localdepth = derive2 { name="localdepth"; version="0.5-7"; sha256="0h0y74xnhdqa7y51ljmpz7ayznppvy2ll06wfds6200lb9cxgr7k"; depends=[circular]; }; localgauss = derive2 { name="localgauss"; version="0.40"; sha256="0y0pcg2i7lr4wipxawn06hy0q11znhcn2ah6rqwnlyy8pab70pyq"; depends=[foreach MASS matrixStats]; }; @@ -6723,9 +7029,11 @@ in with self; { locits = derive2 { name="locits"; version="1.7.3"; sha256="0sjnwqiqwzdkglvbdxbkg17gjp0vyqvywsy0qq7adxj5hh0yah05"; depends=[igraph wavethresh]; }; locpol = derive2 { name="locpol"; version="0.6-0"; sha256="1zpdh3g7yx3rcn3rhlc3dm19c4b9kx2k8wy8vkwh744a1kysvdga"; depends=[]; }; lodGWAS = derive2 { name="lodGWAS"; version="1.0-7"; sha256="0g5b44d3wb5hnx5l2n76myb1pc9ml3a052n1a4gvgqapa5as35s2"; depends=[rms survival]; }; + loder = derive2 { name="loder"; version="0.1.2"; sha256="15bgspig46nspnslazjgwv54kscimn3zzda6fqcmld3zjhcwl333"; depends=[]; }; loe = derive2 { name="loe"; version="1.1"; sha256="1n16pgfxg9vcn729xxjbbvavg2ywbdcch9v2ph8nv3z7psc0q46c"; depends=[MASS]; }; log4r = derive2 { name="log4r"; version="0.2"; sha256="07q8m7z2sxm6n25a62invf76qakxdsijfh3272spc8xrmdmyw6rj"; depends=[]; }; - logbin = derive2 { name="logbin"; version="2.0.2"; sha256="08v8i6jlnlngvh977ndknhw2d9538nq6wy9fwnsdwp2m2ckh2w3j"; depends=[glm2 turboEM]; }; + logOfGamma = derive2 { name="logOfGamma"; version="0.0.1"; sha256="0r7di0l646ycfmdjk8hli6b0v7qj0i8z3i8i7rwd3fsblb2q22vd"; depends=[]; }; + logbin = derive2 { name="logbin"; version="2.0.3"; sha256="0jvld5lh69288g80ypvqyg0s0nip9hgd8p09b91xp11vnlap0g02"; depends=[glm2 turboEM]; }; logconPH = derive2 { name="logconPH"; version="1.5"; sha256="05fkibgh5nzs8c4f39kzg4zyh2dfhg1k69hlx7l8p442snajsg92"; depends=[]; }; logconcens = derive2 { name="logconcens"; version="0.16-4"; sha256="11bk03kjlb747g54axmb0nayz226g41xvanbw79aij76vjbglv7y"; depends=[]; }; logcondens = derive2 { name="logcondens"; version="2.1.5"; sha256="1sq27klnphp74hq0l0460m9bb7lrl06mpgkg4qq8iciy3yy1mrkj"; depends=[ks]; }; @@ -6733,6 +7041,7 @@ in with self; { logcondiscr = derive2 { name="logcondiscr"; version="1.0.6"; sha256="08wwxsrpflwbzgs6vb3r0f52hscxz1f4q0xabr1yqns06gir1kxd"; depends=[cobs Matrix mvtnorm]; }; logging = derive2 { name="logging"; version="0.7-103"; sha256="1sp7q217awizb6l8c9p5dix6skpq8j7w8i088x4mm0fc0qr1ba5c"; depends=[]; }; logistf = derive2 { name="logistf"; version="1.22"; sha256="0npwqbl8rfvn6w2y0qpkckj44mvjjccj0cn9axp2wcs03cmz0rp8"; depends=[mgcv mice]; }; + logistic4p = derive2 { name="logistic4p"; version="1.5"; sha256="0h0dxyklqc95ykyril1a3d2bdnszj5l9dqbxzh2wbfmk06prvh8b"; depends=[MASS]; }; logisticPCA = derive2 { name="logisticPCA"; version="0.2"; sha256="07ikyn127ld0fjdw7x911wrswqwqpw4lbcz0iffvh6jfjkgyk341"; depends=[ggplot2]; }; logitchoice = derive2 { name="logitchoice"; version="0.9.4"; sha256="1vkw7cwp7nwrsj9ifn4gz21zbw9da5rph9lr3w466zxkzdkbldqj"; depends=[]; }; logitnorm = derive2 { name="logitnorm"; version="0.8.34"; sha256="08jm49picrxbwr8d0c64z5gbslrliq674vr0h30gljf3r9w6s5jj"; depends=[]; }; @@ -6759,7 +7068,7 @@ in with self; { lpSolveAPI = derive2 { name="lpSolveAPI"; version="5.5.2.0-17"; sha256="1gfxnjkhhyybhyg29qdrdqzwq569b6pgwjgacmw3q7aldc724cyz"; depends=[]; }; lpbrim = derive2 { name="lpbrim"; version="1.0.0"; sha256="1cbkzl23vgs9hf83ggkcnkmxvvj8867k5b9vhfdrznpqyqv1f2gp"; depends=[Matrix plyr RColorBrewer]; }; lpc = derive2 { name="lpc"; version="1.0.2"; sha256="1r6ynkhqjic1m7fqrqsp7f8rpxqih5idn4j96fqrdj8nj01znv29"; depends=[]; }; - lpdensity = derive2 { name="lpdensity"; version="0.2"; sha256="1kjh6zw2g6izhnjrnr71lccryg2s89zlvc1q73cf7p62lnnmaqnz"; depends=[ggplot2]; }; + lpdensity = derive2 { name="lpdensity"; version="0.2.1"; sha256="15an4ixk1kci1kv5mg0n31wjzby75xnj59z0sxfz2ixvmqw9yq3q"; depends=[ggplot2]; }; lpint = derive2 { name="lpint"; version="2.0"; sha256="0p1np8wlfbax0c7ysc5fs9dai8s00h1v0gan89dbd6bx06307w2r"; depends=[]; }; lplyr = derive2 { name="lplyr"; version="0.1.6"; sha256="1a7wry5v78z4aij7ii64340ycx30wqbm3x2wllka79gkll1fn78h"; depends=[bazar dplyr lazyeval magrittr]; }; lpme = derive2 { name="lpme"; version="1.1.0"; sha256="1mq1lf4vdlbxjax9p8k17vdkc2h3xslbbs17xzy10fbkdicljc10"; depends=[decon flexmix Rcpp RcppArmadillo]; }; @@ -6772,21 +7081,21 @@ in with self; { lrgs = derive2 { name="lrgs"; version="0.5.1"; sha256="1hzcmrvax03bzrljnqskmnnpsw6amnwcfygnls727369h0dbzc4a"; depends=[mvtnorm]; }; lrmest = derive2 { name="lrmest"; version="3.0"; sha256="1yddkgza672z9y0ipgl92pg9prhmr387zsqf0qbi9k2yzfz2vvs6"; depends=[MASS psych]; }; lsa = derive2 { name="lsa"; version="0.73.1"; sha256="1af8s32hkri1hpngl9skd6s5x6vb8nqzgnkv0s38yvgsja4xm1g5"; depends=[SnowballC]; }; - lsasim = derive2 { name="lsasim"; version="1.0.0"; sha256="05b4ddrqs7kpz8nqgarydh9har9v2k0fx8njwzaj3gnih8jzdn84"; depends=[]; }; + lsasim = derive2 { name="lsasim"; version="1.0.1"; sha256="0bwk6bv0wp30v6p55nyd1hcvwnjjddwccyy1swf6sg7lw3fy657p"; depends=[]; }; lsbclust = derive2 { name="lsbclust"; version="1.0.4"; sha256="0a0l1vvr4gp1vvqccjicy4qh7l2kwyh7k503yi403d0987zqywcc"; depends=[clue ggplot2 gridExtra plyr Rcpp reshape2]; }; lsdv = derive2 { name="lsdv"; version="1.1"; sha256="0rl1xszr9r8v71j98gjpav30n2ncsci19hjlc9flzs1s20sb1xpr"; depends=[]; }; lsei = derive2 { name="lsei"; version="1.1-1"; sha256="1akvkccf2cq331agcsi24x3cw73cc8vdl7kw3zjyg8q6lmvq78am"; depends=[]; }; lsgl = derive2 { name="lsgl"; version="1.3.6"; sha256="0zkv5xgwrnwx0w0qpzsg7krd7fdnlr3a85q64xj1wx0gd578dqq6"; depends=[BH Matrix Rcpp RcppArmadillo RcppProgress sglOptim]; }; lshorth = derive2 { name="lshorth"; version="0.1-6"; sha256="0nbjakx0zx4fg09fv26pr9dlrbvb7ybi6swg84m2kwjky8399vvx"; depends=[]; }; lsl = derive2 { name="lsl"; version="0.5.5"; sha256="0555za3yqqdbcpxrl6vzj494784xl1wsmwp1apszaqncz2vwc9pg"; depends=[ggplot2 lavaan reshape2]; }; - lsmeans = derive2 { name="lsmeans"; version="2.25-5"; sha256="1kiwp9z034s182d6d1hwv8gcr263i514jvr5hkj63wmk5fbjlcvw"; depends=[coda estimability multcomp mvtnorm nlme plyr xtable]; }; + lsmeans = derive2 { name="lsmeans"; version="2.26-3"; sha256="0pxpdvdlh0lf45f1b0s53dk8y73j2xnyvzixj1jnafmw1w6bj778"; depends=[coda estimability multcomp mvtnorm nlme plyr xtable]; }; lspline = derive2 { name="lspline"; version="1.0-0"; sha256="0bc1nfpp1r5fi8rrg295k4r8pm03baqplrzwmk3sn4kdbp0apvgk"; depends=[]; }; lspls = derive2 { name="lspls"; version="0.2-1"; sha256="1g27fqhnx9db0zrxbhqr76agvxy8a5fx1bfy58j2ni76pki1y4rl"; depends=[pls]; }; lsr = derive2 { name="lsr"; version="0.5"; sha256="0q385a3q19i8462lm9fx2bw779n4n8azra5ydrzw59zilprhn03f"; depends=[]; }; lss = derive2 { name="lss"; version="0.52"; sha256="1fvs8p9rhx81xfn450smnd0i1ym06ar6nwwcpl74a66pfi9a5sbp"; depends=[quantreg]; }; ltbayes = derive2 { name="ltbayes"; version="0.4"; sha256="0kv5k56hmc1m7bv5pmmmk46822szsgwqgpwydn0x56az7xn6hjk6"; depends=[mcmc MHadaptive numDeriv]; }; ltm = derive2 { name="ltm"; version="1.0-0"; sha256="1igkgb0jy3mzlnp9s6avhcpplwijz5g3x26a3lavyy3d9fjpmfpa"; depends=[MASS msm polycor]; }; - ltmle = derive2 { name="ltmle"; version="0.9-9"; sha256="1fnlnj6r1pvisgain1wvv0yb69wckz31lbxyfvw2xxq6c658ifn8"; depends=[Matrix matrixStats speedglm]; }; + ltmle = derive2 { name="ltmle"; version="0.9-9-3"; sha256="04y0gl44ayyp8n3d92i0dkyanalc25da6prrqmiaw9nr3ykjj78l"; depends=[Matrix matrixStats speedglm]; }; ltsa = derive2 { name="ltsa"; version="1.4.6"; sha256="10wmw9r00400ng2zlysd8jqgypjclshxj83x32002j2a9cz4f186"; depends=[]; }; ltsbase = derive2 { name="ltsbase"; version="1.0.1"; sha256="16p5ln9ak3h7h0icv5jfi0a3fbw5wdqs3si69sjbn8f5qs2hz7yp"; depends=[MASS robustbase]; }; ltsk = derive2 { name="ltsk"; version="1.0.4"; sha256="1p026ryq31iw7d8mbi4m2q43g5frj47387w8g46j50bcv11hh2zm"; depends=[fields gstat sp]; }; @@ -6797,6 +7106,7 @@ in with self; { lucr = derive2 { name="lucr"; version="0.2.0"; sha256="0v5g72cl9fg3b3ix34bsmjwwqrnm4ivgcd5mm98c5jd8rrz1xkwq"; depends=[httr Rcpp]; }; ludic = derive2 { name="ludic"; version="0.1.5"; sha256="03ywna9fd2ypwchwx58ccmlxjdnx7zav7pqxwrc5bh3hrfbsxl13"; depends=[fGarch landpred Matrix Rcpp RcppArmadillo]; }; lulcc = derive2 { name="lulcc"; version="1.0.2"; sha256="1vlaidyqgx5vnf8w2y1a1jmmq7z4195avnv1mryhh414r5r1kpy0"; depends=[lattice raster rasterVis ROCR]; }; + lumberjack = derive2 { name="lumberjack"; version="0.1.0"; sha256="02p1swd1k2b8d95iilqkh3cdwr0r9y7pbicp4ibw8l9yzm2h7s81"; depends=[R6]; }; lumendb = derive2 { name="lumendb"; version="0.2.2"; sha256="0x1k90h6aw7fpvmgbbdmkqvgxfnn4w5xxfck7f4r7zhaxfqbzp2s"; depends=[httr xml2]; }; lunar = derive2 { name="lunar"; version="0.1-04"; sha256="0nkzy6sf40hxkvsnkzmqxk4sfb3nk7ay4rjdnwf2zym30qax74kk"; depends=[]; }; luzlogr = derive2 { name="luzlogr"; version="0.2.0"; sha256="0n0cm94aianwcypa0gwdjvyy3dwbkfv6zi1gq2jn57b41fg20lq5"; depends=[assertthat]; }; @@ -6805,6 +7115,8 @@ in with self; { lvplot = derive2 { name="lvplot"; version="0.2.0"; sha256="01sisj2vbx2yb5w9cjzyaf9j46vh4kkw05xccq1f7wmsg69zmj6b"; depends=[ggplot2 RColorBrewer]; }; lxb = derive2 { name="lxb"; version="1.5"; sha256="16x1mvhxqhvibzmv6mlqcmkgic2sha1xagf7r2azmn4z8x1m9w6n"; depends=[]; }; lymphclon = derive2 { name="lymphclon"; version="1.3.0"; sha256="1jns41sk2rx1j3mg06dzy434k30gpfhbkn6s47fmyv1y8701vfl0"; depends=[corpcor expm MASS]; }; + m2b = derive2 { name="m2b"; version="1.0"; sha256="0agzw67mmwrw1f61yn24z5w1pgjssdapg3li0a53i3ylnij45mzr"; depends=[caret caTools e1071 geosphere ggplot2 randomForest]; }; + m2r = derive2 { name="m2r"; version="1.0.0"; sha256="07zrqhva00jsp9da9ryzi8pjdrwri2mw0mqgg91r3rnl7id8safq"; depends=[gmp memoise mpoly pryr stringr]; }; m4fe = derive2 { name="m4fe"; version="0.1"; sha256="06lh45591z2lc6lw91vyn066x0m1zwxxfp6nbirp1rz901v843ph"; depends=[]; }; mAr = derive2 { name="mAr"; version="1.1-2"; sha256="0i9zp8n8i3fxldgvwj045scss533zsv8p476lsla294gp174njr7"; depends=[MASS]; }; mBvs = derive2 { name="mBvs"; version="1.0"; sha256="0qq6yaqvpg3akwbbaamv1a5rsrwdsq5z161w0prvq8qcbyfwclni"; depends=[]; }; @@ -6826,14 +7138,15 @@ in with self; { macleish = derive2 { name="macleish"; version="0.3.0"; sha256="05zmk28yh54gnm09aps3q64s4igcb629b3zx7giinlfc4xx8qv74"; depends=[DBI dplyr etl lubridate readr]; }; mada = derive2 { name="mada"; version="0.5.7"; sha256="0a2m1rb4d143v9732392xzvbg6x1k3l0g3zscgbx64m21kxshmgb"; depends=[ellipse mvmeta mvtnorm]; }; maddison = derive2 { name="maddison"; version="0.1"; sha256="1ji51wnj0ybjd30b4bwn5npyswrmcfrbxcmdlngwzvca1knh8g1c"; depends=[]; }; - madness = derive2 { name="madness"; version="0.2.1"; sha256="1as5y9gpa4pr0r2hb0mw0gf7dy2779hqp1vghl53ccd8zj50i2fz"; depends=[expm matrixcalc]; }; + madness = derive2 { name="madness"; version="0.2.2"; sha256="0facd1km06kjd70prkjkns8x2nyavj4m7lgiyxd7gpr9plba5wmr"; depends=[expm Matrix matrixcalc]; }; madr = derive2 { name="madr"; version="1.0.0"; sha256="0lzg75kphz4a0w6n0jbsq87g72jvrbkyas4j813mryq2nv4lmsl4"; depends=[]; }; + madrat = derive2 { name="madrat"; version="1.8.0"; sha256="0a37nc7frciji990dfj1hx5rgiv5l7dvgdgrp0yh56636v6lpvyz"; depends=[digest magclass spam]; }; mads = derive2 { name="mads"; version="0.1.5"; sha256="1ac34iff9hvl1bxk3gs5s3i311g9y59nd6v9jhvnfd6wfhck7krs"; depends=[mrds]; }; madsim = derive2 { name="madsim"; version="1.2.1"; sha256="11gfyimbz363p5xy1x6rsz5fcgzcr55myc5aaz5lazjkcnfn17aq"; depends=[]; }; mafs = derive2 { name="mafs"; version="0.0.2"; sha256="1yx4y73hnd30x6cad7md07aiikhdsa6bsbha72j9vlncaj8d504m"; depends=[cmprsk colorspace CombMSC Epi etm forecast forecastHybrid fracdiff ggplot2 ggseas gtable munsell numDeriv plyr quadprog Rcpp scales tictoc tidyr timeDate tseries zoo]; }; - magclass = derive2 { name="magclass"; version="3.85"; sha256="1l3s6j19yvyhprxk2817xmgr64xwkknvq53bfhjdbn2jqh5nx40x"; depends=[abind maptools ncdf4 reshape2 sp]; }; + magclass = derive2 { name="magclass"; version="4.39"; sha256="0i0wfvfnvzc1gpgfhfn4765cjs92hhgrbwch04ci1dvmxmplnbxn"; depends=[abind maptools ncdf4 reshape2 sp]; }; magic = derive2 { name="magic"; version="1.5-6"; sha256="1399w1zhz79nj8cdhslybncd9h6rylfhb548nv22ip0dxxdkyv0v"; depends=[abind]; }; - magicaxis = derive2 { name="magicaxis"; version="2.0.0"; sha256="0f531qlwkp043qgwv58x1b07a3v03vnz0r20hlqqsx8z16jqw6i4"; depends=[celestial mapproj MASS plotrix sm]; }; + magicaxis = derive2 { name="magicaxis"; version="2.0.1"; sha256="065x7076kps7bk66j0ivazqlqcich82y5fbb2953wwlnficx37wl"; depends=[celestial mapproj MASS plotrix sm]; }; magicfor = derive2 { name="magicfor"; version="0.1.0"; sha256="07l33fczr1x42sfxrsqq4q6r65sdflin6l8f5cgclnvx1858jdip"; depends=[]; }; magick = derive2 { name="magick"; version="0.4"; sha256="15w904zqbdm8051xqg1s83pmimkan0wg7z5vdzm5h96mjsqf6wap"; depends=[curl Rcpp]; }; magree = derive2 { name="magree"; version="1.0"; sha256="1qkd6p5g3aigcb0f4d08gc5323alvahzmazm3bzsmz1w033xd1hh"; depends=[]; }; @@ -6848,21 +7161,22 @@ in with self; { managelocalrepo = derive2 { name="managelocalrepo"; version="0.1.5"; sha256="180b7ikas1kb7phm4l2z1d8wi45wi0qyz2c8rl8ml3f71b4mlzgc"; depends=[assertthat stringr]; }; mangoTraining = derive2 { name="mangoTraining"; version="1.0-7"; sha256="0lw46j44jhdcyh079a7zjmxcnv5c6qsfachinlwv3ild1gwggr3p"; depends=[]; }; manhattanly = derive2 { name="manhattanly"; version="0.2.0"; sha256="185fkakx4v35n4gmlpk2kfm2bm8p320q4khkw936m09zx3aqz398"; depends=[ggplot2 magrittr plotly]; }; - manifestoR = derive2 { name="manifestoR"; version="1.2.3"; sha256="0m9xgprm7w68ncm7qpqdcnrl409i4x33lrpwzap2za5r5bb5wv1n"; depends=[base64enc dplyr functional httr jsonlite magrittr NLP psych tibble tm zoo]; }; + manifestoR = derive2 { name="manifestoR"; version="1.2.4"; sha256="1hd4qsa2xsa1dq5jnwh1bph34glkpaabjmsnavdjhkfzjilp32ya"; depends=[base64enc dplyr functional httr jsonlite magrittr NLP psych tibble tm zoo]; }; manipulate = derive2 { name="manipulate"; version="1.0.1"; sha256="1klknqdfppi5lf6zbda3r2aqzsghabcsaxmvd3vw3cy3aa984zky"; depends=[]; }; - manipulateWidget = derive2 { name="manipulateWidget"; version="0.5.1"; sha256="1i69y4gjm35xf3nd6bf031nkw91b0whbd7yd2a1fq5msv0mjqrss"; depends=[base64enc htmlwidgets knitr miniUI shiny]; }; + manipulateWidget = derive2 { name="manipulateWidget"; version="0.7.0"; sha256="1xiiaaay8szmw36vli3kgg4mn73hjdbaqq0w0l01wc2qhv3fa30n"; depends=[base64enc htmltools htmlwidgets knitr lazyeval miniUI shiny]; }; mapStats = derive2 { name="mapStats"; version="2.4"; sha256="18pp1sb9p4p300ffvmzjrg5bv1i7f78mhpggq83myc26c3a593na"; depends=[classInt colorspace Hmisc lattice maptools RColorBrewer reshape2 sp survey]; }; mapdata = derive2 { name="mapdata"; version="2.2-6"; sha256="0k3hsnyvax20jph384gca10rl7a9fcglgkqcjsc5hndx3qrwpanv"; depends=[maps]; }; + mapedit = derive2 { name="mapedit"; version="0.3.0"; sha256="1h620gnb95pd61af4h7j5vhqhhw0s58jq5yzipvm9394307yxgzk"; depends=[dplyr htmltools htmlwidgets jsonlite leaflet leaflet_extras mapview miniUI sf shiny]; }; mapfit = derive2 { name="mapfit"; version="0.9.7"; sha256="16a318bz3my27qj0xzf40g0q4bh9alg2bm6c8jbwgswf1paq1xmx"; depends=[Matrix]; }; mapmisc = derive2 { name="mapmisc"; version="1.5.0"; sha256="1f6yjr3a26nm482ldnx8rzjhc0d9hlrpd48japm0sihxvmsz0pv3"; depends=[raster sp]; }; mapplots = derive2 { name="mapplots"; version="1.5"; sha256="09sk78a0p8hlwhk3w2dwvpb0a6p7fqdxyskvz32p1lcav7y3jfrb"; depends=[]; }; - mapproj = derive2 { name="mapproj"; version="1.2-4"; sha256="1sywwzdikpnkzygb2jx9c67sgrykgbkm39dkf45clz3yylsib2ng"; depends=[maps]; }; + mapproj = derive2 { name="mapproj"; version="1.2-5"; sha256="0rjz37r4rizk2c6jaf54f0kfb60dqv6b262cnhiwjl55d4x6l0pk"; depends=[maps]; }; mapr = derive2 { name="mapr"; version="0.3.4"; sha256="14f7zfzxb1h935bbybj2l2n4a62cnq0wvgmc09in0fvnl75jl971"; depends=[ggplot2 gistr jsonlite leaflet RColorBrewer rworldmap sp spocc]; }; - maps = derive2 { name="maps"; version="3.1.1"; sha256="0ajdrd4z66jpdjqdgk6vz89x7gh1isidgr8qkg0fq6cmrvjn08lp"; depends=[]; }; + maps = derive2 { name="maps"; version="3.2.0"; sha256="0577f3b5d3a7djl7r0miy9mzr6xq6jb32p8nyrma7m2azasbwyj3"; depends=[]; }; maptools = derive2 { name="maptools"; version="0.9-2"; sha256="075lmb3b62171cw2dg8fv1vwmvfzg39r1ji7jwb8s5k9dz88ry1v"; depends=[foreign lattice sp]; }; maptpx = derive2 { name="maptpx"; version="1.9-2"; sha256="1i5djmjg0lsi7xlkbvn90njq1lbyi74zwc2nldisay4xsbgqg7fj"; depends=[slam]; }; maptree = derive2 { name="maptree"; version="1.4-7"; sha256="1k7v84wvy6wz6g0dyiwvd3lvf78rlfidk60ll4fz7chvr2nrqdp4"; depends=[cluster rpart]; }; - mapview = derive2 { name="mapview"; version="1.2.0"; sha256="0785jzs3kr6rcxz5p1mwpz7maq3z2mwxskl6whyzizbrkmxj2ikw"; depends=[brew data_table gdalUtils htmltools htmlwidgets lattice latticeExtra leaflet png raster Rcpp rgdal satellite scales sp viridisLite webshot]; }; + mapview = derive2 { name="mapview"; version="2.1.0"; sha256="014drl0jcbw685q89isiy6gvcs3wnixgw5n3cs3qhaqdy8c0kcdy"; depends=[base64enc brew gdalUtils htmltools htmlwidgets lattice leaflet png raster Rcpp satellite scales sf sp viridisLite webshot]; }; mar1s = derive2 { name="mar1s"; version="2.1"; sha256="0psjva7nsgar5sj03adjx44pw0sdqnsd96m4g6k8d76pv30m1g7l"; depends=[cmrutils fda zoo]; }; march = derive2 { name="march"; version="1.4"; sha256="1wfhm33k2j5yim56sg0wd02ypfhlp9fc138vmdsdjp6nh4y23hnj"; depends=[]; }; marcher = derive2 { name="marcher"; version="0.0-2"; sha256="0hcxbfrwniih4kvx5sxhlffz1pc87kf52v8hvaf193rhhdykis5q"; depends=[magrittr Matrix minpack_lm mvtnorm numDeriv plyr RColorBrewer scales zoo]; }; @@ -6871,11 +7185,11 @@ in with self; { margins = derive2 { name="margins"; version="0.3.0"; sha256="0i6c39acyyvxsx2lkza2afjyhpdlb9fx0zssr24g0xdk3f7c2dc2"; depends=[MASS prediction]; }; marima = derive2 { name="marima"; version="2.2"; sha256="03nvh93r4052li84yjqzc106gwh1542q9s192s980gs6sgy8scm6"; depends=[]; }; marinespeed = derive2 { name="marinespeed"; version="0.1.0"; sha256="1r9bpggb88px8149dsga3xmkjhjq6ybs6a5kp60qz28iyr183mar"; depends=[bit geosphere sp]; }; - markdown = derive2 { name="markdown"; version="0.7.7"; sha256="00j1hlib3il50azs2vlcyhi0bjpx1r50mxr9w9dl5g1bwjjc71hb"; depends=[mime]; }; + markdown = derive2 { name="markdown"; version="0.8"; sha256="1vcgsh2m2f5kfgappgg71nbf04ff0j1sbk668krjs3r2n89dk3sk"; depends=[mime]; }; marked = derive2 { name="marked"; version="1.1.13"; sha256="0zgfd7fdcrvvqnlgzarly16zjnipshxsa1g3j9jqc5kbqvh7fnh2"; depends=[coda expm lme4 Matrix numDeriv optimx R2admb Rcpp TMB truncnorm]; }; markmyassignment = derive2 { name="markmyassignment"; version="0.6.1"; sha256="167q4fwn2ssqn588wx3ig923rcr74m95na1z1wdfy67jczsk492l"; depends=[codetools httr lazyeval testthat yaml]; }; markophylo = derive2 { name="markophylo"; version="1.0.4"; sha256="12np5rg59wjyh1mfhhfh115ziciba973fjvbrhn4qzdnry1mwbdb"; depends=[ape numDeriv phangorn Rcpp RcppArmadillo]; }; - markovchain = derive2 { name="markovchain"; version="0.6.9"; sha256="1wvwxczz51y0cr9f04myw0p8flhh2y68fxfy2cisp8hzdxk5a3xc"; depends=[expm igraph matlab Matrix Rcpp RcppArmadillo RcppParallel]; }; + markovchain = derive2 { name="markovchain"; version="0.6.9.3"; sha256="1fvjpiqf42rg2486f446bf308v5jznbnnx17gl30xll8g0l5hgxi"; depends=[expm igraph matlab Matrix Rcpp RcppArmadillo RcppParallel]; }; marl = derive2 { name="marl"; version="1.0"; sha256="0rndnf3rbcibv3gsrw1kfp5zhg37cw9wwlz0b7dbwprd0m71l3pm"; depends=[]; }; marmap = derive2 { name="marmap"; version="0.9.6"; sha256="1b0mpygk18ri0xs9f56j2g7zmka7krnw7fmh9m9xisbvq2g23g92"; depends=[adehabitatMA DBI gdistance geosphere ggplot2 ncdf4 plotrix raster reshape2 RSQLite shape sp]; }; marqLevAlg = derive2 { name="marqLevAlg"; version="1.1"; sha256="1wmqi68g0flrlmj87vwgvyxap0miss0n42qiiw7ypyj4jw9kwm8j"; depends=[]; }; @@ -6895,7 +7209,7 @@ in with self; { matrixLaplacian = derive2 { name="matrixLaplacian"; version="1.0"; sha256="1ixqdv3sz3sc79wn3vqhlq79j7x7cvl878m5hgvbcg6klfvlmmci"; depends=[scatterplot3d]; }; matrixStats = derive2 { name="matrixStats"; version="0.52.2"; sha256="19fjf19cr0p3j9pj17myz39zpi5bh7ci72db3la9my09n6k6mnir"; depends=[]; }; matrixcalc = derive2 { name="matrixcalc"; version="1.0-3"; sha256="1c4w9dhi5w98qj1wwh9bbpnfk39rhiwjbanalr8bi5nmxkpcmrhp"; depends=[]; }; - matrixpls = derive2 { name="matrixpls"; version="1.0.4"; sha256="1pysvf224wpkawdvz3y38cy8s3lg34s37ip6ybzfxm4vanzj1xjc"; depends=[assertive lavaan MASS matrixcalc psych]; }; + matrixpls = derive2 { name="matrixpls"; version="1.0.5"; sha256="04sshb88rq2mp3y4rrs6nkzr4kc380vx380r911c7j975l55a183"; depends=[assertive lavaan MASS matrixcalc psych]; }; maxLik = derive2 { name="maxLik"; version="1.3-4"; sha256="0jjb5kc7dvx940ybg7b7z9di79v75zm2xlb0kj2y7rmi45vvh6hq"; depends=[miscTools sandwich]; }; maxent = derive2 { name="maxent"; version="1.3.3.1"; sha256="1skc7d0p6kg0gi1bpgaqn2dmxjzbvcphx5x3idpscxfbplm5v96p"; depends=[Rcpp SparseM tm]; }; maxlike = derive2 { name="maxlike"; version="0.1-7"; sha256="0gi33hcjj456sjw7l3q4n46k4cb6m3ml3ycd93pnajxacl24swbb"; depends=[raster]; }; @@ -6906,9 +7220,10 @@ in with self; { mbbefd = derive2 { name="mbbefd"; version="0.8.8"; sha256="17f2y4xi5fxc6mms519xjb9qg94qqlxv0mhdbhjyyfg3x6bj7bsq"; depends=[actuar alabama fitdistrplus gsl MASS Rcpp]; }; mbclusterwise = derive2 { name="mbclusterwise"; version="1.0"; sha256="1ilqaxcxf1k3ck910s0xqwnp88w8ag5rn1dpvaa1i7jlcldsbnhp"; depends=[ade4 doParallel foreach kknn]; }; mbest = derive2 { name="mbest"; version="0.5"; sha256="0l6vmcqkd2b0b90jmsswrhbdmhq2x92g7sr2l99rp7xp1cxdq02w"; depends=[bigmemory foreach lme4 logging nlme]; }; + mbgraphic = derive2 { name="mbgraphic"; version="1.0.0"; sha256="0b4xr2ycx8v56fp40lnxv69qfp0yzai2hdwk3kw4wsmir91d2a91"; depends=[diptest dplyr extracat GGally ggplot2 gridExtra hexbin magrittr mgcv Rcpp scagnostics scales seriation shiny]; }; mblm = derive2 { name="mblm"; version="0.12"; sha256="17h65bapvz89g5in3gkxq541bxgpj9pciz6i5hzhqn0bdbsb3k6r"; depends=[]; }; mbmdr = derive2 { name="mbmdr"; version="2.6"; sha256="0ss5w66hcgd8v8j9bbbp12a720sblhr2hy9kidqfr8hgjaqlch86"; depends=[logistf]; }; - mboost = derive2 { name="mboost"; version="2.7-0"; sha256="1gzn80ixvdv560zl2r6gzcpbjcvhnkmdpis1l4gvidd7amrfzfp2"; depends=[lattice Matrix nnls party quadprog stabs survival]; }; + mboost = derive2 { name="mboost"; version="2.8-0"; sha256="02cb6a0gzwwhvcn0rzvnjzb3c50lfyjcl7j14rki4iz78s4jl55c"; depends=[lattice Matrix nnls party quadprog stabs survival]; }; mbrglm = derive2 { name="mbrglm"; version="0.0.1"; sha256="0yxq1xk8qy5hpiqqldyrs78lp4ggdp5lj2lmh8rqq1xvsfr6nrh4"; depends=[enrichwith nleqslv]; }; mc2d = derive2 { name="mc2d"; version="0.1-18"; sha256="1ljw8ms661bsdqbfpjvvrif9n0c2i6lzxyqj4rxhxsp3dj18w3g3"; depends=[mvtnorm]; }; mcGlobaloptim = derive2 { name="mcGlobaloptim"; version="0.1"; sha256="1p8841y9a4yq51prv6iirgw9ln8jznx8nk547sc5xlznksjy1g9n"; depends=[randtoolbox snow]; }; @@ -6917,6 +7232,7 @@ in with self; { mcbiopi = derive2 { name="mcbiopi"; version="1.1.2"; sha256="12h4bv3hx1m6bsqdxj5n3b5gh98ms508am8pigz7ckmv0xkyhx85"; depends=[]; }; mcc = derive2 { name="mcc"; version="1.0"; sha256="0p661a870bvh3xhcahqqq85azn9rjl3vacjy96jsdn86irj4s0vi"; depends=[]; }; mcclust = derive2 { name="mcclust"; version="1.0"; sha256="00qprmsjwbn2d0jl7p9mz8pv7k8ld3mzk862pr1grigk0lqwhx06"; depends=[lpSolve]; }; + mccr = derive2 { name="mccr"; version="0.4.4"; sha256="1scqds1yx317qmjappy2h1m564dcmsqqfpdm8pm3plalag16xrhj"; depends=[]; }; mcemGLM = derive2 { name="mcemGLM"; version="1.1"; sha256="07ky3bvcns24qia9pyvf5lp7764h8gn2g8zr304iz4x9bq6jvsi0"; depends=[Rcpp RcppArmadillo trust]; }; mcga = derive2 { name="mcga"; version="3.0.1"; sha256="0q0nn881lii8wfw28k8jh9z0kbi5ljcwi2wpq460k2w3agsjzw5n"; depends=[GA Rcpp]; }; mcgfa = derive2 { name="mcgfa"; version="1.0.0"; sha256="19q6lmrmbl3sh844n7mnl1r01bs8kgf0gghy4p4xmba1la0cb67k"; depends=[pgmm]; }; @@ -6926,7 +7242,7 @@ in with self; { mclcar = derive2 { name="mclcar"; version="0.1-8"; sha256="1hrjfjbsxh8g6bw2cfxciry8hn9xxfg4bww5p1sjq98v8bsqcx23"; depends=[fields maxLik nleqslv rsm spam spdep]; }; mcll = derive2 { name="mcll"; version="1.2"; sha256="0i9zqbh0l9a9mv4558gbdq9mh52chanykyfwmiymmxygxhp809sz"; depends=[locfit statmod]; }; mclogit = derive2 { name="mclogit"; version="0.4.4"; sha256="1nnzds9md3drcgblzpbg39a53v4npdbi0xp3xgw8xqfyy37nia59"; depends=[Matrix memisc]; }; - mclust = derive2 { name="mclust"; version="5.2.3"; sha256="0045msdw1xndfmlylbnm1ss716iiqzqwj454a97gmcq5kph86qzz"; depends=[]; }; + mclust = derive2 { name="mclust"; version="5.3"; sha256="0h5syvpg3azrz5d10z2afilaa27jb4azi38idzlv05mfcs16s6rb"; depends=[]; }; mcmc = derive2 { name="mcmc"; version="0.9-5"; sha256="1i3rahph8pbhi5dsyjnkazqklg4lhh3azlyvx4kvabx50q0awxn6"; depends=[]; }; mcmcplots = derive2 { name="mcmcplots"; version="0.4.2"; sha256="0ws2la6ln016l98c1rzf137jzhzx82l4c49p19yihrmrpfrhr26l"; depends=[coda colorspace denstrip sfsmisc]; }; mcmcse = derive2 { name="mcmcse"; version="1.2-1"; sha256="18k2cp5hpr3lzv9yva5qc379iq9aysnl872dv8jidwrj4iy2xccy"; depends=[ellipse Rcpp RcppArmadillo]; }; @@ -6937,19 +7253,21 @@ in with self; { mcsm = derive2 { name="mcsm"; version="1.0"; sha256="13sx7s3ywis5n4a70ld2szld9fb8jkfsc82dy6iskhy17vy8pml0"; depends=[coda MASS]; }; mctest = derive2 { name="mctest"; version="1.1"; sha256="0ck41xkrhfznzqqxk5yx5467ayd7wxqcjb6dzizbyz6dyjxbwm0n"; depends=[]; }; md = derive2 { name="md"; version="1.0.4"; sha256="13z8f3p84kivk6j58fb1qpzrmml41mq9pgv9nv2gvxrhyhanzi46"; depends=[]; }; + md_log = derive2 { name="md.log"; version="0.1.1"; sha256="0ix5nz38xzlhrga40hfhlfss938mrfbni2wysvz2qbpm59qxrhg0"; depends=[futile_logger]; }; mda = derive2 { name="mda"; version="0.4-9"; sha256="11gxgy4f3k03c4z6jpkzb4ynv0zl3k93b5s88ib8jjavzb95c95p"; depends=[class]; }; mdatools = derive2 { name="mdatools"; version="0.8.2"; sha256="11xlfgcn8gb19alfjp268mlid9g2rl69s1nlm5plwyy5h8x0hvcj"; depends=[]; }; mded = derive2 { name="mded"; version="0.1-2"; sha256="1j8fcz5yc70p9qd9l010xj1b625scdps8z1pqh75b45p2hiqbhlc"; depends=[]; }; mdftracks = derive2 { name="mdftracks"; version="0.2.0"; sha256="0l8dc6ljrhbm8jwadaa3xkf6nx90vyiig15p7rryswczz9hw5ga6"; depends=[hellno]; }; mdhglm = derive2 { name="mdhglm"; version="1.6"; sha256="1lvckais4c3pbf6zrpfkdlyqhcg4jaw11n00622h9ks413fl788v"; depends=[boot Matrix mvtnorm numDeriv]; }; mdmb = derive2 { name="mdmb"; version="0.2-0"; sha256="13pkz0mjvd5gph1fpz3cd2yn5mb0lsvyjr7xr9bbikh11jqx80wb"; depends=[CDM coda miceadds sirt TAM]; }; - mdpeer = derive2 { name="mdpeer"; version="0.1.0"; sha256="0z84xm189v99frnayp4vr0qr7fr495sai5mjvyqpv9cbhvqn3xkr"; depends=[ggplot2 glmgraph glmnet magic MASS nlme nloptr reshape2 scalreg]; }; - mdsOpt = derive2 { name="mdsOpt"; version="0.1-2"; sha256="0afdlaw2gxi50psglgqb1k01ccv70x180dkwm78dzw6sjlz6fcjy"; depends=[clusterSim smacof]; }; + mdpeer = derive2 { name="mdpeer"; version="1.0.1"; sha256="1vsqhah8h47s8k687fwa352549mdz16mwk1g7rcmhx75c2k85w2q"; depends=[boot ggplot2 glmnet magic nlme nloptr psych reshape2 rootSolve]; }; + mdsOpt = derive2 { name="mdsOpt"; version="0.1-3"; sha256="0x2jd675v7h6d6psgdbh4krgpy2y8j5hknhjrcjkfx8hwn3s64hd"; depends=[clusterSim smacof]; }; mdscore = derive2 { name="mdscore"; version="0.1-3"; sha256="10cl5r6kd9chdik5v0q91x40xpw2cjvvyi220z4bvngpb0989x8j"; depends=[MASS]; }; mdsdt = derive2 { name="mdsdt"; version="1.2"; sha256="0nbzc54jac4wmfyrs821ycxh749cb1zfxcws0nbpk35rydqkc627"; depends=[ellipse mnormt polycor]; }; mdsr = derive2 { name="mdsr"; version="0.1.3"; sha256="19ryy7cm2ia3xi54r0176n72y7w35dqml0l7ysi6qd8zy4yavkvx"; depends=[babynames DBI dplyr ggplot2 mosaic RMySQL]; }; meanShiftR = derive2 { name="meanShiftR"; version="0.50"; sha256="0wb08x9vanwfzs7ijskl53118jvy3z48gqda7gn33aq82dkablza"; depends=[]; }; - measuRing = derive2 { name="measuRing"; version="0.3"; sha256="16lgvk9lm0vjy50das0qq0h0z683hh94spjcdmkljmxxzwmzfl4b"; depends=[pastecs png tiff]; }; + meanr = derive2 { name="meanr"; version="0.1-0"; sha256="1vbsqcbgbv0h4ld45cfpasy5sy5a019zn1fh141ylhsd9czrb9d4"; depends=[]; }; + measuRing = derive2 { name="measuRing"; version="0.4"; sha256="165j3i5295hxzqg8l2hrd61a0fh9xmw61dpx8js8qjz1zi9rm84x"; depends=[dplR pastecs png tiff]; }; measurements = derive2 { name="measurements"; version="1.1.0"; sha256="1zi6mpwyxycbphq48s7vfc8gm76nidpa2gafp0jxiv56rwpv3jc3"; depends=[]; }; meboot = derive2 { name="meboot"; version="1.4-7"; sha256="1i0h71aj49hyj889447s611gz668ys7xlr1i82b5nvaf6chfbfin"; depends=[dynlm nlme]; }; medSTC = derive2 { name="medSTC"; version="1.0.0"; sha256="1f7w6jbxairqvghr5b7vgdllg3ian16a1fgi7vqlq0mhy2j6phan"; depends=[]; }; @@ -6962,39 +7280,42 @@ in with self; { mefa = derive2 { name="mefa"; version="3.2-7"; sha256="1qrf6d3y38q7yy6bg3bxg7514d9paz1f8y6sr7lbksi30qn92fmj"; depends=[]; }; mefa4 = derive2 { name="mefa4"; version="0.3-4"; sha256="11zg30i2fkxdv8fn7jilbmm7k5g0ls8f91bpq6qiwiagwg8gj2lh"; depends=[Matrix pbapply]; }; meifly = derive2 { name="meifly"; version="0.3"; sha256="1x3lhy7fmasss0rq60z5qp74ni32sahw62s8cnp2j431sp95pczc"; depends=[leaps MASS plyr]; }; + meltt = derive2 { name="meltt"; version="0.3.0"; sha256="0hg9madjiiq5gm4mnx3y4gg1j04997ijxd1g6hyppxmpchi0yk61"; depends=[ggmap ggplot2 plotGoogleMaps plyr reticulate scales sp]; }; melviewr = derive2 { name="melviewr"; version="0.0.1"; sha256="19syc3d6zc0hmcjjdj7ibrdqxcdlh95ny970f3ska453qh1898b2"; depends=[cairoDevice gtools gWidgets gWidgetsRGtk2 jsonlite RColorBrewer RGtk2 RNifti]; }; - mem = derive2 { name="mem"; version="1.4"; sha256="1d3fgllh7fhlfz3rz2jm31r8vn7msz4na4762iaw161qp2j101db"; depends=[boot sm]; }; + mem = derive2 { name="mem"; version="2.8"; sha256="1kak73ajw50i6y2j26hz46dxihzzj820l6yhpk4z6zscp5bwcrwl"; depends=[boot mixtools RColorBrewer reshape2 sm stringr]; }; + memapp = derive2 { name="memapp"; version="2.2"; sha256="0y6qhr3fx44n4g7y3n7p7f75z7qhv07f0y3kzrm900v61vkqbbzk"; depends=[DT formattable ggplot2 ggthemes mem openxlsx plotly RColorBrewer readxl reshape2 RODBC shiny shinyBS shinydashboard shinyjs shinythemes stringi stringr]; }; memgene = derive2 { name="memgene"; version="1.0"; sha256="00b1mi2hvzzps542mh2p96s27kjqkpcic7djklfcwnfn1m4bz0i5"; depends=[ade4 gdistance raster vegan]; }; memisc = derive2 { name="memisc"; version="0.99.8"; sha256="1wdh8qsf6n3zg5hkgjngnabbabi0kq31prcscm39kfiv3jmvh7pk"; depends=[lattice MASS]; }; memo = derive2 { name="memo"; version="1.0"; sha256="1pqlsn79gpm0d5bxnjg1c1gjaqdrdvcjvr84zpfk6nmsb2862w48"; depends=[digest]; }; - memoise = derive2 { name="memoise"; version="1.0.0"; sha256="0sq2dhpvxy17v1baj256r0jnygdy3m5a8x4zh6vhv29957qnq6zx"; depends=[digest]; }; + memoise = derive2 { name="memoise"; version="1.1.0"; sha256="034qfc2xlh30x1q2vya239w34a3ir3y2fwnx2agbgbi6592zjxmj"; depends=[digest]; }; memuse = derive2 { name="memuse"; version="3.0-1"; sha256="1fxjw209sjk9cfbbfw1ixnf2s8zzc73gnksxa9qax4mp6145i1w5"; depends=[]; }; merDeriv = derive2 { name="merDeriv"; version="0.1-1"; sha256="1bkpn4a4g9ps0wzrw77w0lj14h6rdpz1bicwqvv98316ggv0zkxw"; depends=[lme4 Matrix nonnest2 sandwich]; }; merTools = derive2 { name="merTools"; version="0.3.0"; sha256="1kc32zm1wmmivf1qfs6vi7y8kwibj6sr540is82dyh7xdmbc5mx3"; depends=[abind arm blme broom dplyr DT ggplot2 lme4 mvtnorm shiny]; }; merror = derive2 { name="merror"; version="2.0.2"; sha256="13d9r5r83zai8jnzxaz1ak40876aw20zbpr244gs55rvj5j7f87q"; depends=[]; }; + meshsimp = derive2 { name="meshsimp"; version="0.1.1"; sha256="0cdgq4vfjf0h6l55v687k5xs0nwmlpqmw424xgnsfnwxw5ljcvb1"; depends=[plot3D Rcpp RcppEigen]; }; metRology = derive2 { name="metRology"; version="0.9-23-2"; sha256="16hdcrqa15mf2cfgl6r9awd0y2kwrdbld8sxqmwnchlvdbm6gib4"; depends=[MASS numDeriv robustbase]; }; - metScanR = derive2 { name="metScanR"; version="0.0.1"; sha256="1mhdgrh4nc14avfsf1f4rpq8qxkgsd9v65dvhvqq7swykia9vsfv"; depends=[geosphere ggmap leaflet plotly RColorBrewer rjson]; }; - meta = derive2 { name="meta"; version="4.8-1"; sha256="1zk1c9vrx23qgbhir6bzi26fa3gfky4gyhq7f0s8sk96h6g568kj"; depends=[]; }; + metScanR = derive2 { name="metScanR"; version="1.0.0"; sha256="0fy4r1bwi792f5z7d2c49yzx9flc6fhfmjxn0d0m4cci634nf1cb"; depends=[geosphere ggmap leaflet plotly plyr RColorBrewer RCurl rjson sp]; }; + meta = derive2 { name="meta"; version="4.8-2"; sha256="154cw0b0hdl63509ybz7bjnrxwgf9r0lidzc2b4v4if814dlm4gl"; depends=[]; }; meta4diag = derive2 { name="meta4diag"; version="2.0.5"; sha256="0hwzwyzr23sqlqpx2372419167wad1q7spyzmcxhf4f5hmqv14c9"; depends=[caTools shiny shinyBS sp]; }; metaLik = derive2 { name="metaLik"; version="0.42.0"; sha256="1rk5mwgmgnqq2hrzbh936hzw3aa815l12r1a1qywap5ggmmyhszl"; depends=[]; }; metaMA = derive2 { name="metaMA"; version="3.1.2"; sha256="1mjyz06q1kc8lhfixpym4ndpnisi1r849fj3da6riwfd6ab1v181"; depends=[limma SMVar]; }; metaMix = derive2 { name="metaMix"; version="0.2"; sha256="0xlsdgincxwjzyr4i8qfmfw2wvgf41qbmyhf2rxcbarf7rmwhmqf"; depends=[data_table ggplot2 gtools Matrix Rmpi]; }; metaRNASeq = derive2 { name="metaRNASeq"; version="1.0.2"; sha256="1xz7df7ypq4326yg429pgxd6aldp14c3h3qi20j5nqr5xgsdgzqa"; depends=[]; }; - metaSEM = derive2 { name="metaSEM"; version="0.9.12"; sha256="1lmsqpfb1yxdlwb2qhcsm7111w25qlz6794i2pwf5wmaixwyw0nj"; depends=[ellipse MASS Matrix OpenMx]; }; + metaSEM = derive2 { name="metaSEM"; version="0.9.14"; sha256="0hzx2wp81hf3dkkq3vq8dpi8cxhkas6xv3zj822zchc1nwk4dn8g"; depends=[ellipse MASS Matrix mvtnorm OpenMx]; }; metabolomics = derive2 { name="metabolomics"; version="0.1.4"; sha256="0m5d2784mkpkkg396y3vpvf38vmba5kvxarilq3zf818vjs4pnax"; depends=[crmn gplots limma]; }; - metacoder = derive2 { name="metacoder"; version="0.1.2"; sha256="0srrmmn86jpxdx463qngd1fj8ssnly18kb74csa9957n1lr0l9xf"; depends=[ape dplyr ggplot2 igraph lazyeval magrittr RColorBrewer RCurl readr reshape reshape2 scales seqinr stringr taxize traits zoo]; }; + metacoder = derive2 { name="metacoder"; version="0.1.3"; sha256="1kbxv4gvpq33vg0ri9mqkaqxlqhnccycha30dv48n4m4f3s7h8ad"; depends=[ape dplyr ggplot2 igraph lazyeval magrittr RColorBrewer RCurl readr reshape reshape2 scales seqinr stringr taxize traits zoo]; }; metacom = derive2 { name="metacom"; version="1.4.6"; sha256="0qqjfy5cqfpyd5906d49rkc67zrj8rp28zk2ii49dwddi2nhj4yy"; depends=[vegan]; }; metacor = derive2 { name="metacor"; version="1.0-2"; sha256="04k3ph0yg3jp8x4g6l1h4m0qwl51mx0626xmm0fzr1pv4b4a1ypw"; depends=[gsl rmeta]; }; metafolio = derive2 { name="metafolio"; version="0.1.0"; sha256="18s78lljwnn3j0l3mqc0svszcb3c8yzyzlpnimndbiq9yxagxnnf"; depends=[colorspace MASS plyr Rcpp RcppArmadillo]; }; - metafor = derive2 { name="metafor"; version="1.9-9"; sha256="14287z65ffm013787wfnyb9842zcv63i97g445xa4j8075p8sp7p"; depends=[Matrix]; }; + metafor = derive2 { name="metafor"; version="2.0-0"; sha256="0h14wd7hr1d40p5r70f2jgdgj24jwpnr4nrj6yp5qjr466v81z96"; depends=[Matrix nlme]; }; metafuse = derive2 { name="metafuse"; version="2.0-1"; sha256="1zdw22f5kzvy2xr3c2csy873hcags60as567brc2sw17d0apfy8j"; depends=[evd glmnet MASS Matrix]; }; metagear = derive2 { name="metagear"; version="0.4"; sha256="0ww1j34600y99wyanj9ffg1019xqshb9c32wiqnsblyw8pq4va5f"; depends=[EBImage gWidgets gWidgetsRGtk2 hexView MASS Matrix metafor RCurl stringr]; }; metagen = derive2 { name="metagen"; version="1.0"; sha256="0jvbm22976aqvmfnjzs51n2w099yj5hpx6hd0pgvbia80jk7b9vk"; depends=[BatchExperiments BatchJobs BBmisc ggplot2 lhs MASS metafor ParamHelpers plyr]; }; metaheur = derive2 { name="metaheur"; version="0.2.0"; sha256="1rr5mjx3v87alj7cl9hxldvhhbpkz1fzmymmkqv0hs65pny6gbqw"; depends=[doParallel foreach ggplot2 preprocomb reshape2]; }; - metamisc = derive2 { name="metamisc"; version="0.1.4"; sha256="0v2yrdvj6lm4fhfpxd8fnnrvbdph8cb1v27yhp4w8sf1d6mq2lwc"; depends=[bbmle ellipse lme4 metafor mvtnorm survival]; }; + metamisc = derive2 { name="metamisc"; version="0.1.5"; sha256="1rq5bqdij71gf06i20mj6491pv6xjwyjj4m2qhzg41g4dn0bfsac"; depends=[ellipse lme4 metafor mvtnorm]; }; metansue = derive2 { name="metansue"; version="1.2"; sha256="0gcysmi4lvl4496vygc7v58pd4sgz013mr8nqb870s861jwjj31v"; depends=[]; }; metap = derive2 { name="metap"; version="0.8"; sha256="06ny9zkilawdy0s8yiwhnygs3yppw89bbyf76zgdavykbzscz5lh"; depends=[lattice]; }; - metaplot = derive2 { name="metaplot"; version="0.1.1"; sha256="00pc7ljhhlcng4dq57a7a5ppfswid1lnnxza2yjrylf6hsh37ids"; depends=[dplyr encode fold lattice lazyeval magrittr]; }; + metaplot = derive2 { name="metaplot"; version="0.1.2"; sha256="1g8068vx5dk7k66d30b6i8rd73yh6pskm650wrz6mymg1bb94rvk"; depends=[dplyr encode fold lattice lazyeval magrittr]; }; metaplotr = derive2 { name="metaplotr"; version="0.0.3"; sha256="01iala6cxsxv30fnlh80md5mpy3ksd2piw90zcls8f68g1c6v1jy"; depends=[ggplot2 gridExtra]; }; metaplus = derive2 { name="metaplus"; version="0.7-9"; sha256="1hrczccszx9jcgifwg6wsigsbm8ih4xjr00knb0rxyygijk38c82"; depends=[bbmle boot fastGHQuad lme4 MASS metafor numDeriv]; }; metasens = derive2 { name="metasens"; version="0.3-1"; sha256="0nxvllfa2x6v2hpgind5xr0i40wi7cpdd18lwgy9s4jpgbn0n17p"; depends=[meta]; }; @@ -7006,7 +7327,7 @@ in with self; { meteoForecast = derive2 { name="meteoForecast"; version="0.51"; sha256="1k5m561b6hpqvzrg5l16523ig1rxcsi4s172jmya039cwyk8mqfp"; depends=[ncdf4 raster sp XML zoo]; }; meteogRam = derive2 { name="meteogRam"; version="1.0"; sha256="167gyxjnl4dyfqs3znv8sdpkvpqdxzdqi1g730s30gycrm9snap9"; depends=[ggplot2 RadioSonde]; }; meteoland = derive2 { name="meteoland"; version="0.5.9"; sha256="1kjnwl1mhp5zwfgfngc48388xdppv96b9clnk7r9l714nk58mq10"; depends=[curl ncdf4 ncdf4_helpers qmap Rcpp rgdal sp spdep]; }; - metricTester = derive2 { name="metricTester"; version="1.3.2"; sha256="1n64l69w5skbymizm5ghq50gwhpasyk9zmywib6hkd9k5ijgayv5"; depends=[ape doParallel dplyr foreach geiger MASS picante plotrix spacodiR]; }; + metricTester = derive2 { name="metricTester"; version="1.3.3"; sha256="0sggd32ivzvi0xn0gn0hx0kp1zp1qzpzy1n6slqa3vda4f67l4yp"; depends=[ape doParallel dplyr foreach geiger MASS picante plotrix spacodiR]; }; metricsgraphics = derive2 { name="metricsgraphics"; version="0.9.0"; sha256="1zbx82b34y0rr4w7rzvyc1nzk95w6cdkg0j1kkshbmkvplq6v9i4"; depends=[htmltools htmlwidgets magrittr]; }; mets = derive2 { name="mets"; version="1.2.2"; sha256="1rdljq4069n7i05sqi75bcp1zpq69m13vf1nrjfg568cpwmr4m37"; depends=[lava numDeriv Rcpp RcppArmadillo survival timereg]; }; mev = derive2 { name="mev"; version="1.10"; sha256="0kidgghwjc81rx2vb8y1iiwvlfxafv7r11n3zz1gb7705w6ynw1m"; depends=[boot evd gmm ismev nleqslv numDeriv Rcpp RcppArmadillo rootSolve]; }; @@ -7019,7 +7340,7 @@ in with self; { mgcv = derive2 { name="mgcv"; version="1.8-17"; sha256="1zj223l4a3j15d3c01wv7dkzn9w6084gxrq5600ck9rvr0lfpwwg"; depends=[Matrix nlme]; }; mglR = derive2 { name="mglR"; version="0.1.0"; sha256="1b7nd913d4a1szgw2qnhlnjqhfxr95xag6jwjcb2wnnxd12lib7n"; depends=[biomaRt dplyr gdata ggplot2 gplots magrittr stringr]; }; mglmn = derive2 { name="mglmn"; version="0.0.2"; sha256="1ijkmr85s4yya0hfwcyqqskbprnkcbq8sc9c889i0gy0543fgqz4"; depends=[mvabund snowfall]; }; - mgm = derive2 { name="mgm"; version="1.1-7"; sha256="01srb1fb3ndfh1jimrdvf35g3f25jddij0sdi3n2d7gm4x8s0h24"; depends=[glmnet matrixcalc Rcpp]; }; + mgm = derive2 { name="mgm"; version="1.2-1"; sha256="131zw61d2g39pzgy7ap95ah6mgbbybcpci665cxshascmlki3rpr"; depends=[glmnet Hmisc matrixcalc stringr]; }; mgpd = derive2 { name="mgpd"; version="1.99"; sha256="0cxpgza9i0hjm5w1i5crzlgh740v143120zwjn95cav8pk8n2wyb"; depends=[corpcor evd fields numDeriv]; }; mgraph = derive2 { name="mgraph"; version="1.03"; sha256="0av2c0jvqsdfb3i0s0498wcms0n2mm0z3nnl98mx2fy7wz34z8b2"; depends=[rgdal]; }; mhde = derive2 { name="mhde"; version="1.0-1"; sha256="1q7lbj2is024f5rmfpdn3a0hsb78bf62ddal3chhnh3bi1z3jrjk"; depends=[]; }; @@ -7029,6 +7350,7 @@ in with self; { mhurdle = derive2 { name="mhurdle"; version="1.1-7"; sha256="06ph0vbm7yk5388v2aww6nmi2rhjhfjj1hl506a41m5k6hf746pk"; depends=[Formula maxLik survival texreg truncreg]; }; mi = derive2 { name="mi"; version="1.0"; sha256="1h47k5mpbvhid83277dvvj2di493bgzz9iarpyv3r30y219l7x1l"; depends=[arm Matrix]; }; miCoPTCM = derive2 { name="miCoPTCM"; version="1.0"; sha256="1lmf6zahfp59ylhdp2cbr7y3vayhim72zazimg4qfld4r9d6kygc"; depends=[distr MASS nleqslv survival]; }; + miRNAss = derive2 { name="miRNAss"; version="1.1"; sha256="1mpwr4qb3mzasl5q0d9hr6a023nqgmhq4iq4bknkghnsjf5jr85p"; depends=[CORElearn Matrix Rcpp RSpectra]; }; miRada = derive2 { name="miRada"; version="1.13.8-8"; sha256="1m6rm65pv4r16r0s5ih69nr3v2rnpsvpdpk07pi7k4f7v9wck71v"; depends=[]; }; miRtest = derive2 { name="miRtest"; version="1.8"; sha256="0i66s1sz7vf8p8ihfrxmag7wbkw8mlkldcp1w2figlzyhs74c85p"; depends=[corpcor GlobalAncova globaltest limma MASS RepeatedHighDim]; }; micEcon = derive2 { name="micEcon"; version="0.6-14"; sha256="1d3cdg36ighyhly5by9gl6lxkdvx2agb5cv2mf77pwwd7rpq35h3"; depends=[miscTools plm]; }; @@ -7037,9 +7359,10 @@ in with self; { micEconIndex = derive2 { name="micEconIndex"; version="0.1-6"; sha256="1ihly6qpyg1pms4nkvs6khxxqwr3fwg57i8pg0yhyy1apqxyj2xl"; depends=[miscTools]; }; micEconSNQP = derive2 { name="micEconSNQP"; version="0.6-6"; sha256="1n3pxapc90iz1w3plaqflayd0b1jqd65yw5nbbm9xz0ih132dby9"; depends=[MASS miscTools systemfit]; }; mice = derive2 { name="mice"; version="2.30"; sha256="1r673x51vs3w7kz4bkp2rih4445hcmajw86gjwz7m2piajwvs817"; depends=[lattice MASS nnet Rcpp rpart survival]; }; - miceadds = derive2 { name="miceadds"; version="2.4-12"; sha256="0bav0jbawy1jnr7gms2mcr651g9azrkx2870slnzf75bjrlm054g"; depends=[blme car CDM foreign grouped lme4 MASS MCMCglmm mice mitools multiwayvcov mvtnorm Rcpp RcppArmadillo sirt sjmisc TAM]; }; - micompr = derive2 { name="micompr"; version="1.0.1"; sha256="1380x9jp5lpc6n6bjvhmkwlb59ch7q59r3bc6f0i5j2kpaairbc4"; depends=[]; }; - microPop = derive2 { name="microPop"; version="1.1"; sha256="1ib4jiyrn4kb0llyx95byd1bi34hy1bxi9w1796c6wpa49dbxvpp"; depends=[deSolve]; }; + miceadds = derive2 { name="miceadds"; version="2.5-9"; sha256="1dyhcsydmcgbzjwl6fvxyr1dbzp6wbpqy39l9slvyh6dycfws9wz"; depends=[blme car CDM foreign grouped lme4 MASS MCMCglmm mice mitools multiwayvcov mvtnorm Rcpp RcppArmadillo sirt sjlabelled TAM]; }; + micemd = derive2 { name="micemd"; version="1.0.0"; sha256="0zzdykkhl87qzklxvn5h6x9lvbg1mix5xhglk3cii8qrq4c6jik2"; depends=[abind digest jomo lme4 MASS Matrix mice mvmeta mvtnorm nlme]; }; + micompr = derive2 { name="micompr"; version="1.0.2"; sha256="1hmxi5wz7vfnvawh50zk316gr3ry59m820ddj2v9p7cxq21hwv9i"; depends=[]; }; + microPop = derive2 { name="microPop"; version="1.2"; sha256="1gx5x4csqbqdxnzyfj72p8d5dw5qn5y1ijfas7q1vbfv65sdkak3"; depends=[deSolve]; }; microbats = derive2 { name="microbats"; version="0.1-1"; sha256="1mahvblaiwg1xk2s34wd1ic8ddc9lh6g0azik2pd97bsf0krkyw8"; depends=[]; }; microbenchmark = derive2 { name="microbenchmark"; version="1.4-2.1"; sha256="0qn5r1a6qidghcisc2hpbdmj62pnixc3zz6p4ipk8mvakf0hdsvg"; depends=[ggplot2]; }; microclass = derive2 { name="microclass"; version="1.1"; sha256="0hl2s4135k187f0vqmj9snvmnwa5k9fg8ahivfs7ciknrcxfv3nk"; depends=[microcontax microseq Rcpp RcppEigen RcppParallel]; }; @@ -7055,9 +7378,10 @@ in with self; { migest = derive2 { name="migest"; version="1.7.3"; sha256="1g49b4fa2974w8alb97k06k3zi49q66n16cvcbqdaj9j21c9qfmy"; depends=[]; }; migration_indices = derive2 { name="migration.indices"; version="0.3.0"; sha256="0h0yjcj70wzpgrv3wl1f2h2wangh1klsllq0i0935plgzw736mwd"; depends=[calibrate]; }; migui = derive2 { name="migui"; version="1.1"; sha256="1qchjsc7ff2b6s9w6ncj9knjv6pyp90jd4jxljn2rr1ix1gc45za"; depends=[arm gWidgets2 mi]; }; - milr = derive2 { name="milr"; version="0.2.0"; sha256="1fhpnibs99045fcphydgdh7mdbpclbskbb74zlvhpbr6q8hh70hd"; depends=[assertthat glmnet numDeriv pipeR purrr Rcpp RcppArmadillo]; }; + milr = derive2 { name="milr"; version="0.3.0"; sha256="0z4d22fd6gd3zbi973vws9jqyh4c4m4i4ajcpxv934vxmbj0cma9"; depends=[glmnet numDeriv pipeR Rcpp RcppArmadillo RcppParallel]; }; mime = derive2 { name="mime"; version="0.5"; sha256="0i91m3ivaja1k33jwcvz16pfjypkci27awm8glil7sxhmwaj3izw"; depends=[]; }; minPtest = derive2 { name="minPtest"; version="1.7"; sha256="088kckpbfy2yp0pk3zrixrimywrvkaib5ywa7fkr5phnzlsl80sv"; depends=[Epi scrime]; }; + mindr = derive2 { name="mindr"; version="1.0.4"; sha256="0mvpa0g3hf8gp6ygibyib0kz0b1hgm6d2392yznmp59g5bvz1paa"; depends=[]; }; minerva = derive2 { name="minerva"; version="1.4.5"; sha256="0k6hyfh1lr345718vl1ssqgm5567nylk158awygmbjgkv8g8v2av"; depends=[]; }; miniCRAN = derive2 { name="miniCRAN"; version="0.2.7"; sha256="0ijvsc0aqhcyy5fmxjh7ks4f40l5hm3p485x80a475bmjrh9g15w"; depends=[httr XML]; }; miniGUI = derive2 { name="miniGUI"; version="0.8.0"; sha256="1iq52x7wbcin7ya207jj3k9vym7mavm5z61vggyabdmr768pci39"; depends=[]; }; @@ -7065,16 +7389,16 @@ in with self; { minimalRSD = derive2 { name="minimalRSD"; version="1.0.0"; sha256="1p1jpi8lnv952k4c1wjgbgpb0hv4zg0f9qrd43cx0caibkqvhzf7"; depends=[]; }; minimap = derive2 { name="minimap"; version="0.1.0"; sha256="0y5yzic9pwpzs01gnl82syankijcjp85n22jn5zda0bp3y01r53r"; depends=[]; }; minimax = derive2 { name="minimax"; version="1.0"; sha256="1g0d9q5h1avbb0yg7ajw5330820i3n5cgkpsif754l4j3ikya8p3"; depends=[]; }; - minimaxdesign = derive2 { name="minimaxdesign"; version="0.1.1"; sha256="0rclwfqpj262krghjcmq79fb2m2syb39jxk048ll98a58bz103dp"; depends=[DiceDesign doParallel doSNOW foreach gtools MaxPro nloptr randtoolbox Rcpp RcppArmadillo]; }; + minimaxdesign = derive2 { name="minimaxdesign"; version="0.1.2"; sha256="0sbycipns8nx63lp0426b9fwmlq3lprb9j3cfry7a1ibfkw63qf9"; depends=[DiceDesign doParallel doSNOW foreach gtools MaxPro nloptr randtoolbox Rcpp RcppArmadillo]; }; minimist = derive2 { name="minimist"; version="0.1"; sha256="007y829d766b1v6wkrhk7pkg99r38bvmhc8bwvs8rs13dr7444ln"; depends=[V8]; }; minpack_lm = derive2 { name="minpack.lm"; version="1.2-1"; sha256="18ym2pdql5vzngc7q5gn66d153hrfrnd8ilv8yh6vd7j7sx7vjql"; depends=[]; }; minqa = derive2 { name="minqa"; version="1.2.4"; sha256="036drja6xz7awja9iwb76x91415p26fb0jmg7y7v0p65m6j978fg"; depends=[Rcpp]; }; minque = derive2 { name="minque"; version="1.1"; sha256="1hx4j38213hs8lssf9kj5s423imk7dzv60mdbzrpbp7la7jk2n57"; depends=[klaR Matrix]; }; - minval = derive2 { name="minval"; version="0.6-1"; sha256="0m907wff5mk533p5w2q067ji86dh7xskv43glcfbiq8bhbg4qw5h"; depends=[]; }; + minval = derive2 { name="minval"; version="0.8"; sha256="05yqr2b5x17kpp4661x6p4pjszmvz2bad43z8m3qnvaa29zhd3n3"; depends=[]; }; minxent = derive2 { name="minxent"; version="0.01"; sha256="1a0kak4ff1mnpvc9arr3sihp4adialnxxyaacdgmwpw61wgcir7h"; depends=[]; }; mipfp = derive2 { name="mipfp"; version="3.1"; sha256="18cfv8s38cd0g1wc5pry6a4m2ykqflkxhqbqnjbjvmr42bj3r6sp"; depends=[cmm numDeriv Rsolnp]; }; - mirt = derive2 { name="mirt"; version="1.23"; sha256="13dx1ir09lmvapjv6igya71w5yp6r41yzpcdnbdk5jqyyqidnian"; depends=[GPArotation lattice mgcv numDeriv Rcpp RcppArmadillo sfsmisc]; }; - mirtCAT = derive2 { name="mirtCAT"; version="1.4"; sha256="1gfpbx0zay8bkr116fnvcwxgrm6vpcvf25k3advnaj54ad8vw4b4"; depends=[lattice lpSolve markdown mirt pbapply Rcpp RcppArmadillo shiny]; }; + mirt = derive2 { name="mirt"; version="1.24"; sha256="1hlhcb5mzccispwk26caqaykqqpx600awjsw5xyi5bzlpn2llv5p"; depends=[GPArotation lattice mgcv numDeriv Rcpp RcppArmadillo sfsmisc]; }; + mirtCAT = derive2 { name="mirtCAT"; version="1.5"; sha256="032d73am0nligja1wfj5b2gnfb0yiivipajvy1wfx46wi7dv8i12"; depends=[lattice lpSolve markdown mirt pbapply Rcpp RcppArmadillo shiny]; }; misc3d = derive2 { name="misc3d"; version="0.8-4"; sha256="0qjzpw3h09qi2gfz52b7nhzd95p7yyxsd03fldc9wzzn6wi3vpkm"; depends=[]; }; miscF = derive2 { name="miscF"; version="0.1-3"; sha256="1djmsffwkicj25ndg07dnid6qj66b1rdw0yrv79jakjfbv71c13i"; depends=[BayesBridge BRugs MASS MCMCpack mvtnorm R2jags Rcpp RcppArmadillo]; }; miscFuncs = derive2 { name="miscFuncs"; version="1.2-10"; sha256="1kqya581n76ff9avhj6xm6nwsbw7zlm4mwy0vyvdlqlf7c381qq0"; depends=[mvtnorm roxygen2]; }; @@ -7084,16 +7408,18 @@ in with self; { miscset = derive2 { name="miscset"; version="1.1.0"; sha256="1gwi7jnqdf2fa8yk8gmcc7dcv72bbdl7yj3yccj3r5jjk41vdp91"; depends=[data_table devtools ggplot2 gridExtra Rcpp xtable]; }; mise = derive2 { name="mise"; version="0.1.0"; sha256="1ydbm76w3y0p5h82shxjblwlzbrmzwx0bgq9w2axjwz2nx8jfw0a"; depends=[]; }; misreport = derive2 { name="misreport"; version="0.1.1"; sha256="1f78zcw4cg51mjvflhwd64hip2gj8x9ng1mhh4w43yv3x8hmbd6h"; depends=[mvtnorm numDeriv VGAM]; }; - missDeaths = derive2 { name="missDeaths"; version="2.2"; sha256="0gkzq7jpqkfcvc40i0xdjxmwmn1mpd7p4hik4fqz22q3pvmhmmwn"; depends=[cmprsk MASS mitools Rcpp relsurv rms survival]; }; + missDeaths = derive2 { name="missDeaths"; version="2.5"; sha256="0pslssgf580zd0dd7m0l97bzgxnywj2qac0agxv6ih1a0xlxz874"; depends=[cmprsk MASS mitools Rcpp relsurv rms survival]; }; missForest = derive2 { name="missForest"; version="1.4"; sha256="0y02dhrbcx10hfkakg5ysr3kpyrsh2d9i5b0qzhj9x5x0d5q11gp"; depends=[foreach itertools randomForest]; }; missMDA = derive2 { name="missMDA"; version="1.11"; sha256="185ia5zg5gdrkjpj5sql46lz5svw77wjy9zplpqhrmgx43fv0w0i"; depends=[FactoMineR mice mvtnorm]; }; mistat = derive2 { name="mistat"; version="1.0-4"; sha256="0gzng0kl3handy3k7g62c4sdcf9l6x0b69jxmfrwfd4297f57n9n"; depends=[]; }; mistral = derive2 { name="mistral"; version="2.1.0"; sha256="1cr79p8q82lpj9d0y6q24xmfkxmnlqv8ivkd0baj7fxfb1nb8sak"; depends=[DiceKriging doParallel e1071 emoa foreach ggplot2 iterators Matrix mvtnorm quadprog]; }; mitml = derive2 { name="mitml"; version="0.3-5"; sha256="1s888r9y2ri39b48h1iypps6lddqkqv3g31l2sjmi2pvyccfpkwb"; depends=[haven jomo pan]; }; mitools = derive2 { name="mitools"; version="2.3"; sha256="0w76zcl8mfgd7d4njhh0k473hagf9ndcadnnjd35c94ym98jja33"; depends=[]; }; - mix = derive2 { name="mix"; version="1.0-9"; sha256="08729y6ih3yixcc4a6m8fszg6pjc0s02iq47339b9gj16p82b74z"; depends=[]; }; + mix = derive2 { name="mix"; version="1.0-10"; sha256="0z16ddbh79kqxi64bl1h2sd8anpgc48n9d1nyr2zlln39nhv8w8g"; depends=[]; }; mixAK = derive2 { name="mixAK"; version="5.0"; sha256="1lb3ivcl64vny21gifll6sc2yaf970mvb1hwlch1k49125ybxz5q"; depends=[coda colorspace fastGHQuad lme4 mnormt]; }; - mixOmics = derive2 { name="mixOmics"; version="6.1.2"; sha256="1f5053xpp674g2dn54rl1yz3knb5i1824dj5v213y6i82m2vygc6"; depends=[corpcor dplyr ellipse ggplot2 igraph lattice MASS plyr RColorBrewer reshape2 rgl tidyr]; }; + mixEMM = derive2 { name="mixEMM"; version="1.0"; sha256="0344ay1avi37kvh5w9bknayx67yh7rflj6zhw68d2888v7cbghjy"; depends=[]; }; + mixKernel = derive2 { name="mixKernel"; version="0.1"; sha256="0p0m081ivpc22z3p8308z12fcdjnid86niwk4i97dvz12dr8v9ws"; depends=[corrplot ggplot2 LDRTools mixOmics phyloseq psych quadprog]; }; + mixOmics = derive2 { name="mixOmics"; version="6.1.3"; sha256="1843gvsm2rd4pmcb6ysq2x39cmipsyyaq6rkdwi8w76sn1r7myhl"; depends=[corpcor dplyr ellipse ggplot2 igraph lattice MASS plyr RColorBrewer reshape2 rgl tidyr]; }; mixPHM = derive2 { name="mixPHM"; version="0.7-2"; sha256="1wvkdb9zj2j8dpppnyins05rg877zbydqsl3qaan62wznkknxcac"; depends=[lattice survival]; }; mixR = derive2 { name="mixR"; version="0.1.0"; sha256="16rl1ggavs1qfq4i3jm85acd0w2zbiacnvnnim3vi3kqa9i09byy"; depends=[ggplot2 Rcpp]; }; mixRasch = derive2 { name="mixRasch"; version="1.1"; sha256="1r067pv7b54y1bz8p496wxv4by96dxfi2n1c99gziqf5ramx3qzp"; depends=[]; }; @@ -7104,7 +7430,7 @@ in with self; { mixer = derive2 { name="mixer"; version="1.8"; sha256="1r831jha7qrxibw5m3nc3l6r887ihzxzsj65yjnbl5cf5b8y19bb"; depends=[]; }; mixexp = derive2 { name="mixexp"; version="1.2.5"; sha256="0nbf10xhrr51rb1b2apcj4p3ci8xbi7flgz500ar3mxh8h8l74sq"; depends=[daewr gdata lattice]; }; mixlink = derive2 { name="mixlink"; version="0.1.4"; sha256="138q48k9bz7dc18fdi6g7ra10b08avwa7xnvw7i8f1fdjk6h2zpc"; depends=[mvtnorm numDeriv Rcpp RcppGSL]; }; - mixlm = derive2 { name="mixlm"; version="1.1.5"; sha256="17ph8a7p9jq7529vvbxb77m6hwscwgamzsm6a9v71cvqkvc5lkmr"; depends=[car leaps lme4 multcomp pls pracma]; }; + mixlm = derive2 { name="mixlm"; version="1.2.1"; sha256="0gh3w7nhnzwq65b9fs2m4dfhy6n04mw09s3q5sjlxrw571v0h1pl"; depends=[car leaps multcomp pls pracma]; }; mixor = derive2 { name="mixor"; version="1.0.3"; sha256="1qnrfd0hggad81rn8ryfm9l0cpd59ifj9sxc1bav35bma535azdv"; depends=[]; }; mixpack = derive2 { name="mixpack"; version="0.3.6"; sha256="0q19mal86qlriwilabgy3sn33iymi5hl3wa33kvb8cd1dgdmjr7a"; depends=[mvtnorm Rcpp RcppArmadillo]; }; mixreg = derive2 { name="mixreg"; version="0.0-5"; sha256="0wsb1z98ymhshw9nhsvlszsanflxv3alwpdsw8lr3v62bkwka8zr"; depends=[]; }; @@ -7130,6 +7456,7 @@ in with self; { mleur = derive2 { name="mleur"; version="1.0-6"; sha256="0mddphq3b6y2jaafaa9y41842kcaqdl3dh7j4pva55q2vcjcclj7"; depends=[fGarch lattice stabledist urca]; }; mlgt = derive2 { name="mlgt"; version="0.16"; sha256="1nvdq6mvgr39ikkf73aggsb6pmbw132injj8fdkr8hgcmwm6lgd9"; depends=[seqinr]; }; mlica2 = derive2 { name="mlica2"; version="2.1"; sha256="0c3m1zd9x99n6lw12hfzmd59355z51xa8rhg1h7qwfn9p86r826f"; depends=[]; }; + mljar = derive2 { name="mljar"; version="0.1.1"; sha256="1mw45aqjwklsnrfwf8656jf30miyrlxpz87z97nkv9i135yhwfx3"; depends=[httr jsonlite readr]; }; mlmRev = derive2 { name="mlmRev"; version="1.0-6"; sha256="0mvmahnbbp478xwldj4wlsjib4v4afhs07643gxgcqpi56zbd5h7"; depends=[lme4]; }; mlma = derive2 { name="mlma"; version="4.0-1"; sha256="0pk2h4m74r95dfkqzliixi6z1rwdfc6gbz8c3162y22m919f00vc"; depends=[car gplots lme4]; }; mlmc = derive2 { name="mlmc"; version="1.0.0"; sha256="01h7w0ajyg3bccynlpbi3yjpy089wczbfbajpg6yw5v4dppw7k7a"; depends=[ggplot2 Rcpp]; }; @@ -7137,14 +7464,14 @@ in with self; { mlogit = derive2 { name="mlogit"; version="0.2-4"; sha256="15ndly7i56k8blgvpn15ixxnqx9yvbci7n3mb3hm9mnrxwh5v7sx"; depends=[Formula lmtest MASS maxLik statmod zoo]; }; mlogitBMA = derive2 { name="mlogitBMA"; version="0.1-6"; sha256="1wl8ljh6rr1wx7dxmd1rq5wjbpz3426z8dpg7pkf1x9wr94a2q25"; depends=[abind BMA maxLik]; }; mlr = derive2 { name="mlr"; version="2.11"; sha256="1fs62xzxgk75k3b4wkxh2qkij03m5i1bbmacgffwq4xak3mr64ma"; depends=[backports BBmisc checkmate data_table ggplot2 parallelMap ParamHelpers stringi survival]; }; - mlrMBO = derive2 { name="mlrMBO"; version="1.0.0"; sha256="1id99p3dxs6z9wq8xwk16xg99kwv4nw0mdyfammin4nnwwbkggsd"; depends=[backports BBmisc checkmate data_table lhs mlr parallelMap ParamHelpers smoof]; }; + mlrMBO = derive2 { name="mlrMBO"; version="1.1.0"; sha256="1858a01qb531s1bylvmlkl10f41azwiwx8jy1033ycv6llqjgs3a"; depends=[backports BBmisc checkmate data_table lhs mlr parallelMap ParamHelpers smoof]; }; mlsjunkgen = derive2 { name="mlsjunkgen"; version="0.1.1"; sha256="109ag52x4y3rzx8yccilrnl24mz4ximzx6v4lrbak7dpiclqrw7a"; depends=[]; }; - mlt = derive2 { name="mlt"; version="0.1-3"; sha256="0195v5hl3vljc4vwybkrw9z43pfh3n1awixryf5ysv0xc6ksm7bi"; depends=[basefun BB numDeriv quadprog sandwich variables]; }; - mlt_docreg = derive2 { name="mlt.docreg"; version="0.1-5"; sha256="0clgrrcdi0ij23nn7pzbv901paxy092pbr3g987c2ij22sh32l7n"; depends=[mlt numDeriv]; }; - mltools = derive2 { name="mltools"; version="0.2.0"; sha256="0q7k4gkvswlkvjjvjpaw72cx7wjb26yjpap1yqbdq9b3gq32w02j"; depends=[data_table Matrix]; }; - mlxR = derive2 { name="mlxR"; version="3.1.0"; sha256="1xdv7s6li1kwn8m4dnhz18rhmhv13y128npcfmfka646l0p5g1r9"; depends=[ggplot2 Rcpp XML]; }; + mlt = derive2 { name="mlt"; version="0.2-0"; sha256="09pvqyyzlb76x47v2lbgsdrld0z0r1v3c29q3a0dsx62ia367mqr"; depends=[alabama basefun BB numDeriv quadprog sandwich survival variables]; }; + mlt_docreg = derive2 { name="mlt.docreg"; version="0.2-0"; sha256="1n23bjfjacyq7b9n47ai9is8p0ka6m36085c0q1i47zpz5kv6d5k"; depends=[mlt numDeriv]; }; + mltools = derive2 { name="mltools"; version="0.3.0"; sha256="15i9w5qa986wnn9vlzy5f3nf0pccd80a9silxjxi77hls80snvgq"; depends=[data_table Matrix]; }; + mlxR = derive2 { name="mlxR"; version="3.2.0"; sha256="1a0104h4b0qag20xv5sg8m4b0ndvz843lnc4jypfxns3bi5k4v1m"; depends=[ggplot2 Rcpp XML]; }; mma = derive2 { name="mma"; version="5.0-0"; sha256="1k65ar8nhv7ya254ap94hbx91siqcwxlg3yac85xxxs9rr6b27bf"; depends=[car doParallel foreach gbm gplots survival]; }; - mmand = derive2 { name="mmand"; version="1.4.1"; sha256="1gkn0dhfffsa2bsrm6wy21l1w17x6h3znfn4a8s8yvgggwnq4030"; depends=[Rcpp reportr]; }; + mmand = derive2 { name="mmand"; version="1.5.0"; sha256="1snakabn77y5mmyab5djkd87ld1hv5kl91bb2hwial8vkjpv9cq5"; depends=[Rcpp]; }; mmap = derive2 { name="mmap"; version="0.6-12"; sha256="12ql03wzwj23h8lwd07rln6id44mfrgf9wcxn58y09wn3ky1rm6a"; depends=[]; }; mmc = derive2 { name="mmc"; version="0.0.3"; sha256="03nhfhiiadga8mcp33kj20g33v9n5i62fdqgi20h5p80g849k719"; depends=[MASS survival]; }; mmcm = derive2 { name="mmcm"; version="1.2-6"; sha256="0lk2lk8j4hq6shw3vpq53gvh2w1gwkayvgfny4i04k5fglbwivg7"; depends=[mvtnorm]; }; @@ -7159,11 +7486,12 @@ in with self; { mmpp = derive2 { name="mmpp"; version="0.4"; sha256="120ciyd9c6zwbdvzcpasb1476d0i9h28a1a5c99z3zar8lpp184p"; depends=[]; }; mmppr = derive2 { name="mmppr"; version="0.1"; sha256="0fswkqcw0xkqd9gmqabb61i32zscp5jzfx0z43wq7mrlwynryylv"; depends=[expm reshape2]; }; mmtfa = derive2 { name="mmtfa"; version="0.1"; sha256="113bpcb05i78y78byrdn9j45dfcar7q8z7qmlid8cl6b8cjv1vfz"; depends=[matrixStats mvnfast]; }; - mnis = derive2 { name="mnis"; version="0.2.3"; sha256="03ka16wmgcgzplp1gj76irbg3j7302jd1jw71dlghngx6ic337yh"; depends=[dplyr httr jsonlite Rcpp tibble]; }; + mnis = derive2 { name="mnis"; version="0.2.6"; sha256="1jss648lr7ypr462jq009lawvfhbxih6c9max75dykrz2q2m8mjx"; depends=[dplyr httr jsonlite Rcpp stringi tibble]; }; mnlogit = derive2 { name="mnlogit"; version="1.2.5"; sha256="0vwragk71hisz7dy4h5i6zl9yp6wvzwlnfyw2kprnd94y02laq63"; depends=[Formula lmtest mlogit]; }; mnormpow = derive2 { name="mnormpow"; version="0.1.1"; sha256="0z53vwhkhkkr6zrjhd3yr14mb02vh7lr63frf0ivajndxiap0s9v"; depends=[]; }; mnormt = derive2 { name="mnormt"; version="1.5-5"; sha256="1b34xxrnf35khsx82mhvmk96sgfr2flyasaah7qkb2976pwxay7z"; depends=[]; }; mockery = derive2 { name="mockery"; version="0.3.0"; sha256="1ydgxqdzwn68b84a7557nasgm1r5jk2mivzwq9x71p7zwqf4c8vd"; depends=[testthat]; }; + mockr = derive2 { name="mockr"; version="0.1"; sha256="0340v6189ivlzzriwk7yhf3v2k651x05fd1xrqfxxjgwhysaqj6z"; depends=[lazyeval]; }; mod09nrt = derive2 { name="mod09nrt"; version="0.14"; sha256="1wn1y33bj9r712l0f063j5gcl423anjzmvgfy0ddihcrbpz4l7a0"; depends=[]; }; modEvA = derive2 { name="modEvA"; version="1.3.2"; sha256="0p41fl0k780rx1vmq9laknz01ar6507sj8ss8kphrqkjnymsi2a0"; depends=[]; }; modMax = derive2 { name="modMax"; version="1.1"; sha256="1mx4623az7vzaqf530pklx7j92qwwq93pa2416lnr24jjcxgva2h"; depends=[gtools igraph]; }; @@ -7171,13 +7499,15 @@ in with self; { modTempEff = derive2 { name="modTempEff"; version="1.5.2"; sha256="00xdvc0i3p8wq913giy44w0xz07sa4bdgqpi7pmpbv2c5wj30pk1"; depends=[mgcv]; }; modeest = derive2 { name="modeest"; version="2.1"; sha256="0l4y7yhkgsxycdd2lck0g8g6k2r059hwlrrcpl46md3rva4jgbnp"; depends=[]; }; modehunt = derive2 { name="modehunt"; version="1.0.7"; sha256="0qz9kmf1qfs2dr7kzm9l7ac0h5rvi3b9j9896p991sk4bcalsl0b"; depends=[]; }; - modelObj = derive2 { name="modelObj"; version="1.0"; sha256="0r4smak9hni9pzih4nzkpv3bq18acrsmmxs1a13wq3pgjfvkwa63"; depends=[]; }; + modelObj = derive2 { name="modelObj"; version="3.0"; sha256="0wc67zsh26zyr7x9s229g2mppfk6g6z12j74zj2bdhk2m7i2x3zq"; depends=[]; }; modelfree = derive2 { name="modelfree"; version="1.1-1"; sha256="0ammka2wxx90z31zfzypw9dk5n118l0vxhykxbx6srfig2vdyn82"; depends=[PolynomF SparseM]; }; modelr = derive2 { name="modelr"; version="0.1.0"; sha256="1vrhszix1kq5p02i044vjlbpmkdgn6ifg1jk00if7bn33sb872vy"; depends=[broom dplyr lazyeval magrittr purrr tibble tidyr]; }; modeltools = derive2 { name="modeltools"; version="0.2-21"; sha256="0ynds453xprxv0jqqzi3blnv5w6vrdww9pvd1sq4lrr5ar3k3cq7"; depends=[]; }; modes = derive2 { name="modes"; version="0.7.0"; sha256="185qjrmz2sj0l5931g4d3kx3jpgjn4rf4lln84h6g97prk1ykqmj"; depends=[]; }; + modest = derive2 { name="modest"; version="0.1"; sha256="0nwa71pk015pqamiyrbcq0pxdq43mvcq8zpvfn2xmzcjhm30770b"; depends=[knitr shiny shinyBS]; }; modeval = derive2 { name="modeval"; version="0.1.3"; sha256="10yjba2dlwrgd3ycw10y1sa3xdxf2spq829bbxwfissc5l9gk48x"; depends=[caret dplyr e1071 ggplot2 gridExtra knitr magrittr mlbench ModelMetrics psych purrr stringr tibble]; }; modiscloud = derive2 { name="modiscloud"; version="0.14"; sha256="0vwhfp50yb21xkanvzk983vk0laflv60kj1ybx3fydfljwqx0rwj"; depends=[date raster rgdal sfsmisc sp]; }; + modmarg = derive2 { name="modmarg"; version="0.5.0"; sha256="00ccgcmk13zpiq96n7clag1a2mav76z2njfnvn79lxnp5rfx2rjb"; depends=[]; }; moduleColor = derive2 { name="moduleColor"; version="1.08-3"; sha256="183l968l49b7jbmvsjjnmk1xd36cpjkp777c00gw1f73h6nb2na8"; depends=[dynamicTreeCut impute]; }; modules = derive2 { name="modules"; version="0.5.0"; sha256="1dwvwdfshhdv7fk346l8czbkq0f1im0xfci3pzzinkdlfi3m0h2a"; depends=[stringr]; }; modygliani = derive2 { name="modygliani"; version="1.0"; sha256="01g96cdm4hgbsh6xsdfjg7vp7zb138sxwgv0msrlm27a6p4fcnlx"; depends=[]; }; @@ -7186,34 +7516,37 @@ in with self; { mokken = derive2 { name="mokken"; version="2.8.5"; sha256="1f45yacq50g0xfvipv3vxrcy20d69q2ijvnx1byxphzfkqjvrlj4"; depends=[poLCA]; }; moko = derive2 { name="moko"; version="1.0.0"; sha256="0nsj83hn0kflsw15ghw6b5zjsd875vj9vj7i0ag67cn2n82yncb5"; depends=[DiceKriging DiceOptim emoa GenSA GPareto mco]; }; molaR = derive2 { name="molaR"; version="4.2"; sha256="1xz4vfb9rkw731cxjqvh7hpcm2lly9hmxp951il536gwb665jh1j"; depends=[alphahull rgl Rvcg]; }; - mombf = derive2 { name="mombf"; version="1.9.4"; sha256="1vmi3nfhqgdck0haacdjrssqx94w11wh3wc74shlg1ma3dpik1rg"; depends=[actuar mgcv mvtnorm ncvreg survival]; }; + mombf = derive2 { name="mombf"; version="1.9.5"; sha256="1s776bvfkivif7i3338l1pk8qi5b6b7sxb9zgcidw4kwmj388rdd"; depends=[actuar mgcv mvtnorm ncvreg survival]; }; momentchi2 = derive2 { name="momentchi2"; version="0.1.5"; sha256="1fv0jmwws4mkl9dsaybfpj29ncvqx2idsijgwz2qjblcg309a6k9"; depends=[]; }; moments = derive2 { name="moments"; version="0.14"; sha256="0f9y58w1hxcz4bqivirx25ywlmc80gbi6dfx5cnhkpdg1pk82fra"; depends=[]; }; + momentuHMM = derive2 { name="momentuHMM"; version="1.0.0"; sha256="12slwnc7wxk72an5fv6y85bmi9yxcms00y0jq5z30midxjyja8ry"; depends=[argosfilter boot Brobdingnag car CircStats conicfit crawl doParallel foreach ggmap ggplot2 gstat MASS mitools moveHMM mvtnorm nleqslv numDeriv qdapRegex raster Rcpp RcppArmadillo sp splines2 survival]; }; momr = derive2 { name="momr"; version="1.1"; sha256="091vzaw8dm29q89lg2iys25rbg2aslgdn9sk06x038nngxdrn95r"; depends=[gplots Hmisc nortest]; }; mondate = derive2 { name="mondate"; version="0.10.01.02"; sha256="18v15y7fkll47q6kg7xzmj5777bz0yw4c7qfiw2bjp0f3b11qrd2"; depends=[]; }; mongolite = derive2 { name="mongolite"; version="1.2"; sha256="19zhscsgqvzx5gqryzl82dw6impc6sacx2shanmnj4zfgs7bgwqr"; depends=[jsonlite openssl]; }; monitoR = derive2 { name="monitoR"; version="1.0.5"; sha256="1rqcdg4gha5vh3dvxqzr2albi2capm18rkgf79rd769hrk3z09l5"; depends=[tuneR]; }; - monkeylearn = derive2 { name="monkeylearn"; version="0.1.1"; sha256="1w0d4cvd1y3wal8r0hg8w08x1zqzkv7ag8nyplmkqv9vwc15qd26"; depends=[digest httr jsonlite tibble]; }; + monkeylearn = derive2 { name="monkeylearn"; version="0.1.3"; sha256="1sq30pkqd8q4dck4ck1lfdfyiir5p4c87i3xnvx7w9spx3c6pxpd"; depends=[digest httr jsonlite tibble]; }; monmlp = derive2 { name="monmlp"; version="1.1.4"; sha256="09rjv0d1z6v1qxl0csnip53gc00y23r59xbspn8fqwrwjd1v30l1"; depends=[optimx]; }; monogeneaGM = derive2 { name="monogeneaGM"; version="1.1"; sha256="0fbz26jx05xmna799s086khy6j8xbvv91vh544npd49isnag1v6v"; depends=[ape circular cluster geomorph gplots phytools rgl]; }; monographaR = derive2 { name="monographaR"; version="1.2.0"; sha256="0sis2kw07ifq54w6p56zspmlnvxvq6ajb0sdvc9fk480sfxg9806"; depends=[circular maptools png raster rmarkdown sp]; }; monomvn = derive2 { name="monomvn"; version="1.9-7"; sha256="1bz967sl6ji84x9v0fypjn75d39naaqgvw31n9lgcd5lyj39hbsk"; depends=[lars MASS mvtnorm pls quadprog]; }; + monoreg = derive2 { name="monoreg"; version="1.1"; sha256="0kx6vc8n7wrfmrakjfyzxx5qjibfax6wya8nk204p3jwpzgy456r"; depends=[]; }; monreg = derive2 { name="monreg"; version="0.1.3"; sha256="08rcg2xffa61cgqy8g98b0f7jqhd4yp8nx6g4bq3g722aqx4nfg3"; depends=[]; }; moonBook = derive2 { name="moonBook"; version="0.1.3"; sha256="1wy8qwzymh482gfb4v9v74k666mq8dz2yird7gz43l3hps22kfgb"; depends=[nortest survival]; }; moonsun = derive2 { name="moonsun"; version="0.1.3"; sha256="1y8mwxmcy4iz444c2fayyi4i0jk1k561dp6cbjg2b3lmdml0whmi"; depends=[]; }; + mopa = derive2 { name="mopa"; version="1.0.0"; sha256="0ck3ha6nzpmij91b97vgp1xxgzgxs0jc80hgfivxk1mgilh4rv7a"; depends=[abind dismo e1071 earth gtools lattice PresenceAbsence randomForest ranger raster rpart sampling sp spam spatstat splancs tree]; }; mopsocd = derive2 { name="mopsocd"; version="0.5.1"; sha256="10hssnm1afqmxa9kw6ifqnz3p3yyjrmxgi98zlj31a5g4nis8wb1"; depends=[]; }; morgenstemning = derive2 { name="morgenstemning"; version="1.0"; sha256="17y90cf8ajmkfwla0hm4jgkbkd1mxnym63ph2468sfxkhn0r3v88"; depends=[]; }; morse = derive2 { name="morse"; version="2.2.0"; sha256="0l52hwhbspf1d6wi0qnwgwjjc1kkixkfdsf81jvwshnxbci4s3kw"; depends=[coda dplyr epitools ggplot2 gridExtra reshape2 rjags stringr]; }; mosaic = derive2 { name="mosaic"; version="0.14.4"; sha256="0dvlykr05jjpnjcvkffmjpc83bnbvg7i5zkjr2y1c7h16hy9d5wz"; depends=[dplyr ggdendro ggplot2 gridExtra lattice latticeExtra lazyeval MASS Matrix mosaicData readr tidyr]; }; mosaicData = derive2 { name="mosaicData"; version="0.14.0"; sha256="0f092wp2lpj8rk6r2bd5mxp4q3n7ia9h838z8prrz56vwh3gbpw0"; depends=[]; }; - mosaicQA = derive2 { name="mosaicQA"; version="1.2.0"; sha256="0ddgvvw679pg7lixyxqxqi8pzyy03w6h4z5cas09m2m16nz2nr2f"; depends=[gplots psych]; }; moult = derive2 { name="moult"; version="2.0.0"; sha256="177fhi3f5qsg2k4qb1cgviq96aln80qwri1hf9yym6wrzn8crj7r"; depends=[Formula Matrix]; }; mountainplot = derive2 { name="mountainplot"; version="1.1"; sha256="1l3m7jgq70g83mmfhlwzj5gkdnwgl14g9ljpk6j7z7qxapzva3bb"; depends=[lattice]; }; mousetrack = derive2 { name="mousetrack"; version="1.0.0"; sha256="0lf0xh0c3xl27nh5w8wwyrm2jfzfajm2f73xjdgf746dp365qc8n"; depends=[pracma]; }; - mousetrap = derive2 { name="mousetrap"; version="3.0.0"; sha256="06xadwhcpvqji2qdg2a9xnwq5n3qnyfhziifaaargpzzaz25nvmf"; depends=[cstab diptest dplyr fastcluster ggplot2 magrittr pracma psych RColorBrewer Rcpp scales tidyr]; }; + mousetrap = derive2 { name="mousetrap"; version="3.1.0"; sha256="1r1cpfn6bcgk66lw0la6r3bsv62yhp2m3jkwn0g8rbwrhp9jyl6p"; depends=[cstab diptest dplyr fastcluster fields ggplot2 magrittr pracma psych RColorBrewer Rcpp scales tidyr]; }; movMF = derive2 { name="movMF"; version="0.2-1"; sha256="1yrjz76bwhziwdj2xdibr3lxcka4nq32b6rq3m9q0vkv9gspmw6v"; depends=[clue skmeans slam]; }; move = derive2 { name="move"; version="2.1.0"; sha256="1dk83wdfwmxwr6zhy574h9n95kss0b0bprqd20gwwfk27mfjmc8h"; depends=[geosphere httr raster Rcpp rgdal sp]; }; moveHMM = derive2 { name="moveHMM"; version="1.4"; sha256="10sylvcmbbf599klmc11ayzh4r94dxl74xc5n61b8n6mbrsmmi2l"; depends=[boot CircStats ggmap ggplot2 MASS Rcpp RcppArmadillo sp]; }; + moveVis = derive2 { name="moveVis"; version="0.9.4"; sha256="0vli8vhm3nzqgdkv5f1gx8y8fwci6y5dvavxlyhwmzhp6agvfsn4"; depends=[animation dismo geosphere ggplot2 gridExtra maptools move raster rasterVis RCurl reshape sp xts]; }; moveWindSpeed = derive2 { name="moveWindSpeed"; version="0.2.1"; sha256="020bl3i0i393dfknix03k8y70fjsf0lbw0mqrnhwsvz8kwrw3hi1"; depends=[move Rcpp]; }; mp = derive2 { name="mp"; version="0.4.1"; sha256="0awvwqwb25q47j14b450k1k5mh2yzwhn7gizjv5j7lyiamk30iwq"; depends=[Rcpp RcppArmadillo]; }; mpMap = derive2 { name="mpMap"; version="1.14"; sha256="0gmhg5ps8yli8699a5aw26skfbjxx4zpp0paqxxdc0zl28l0pdff"; depends=[gdata qtl seriation wgaim]; }; @@ -7227,29 +7560,28 @@ in with self; { mpm = derive2 { name="mpm"; version="1.0-22"; sha256="0wijw8v0wmbfrda5564cmnp788qmlkk21yn5cp5qk8aprm9l1fnk"; depends=[KernSmooth MASS]; }; mpmcorrelogram = derive2 { name="mpmcorrelogram"; version="0.1-3"; sha256="0qgzsh744002whh3v1hrxs1i0xnk9zgfgkdgx2f0ffj00vvnwr97"; depends=[vegan]; }; mpmi = derive2 { name="mpmi"; version="0.42"; sha256="1j7xsgz3pgbb7a4ykrcj22isbi5svqsxcckai05q7b401h1ppsnh"; depends=[KernSmooth]; }; - mpoly = derive2 { name="mpoly"; version="1.0.3"; sha256="1wcpr7dps1cnl3x46703an9cjb3srz62wvafdsj2i0dazs6dq4sa"; depends=[ggplot2 orthopolynom partitions plyr polynom stringr tidyr]; }; + mpoly = derive2 { name="mpoly"; version="1.0.5"; sha256="0yjh5nnrywxzgy24nlf5v8kq8nq10ccippzfjwf8hz7zzlxzhp5q"; depends=[ggplot2 orthopolynom partitions plyr polynom stringr tidyr]; }; mppa = derive2 { name="mppa"; version="1.0"; sha256="06v6vq2nfh4b407x2gyvcp5wbdrcnk3m8y58akapi66lj8xplcx4"; depends=[]; }; mpr = derive2 { name="mpr"; version="1.0.4"; sha256="13fqvndwxzqa1safa43ad90pkiqnpqmgr0pkwp8lwmnxqmrmj0jb"; depends=[survival]; }; mpt = derive2 { name="mpt"; version="0.5-4"; sha256="01akz72z6z5ybzika120v4v6ah13hfynh98rzbmqgbchijxbbkz6"; depends=[]; }; mptools = derive2 { name="mptools"; version="1.0.1"; sha256="1g4fbfwxv9hir0jn22nh9854blgkh0b5jan3lv0888izj4isa1hc"; depends=[animation lattice latticeExtra raster rasterVis sp viridis zoo]; }; mrMLM = derive2 { name="mrMLM"; version="2.1"; sha256="0ip8xd2dj6d4hxq18pf4j6mk4yl00ajci72rr485wk94cr0zj5hy"; depends=[ggplot2 gWidgets gWidgetsRGtk2 lars MASS ncvreg openxlsx qqman RGtk2 RGtk2Extras stringr]; }; - mra = derive2 { name="mra"; version="2.16.4"; sha256="134fw4bv34bycgia58z238acj7kb8jkw51pjfa2cwprrgsjdpf5g"; depends=[]; }; mratios = derive2 { name="mratios"; version="1.3.17"; sha256="0a2pn4234ri5likaqbxgkw8xqmwchr6fak3nninral0yzd4rcal5"; depends=[mvtnorm]; }; mrbsizeR = derive2 { name="mrbsizeR"; version="1.0.1"; sha256="1gr8mx1byq8nw095yla4gn2ascgw4d90j7a3a3rzwfdavkjj7167"; depends=[fields maps]; }; mrds = derive2 { name="mrds"; version="2.1.17"; sha256="1vs9fldk9gcwvd1acwswzvblnkdm4bv3jmaamlrp3ik6vyd6xjvv"; depends=[mgcv numDeriv optimx Rsolnp]; }; mreg = derive2 { name="mreg"; version="1.1"; sha256="06la0yy2yys161jhlzlcm5lcv0664wm6sa8gjdnpd1s1nx52jkqf"; depends=[]; }; mregions = derive2 { name="mregions"; version="0.1.4"; sha256="1xlgbjm339wr2rs5i6ddyp1lmfgzjb53gw44c3cj1x5qx1jrp7b1"; depends=[data_table httr jsonlite rappdirs sp tibble wellknown xml2]; }; - mrfDepth = derive2 { name="mrfDepth"; version="1.0.3"; sha256="0d7qz2fvqs28w3ibgfr4j1zjhhbbw78il22i7pl474rpqas3kz2r"; depends=[abind geometry ggplot2 matrixStats Rcpp RcppEigen reshape2]; }; + mrfDepth = derive2 { name="mrfDepth"; version="1.0.4"; sha256="0dfx85yd4swd2cwm7pmxa3q7sgqkrj1sr145i13cdcp76wh95hp1"; depends=[abind geometry ggplot2 matrixStats Rcpp RcppArmadillo RcppEigen reshape2]; }; mrgsolve = derive2 { name="mrgsolve"; version="0.8.6"; sha256="0iv093j9jfpq82qs57kp7clxvsa23iipww2gd9vlqmv8pl9zc0cn"; depends=[BH dplyr lazyeval magrittr Rcpp RcppArmadillo tibble]; }; mri = derive2 { name="mri"; version="0.1.1"; sha256="07lqr9fv0nqd626jpqa6x1qxf85r1j4r5brv760dll1p2kl060gw"; depends=[]; }; mritc = derive2 { name="mritc"; version="0.5-0"; sha256="1344x7gc7wvmcqp0sydppavavvps5v7bs0dza2fr8rz3sn4as8sa"; depends=[lattice misc3d oro_nifti]; }; mro = derive2 { name="mro"; version="0.1.1"; sha256="00gc2hd8q5hb2xrswclcqqw1gxl83zmpma6bhsggg3kppsw1dpjv"; depends=[MASS matrixcalc]; }; ms_sev = derive2 { name="ms.sev"; version="1.0.4"; sha256="1sr2rgiskgwjhwif70qj6ga8i8kg4bh342hff66b2a54rxrchmw5"; depends=[]; }; - msBP = derive2 { name="msBP"; version="1.2"; sha256="1sp8njnvv42q8fkcsjzpfg9p9dzz0hjsn2a6b9kfaymx7zvks2sq"; depends=[DPpackage]; }; + msBP = derive2 { name="msBP"; version="1.3"; sha256="180gx1cml6wl5sp359cqfi8qj1l3jgakzrwxcpacxqqmijgnx1jf"; depends=[DPpackage]; }; msSurv = derive2 { name="msSurv"; version="1.2-2"; sha256="02qm3mq17d2yj5mbz6gapd3zfi1wmiad5hpyimcb39impk43n2hf"; depends=[class graph lattice]; }; msaFACE = derive2 { name="msaFACE"; version="0.1.0"; sha256="1lh8crz507nlddm946lmn73xbnsh4cs0kg238ysnsvxs726c83fs"; depends=[]; }; msaR = derive2 { name="msaR"; version="0.2.0"; sha256="1yj70wxpqbjiwfskb68nx2criz3v426b1wnc9bnsl9cr417zhn9s"; depends=[ape htmlwidgets]; }; - msaenet = derive2 { name="msaenet"; version="2.5"; sha256="0417aaqf3v5c5k3r39387maqvhky7f0wkwhdbxk8cylgkip1ls2k"; depends=[foreach glmnet Matrix mvtnorm ncvreg survival]; }; + msaenet = derive2 { name="msaenet"; version="2.6"; sha256="16h08jfghlzpbivglawm0qj4kgqnghx08p7dsqzwkxgywv6x6a2b"; depends=[foreach glmnet Matrix mvtnorm ncvreg survival]; }; msap = derive2 { name="msap"; version="1.1.8"; sha256="0z5lm782jjb9w1h5vgz8bmxjdcrq9zb3xp1w5cb479jjc7krlgg3"; depends=[ade4 ape]; }; msarc = derive2 { name="msarc"; version="1.4.5"; sha256="1jv364502m6q2w039dmdhwsx5id39jc4xcabyrbwbrgy65kwfspg"; depends=[AnnotationDbi gplots RColorBrewer wordcloud XLConnect]; }; mscstexta4r = derive2 { name="mscstexta4r"; version="0.1.2"; sha256="1hjcasmn33xav2mw085lcndv0432l6sz327aikf63491wj1sj7mw"; depends=[dplyr httr jsonlite pander stringi]; }; @@ -7265,15 +7597,17 @@ in with self; { msm = derive2 { name="msm"; version="1.6.4"; sha256="0h0h9cgavpylbj9692750if1hw7qylhsad549fqjx5l0zqbh3zhy"; depends=[expm mvtnorm survival]; }; msma = derive2 { name="msma"; version="0.7"; sha256="0rrxxva71j8gk25hi6hycnyrhrdc0skcaj1bnmh029cqhjl3qma5"; depends=[mvtnorm]; }; msme = derive2 { name="msme"; version="0.5.1"; sha256="1bkj10pgmv9q61384fwd2pxccclclc3knc5x212p42w4w49hnm1q"; depends=[lattice MASS]; }; - msmtools = derive2 { name="msmtools"; version="1.2"; sha256="0pci771mkz9zaf5dbpd9lddpyfffimwsa3mql2z5sbx2xlrycvqj"; depends=[data_table msm survival]; }; - msos = derive2 { name="msos"; version="1.0.1"; sha256="0fbxi8x83sj8a6bahc7q28vql00pxqdia2vxb6ilsc459xaph6vc"; depends=[mclust tree]; }; + msmtools = derive2 { name="msmtools"; version="1.3"; sha256="0p7xpj78cjc1s015ma7vc38kqiy6wvpyixrdinx4ngig1pqfrq4p"; depends=[data_table msm survival]; }; + msos = derive2 { name="msos"; version="1.1.0"; sha256="1dlqmjz5f8h71334kzdjbzvkn0dhysp7fb18g45qqs79cqpf1vzf"; depends=[mclust tree]; }; msr = derive2 { name="msr"; version="0.4.4"; sha256="1r7kzicyi380xylw4vl88918gqmvs875f3rssx57yg28swb93sv0"; depends=[colorspace e1071 glmnet RColorBrewer rgl]; }; + mssqlR = derive2 { name="mssqlR"; version="1.0.0"; sha256="0qdnm7cx9cg14vfcnkmcjqr1jpxsw8xlrbnxldvzz44mzv2n878l"; depends=[magrittr RODBC]; }; mstR = derive2 { name="mstR"; version="1.0"; sha256="0c189ia2mbhn183j0vbqxhwb20ww64fj11pq7p2cd55zfih4kp4b"; depends=[]; }; mstate = derive2 { name="mstate"; version="0.2.10"; sha256="14namzs0s7v28xkj1pidccjpxg7570fdqhd64rihvyv1r7ybfyav"; depends=[RColorBrewer survival]; }; + mstherm = derive2 { name="mstherm"; version="0.4.7"; sha256="04jrp0w17svwmrvx356jmh04npbwhk9nvfy3r39vqr82yrvn6jip"; depends=[doParallel foreach nls2 plotrix RColorBrewer]; }; mtconnectR = derive2 { name="mtconnectR"; version="1.1.0"; sha256="068rp4n2afl9qgqrnp0a4lmnq7mq9wrc2yi361bfvib96gzg1fdw"; depends=[data_table dplyr dtw ggplot2 magrittr plyr proxy stringr tidyr XML]; }; mtk = derive2 { name="mtk"; version="1.0"; sha256="0vq2xlxf86l92fl91qm8m4yfjyz1h8szmwxiics7sc9f0as0dkmy"; depends=[lhs rgl sensitivity stringr XML]; }; mtsdi = derive2 { name="mtsdi"; version="0.3.3"; sha256="1hx4m1jnfhkycxizxaklnd9illajqvv1nml8ajfn3kjmrb5z7qlp"; depends=[gam]; }; - muRL = derive2 { name="muRL"; version="0.1-10"; sha256="0411vqijsida63jq63qwflr6lvv0rr777z0xba6pn0gpi6khjqqz"; depends=[maps]; }; + muRL = derive2 { name="muRL"; version="0.1-11"; sha256="1pyspp1wpd80hcla1zwnl3misqggfk0ls54akwnx5aa617bibzz8"; depends=[maps stringr]; }; muStat = derive2 { name="muStat"; version="1.7.0"; sha256="18727xj9i9hcnpdfnl1b9wd6cp7wl1g74byqpda2gsrcardl57wz"; depends=[]; }; muckrock = derive2 { name="muckrock"; version="0.1.0"; sha256="16lm1iiaaws7clby7qgblqdiznw6abjjgvsxlfpza7l2xdvplxpg"; depends=[]; }; mudata = derive2 { name="mudata"; version="0.1"; sha256="1906g4mmv3k2pkzq0y2dr1ahlrdvprw8qyxfkmmkll22qn9pmaqa"; depends=[dplyr ggplot2 jsonlite plyr reshape2]; }; @@ -7283,6 +7617,7 @@ in with self; { multcomp = derive2 { name="multcomp"; version="1.4-6"; sha256="18pd5v288g4d3kyp1wg0fv6ypyhqq9y17fdxkj0ljsj1f7kgp7py"; depends=[codetools mvtnorm sandwich survival TH_data]; }; multcompView = derive2 { name="multcompView"; version="0.1-7"; sha256="18gfn3dxgfzjs13l039l2xdkkf10fapjjhxzjx76k0iac06i1p7i"; depends=[]; }; multdyn = derive2 { name="multdyn"; version="1.5.1"; sha256="1rqvfgz3lcjb1lgzp2w6wzqdysj4c1qrw77nrdc14pgm59g2vvvl"; depends=[data_table ggplot2 Rcpp RcppArmadillo reshape2]; }; + multfisher = derive2 { name="multfisher"; version="1.0"; sha256="1pc3f6f87n29cb4caszp4arpy33pc3a0iwmrqinhyw66xjnqm8qp"; depends=[]; }; multgee = derive2 { name="multgee"; version="1.5.3"; sha256="0m7qgpygsax6f2gakrq19bkxvkl9kn8s4n3wy5lbijx01bay9jg2"; depends=[gnm VGAM]; }; multiAssetOptions = derive2 { name="multiAssetOptions"; version="0.1-1"; sha256="1kb4qxyl9shvrpqfxq26lhh3sssmyjcnhhcl6gcbb0s86snh9ms9"; depends=[Matrix]; }; multiCA = derive2 { name="multiCA"; version="1.0"; sha256="1b4m4faaq57k322m7i7y0jqgj7mz4ch39fsn1via7cnd1rrzavq1"; depends=[bitops]; }; @@ -7290,10 +7625,11 @@ in with self; { multiPIM = derive2 { name="multiPIM"; version="1.4-3"; sha256="0j7d0cgs8zcyiyibzmfhcandad76sf4gm57wkcv98bf96wkls58l"; depends=[lars penalized polspline rpart]; }; multiband = derive2 { name="multiband"; version="0.1.0"; sha256="1f4gmy0yf9zid7kl05zncvvig6hs4nl1h9wkrkc24rxx9risw9k9"; depends=[]; }; multibiplotGUI = derive2 { name="multibiplotGUI"; version="1.0"; sha256="0ig7r4p8mq594cjwclbqwjk8saqkvjqjbbnnxj1hc1sdj7qdlcpf"; depends=[cluster dendroextras Matrix rgl shapes tcltk2 tkrplot]; }; + multicmp = derive2 { name="multicmp"; version="1.0"; sha256="0cdb1jshrkx1n9a8p4xsa11n3z9g27qcibbc6wz3jcjykdqlwi0r"; depends=[numDeriv]; }; multicon = derive2 { name="multicon"; version="1.6"; sha256="16glkgnm4vlpxkhf1xw1gl1q10yavx9479i21v29lldag35z8pqx"; depends=[abind foreach mvtnorm psych sciplot]; }; multicool = derive2 { name="multicool"; version="0.1-10"; sha256="1ybg9piya9psqg42w9i3zsnavbxhkfklfwl7cb420i5nkq6wpc2v"; depends=[Rcpp]; }; multifwf = derive2 { name="multifwf"; version="0.2.2"; sha256="1l6z3pzz6g6w1spp1f918jh6w0jm93qyc882rj8jhn1198d2s8nd"; depends=[]; }; - multigraph = derive2 { name="multigraph"; version="0.50"; sha256="033cxgl1gixrdyyyp7i1hsgf7jjhrn2lnxhp4rq0bnlxg5hgqx8h"; depends=[multiplex]; }; + multigraph = derive2 { name="multigraph"; version="0.60"; sha256="04akyy2qpazj9z4g51i404px2m018m0zjj3l50mgnk9mr25ivj2q"; depends=[multiplex]; }; multigroup = derive2 { name="multigroup"; version="0.4.4"; sha256="1r79zapziz3jkd654bwsc5g0rphrk9hkp1fpik8jvjsa1cix40mq"; depends=[MASS]; }; multilevel = derive2 { name="multilevel"; version="2.6"; sha256="19zrvpq23dn69d7kai1rgw5b8ibmgybnbg6isliq0n8bv9jvrzia"; depends=[MASS nlme]; }; multilevelPSA = derive2 { name="multilevelPSA"; version="1.2.4"; sha256="0v4mhdpagmkjsc8x4wlqxa88yl3v0y91a1bbq1lh3rhqfmp9yra5"; depends=[ggplot2 MASS party plyr PSAgraphics psych reshape xtable]; }; @@ -7303,17 +7639,17 @@ in with self; { multinomRob = derive2 { name="multinomRob"; version="1.8-6.1"; sha256="1fdjfk77a79fy7jczhpd2jlbyj6dyscl1w95g64jwxiq4hsix9s6"; depends=[MASS mvtnorm rgenoud]; }; multipanelfigure = derive2 { name="multipanelfigure"; version="0.9.0"; sha256="1vblwn15817xxixbcy2smsp51cjyfvh34c1v9ddxypj9ycx09zd3"; depends=[assertive_base assertive_files assertive_numbers assertive_properties assertive_types caTools ggplot2 gridGraphics gtable jpeg magrittr png rsvg tiff]; }; multipleNCC = derive2 { name="multipleNCC"; version="1.2-1"; sha256="080wpyifpw41p6jip2ia7439jdhzyb7lbhs2qzzg0hn6c0qq7mrr"; depends=[mgcv survival]; }; - multiplex = derive2 { name="multiplex"; version="2.5"; sha256="1yp9n2yzyjrp68fmhv8fgm5qvc4m39qfmw0lnksammmc44hlm12g"; depends=[]; }; + multiplex = derive2 { name="multiplex"; version="2.6"; sha256="1vzgxhzm6m1jzn9svyw8ir2vgam860g57cwppj59gh4xbwf0gxnj"; depends=[]; }; multiplyr = derive2 { name="multiplyr"; version="0.1.1"; sha256="0bsf2zhzqwl3skg26fm27j2wpifky0mph26acrlq8p72njkbcw4d"; depends=[bigmemory bigmemory_sri magrittr]; }; multipol = derive2 { name="multipol"; version="1.0-6"; sha256="1yjz0p4mcgzs98s61i8315wyhh986jxp8b0lq66375ckpr2ddcss"; depends=[abind]; }; multirich = derive2 { name="multirich"; version="2.1.1"; sha256="04jr5jvds70j2psyxz12d2my61jcj5hvdyv10pvar2rpqaw0yxyh"; depends=[]; }; multisensi = derive2 { name="multisensi"; version="2.0"; sha256="11al13flm3ywgfpj6s6g2jc38bw6pbalf6k5xgix05bgkdd5647s"; depends=[knitr sensitivity]; }; - multisom = derive2 { name="multisom"; version="1.2"; sha256="0j993zxpj7q4am6w0w6i6r1ilk47rb5lv9ywyrz98mzm8rfpm4k0"; depends=[class kohonen]; }; + multisom = derive2 { name="multisom"; version="1.3"; sha256="0msxmrj4iawxg4vf4r7kj26zalxz4di2w4nxgxiakiig4g4ggy9z"; depends=[class kohonen]; }; multispatialCCM = derive2 { name="multispatialCCM"; version="1.0"; sha256="1fzd91w10iln8qb81z240lq3fi4gq22l4rh9npkav6fiq6g6rlp8"; depends=[]; }; multitaper = derive2 { name="multitaper"; version="1.0-13"; sha256="1ckf9bhvd5k7ypaw2viqh3cyj9jij0ygcp4q9pxwqs508s6yx3a5"; depends=[]; }; - multivator = derive2 { name="multivator"; version="1.1-4"; sha256="125ifkpm1pny4rjpzirnwpmpjfg0y8w0rygj0way0p1qwm0l207n"; depends=[emulator mvtnorm]; }; + multivator = derive2 { name="multivator"; version="1.1-9"; sha256="0vbqvhmym46zjr1h4s53sjrddfjpv8wi0sq4lrh2rmqarq068416"; depends=[emulator mvtnorm]; }; multiwave = derive2 { name="multiwave"; version="1.2"; sha256="1bw071izjxrsk5gx8s49nrlryabpgpg7k2z1ghmk8p6i9m5apnl8"; depends=[]; }; - multiway = derive2 { name="multiway"; version="1.0-2"; sha256="03cj4767xd1918vb4jkp7xk2l4gq340c0kc24h40zq4c3gsxwmbw"; depends=[]; }; + multiway = derive2 { name="multiway"; version="1.0-3"; sha256="0n90bjqp1s5dij2wq2mv967np25achlj2qlxdv4i0f958wf4pv00"; depends=[quadprog]; }; multiwayvcov = derive2 { name="multiwayvcov"; version="1.2.3"; sha256="1znsmca16jac8s5z0j64cck27pvf88anm1mfblabqchqqcz1ykfc"; depends=[boot sandwich]; }; multxpert = derive2 { name="multxpert"; version="0.1"; sha256="03mvf4m0kabm22vy4zkj1cfh884larpj8cbgg3p9l3pag20snf1l"; depends=[mvtnorm]; }; muma = derive2 { name="muma"; version="1.4"; sha256="0midx3wzyvcz8rk9kvsfll3xg41pkz40si4jw2ps54ykkf9rkm99"; depends=[bitops car caTools gplots gtools mvtnorm pcaPP pdist pls robustbase rrcov]; }; @@ -7323,17 +7659,18 @@ in with self; { murphydiagram = derive2 { name="murphydiagram"; version="0.11"; sha256="0wax9gjhzz8nphzwijqzllz4y25jksf1vqfcbnfb7zafsfv40rib"; depends=[]; }; musicNMR = derive2 { name="musicNMR"; version="0.0.2"; sha256="09xxc78ajk428yc3617jfxqp5fy89nfc24f1rig6cw28fflwqj0k"; depends=[seewave]; }; musica = derive2 { name="musica"; version="0.1.3"; sha256="0cfzfar706l0xdb0n11m18mayj5rrplvf4qry36vgxsiaxcba90r"; depends=[data_table lubridate magrittr qmap]; }; + mut = derive2 { name="mut"; version="1.1"; sha256="0v0vviarsmaiap3fa82ia01cblana65fd3cbj7jkd3aral6pm6yz"; depends=[expm Familias IBDsim paramlink]; }; mutSignatures = derive2 { name="mutSignatures"; version="1.2"; sha256="1kbp221lm43a5wiw754yjkd3qidmca20m0i8jlxsqk8ijbp40ky2"; depends=[cluster doParallel foreach ggplot2 pracma proxy]; }; mutoss = derive2 { name="mutoss"; version="0.1-10"; sha256="1pijr3admnciiwdgxbdac4352m7h08jyvpj7vdd27yx07wp2rri3"; depends=[multcomp multtest mvtnorm plotrix]; }; mutossGUI = derive2 { name="mutossGUI"; version="0.1-10"; sha256="16fgmpnym9nhiywqimjgv10swrvs3whp0nlzsw573vv0k6qjmwd2"; depends=[CommonJavaJars JavaGD JGR multcomp mutoss plotrix rJava]; }; mvLSW = derive2 { name="mvLSW"; version="1.1"; sha256="0nh3myycz8kagk1sks71i20602r82mh6nxczjnlnal5qwgp6zg80"; depends=[fields wavethresh xts zoo]; }; - mvMORPH = derive2 { name="mvMORPH"; version="1.0.8"; sha256="1psjlqx7xb5zlrwcd2q2by8y8ykffxdcskbzb12f643iimlp1l4m"; depends=[ape corpcor phytools spam subplex]; }; + mvMORPH = derive2 { name="mvMORPH"; version="1.0.9"; sha256="09368vgyb1s18awfr07hs1s40n2h15hy08fmir3ayhdfrdain4k6"; depends=[ape corpcor phytools spam subplex]; }; mvPot = derive2 { name="mvPot"; version="0.1.2"; sha256="0ni953ncm8h4ap0gjimlxjypgjaj2crlx4vscqi7a158hphahj2g"; depends=[evd gmp MASS numbers]; }; mvProbit = derive2 { name="mvProbit"; version="0.1-8"; sha256="07dizclqjlwj29yb3xwjihjh8kmn6jiq5cpf8rcirylzykfdv3wk"; depends=[abind bayesm maxLik miscTools mvtnorm]; }; mvQuad = derive2 { name="mvQuad"; version="1.0-6"; sha256="016477dhjdkqiadc631vzpbp967mn4yli6by3s1k348mlfirwsi3"; depends=[data_table statmod]; }; - mvSLOUCH = derive2 { name="mvSLOUCH"; version="1.3.2"; sha256="142ldrd3y335z9dsgk9g8fd9ikg0wqfgmr45by39f44gnxsmbvzi"; depends=[ape corpcor mvtnorm numDeriv ouch]; }; + mvSLOUCH = derive2 { name="mvSLOUCH"; version="1.3.3"; sha256="18gnxs1cx4f7r3m2vgrkmm41vwkamk9mn5hcgjacv2adl0ihnagd"; depends=[ape corpcor mvtnorm numDeriv ouch]; }; mvShapiroTest = derive2 { name="mvShapiroTest"; version="1.0"; sha256="0zcv5l28gwipkmymk12l4wcj9v047pr8k8q5avljdrs2a37f74v1"; depends=[]; }; - mvabund = derive2 { name="mvabund"; version="3.12"; sha256="1njszq4fh7ffbr18yd1r23gya33klk5kpzaj414ijp3hwj24wppm"; depends=[MASS Rcpp RcppGSL statmod tweedie]; }; + mvabund = derive2 { name="mvabund"; version="3.12.3"; sha256="1lk1kqglj7czbq38714dwlbhnhazba8clbg9s1pmrakh5b2gkvz7"; depends=[MASS Rcpp RcppGSL statmod tweedie]; }; mvbutils = derive2 { name="mvbutils"; version="2.7.4.1"; sha256="1vs97yia78xh35sdfv5pj3ddqmy83qgamvyyh9gjg0vdznqhffzg"; depends=[]; }; mvc = derive2 { name="mvc"; version="1.3"; sha256="0kmh6vp7c2y9jf71f4a29b0fxcl0h7m4p8wig4dk3fi7alhjf7ym"; depends=[rattle]; }; mvcluster = derive2 { name="mvcluster"; version="1.0"; sha256="0yfl31scdgsiljvpv1yxc5bwwzr6kbhpjwqh2kql7xf0m0hc1pr4"; depends=[Rcpp RcppArmadillo]; }; @@ -7373,22 +7710,25 @@ in with self; { nFCA = derive2 { name="nFCA"; version="0.3"; sha256="1jyyzagmppm3i7vh3ia4ic0zql1w04f66z81v0zpdihd4cbl5ra7"; depends=[]; }; nFactors = derive2 { name="nFactors"; version="2.3.3"; sha256="016d76yfxz7gx7zz5dgwjmj2c5m6kxdmqj0lln5w6d70r9g1kxg7"; depends=[boot lattice MASS psych]; }; nLTT = derive2 { name="nLTT"; version="1.3.1"; sha256="1wha26lcgk2kw48vyiws1ciyp8x6d7nmkrahh5b8w23ns6bqpngf"; depends=[ape coda deSolve]; }; - nabor = derive2 { name="nabor"; version="0.4.6"; sha256="0kd0h8n5yrn16vrfdchdiqzws05q0fm8z577p20dm18gdcs2vbxv"; depends=[BH Rcpp RcppEigen]; }; + nabor = derive2 { name="nabor"; version="0.4.7"; sha256="16dxnvq6yxlrignzvxjdwzwm32fn2a8bsjqjsg5qz94ir7g3pzm6"; depends=[BH Rcpp RcppEigen]; }; nadiv = derive2 { name="nadiv"; version="2.14.3.1"; sha256="08276bakyrn9d9vh08yzan60kigsihwfhgx788gwp6pk8v6m25wa"; depends=[Matrix]; }; naivebayes = derive2 { name="naivebayes"; version="0.9.1"; sha256="051mg1idim75k181v4n8s5rji94rwy9c75yjkavjhr4brhizqy8f"; depends=[]; }; + namedCapture = derive2 { name="namedCapture"; version="2017.06.01"; sha256="14zimn3wbavbkwra8vfmqdm1q5bmlmsbg0b29cjly5dd4zlfzzb0"; depends=[]; }; namespace = derive2 { name="namespace"; version="0.9.1"; sha256="1bsx5q19l7m3q2qys87izvq06zgb22b7hqblx0spkvzgiiwlq236"; depends=[]; }; + nandb = derive2 { name="nandb"; version="0.2.0"; sha256="0zxf3gmpxwj5b8w6svf49y8rxam98d0j3awd3s1y9nxh9rpaysxm"; depends=[abind autothresholdr BH BiocParallel dplyr EBImage filesstrings ggplot2 hexbin magrittr matrixStats ore purrr R_utils Rcpp RcppRoll readr reshape2 RSAGA stringr tibble tiff viridis]; }; nanop = derive2 { name="nanop"; version="2.0-6"; sha256="007gdc93pk0vpfmsw7zgfma2k1045n2cxwwsyy276smy0ys9fdhp"; depends=[distrEx rgl]; }; - nanotime = derive2 { name="nanotime"; version="0.1.2"; sha256="1faiqjbgp1qyr8wpqwwzynl8rcrkzh680j2vqczzg3d7fvcwvl34"; depends=[bit64 RcppCCTZ zoo]; }; + nanotime = derive2 { name="nanotime"; version="0.2.0"; sha256="138qz844sczgzzl8vn5079590hnq96w7jdbn851cpw64gmq21r4w"; depends=[bit64 RcppCCTZ zoo]; }; naptime = derive2 { name="naptime"; version="1.3.0"; sha256="1cadfv5sdsmz61kf96hf2gbnghf24q40g5c3h9b8prvkxslap691"; depends=[lubridate]; }; narray = derive2 { name="narray"; version="0.2.2"; sha256="0cxibb8lhv3in44xxln3fw6rf8c9a18bdhcdiyp3cpcm83h22nh7"; depends=[abind pryr reshape2 stringr]; }; nasadata = derive2 { name="nasadata"; version="0.9.0"; sha256="0y88qdy8c1y0prsajxic5vdqfixv9knjsbhw3vbfac8wv3a69bjl"; depends=[dplyr jsonlite plyr png]; }; nasaweather = derive2 { name="nasaweather"; version="0.1"; sha256="05pqrsf2vmkzc7l4jvvqbi8wf9f46854y73q2gilag62s85vm9xb"; depends=[]; }; - nat = derive2 { name="nat"; version="1.8.7"; sha256="14mfjlhf08ypbml8zqz90z80dljqk9ns7mk1h0s0fma308xwab7m"; depends=[digest filehash igraph nabor nat_utils plyr rgl yaml]; }; + nat = derive2 { name="nat"; version="1.8.9"; sha256="1pw8bzyfry5px2gsngywq1cqvfh9qlnlhaw5qvhkv58z62sxif4d"; depends=[digest filehash igraph nabor nat_utils plyr rgl yaml]; }; nat_nblast = derive2 { name="nat.nblast"; version="1.6.2"; sha256="0b2gzyzszj2v5girxyv31nvds0837lzvim7x7bs9h897yrxs57k8"; depends=[dendroextras nabor nat plyr rgl spam]; }; - nat_templatebrains = derive2 { name="nat.templatebrains"; version="0.6.2"; sha256="1yc0k5nsg6nmxf3wmhr5prbz2l820z62xjayi83mz3jpzwilz4by"; depends=[digest igraph nat rappdirs rgl]; }; + nat_templatebrains = derive2 { name="nat.templatebrains"; version="0.8.2"; sha256="09kyi4p28n8dgw8jpv00vh9vl6nqmmgqfriwkicx8yyq65vh6fxk"; depends=[digest igraph memoise nat rappdirs rgl]; }; nat_utils = derive2 { name="nat.utils"; version="0.5.1"; sha256="12g87ar795xfbz7wljksb24x9hqvcirjr50y4mbpx1427r0l7clv"; depends=[]; }; natserv = derive2 { name="natserv"; version="0.1.4"; sha256="0qwf7lapx5gchk8xmdnmxr10j5dnkp52mqnh1ja216z7l841cl07"; depends=[crul data_table tibble xml2]; }; naturalsort = derive2 { name="naturalsort"; version="0.1.3"; sha256="0mz801y9mzld9ypp3xmsjw2d8l9q97sdnv09wrci9xi3yg2sjf6d"; depends=[]; }; + nauf = derive2 { name="nauf"; version="1.1.0"; sha256="1c7g7qjd77lcx2nghw1mxp60q7sc2hjdr4drjkypzyqs8q3q97rm"; depends=[bayesplot car digest lme4 lmerTest loo lsmeans MASS Matrix pbkrtest Rcpp rstan rstanarm shinystan standardize stringr]; }; nbc4va = derive2 { name="nbc4va"; version="1.0"; sha256="0y1qpkzjr327qyvmqf129m400rvn6gwk72ccnly6cqq53icrarn4"; depends=[]; }; nbconvertR = derive2 { name="nbconvertR"; version="1.0.2"; sha256="1dc9jxfibvb27qwiykj93322nb1ahwrg69zqcc0p9xp0rpsim02w"; depends=[]; }; nbpMatching = derive2 { name="nbpMatching"; version="1.5.1"; sha256="0f90k9vq05gkc0sgywb98frig63df0ih4z41dq7m2inx1zk5rqns"; depends=[Hmisc MASS]; }; @@ -7398,32 +7738,33 @@ in with self; { ncdf_tools = derive2 { name="ncdf.tools"; version="0.7.1.295"; sha256="1jgxivmg2gzvkn09n13i5xr1v0xcyp5ckhwxz6g5kdh9z2dkjhc2"; depends=[abind chron JBTools plotrix raster RColorBrewer RNetCDF]; }; ncdf4 = derive2 { name="ncdf4"; version="1.16"; sha256="0lwjjis0b83c4l3xvqai4ckzrskd6mychck1iwxcxgjvh0d77mgd"; depends=[]; }; ncdf4_helpers = derive2 { name="ncdf4.helpers"; version="0.3-3"; sha256="051akd7r6zx805a0xwcs95q5sd8alag0f1gzqjk3n188q8r3ji5j"; depends=[abind ncdf4 PCICt]; }; + ncdump = derive2 { name="ncdump"; version="0.0.3"; sha256="09g98mzpky32z41jf23ahzhyv34l34y1gqq99j2hl4pqlvvhxs9i"; depends=[dplyr ncdf4]; }; ncf = derive2 { name="ncf"; version="1.1-7"; sha256="0r3xhpinkcnkzc855q8ddd889v12snx4n1g8jyw9cnmrki8n2hxh"; depends=[]; }; ncg = derive2 { name="ncg"; version="0.1.1"; sha256="1jzkzp61cc5jxmdnl867lcrjjm7y2iw9imzprbd098p1j3w8fvj7"; depends=[]; }; - ncvreg = derive2 { name="ncvreg"; version="3.9-0"; sha256="0z6zh2jhgf7yj4ajmhggbf6v522jg5cc0dd56bbxakypvl7mhzfq"; depends=[]; }; - ndjson = derive2 { name="ndjson"; version="0.2.0"; sha256="1y6hjcip18mazss7g888pydywb07hkfrk6ams0sm71yckyc865lb"; depends=[data_table dtplyr Rcpp Rcpp11]; }; + ncvreg = derive2 { name="ncvreg"; version="3.9-1"; sha256="1v71r2k25n28lhpqsgzaaw48w1gwn0yjbir64hx5lchdbvd5k1j3"; depends=[]; }; + ndjson = derive2 { name="ndjson"; version="0.5.0"; sha256="1ivwr9wm45ivk4jcc39hgqsyhilpisyhccks093iisx51vhxjjl0"; depends=[data_table dplyr dtplyr Rcpp]; }; ndl = derive2 { name="ndl"; version="0.2.17"; sha256="08h01rw7gsa31zp91q2rsw1ba9yf0fyhz3w8s9xq5788qwc80280"; depends=[Hmisc MASS Rcpp]; }; ndtv = derive2 { name="ndtv"; version="0.10.0"; sha256="1j4g5qclfbw7fkykaclrsb2d70vy40fd1rgr1n73qyrkx0fyym44"; depends=[animation base64 jsonlite MASS network networkDynamic sna statnet_common]; }; - nearfar = derive2 { name="nearfar"; version="1.0"; sha256="1fafsb392dm16388a17sfwfgnxwbr8y8v7sdvbfv46sdndwaif1z"; depends=[AER GenSA MASS nbpMatching sem]; }; + nearfar = derive2 { name="nearfar"; version="1.1"; sha256="0i2nc1b4vslgjj29x5q24yxv9l3i0g5hcrbm9xy1b3039n70cwix"; depends=[car GenSA MASS nbpMatching]; }; neariso = derive2 { name="neariso"; version="1.0"; sha256="1npfd5g5xqjpsm5hvhwy7y84sj5lqw9yzbnxk6aqi80gfxhfml4c"; depends=[]; }; - neat = derive2 { name="neat"; version="1.0"; sha256="191bx96cmrzy4jd5x96h1vw01ii60jy7mlmcl5lzwkxrbv4zr6k7"; depends=[]; }; + neat = derive2 { name="neat"; version="1.1"; sha256="0pfwpdxyspwm11lhhw24vz8sfxjyn140a4n8rg5dc9v6krl1i0cg"; depends=[]; }; needs = derive2 { name="needs"; version="0.0.3"; sha256="16dkjpijz3rz7kd5ggxsdg55iwd42nll1vk6g5ix4xdbqrx6cp9x"; depends=[]; }; needy = derive2 { name="needy"; version="0.2"; sha256="1ixgpnwrg6ph1n5vy91qhl1mqirli9586nzkmfvzjrhdvrm0j5l0"; depends=[]; }; negenes = derive2 { name="negenes"; version="1.0-5"; sha256="0fdhc0v0b820wfg3sypvya7zhg7mhfmdbfiwn1lj3a2xg01zvc2n"; depends=[]; }; neighbr = derive2 { name="neighbr"; version="1.0"; sha256="0612nzpryj4xp0ncpvpn56x5n9ammzjp3ysq1rj1fc84h0p7nml3"; depends=[]; }; neldermead = derive2 { name="neldermead"; version="1.0-10"; sha256="1snavf90yb12sydic7br749njbnfr0k7kk20fy677mg648sf73di"; depends=[optimbase optimsimplex]; }; - neotoma = derive2 { name="neotoma"; version="1.6.2"; sha256="023dpcrhhq8daa0c4viccqs9y19gi05srz4d985diaq7yxjs9vhz"; depends=[analogue httr jsonlite plyr reshape2 xml2]; }; - nephro = derive2 { name="nephro"; version="1.1"; sha256="06lxkk67n5whgc78vrr7gxvnrz38pxlsj4plj02zv9fwlzbb9h6p"; depends=[]; }; + neotoma = derive2 { name="neotoma"; version="1.7.0"; sha256="0f4s5yw0yj4n8lkvbl2l3ivdclg9pknyss7qhppp85rdxzwxilpq"; depends=[analogue httr jsonlite leaflet plyr reshape2 xml2]; }; + nephro = derive2 { name="nephro"; version="1.2"; sha256="1izmzx8lah322xzb42asfnrvr2c9yqd0zf7fmrhwd3p4rr1rqa7d"; depends=[]; }; nestedRanksTest = derive2 { name="nestedRanksTest"; version="0.2"; sha256="0r08jp8036cz2dl1mjf4qvv5qdcvsrad3cwj88x31xx35c4dnjgj"; depends=[]; }; - net_security = derive2 { name="net.security"; version="0.1.0"; sha256="0p9hh89bp0s6v8i8zkm5s4lm5sg6p6z0q8ww2c23qb81038pak3k"; depends=[data_table dplyr jsonlite plyr R_utils stringr XML]; }; + net_security = derive2 { name="net.security"; version="0.3.0"; sha256="15vvcmakl9hl1srdhjf73g2bwwcxn93220i4gv0rcsw5732mjanz"; depends=[data_table dplyr jsonlite plyr R_utils stringr XML]; }; netClass = derive2 { name="netClass"; version="1.2.1"; sha256="04yrj71l5p83rpwd0iaxdkhm49z9qp3h6b7rp9cgav244q060m9y"; depends=[AnnotationDbi graph igraph kernlab Matrix ROCR samr]; }; netCoin = derive2 { name="netCoin"; version="0.2.5"; sha256="0bhn7jhwr5jf8hmw4n86fg4994bhcjd6awcx96gm2qgf1j5r2m44"; depends=[igraph Matrix]; }; - netassoc = derive2 { name="netassoc"; version="0.6.2"; sha256="01h0nnyrgv08bxyl01lqsqnj69bhkwci692h77vfa7cf8rsm67kg"; depends=[corpcor huge igraph infotheo rags2ridges vegan]; }; + netassoc = derive2 { name="netassoc"; version="0.6.3"; sha256="1hyshnbpq60a3y13b4sh1c2rk78x09q01b7q6xrgv10w7bn9r2sg"; depends=[corpcor huge igraph infotheo vegan]; }; netcoh = derive2 { name="netcoh"; version="0.2"; sha256="0q60hvyparlwdww6as6hcdzfs6q3n8z1rfpj53r5q2s77x6q07xx"; depends=[Matrix Rcpp RcppArmadillo]; }; netdiffuseR = derive2 { name="netdiffuseR"; version="1.17.0"; sha256="15yq903li51s2mbjp7bqrvk2zcf2yjmvvma2ynp325aqhwgvisf7"; depends=[boot igraph MASS Matrix network Rcpp RcppArmadillo sna SparseM]; }; netgen = derive2 { name="netgen"; version="1.3"; sha256="1iywpl9n1yplnd38dff8m9mz1vlfbvplw393grhpav5czcknj160"; depends=[BBmisc checkmate ggplot2 igraph lhs lpSolve mvtnorm stringr]; }; netgsa = derive2 { name="netgsa"; version="3.0"; sha256="0cqyiilpxhdi6zmibn85y1aqwpcs1aialz34klakmllzn6kvdsng"; depends=[corpcor glasso glmnet igraph Matrix]; }; - netmeta = derive2 { name="netmeta"; version="0.9-4"; sha256="04p59iwhibaqhcwr39axlhjl7h704fpckh4rfqiqfv87p7wyifwj"; depends=[magic MASS meta]; }; + netmeta = derive2 { name="netmeta"; version="0.9-5"; sha256="0ybpm7r78nx82vbgzbk88ci2rnv2xs2y7pgl0drgl4d9ha24mdia"; depends=[magic MASS meta]; }; nets = derive2 { name="nets"; version="0.8"; sha256="10h6sqy9jw2a909nzmzd5x9cjg3w4wpqwikp23k4q9fj71aswd5v"; depends=[igraph]; }; nettools = derive2 { name="nettools"; version="1.0.1"; sha256="13fw316r31g9cjlbyy9qfccsyagxb6pyvn5k32f166b7vj92mk1q"; depends=[combinat dtw igraph Matrix minerva minet rootSolve WGCNA]; }; network = derive2 { name="network"; version="1.13.0"; sha256="11sg330xb7gcnl3f6lwhhjdabz6mk43828i2np635pqw4s4yl13s"; depends=[]; }; @@ -7439,21 +7780,22 @@ in with self; { neuralnet = derive2 { name="neuralnet"; version="1.33"; sha256="14ga04mcd793v9a2584jb9l7n20kw00fgy3gayfwrkr1j39szdls"; depends=[MASS]; }; neurobase = derive2 { name="neurobase"; version="1.13.2"; sha256="1sv2kxahw123f6a7cl35n6dyz4ip8iifzk4dcp6jf8fnnnjyg8aq"; depends=[matrixStats oro_nifti R_utils RNifti]; }; neuroblastoma = derive2 { name="neuroblastoma"; version="1.0"; sha256="0hs87fvwaq53xxbh2dw3hjsmf1zkyqli9qyacxf72fnkyhhl8b45"; depends=[]; }; + neurohcp = derive2 { name="neurohcp"; version="0.6"; sha256="0slk963rcrh5pyw1iv80dnh0a1yabkyvlvyshm2jwznp87r6lk3k"; depends=[base64enc digest httr xml2]; }; neuroim = derive2 { name="neuroim"; version="0.0.6"; sha256="00cjr6pkip6zi2d0q3qbn3lb3k0z82v6c19qslvgpa9n0g63dr5p"; depends=[abind assertthat hash iterators Matrix Rcpp readr rgl stringr yaImpute]; }; neuropsychology = derive2 { name="neuropsychology"; version="0.5.0"; sha256="0hlbjf8hxz4cl7fvg9mbyfmcyyxncc2nh9h1mrd2yzgrpgn0d0b5"; depends=[BayesFactor caret dplyr ggcorrplot ggplot2 Hmisc htmlTable lme4 MuMIn png ppcor psych stringi tidyr tidyverse tm wordcloud2]; }; ngram = derive2 { name="ngram"; version="3.0.3"; sha256="03jfi07b7wzh2ydrrim9d9laragc9a7mri2gqmnqbf98f74s8vkn"; depends=[]; }; ngramrr = derive2 { name="ngramrr"; version="0.2.0"; sha256="1p8s4p3h27g647rxx9qjfad5dzbngjbmvhw4gz0jbsmfqrsf72by"; depends=[tau tm]; }; - ngspatial = derive2 { name="ngspatial"; version="1.1-3"; sha256="08g1786vxb544r6i6mccd4gzzgcq35m0af65326m82xxyffiv6gw"; depends=[batchmeans lattice Rcpp RcppArmadillo]; }; + ngspatial = derive2 { name="ngspatial"; version="1.2"; sha256="09sc67g7xyqzhmnzvnj6hhjkvkl3xzkwj1vi3idfl093g8m7x29v"; depends=[batchmeans Rcpp RcppArmadillo]; }; nhanesA = derive2 { name="nhanesA"; version="0.6.4.3.3"; sha256="09mpxmk8w48hc14167jd2xifnj0kjz9h3h76bdnbb33wvhkn4jld"; depends=[Hmisc magrittr plyr rvest stringr xml2]; }; nhlscrapr = derive2 { name="nhlscrapr"; version="1.8.1"; sha256="107k063279w9cy6in99rn03w2rq42ci8s6dvb9x6f9w7y3bdpvzn"; depends=[biglm bitops RCurl rjson]; }; nhstplot = derive2 { name="nhstplot"; version="1.0.1"; sha256="1f07gfmbx80as54mlzdbs2z1vzc78rjy6i6m7zd4jplgcqdcynws"; depends=[ggplot2]; }; nice = derive2 { name="nice"; version="0.4-1"; sha256="1p8vmimiq9sbjvbx6c2wqwwkpnzw4kkdvjry6qyadmm3frwhj5qb"; depends=[]; }; nicheROVER = derive2 { name="nicheROVER"; version="1.0"; sha256="0sa7wfpzkin78vz48vwa5iac82v5l1s3zczdxz8sc2kyg22fj0aw"; depends=[mvtnorm]; }; nima = derive2 { name="nima"; version="0.3.0"; sha256="10g0a8qa64sk16xrya3qhrlrjbjyq7ndv208xz36knp5az2n27ak"; depends=[assertthat ggplot2 gridExtra plyr survival]; }; - nimble = derive2 { name="nimble"; version="0.6-3"; sha256="0j52kqr53lxmsc7dsv67mbqr5lg51vc2l7fqnv6qmrnzl4mn5ds0"; depends=[coda igraph]; }; + nimble = derive2 { name="nimble"; version="0.6-5"; sha256="1iii5wk43rk378zsvkdbxl5pv73lv5b3mj9zxcjdq5d1ahrarjw0"; depends=[coda igraph]; }; nivm = derive2 { name="nivm"; version="0.3"; sha256="111jkgirgsl1j36xgwi81wzwxial3vdw8mqzi1faldxxd9a2cixm"; depends=[bpcp ssanv]; }; nlWaldTest = derive2 { name="nlWaldTest"; version="1.1.3"; sha256="1cppdz8qvigjdz4sgr1gm2j09zi407xxmryc28zc7ps7rvgy344h"; depends=[]; }; - nleqslv = derive2 { name="nleqslv"; version="3.2"; sha256="1832p6hyg9lms570m9hjn7fngrj6br0qhrgk8k9dsvg04cyrmpqc"; depends=[]; }; + nleqslv = derive2 { name="nleqslv"; version="3.3"; sha256="1b0hjc6qi60brrk0qh825jv7cm56ys3ajix1lbcm9gxgmgbglv96"; depends=[]; }; nlme = derive2 { name="nlme"; version="3.1-131"; sha256="0k2nvdzhic6bzhfsbq6la6q6a1i5nlj4pnh6lpdxiiwvxdks3nkr"; depends=[lattice]; }; nlmeODE = derive2 { name="nlmeODE"; version="1.1"; sha256="1zp1p98mzbfxidl87yrj2i9m21zlfp622dfnmyg8f2pyijhhn0y2"; depends=[deSolve lattice nlme]; }; nlmeU = derive2 { name="nlmeU"; version="0.70-3"; sha256="05kxymgybziiijpb17bhcd9aq4awmp5km67l2py9ypakivi0hc6l"; depends=[nlme]; }; @@ -7464,18 +7806,20 @@ in with self; { nlrr = derive2 { name="nlrr"; version="0.1"; sha256="09wm8s5sadkhkq9pb3fjk66cb2xn8py46w1d7yp7fjhczh31bjsq"; depends=[Hmisc rms]; }; nls2 = derive2 { name="nls2"; version="0.2"; sha256="0k46i865p6jk0jchy03jiq131pc20h9crn3hygzy305rdnqvaccq"; depends=[proto]; }; nlsMicrobio = derive2 { name="nlsMicrobio"; version="0.0-1"; sha256="0676n78265z00dacmq593c9l2239ii574djm9s7i7w8jk1kdhzx2"; depends=[nlstools]; }; - nlsem = derive2 { name="nlsem"; version="0.7"; sha256="1g5vnqmqq4swnid3601f1cm0q9w9k802394jd3yac95n8sm05i5g"; depends=[gaussquad lavaan mvtnorm nlme orthopolynom]; }; + nlsem = derive2 { name="nlsem"; version="0.8"; sha256="0q3wk7x67mh2447ah807djyklia2x2d45krsskffynazm83msnj9"; depends=[gaussquad lavaan mvtnorm nlme orthopolynom]; }; nlshelper = derive2 { name="nlshelper"; version="0.2"; sha256="02xnx0j8p1im1hdwnia3n51dicscjf8s33y475i3dczvhmivvbmf"; depends=[broom dplyr magicaxis mgcv nlme]; }; nlshrink = derive2 { name="nlshrink"; version="1.0.1"; sha256="0adnr7g3n3brwlvyix8wa7h59gj036l5anv8abqy80ysmfcmsp0y"; depends=[MASS nloptr]; }; nlsmsn = derive2 { name="nlsmsn"; version="0.0-4"; sha256="1gvpy8rq020l64bdw6n7kv354l7gwa2rgxarm6k0mqq7z21fxf58"; depends=[]; }; - nlsr = derive2 { name="nlsr"; version="2017.2.19"; sha256="0y1qfg042yk855v6i45w00mbmwic1ravlkrd0fbnr8zrvq74iy1s"; depends=[digest]; }; - nlstimedist = derive2 { name="nlstimedist"; version="1.0.4"; sha256="10wbkngcx02cjyv188ascrw7aaqg8vvwbr7rgy6q87ch5g7ih35g"; depends=[broom dplyr ggplot2 lazyeval minpack_lm nlstools]; }; + nlsr = derive2 { name="nlsr"; version="2017.6.18"; sha256="1zgdzm2r06mgps44ql8rnjksb149zcp06rw9rkdrgq6p5w5vyxp1"; depends=[digest]; }; + nlsrk = derive2 { name="nlsrk"; version="1.1"; sha256="0yqcsz5pdhqsrd86g0yx8bdac13fbmvg89phj3v4qvla2jfznjba"; depends=[]; }; + nlstimedist = derive2 { name="nlstimedist"; version="1.1.1"; sha256="1222vj2w4f8xh7fkrzlyarr7980a6wj047p5p0nw3cfna3mmhi5b"; depends=[broom dplyr ggplot2 lazyeval minpack_lm nlstools]; }; nlstools = derive2 { name="nlstools"; version="1.0-2"; sha256="0mjn1j9fqqgr3qgdr0ki4lfbd0yrkanvya4y2483q3wklqa6qvjc"; depends=[]; }; nlt = derive2 { name="nlt"; version="2.1-3"; sha256="1j0xrrbr1hvfda8rvnc17lj96m6cz24faxvwn68ilf7j1ab2lkgn"; depends=[adlift EbayesThresh]; }; nlts = derive2 { name="nlts"; version="0.2-0"; sha256="14kvzc1p4anj9f7pg005pcbmc4k0917r49pvqys9a0a51ira67vb"; depends=[acepack locfit]; }; - nmcdr = derive2 { name="nmcdr"; version="0.3.0"; sha256="1557pdv7mqdjwpm6d9zw3zfbm1s8ai3rasd66nigscmlq102w745"; depends=[CDFt]; }; + nmaINLA = derive2 { name="nmaINLA"; version="0.1.1"; sha256="0976jafmdhy2rz5fcarb7hh1vaanm8l2610hk06f5k93xjhypg8j"; depends=[]; }; nmfgpu4R = derive2 { name="nmfgpu4R"; version="0.2.5.2"; sha256="05066rgbbp6kj2d67nzf3d1pf32gypz9ammz4ba88yxblydb3cwk"; depends=[Matrix Rcpp SparseM stringr]; }; nmw = derive2 { name="nmw"; version="0.1.1"; sha256="0dqcix916as40h54i78g4437k8zbdlwbdfzmjyp08i9xr0gc0a80"; depends=[]; }; + nneo = derive2 { name="nneo"; version="0.1.0"; sha256="0jaaz15y1csh3bwmzp7mgx86m3f0w3ykzb8qdvg8ak2grxw3wl6a"; depends=[crul data_table fauxpas jsonlite tibble]; }; nnet = derive2 { name="nnet"; version="7.3-12"; sha256="17amqnw9dpap2w8ivx53hxha2xrm0drwfnj32li0xk41hlz548r7"; depends=[]; }; nnetpredint = derive2 { name="nnetpredint"; version="1.2"; sha256="1c6s9wm6vhylwv4xhp2hkllw18zj8hdr17ls9vlxm9qs3wx1v48w"; depends=[RSNNS]; }; nnlasso = derive2 { name="nnlasso"; version="0.3"; sha256="1n7karlmgq61z9ywfx9xb5wvmxx40ydpnzzazj1xr70qlv5m0qk4"; depends=[]; }; @@ -7484,14 +7828,15 @@ in with self; { nodiv = derive2 { name="nodiv"; version="1.1.6"; sha256="1srcmv4mmmsmkk4nbbnmrkv4z19l80agvwlh2q1j7xdi26wpqc5r"; depends=[ape picante raster sp vegan]; }; noia = derive2 { name="noia"; version="0.97.1"; sha256="0yldfmnb4ads4s9v9cj1js8zf1w1hxasqq6qjyzwknmvmp7kh62h"; depends=[]; }; noise = derive2 { name="noise"; version="1.0"; sha256="1a48s9vpz3nc058966lad8hydmg7z0vbzfwcf6nxc9g3c8mw4nig"; depends=[preprocessCore]; }; - nomclust = derive2 { name="nomclust"; version="1.00.1011"; sha256="1mzz1bc8gg9lw5aacmicfzjak212hrbq2wchblljcxxjvkkn87w5"; depends=[cluster dummies]; }; + nomclust = derive2 { name="nomclust"; version="1.1.1106"; sha256="17hb89k72sw3ya0wm3n95mpx4vj7mpl4mzs8qwl2773dh2mcjgjq"; depends=[cluster dummies]; }; nomogramEx = derive2 { name="nomogramEx"; version="2.0"; sha256="1as0hbmb37z9izz95x9rd98a0fs4b6zbhzjpgnyq5c1j4219vzs3"; depends=[pracma rms]; }; noncensus = derive2 { name="noncensus"; version="0.1"; sha256="0cfj17bfzddfshhhzv2ijhrp9ylcscmsysswjcsjfxmy3gbkd00q"; depends=[]; }; noncompliance = derive2 { name="noncompliance"; version="0.2.2"; sha256="1lcybgj95z7lz7p26xbsdiv0vvms4ab4f8kad0pclacf1l43v0j6"; depends=[data_table Rcpp]; }; nonlinearTseries = derive2 { name="nonlinearTseries"; version="0.2.3"; sha256="1pcah255hh3lqabxgjb5fsaap4s2d92lvxw9a48l1p4dkmm1lbsx"; depends=[Matrix Rcpp rgl TSA tseries]; }; - nonmem2R = derive2 { name="nonmem2R"; version="0.1.5"; sha256="07ky2s8bfk6qiayj9vv9plwkd4615nkk9vb0aa4bq54m0191zd18"; depends=[lattice latticeExtra MASS mvtnorm xpose4]; }; + nonmem2R = derive2 { name="nonmem2R"; version="0.1.7"; sha256="1a3azvf9dbmi3l3crmkv1qvrd0j1d14x4s9hjk2r1cayiazpmbib"; depends=[lattice latticeExtra MASS mvtnorm xpose4]; }; + nonmemica = derive2 { name="nonmemica"; version="0.7.1"; sha256="1kz5sm15s1yrkx0mymzw53f3pxwba251hcdbid3mkfd3nb5cxlar"; depends=[csv dplyr encode fold lazyeval magrittr metaplot spec tidyr xml2]; }; nonnest2 = derive2 { name="nonnest2"; version="0.4-1"; sha256="0lgcrxvyyw789hw80lqbxvvxl6z95qxzq9k5lphl5435xqzpfj6f"; depends=[CompQuadForm lavaan mvtnorm sandwich]; }; - nonpar = derive2 { name="nonpar"; version="1.0.0"; sha256="0baavlsnh5hjgmhx42v0vn4c11bcrbssxxc7971g0rk93cgnk5nj"; depends=[]; }; + nonpar = derive2 { name="nonpar"; version="1.0.1"; sha256="0pxks3nga7jrcvq0pzr1axj3a9xvzky836fl7966a09ws1vff7i4"; depends=[]; }; nonparaeff = derive2 { name="nonparaeff"; version="0.5-8"; sha256="1kkn68m7cqlzx3v539cjxw3x5a2y86lvmyv2k98s87m3yvqg0gdk"; depends=[gdata geometry Hmisc lpSolve psych pwt rms]; }; nonrandom = derive2 { name="nonrandom"; version="1.42"; sha256="0icm23hw593322z41wmjkwxqknh2pa9kpzbrch7xw1mhp93sd5ll"; depends=[lme4]; }; nontarget = derive2 { name="nontarget"; version="1.9"; sha256="0ndqcr73sja5ks5kdahhakpz9lw3rp26imklagdv4f5agqnb608s"; depends=[enviPat mgcv nontargetData]; }; @@ -7508,20 +7853,21 @@ in with self; { normwhn_test = derive2 { name="normwhn.test"; version="1.0"; sha256="1kr45bfydk40hgdg24i2f28cdaw65hg9gmsgv4lsvvr2m3r74vi6"; depends=[]; }; nortest = derive2 { name="nortest"; version="1.0-4"; sha256="17r0wpz72z9312c70nwi1i1kp1v9fm1h6jg7q5cx1mc1h420m1d3"; depends=[]; }; nortestARMA = derive2 { name="nortestARMA"; version="1.0.2"; sha256="11ala9z0snsbn1xmj9yzs4kyh9js1w19x0dnnmh5cbr9bi7aag50"; depends=[astsa]; }; + nos = derive2 { name="nos"; version="1.0.0"; sha256="0p60jfknmkpmh9a5590xcdra8473f0h063w3xj2sq8myv1hgd2q1"; depends=[dplyr gmp]; }; nose = derive2 { name="nose"; version="1.0"; sha256="17l78vmfqc22inq6zaqpnk2m91wp0nfjbbwfcpfqykf8lk9ipqna"; depends=[]; }; not = derive2 { name="not"; version="1.0"; sha256="1hwrka8a5jygm3zjh5jhzjx2bvdqip7pb5009vkk7k0sp8m760kq"; depends=[]; }; notifyR = derive2 { name="notifyR"; version="1.02"; sha256="0jx76ic5r1crcgg0n0yqnka0gwniflfxakh838a98j9wb11wi6h5"; depends=[RCurl rjson]; }; notifyme = derive2 { name="notifyme"; version="0.3.0"; sha256="0b6xrv6c4id7rs0dafg96pl4brn4yma5xh9wjz78ql44bg3w5s91"; depends=[dplyr httr magrittr]; }; novelist = derive2 { name="novelist"; version="1.0"; sha256="0wzx0vkqvl9sfhbbrzylsxhm3qmjj5w8sy5w6gvd104fn84d49yk"; depends=[]; }; noweb = derive2 { name="noweb"; version="1.0-4"; sha256="17s65m1m8bj286l9m2h54a8j799xaqadwfrml11732f8vyrzb191"; depends=[]; }; - np = derive2 { name="np"; version="0.60-2"; sha256="0zs1d4mmgns7s26qcplf9mlz9rkp6f9mv7abb0b9b2an23y6gmi5"; depends=[boot cubature]; }; + np = derive2 { name="np"; version="0.60-3"; sha256="12hzmhh59dfifssj08bjwxszxy38irami70bq14dxlm48fjyz17g"; depends=[boot cubature quantreg]; }; npIntFactRep = derive2 { name="npIntFactRep"; version="1.5"; sha256="14ms66ppzb4jjsa3fparic6gdn913f6wv2ccjyb02j1ahs4iaa4g"; depends=[ez plyr]; }; - npROCRegression = derive2 { name="npROCRegression"; version="1.0-4"; sha256="1w635wqkkbw5csrzjdyim6qxp5rvrlik260wp9iarh97rs5jgm53"; depends=[lattice]; }; + npROCRegression = derive2 { name="npROCRegression"; version="1.0-5"; sha256="09ngfj0bd9cp19lpwsbknp2y71x36k03ph84bmf67wm1q2na7f93"; depends=[lattice]; }; nparACT = derive2 { name="nparACT"; version="0.7"; sha256="0ia7s4gcqvcx02gybzizf6dsv75graknsjq7m74iplb2v6rzyywj"; depends=[ggplot2 stringr zoo]; }; nparLD = derive2 { name="nparLD"; version="2.1"; sha256="1asq00lv1rz3rkz1gqpi7f83p5vhzfib3m7ka1ywpf2wfbfng27n"; depends=[MASS]; }; nparcomp = derive2 { name="nparcomp"; version="2.6"; sha256="111ypwyc885lvn64a5sb2k552j6wr3iihmhgx5y475axdiva5pzf"; depends=[multcomp mvtnorm]; }; nparsurv = derive2 { name="nparsurv"; version="0.1.0"; sha256="1qy9qkkpqrk49vjxbyvl25i4kfk0py6v64izd8lmaw38dynybpy2"; depends=[survival TH_data]; }; - npbr = derive2 { name="npbr"; version="1.4"; sha256="0h2lrjls89ivd3v1jksiq5jh57n20xgxaxcpwx8vqcvbpsdvfkd4"; depends=[Benchmarking np quadprog Rglpk]; }; + npbr = derive2 { name="npbr"; version="1.5"; sha256="0z35bdk3ri34idjgvxw91n4gyyq838d1rrs096y6ihxhqnywfmv5"; depends=[Benchmarking np quadprog Rglpk]; }; npcopTest = derive2 { name="npcopTest"; version="1.02"; sha256="1avjhm6rzyawwaabch6cxc7w2if4631jwrd2l8lyd3nk39kpr8ch"; depends=[]; }; npcp = derive2 { name="npcp"; version="0.1-6"; sha256="1ki9q49nyw21c6x3iwpd8aa152jc30idl0xx8f803j72yl21j47c"; depends=[]; }; npde = derive2 { name="npde"; version="2.0"; sha256="1cp4k7jvsw9rc6rrck902nqqjaf2c1nxjic7i9r3fd6yca1lgqb9"; depends=[mclust]; }; @@ -7539,17 +7885,22 @@ in with self; { npsp = derive2 { name="npsp"; version="0.5-3"; sha256="0ck6iymfc73bzrifdc2sagcliz1yakqk1yv67a3ykha996jsrx99"; depends=[quadprog]; }; npst = derive2 { name="npst"; version="2.0"; sha256="1y5ij3nmh9pj6p97jpx75g26sk508mznr0l67cwj381zfb77hj1n"; depends=[]; }; npsurv = derive2 { name="npsurv"; version="0.3-4"; sha256="1z456q3vi9pndr2x8byq95hh4dv95hpgj1an6vxhnwlhbfwjdjlx"; depends=[lsei]; }; - nricens = derive2 { name="nricens"; version="1.3"; sha256="0wyr6bh8vhvvixqa8z2pmav94frskv5kvsf2y4yk2064ra65kjiz"; depends=[survival]; }; + nricens = derive2 { name="nricens"; version="1.4"; sha256="0n2nqnb1gp6vxsrm8zlg8p52jb5a5pg5k6iyimwy0xcrh7ss7iv7"; depends=[survival]; }; nsRFA = derive2 { name="nsRFA"; version="0.7-12"; sha256="182zshwyg0l6shb5wcwibqygxs8qmgma9c4s683za8q3f9l94aqj"; depends=[]; }; + nsROC = derive2 { name="nsROC"; version="1.0"; sha256="0c99z8kknbrnbyyv7p79sj848aq7b5n4m4r7v1yrcs61ackrdn2n"; depends=[sde survival]; }; nscancor = derive2 { name="nscancor"; version="0.6"; sha256="1wkk08h8yz2mzgvmq0vr30iiczpbp0304vjwxqgsa3h240m4awsm"; depends=[]; }; + nscprepr = derive2 { name="nscprepr"; version="0.1.1"; sha256="1rd32zywrzyxz6hpn9s6cwjlg8q8rz3cc0p3b5gan8bicx0ilwjc"; depends=[dplyr lubridate stringr]; }; nse = derive2 { name="nse"; version="1-00.17"; sha256="16zam539ir29m9ixyim9bqnf3sdy8aaaaly3wf96i3csgysf8pjc"; depends=[coda mcmc mcmcse np Rcpp sandwich sapa]; }; nsga2R = derive2 { name="nsga2R"; version="1.0"; sha256="04jj0a3isfc348vg46il5x9l33cr7xawz5w0mm4pwr6djhd8nfhx"; depends=[mco]; }; nsgp = derive2 { name="nsgp"; version="1.0.5"; sha256="0piajjz3r71dnjw7lwpjhbaygxcrbbxfvhf8p3n2izyr2pw5fml9"; depends=[MASS]; }; + nspmix = derive2 { name="nspmix"; version="1.3-0"; sha256="07avjfpapd5vz8mi8cj658w1hra17j9wwairisyvb5dw3c9s2qac"; depends=[lsei]; }; nsprcomp = derive2 { name="nsprcomp"; version="0.5"; sha256="1rrjiwkpiaqlp27s5xfd6jwmmpzgxm5d7874gp33511wa0vrhnnf"; depends=[]; }; nucim = derive2 { name="nucim"; version="1.0.0"; sha256="0fyapw6f5wkybr4mwmqpk9wy349j5sa4q26pci1bsy4ly2wf9wx6"; depends=[bioimagetools EBImage fields stringr]; }; nullabor = derive2 { name="nullabor"; version="0.3.1"; sha256="0anwla6x9y2i7yd6r0yi1xhy0zfqwfpp5h1f18gji11nmiva9d81"; depends=[dplyr fpc ggplot2 MASS moments plyr]; }; numDeriv = derive2 { name="numDeriv"; version="2016.8-1"; sha256="07ni52rwiap4wilfz94w5mrqaxr59axxmgn57857ip4p6qkiss0v"; depends=[]; }; - numOSL = derive2 { name="numOSL"; version="2.2"; sha256="03dy8inwm1s4kiql7iaisvn7xyr1lz96srqi3jarsyjipvbicjfb"; depends=[]; }; + numGen = derive2 { name="numGen"; version="0.1.0"; sha256="0cdlv6pmxzhpybpihbzcdjcm3lqqnivjx55cjnrgi9q2dgrndcnr"; depends=[]; }; + numKM = derive2 { name="numKM"; version="0.1.0"; sha256="0pnwb7skp5jx5ibgfkympq59m9sf71gvk5zc0fwik539vrzfykdf"; depends=[survival]; }; + numOSL = derive2 { name="numOSL"; version="2.3"; sha256="1bcj1qk3nx1jqhldx9rcwphvlxspz3bj4vb891hkw2fa2i4559c5"; depends=[]; }; numbers = derive2 { name="numbers"; version="0.6-6"; sha256="05qmv12b90vkzf2b50qjnp8hja6rms91jj97knx70n2yhpb2lnd9"; depends=[]; }; nutshell = derive2 { name="nutshell"; version="2.0"; sha256="1v11g5wqyxnj29b7akl0cwa34hcqs79ijbiv735pg3df4ggyrzvm"; depends=[nutshell_audioscrobbler nutshell_bbdb]; }; nutshell_audioscrobbler = derive2 { name="nutshell.audioscrobbler"; version="1.0"; sha256="10fvc5d22gnfb0bkgbww48f0vvcaja96g5gfv85kap939j11172j"; depends=[]; }; @@ -7569,7 +7920,6 @@ in with self; { objectProperties = derive2 { name="objectProperties"; version="0.6.5"; sha256="0wn19byb1ia5gsfmdi6cj05pnlxbr3zcrjabjg3g1d7b58nz7wlh"; depends=[objectSignals]; }; objectSignals = derive2 { name="objectSignals"; version="0.10.2"; sha256="1rcgfq1i3nz2q93vv4l069f3mli1c6fd5dhhhw1p7cc4sy81008w"; depends=[]; }; obliclus = derive2 { name="obliclus"; version="0.9"; sha256="000r1dx4zbgjxrfs66c1yazm0w6q2z0z1scf45g2qj5ykcm9ylma"; depends=[]; }; - oblique_tree = derive2 { name="oblique.tree"; version="1.1.1"; sha256="01vyc46gz7qx8fc5bg3zbhjyhnmfgjii120a915vmr38cs51qhqh"; depends=[glmnet nnet tree]; }; obliqueRF = derive2 { name="obliqueRF"; version="0.3"; sha256="1bwlgv820mmpc6vg26bsdlfy2p78586i3y42hkzbw3z1fmwq3pz5"; depends=[e1071 mda pls ROCR]; }; obs_agree = derive2 { name="obs.agree"; version="1.0"; sha256="191xshnrncjqzwd2rdq334vsx0338q3y3k1nbm04hdaysbnla9jv"; depends=[]; }; obsSens = derive2 { name="obsSens"; version="1.3"; sha256="1vfm1mzsycwkqa39vf3fcdv1s6adps9hw1rxlvl8v9kq746hcabw"; depends=[]; }; @@ -7577,29 +7927,31 @@ in with self; { oc = derive2 { name="oc"; version="0.96"; sha256="110pf3rqcab0671djx25jwwl8rbaskcd2lrcv56d786j693y2ash"; depends=[pscl]; }; occ = derive2 { name="occ"; version="1.0"; sha256="1rpgq6mqrdzz52ln897f5k8yyz5i14s3lxqmy3nwsxf3q2bdf3yh"; depends=[]; }; oce = derive2 { name="oce"; version="0.9-21"; sha256="1nwnfs75mdq0s13jz5l9zv1rjx5637yljhrc56sghwq38gi1mpal"; depends=[gsw]; }; - oceanmap = derive2 { name="oceanmap"; version="0.0.5"; sha256="1afjkkfx2040606x2ivkppl14207d02y03i058gnkf9zdnvr15nc"; depends=[abind extrafont fields mapdata maps maptools marmap ncdf4 plotrix raster sp]; }; + oceanmap = derive2 { name="oceanmap"; version="0.0.8"; sha256="0l9w4mk9n0g52jr6pw6c3i82hishp9qzdf97bxgm326h08wz7z6l"; depends=[abind extrafont fields mapdata maps maptools marmap ncdf4 plotrix raster sp]; }; ocedata = derive2 { name="ocedata"; version="0.1.3"; sha256="0lzsyaz8zb6kiw86fnaav2g2wfdhyicxvm81ly5a9z4mjch3qj02"; depends=[]; }; ockc = derive2 { name="ockc"; version="1.0"; sha256="0chzrs3ipa2518r4d35z4fxffgq12p1mwj0hzkxw19gdgq6aa8s7"; depends=[flexclust modeltools]; }; ocomposition = derive2 { name="ocomposition"; version="1.1"; sha256="0fk8ia95yjlvyvmjw7qg72piqa40kcqq9wlb3flc6a81pys1ycb5"; depends=[bayesm coda]; }; - odbc = derive2 { name="odbc"; version="1.0.1"; sha256="0i047xpp481r5lsmrk853fcwhhvanwl6xdbddjgypd0mf0c11ng0"; depends=[BH blob DBI Rcpp]; }; + odbc = derive2 { name="odbc"; version="1.1.1"; sha256="1n9i1x238di3ydcx7533ifa3q72iacskfx436z8agfasfz2lmy5l"; depends=[BH bit64 blob DBI hms Rcpp]; }; odds_converter = derive2 { name="odds.converter"; version="1.4"; sha256="13y3s04l2jvjhn1i4syz4y3q42ba8br0sp3mks5f5h4cp8w4j3wy"; depends=[]; }; - oddsratio = derive2 { name="oddsratio"; version="0.3.1"; sha256="0vpqhb6zady7facbrv5g3idxnzwy65237w6wfdxafsx40vc7bcig"; depends=[cowplot ggplot2 MASS mgcv]; }; + oddsratio = derive2 { name="oddsratio"; version="1.0.0"; sha256="19xihbdcyx19lbvylpzqwgdf7ij043zfn7cz5v7ax5byhhz26vdk"; depends=[cowplot ggplot2 MASS mgcv]; }; odeintr = derive2 { name="odeintr"; version="1.7.1"; sha256="0wfb5lgv10p0qyfbn9hdg14bda37v43lpgbwv6nbw63zzbsbazqi"; depends=[BH Rcpp]; }; odfWeave = derive2 { name="odfWeave"; version="0.8.4"; sha256="1rp9j3snkkp0fqmkr6h6pxqd4cxkdfajgh4vlhpz56gr2l9j48q5"; depends=[lattice XML]; }; odfWeave_survey = derive2 { name="odfWeave.survey"; version="1.0"; sha256="0cz7dxh1x4aflvfrdzhi5j64ma5s19ma8fk9q2m086j11a1dw3jn"; depends=[odfWeave survey]; }; oec = derive2 { name="oec"; version="2.2"; sha256="11ldy303xkl7qaqvlzfwr7qxwnz06n39mkjvrj0sca6xzw12lq5d"; depends=[curl data_table jsonlite plyr servr]; }; oem = derive2 { name="oem"; version="2.0.5"; sha256="1zhfq4njxsq6fq73y6nxz637h85xk3mj19y7v3b37ma3cqb2s52p"; depends=[BH bigmemory foreach Matrix Rcpp RcppArmadillo RcppEigen]; }; - officer = derive2 { name="officer"; version="0.1.1"; sha256="0qn77x6zfkrcfmlhndfj6a4kbicr6s7wshz8r90s92vmvdzvv703"; depends=[base64enc digest dplyr gdtools ggplot2 lazyeval magrittr purrr R_utils R6 Rcpp tibble xml2]; }; + officer = derive2 { name="officer"; version="0.1.4"; sha256="0v6nfx34r2476qgmsy8aygw4b49hmp94jhx7a7x8hdh6dglmfzhp"; depends=[base64enc digest dplyr gdtools ggplot2 lazyeval magrittr purrr R_utils R6 Rcpp tibble uuid xml2 zip]; }; oglmx = derive2 { name="oglmx"; version="2.0.0.3"; sha256="02skdnf89ryl4d8ja1a9mj1jzzmjqjgfdcsf6v5dpjn1z9aycc6c"; depends=[maxLik]; }; oii = derive2 { name="oii"; version="1.0.1"; sha256="0w1afajkr5vly9qi1r2iz1ikbvyvy6hcbc10g8s7g6zi8db5dgf4"; depends=[Deducer gmodels rapportools]; }; okcupiddata = derive2 { name="okcupiddata"; version="0.1.0"; sha256="1l04rr4yr73a6q2am9ylyr5prf347hkf2jx735w78rsb6472kbaq"; depends=[]; }; okmesonet = derive2 { name="okmesonet"; version="0.1.5"; sha256="1kzyzmg702ayzphn9jsk64m51mlnz37ylxiwq5gsr23vaiida680"; depends=[plyr]; }; olctools = derive2 { name="olctools"; version="0.3.0"; sha256="1gbchwynvmryarz32f24v56kj57h7x6nrrm878fkjkpq140cqwzz"; depends=[Rcpp]; }; + olsrr = derive2 { name="olsrr"; version="0.2.0"; sha256="0xlp54wag3k0bqy22vly953xf5jslrpx1z4vj5rbivnnfxaw3ixk"; depends=[dplyr ggplot2 goftest gridExtra magrittr nortest purrr Rcpp tibble tidyr]; }; omd = derive2 { name="omd"; version="1.0"; sha256="0s1wcgivqapbkzjammga8m12gqgw113729kzfzgn02nsfzmsxspv"; depends=[]; }; omics = derive2 { name="omics"; version="0.1-5"; sha256="1y2x33mfgq98nglhvpr1wq1v6nfiq4njy2yac47x72rpwxsj9vb1"; depends=[lme4 pheatmap]; }; ompr = derive2 { name="ompr"; version="0.6.0"; sha256="1yjzi2xg9543g0bwx95anvx2sckdmbbh7k4hmljff2lrpffwf735"; depends=[dplyr lazyeval Rcpp]; }; ompr_roi = derive2 { name="ompr.roi"; version="0.6.0"; sha256="0j0mbkbwb3iz00b1p8q5jsydhj3j36mjqc762mcspml1i68ip8iy"; depends=[ompr ROI]; }; oncomodel = derive2 { name="oncomodel"; version="1.0"; sha256="1jyyq9znffiv7rg26mjldbwc5yi2f4f8npsd2ykhxyacb3g96fp1"; depends=[ade4]; }; + onehot = derive2 { name="onehot"; version="0.1.1"; sha256="1cdsz007wr054k5phvihhg4qx0fc039k2s6484m92kws8mb2ziix"; depends=[]; }; onemap = derive2 { name="onemap"; version="2.0-4"; sha256="00xmhm5qy0ycw0mnlyl20vfw0wxmpb36f07k0jj92c4zbpwjiygx"; depends=[tkrplot]; }; onewaytests = derive2 { name="onewaytests"; version="1.4"; sha256="0p48bic8fnj4bgrlh3r7flbaj12z3ir5bigmvh8izznablq93wkk"; depends=[car ggplot2 moments nortest]; }; onion = derive2 { name="onion"; version="1.2-4"; sha256="0x3n9mwknxjwhpdg8an0ilix5cb8dyy5fqnb6nxx7ww885k0381a"; depends=[]; }; @@ -7609,13 +7961,14 @@ in with self; { ontologyPlot = derive2 { name="ontologyPlot"; version="1.4"; sha256="0sj1jg9lr1w3ahzw7fj86vp2bnvf4nq0x3hiqb3hzngwyj9bykpn"; depends=[ontologyIndex paintmap Rgraphviz]; }; ontologySimilarity = derive2 { name="ontologySimilarity"; version="2.2"; sha256="1g1ag2bnfczdx2xyswrc9xbl9krnyibb4639wynm7c0lf2876964"; depends=[ontologyIndex Rcpp]; }; opefimor = derive2 { name="opefimor"; version="1.2"; sha256="06j5diwp42x7yrhclwyiimfwmx66y23dkwlnkd2lj2zcsgam9s8w"; depends=[]; }; + openEBGM = derive2 { name="openEBGM"; version="0.1.0"; sha256="10r8yg5h38npw6vsjkg15j762yh8r561495sn4d47x6i8arp34sj"; depends=[data_table ggplot2]; }; openNLP = derive2 { name="openNLP"; version="0.2-6"; sha256="1173cng877sg6ynbs3csfnn956wwrq3yldhhzfbqdsz35draganj"; depends=[NLP openNLPdata rJava]; }; openNLPdata = derive2 { name="openNLPdata"; version="1.5.3-2"; sha256="1472gg651cdd5d9xjxrzl3k7np77liqnh6ysv1kjrf4sfx13pp9q"; depends=[rJava]; }; openVA = derive2 { name="openVA"; version="1.0.3"; sha256="09wbhl0g6q1rhi6yr3wpbns4ik7jalpagacn6am09i6zvmz8745j"; depends=[ggplot2 InSilicoVA InterVA4 nbc4va Tariff]; }; openadds = derive2 { name="openadds"; version="0.2.0"; sha256="1jb8zd3rpxfkjkg895iab6m4cfi53p5vy3nnpjkgq7ym6499qjcv"; depends=[crul dplyr jsonlite maptools rappdirs readr tibble xml2]; }; openair = derive2 { name="openair"; version="2.1-0"; sha256="0ybly7xmxrlyn12al2pk1w1yjm857npj3ih3zl1p0sd744x8pm6w"; depends=[cluster dplyr hexbin lattice latticeExtra lazyeval lubridate mapproj MASS mgcv plyr RColorBrewer Rcpp reshape2]; }; - opencage = derive2 { name="opencage"; version="0.1.0"; sha256="0fx5l5rzl9c7df03bvxcykfcrqjl2ld5k49kzsc5d157gxynnh56"; depends=[dplyr httr jsonlite memoise]; }; - opencpu = derive2 { name="opencpu"; version="1.6.1"; sha256="01m9zrbyishf4qbsw6fnfihnw4470qvv6br63zbzj2c7jzpi0v6g"; depends=[brew devtools evaluate httpuv httr jsonlite knitr openssl protolite]; }; + opencage = derive2 { name="opencage"; version="0.1.2"; sha256="1wnv5mgapdnkpg62sv0375jac2rdnchggjfjnr07bziwpf3xj74d"; depends=[dplyr httr jsonlite memoise]; }; + opencpu = derive2 { name="opencpu"; version="2.0.3"; sha256="0yjlmhvqyvk4097bjw94ji8nn7clnfpj8g204vrvhy0y59bbg5rr"; depends=[brew curl devtools evaluate httpuv jsonlite knitr mime openssl protolite rappdirs sendmailR sys webutils zip]; }; openintro = derive2 { name="openintro"; version="1.4"; sha256="1k6pzlsrqikbri795vic9h191nf2j7v7hjybjfkrx6847c1r4iam"; depends=[]; }; openssl = derive2 { name="openssl"; version="0.9.6"; sha256="0ffwllii8xl6sa2v66134g0fwaw1y3zn3mvaa4nrc120vv5d3mkd"; depends=[]; }; opentraj = derive2 { name="opentraj"; version="1.0"; sha256="13nqal96199l8vkgmkvl542ksnappkscb6rbdmdapxyi977qrgxk"; depends=[doParallel foreach maptools openair plyr raster reshape rgdal sp]; }; @@ -7629,17 +7982,17 @@ in with self; { optCluster = derive2 { name="optCluster"; version="1.1.1"; sha256="0nb9b2lbsrl1gldy27vnqqd0z439vbvjg1h4a1rvqj01ik4xzfyn"; depends=[cluster clValid gplots kohonen MBCluster_Seq mclust RankAggreg]; }; optDesignSlopeInt = derive2 { name="optDesignSlopeInt"; version="1.1"; sha256="0vpm4359rq5v231k63vgaac6iv2ybfkcpy59n86djb710b3h2qcn"; depends=[MCMCpack neldermead]; }; optR = derive2 { name="optR"; version="1.2.5"; sha256="0q7jf4m0gzm11izl5lff17pvr855smqmc6zzi1bc7m6h3z865l32"; depends=[]; }; - optband = derive2 { name="optband"; version="0.2"; sha256="0a0kr8h4asziq66k1556mabwjyib84v0arn4jmb0gjzxjrg6rk2f"; depends=[LambertW]; }; + optband = derive2 { name="optband"; version="0.2.1"; sha256="1rv4r7h7x3xipav917cz9bcr6nqjzbinfrqxv8mcls9gdl9ha3y9"; depends=[LambertW]; }; optbdmaeAT = derive2 { name="optbdmaeAT"; version="1.0.1"; sha256="1y1mvcyjihpj1wgjmifhmd10717wr1srp7h87azs4gfypgsiqchn"; depends=[igraph MASS Matrix]; }; optextras = derive2 { name="optextras"; version="2016-8.8"; sha256="03wqz16q8kn0ndk241h541fa0g5y0nrfg17vph85cm5xvzdd14cc"; depends=[numDeriv]; }; optiRum = derive2 { name="optiRum"; version="0.37.3"; sha256="1g3kgfwa7ckh45v14qdi3gq9vy0zfpjaffcgpfapyylrsrnspy3f"; depends=[AUC data_table ggplot2 knitr plyr scales stringr XML]; }; - optiSel = derive2 { name="optiSel"; version="0.7.1"; sha256="1klf68s3c65sp8ap7f4jq1sl9aqvhjzqcd44r3lzjxpspnm8055m"; depends=[alabama cccp data_table kinship2 magic MASS Matrix nadiv nloptr pedigree plyr pspline quadprog Rcpp RcppArmadillo Rcsdp stringr]; }; + optiSel = derive2 { name="optiSel"; version="0.9.1"; sha256="1s126aylwrg9phcyil2mmrdsdx99c1va95h57ahim523vr30ipf0"; depends=[alabama cccp data_table doParallel ECOSolveR foreach kinship2 magic MASS Matrix nadiv nloptr pedigree plyr pspline quadprog Rcpp RcppArmadillo Rcsdp stringr]; }; opticut = derive2 { name="opticut"; version="0.1-0"; sha256="0dh7zw8yrzxw3vfzfm776rdhfczmlwfs3fw568s5cc60xsn8fa93"; depends=[betareg MASS mefa4 pbapply pscl ResourceSelection]; }; optifunset = derive2 { name="optifunset"; version="1.0"; sha256="18pvdl04ln1i0w30ljdb3k86j27zg2nvrn3ws54c1g6zg9haqhbg"; depends=[]; }; optigrab = derive2 { name="optigrab"; version="0.7.3"; sha256="1vd4b6mh4a137nvsbpx71jibfd67va1m8iya1gasqiflm6qzszcx"; depends=[magrittr stringi]; }; optim_functions = derive2 { name="optim.functions"; version="0.1"; sha256="1la3v8yd9cdichp3mka4x86hr9lynh6qfg7h9ab6cwijw6kzkn6g"; depends=[lhs randtoolbox stringr]; }; optimbase = derive2 { name="optimbase"; version="1.0-9"; sha256="0ivz24kf3yacgq5bl3s3az1pcyhsz0cza5f8vdksy5gchwqplm8n"; depends=[Matrix]; }; - optimization = derive2 { name="optimization"; version="1.0-1"; sha256="1smmpv9ahv2fdfqxlpp42wzg08xhhj9niay8wsd49799xvpcw1jg"; depends=[colorspace Rcpp]; }; + optimization = derive2 { name="optimization"; version="1.0-5"; sha256="1lg8al7i3yrbjf1z8d9qgh9n67b34l5cww443asyciq362zjalnw"; depends=[colorspace Rcpp]; }; optimr = derive2 { name="optimr"; version="2016-8.16"; sha256="02dgwkcjhf6ciwb6x6gyk7nn4v2jras7l1icfd4pjbypiapwnck9"; depends=[numDeriv optextras Rcgmin Rvmmin setRNG]; }; optimsimplex = derive2 { name="optimsimplex"; version="1.0-5"; sha256="1aiq0w2zlra3k6x4hf2rglb6bj8w25yc8djnpgm508kkrbv3cc17"; depends=[optimbase]; }; optimus = derive2 { name="optimus"; version="0.1.0"; sha256="1dz0wczyl1awv3s01malmyrzwijxdywh0xhpfh1i0pncbb4rq3vc"; depends=[mvabund ordinal]; }; @@ -7664,17 +8017,19 @@ in with self; { orddom = derive2 { name="orddom"; version="3.1"; sha256="165axs15fvwhrp89xd87l81q3h2qjll1vrwcsap645cwvb85nwsh"; depends=[psych]; }; orderbook = derive2 { name="orderbook"; version="1.03"; sha256="0dlvjrzdhhh8js4g1lvxs46q7fdxfxavxnb4nj6xlwca75i51675"; depends=[hash lattice]; }; orderedLasso = derive2 { name="orderedLasso"; version="1.7"; sha256="0vrh89nrmpi8xscvambcb1y70gqqi5819a2gxh02h4pnyjn8axql"; depends=[ggplot2 Iso Matrix quadprog reshape2]; }; + orderstats = derive2 { name="orderstats"; version="0.1.0"; sha256="0a3ga0cjryvbininspsx5wzc96s3fza06s3d5fhbllbixz0rap4a"; depends=[]; }; ordiBreadth = derive2 { name="ordiBreadth"; version="1.0"; sha256="04faqhas1p9lxhghd4xq07yq1nxv7ns18avhvkql7sy5a9g7bfs1"; depends=[vegan]; }; ordinal = derive2 { name="ordinal"; version="2015.6-28"; sha256="0lckjzjq2k8rlibrjf5s0ccf17vcvns5pgzvjjnl3wibr2ff4czs"; depends=[MASS Matrix ucminf]; }; - ordinalCont = derive2 { name="ordinalCont"; version="1.0.2"; sha256="0dj98ziwaka1a2bra6zzqqwmw9f0ki5iyzibslix0brk9v8lq3km"; depends=[boot]; }; + ordinalCont = derive2 { name="ordinalCont"; version="1.2"; sha256="0a30yba3gmhrl4ln47kk046fk9wqn32hjkqwmrhzjyzl3w4jq8jz"; depends=[boot]; }; ordinalForest = derive2 { name="ordinalForest"; version="1.0"; sha256="1hmvr94s7fwpqzziaqh01w7c7hg1z4ms03cll8v13jkbaryk3yik"; depends=[combinat ggplot2 ranger]; }; - ordinalNet = derive2 { name="ordinalNet"; version="1.5"; sha256="1iy8vgx6znnazhzx7m649hbikliwv9j5c5nrr0jrbdl28d84qapl"; depends=[]; }; + ordinalNet = derive2 { name="ordinalNet"; version="2.0"; sha256="168sl18rcxnv2h26y83sbna5855b6shc5pw72dhv8zi268ykwkcx"; depends=[]; }; ordinalgmifs = derive2 { name="ordinalgmifs"; version="1.0.3"; sha256="0ki91l6vvfxpzq7zgl3d08r5pzx47jxkgf7g0g95580xx2q7n7zx"; depends=[survival]; }; ore = derive2 { name="ore"; version="1.6.0"; sha256="115s3wq7rrpmx65k9jlpf2x1d218gnl7vsc8zsvmjbsi4gfyliwf"; depends=[]; }; ores = derive2 { name="ores"; version="0.2.0"; sha256="164z4r4894r8j5vigh5rsqwkslmgdwj0rsl088fq0hb40p3w1nd0"; depends=[httr]; }; orgR = derive2 { name="orgR"; version="0.9.0"; sha256="1q4qbwnbhmja8rqiph7g7m4wxhzhk9mh91x1jgbnky8bs4ljdgrx"; depends=[data_table ggplot2 ggthemes lubridate stringr]; }; orgutils = derive2 { name="orgutils"; version="0.4-1"; sha256="1yc3avhq3786his7nd60zfbzd9inkfrfz938r8378z59zbb1mzqq"; depends=[textutils]; }; orientlib = derive2 { name="orientlib"; version="0.10.3"; sha256="1qi46hkz73b8722zc3w6wvsq1ydlk37yxn9rd1dqygqbs1svkmvv"; depends=[]; }; + origami = derive2 { name="origami"; version="0.8.0"; sha256="09sw2chrb4bl285cvnhnjf3idbxdriqj17c8w510j7qs22jlnywb"; depends=[abind data_table future listenv]; }; originr = derive2 { name="originr"; version="0.2.0"; sha256="06n5qshk4dq6ac4prnhzymz7gcmp6m2zdc8d9d13ii7n7xa0ymx2"; depends=[data_table httr jsonlite taxize xml2]; }; orloca = derive2 { name="orloca"; version="4.2"; sha256="14accc5kcvvin5qav6g3rx10by00r0b8970nd09w4c09nhwyblcd"; depends=[]; }; orloca_es = derive2 { name="orloca.es"; version="4.1"; sha256="0nzhg7vzfxlmryw5ijww8z2b1g9cmgcgzi3gsgigsgn4shnc2hni"; depends=[orloca]; }; @@ -7682,7 +8037,7 @@ in with self; { oro_nifti = derive2 { name="oro.nifti"; version="0.7.2"; sha256="00s5ml1wmxly6mjnhkxjigivjnylyxq39p2zwzhk8vaj5llk2x1q"; depends=[abind bitops RNifti]; }; oro_pet = derive2 { name="oro.pet"; version="0.2.3"; sha256="06agl6rvd01h6mnilj0vl52dxw6b7b41vl6vmbvaq5qy1wmiaiz7"; depends=[oro_dicom oro_nifti]; }; orsifronts = derive2 { name="orsifronts"; version="0.1.1"; sha256="1js4q2s1mn263x8szl5q47ajfxv9lsjd5zyphwyhbkqrnd8ijd3w"; depends=[sp]; }; - orsk = derive2 { name="orsk"; version="1.0-2"; sha256="0h0h1z8ddn2nkc7c6c4s39sxwvav562p0lcwy13441rrlibywbhq"; depends=[BB BHH2]; }; + orsk = derive2 { name="orsk"; version="1.0-3"; sha256="0j8bz5kddzglcljycxy8lv8h5f6hvz88nzwq3b9cdyayd8mlbxs2"; depends=[BB BHH2]; }; orthogonalsplinebasis = derive2 { name="orthogonalsplinebasis"; version="0.1.6"; sha256="07rbd0fhs2gsk7wj41y2h7wf6pfg324vzv2al753d8kqyx5ns2dj"; depends=[]; }; orthopolynom = derive2 { name="orthopolynom"; version="1.0-5"; sha256="1gvhqx6jlh06hjmkmbsl83gri0gncrm3rkliyzyzmj75m8vz993d"; depends=[polynom]; }; osDesign = derive2 { name="osDesign"; version="1.7"; sha256="0y68pnsmq4nlmfsn28306q2kxab200pirr6ha0w4himzpnw1sil3"; depends=[]; }; @@ -7690,17 +8045,18 @@ in with self; { osd = derive2 { name="osd"; version="0.1"; sha256="1py9p15nrcydr8w9ilxkxabiz9zlqnls8xn9avjkxd8x6602jx6p"; depends=[JADE nnls]; }; osi = derive2 { name="osi"; version="0.1.0"; sha256="1wzkvsqifk0g29jnpvykn26myq27pxll3glqlp74djkz0rbpv7aa"; depends=[httr]; }; osmar = derive2 { name="osmar"; version="1.1-7"; sha256="0q6d8nw7d580bnx66mjc282dx45zw9srczz90b520hjcli4w3i3r"; depends=[geosphere RCurl XML]; }; + osmdata = derive2 { name="osmdata"; version="0.0.4"; sha256="0j0zc5kyz2r9hik2hrmvf9m1b4zig7jm0g8krww331dbdw3bmb7x"; depends=[curl httr jsonlite lubridate Rcpp rvest sp xml2]; }; osmplotr = derive2 { name="osmplotr"; version="0.2.3"; sha256="1gvr3plni62hrs1i4b1id863ib0d4l4gfh8h40nyvk16mgvp4a4c"; depends=[curl ggm ggplot2 httr igraph osmar rgeos sp spatstat XML]; }; osrm = derive2 { name="osrm"; version="3.0.1"; sha256="0sz3fbdljfakh0g8bmsx6arwz7j2sjd63c4af1sryh9c8sk8gpjp"; depends=[gepaf jsonlite raster RCurl rgeos sp]; }; otinference = derive2 { name="otinference"; version="0.1.0"; sha256="1l75jjnkyk8yzaw9zyk45jq9ys304i6pzm2xd5apxrb1jk75a3li"; depends=[MASS Rglpk sm transport]; }; - otrimle = derive2 { name="otrimle"; version="0.4"; sha256="0xhsx11rpm9179jm5p00x2c125r15bhslsnll182bhw282vwx2kx"; depends=[mclust prabclus]; }; + otrimle = derive2 { name="otrimle"; version="1.1"; sha256="0c3wlj6cxpikrfr0knldd1z2kfihpfsppnyb9n3rflnxhk7pwij2"; depends=[doParallel foreach mclust]; }; ouch = derive2 { name="ouch"; version="2.9-2"; sha256="05c3bdxpjcgmimk0zl9744f0gmchhpm7myzjrx5fhpbp5h6jayaf"; depends=[subplex]; }; outbreaker = derive2 { name="outbreaker"; version="1.1-7"; sha256="0bq8an4hcs88279nkbn92x5s36i3sb64xqdlcrxy8fdk05w0cmg4"; depends=[adegenet ape igraph]; }; - outbreaks = derive2 { name="outbreaks"; version="1.2.0"; sha256="1snycxcllc5vq93ay7xyjw6g4130dvcmja56wvdxixvc5bbv4z1d"; depends=[]; }; + outbreaks = derive2 { name="outbreaks"; version="1.3.0"; sha256="1k0g9x6wvdw8lkpjiv8z1ijp6pg5hri3gawx7zfpnm05g6ncvg81"; depends=[]; }; outliers = derive2 { name="outliers"; version="0.14"; sha256="0vcqfqmmv4yblyp3s6bd25r49pxb7hjzipiic5a82924nqfqzkmn"; depends=[]; }; outreg = derive2 { name="outreg"; version="0.2.2"; sha256="04f1x7mxq4swbd7bfwjjgx4838jm6qj4piaighmhcscwrdkxa1cp"; depends=[magrittr reshape2 sandwich stringr tidyr]; }; - overlap = derive2 { name="overlap"; version="0.2.7"; sha256="1v7i3p8mmhvnxd9h1g6zprphjgs2nfh7ffkyj7vjbkhfsixp9fpz"; depends=[]; }; - overlapping = derive2 { name="overlapping"; version="1.4.0"; sha256="00rn55wvcj32qgjbjplaq32k2vxzrdlbp8dh7scyw78wyn8bdv2c"; depends=[ggplot2]; }; + overlap = derive2 { name="overlap"; version="0.3.0"; sha256="09xa4v0g97rn7xjf6m8fb53h2cna5l1p20b72v0hgrhawvxbjmry"; depends=[]; }; + overlapping = derive2 { name="overlapping"; version="1.5.0"; sha256="1xqpkyxpdzcvq7s2hzkbnfddffjfs1xrxhrkvl5i4qv1czdsphjn"; depends=[ggplot2]; }; owmr = derive2 { name="owmr"; version="0.7.2"; sha256="0206i5zzmfjdd43qziis6kqc0zsvn0l7v5sspjrywjxw2gyjfmwb"; depends=[httr jsonlite magrittr]; }; oz = derive2 { name="oz"; version="1.0-21"; sha256="0p4r8qbpv7q6vad940540pd3lk79pyfj41h2cn22hsy1j0va1qbv"; depends=[]; }; p2distance = derive2 { name="p2distance"; version="1.0.1"; sha256="1ims8i5z5k97kjpdysgx8g7lgvnvf7amahcrssw7bk38bvbxawni"; depends=[]; }; @@ -7712,7 +8068,7 @@ in with self; { pGMGM = derive2 { name="pGMGM"; version="1.0"; sha256="1hkczz38g8a8253jm8vhm8948fs91g6b2rfzkz47srkkby9ksa4x"; depends=[JGL MASS mvtnorm]; }; pMineR = derive2 { name="pMineR"; version="0.31"; sha256="1j71dcldzmk4kzspx4v5s3vqqkllgwkckfm1g145qgg26c1gyc6l"; depends=[cluster DiagrammeR stringr XML]; }; pRF = derive2 { name="pRF"; version="1.2"; sha256="17srabk7mam16rdzc5g9ggdrhjjk8wibny40gxvgzkv7qgq7m80x"; depends=[dplyr ggplot2 multtest permute randomForest reshape2]; }; - pROC = derive2 { name="pROC"; version="1.9.1"; sha256="1fc5wq4skry52jjwldp4dyxwvss1g93ji5915zv9zz3c9nxd3hpq"; depends=[plyr Rcpp]; }; + pROC = derive2 { name="pROC"; version="1.10.0"; sha256="0rm08hf2gxqn5b83ara733w5nihkg1jmdilz67zzrc9iwmqznfa0"; depends=[ggplot2 plyr Rcpp]; }; pRSR = derive2 { name="pRSR"; version="3.1.1"; sha256="1irx95b7cwvx3gpn9brjjn4k947m8frz542r18nilc9f1159mb3s"; depends=[]; }; pSI = derive2 { name="pSI"; version="1.1"; sha256="0cvw38dqqlyx7cpl27hq33f5xns2d0019lyr98pwndcnbp09mx0b"; depends=[gdata]; }; pa = derive2 { name="pa"; version="1.2-1"; sha256="1pfgzxirkb0p8f6smjlrbp1qpsh0vsvqf306cvldaj9zx8cw0q9f"; depends=[ggplot2]; }; @@ -7725,12 +8081,13 @@ in with self; { packagetrackr = derive2 { name="packagetrackr"; version="0.1.1"; sha256="0xjq27j7bd7lps0vp9gdinxn19wl10k2cp9wb2xjih7p6l0wd57g"; depends=[dplyr httr magrittr rappdirs]; }; packcircles = derive2 { name="packcircles"; version="0.2.0"; sha256="1z0s5lnzpmipcsdk0wsjp18mm6j50yfn8qip98rx30hmyh3flwmc"; depends=[Rcpp]; }; packrat = derive2 { name="packrat"; version="0.4.8-1"; sha256="1wvjyvb7yy6hq188msqzf8qa00lhll865jp939byc6d4zpscm0x2"; depends=[]; }; - pacman = derive2 { name="pacman"; version="0.4.1"; sha256="0qh3nxgfn26q3mwv3zyc6qq4h00mjdjrn2pfbfmdbjqjg4q75ypz"; depends=[devtools]; }; + pacman = derive2 { name="pacman"; version="0.4.6"; sha256="1vdak1hv3j44dsj6cckzc1a86dg933jqhxdys8fyxacmk101l388"; depends=[devtools]; }; paco = derive2 { name="paco"; version="0.3.1"; sha256="18k4ls6y9jdknx3dn2494chjigzn8hrsh332ha8a01snfzhp66m0"; depends=[plyr vegan]; }; pacotest = derive2 { name="pacotest"; version="0.2.2"; sha256="0n17qzn7wabs6am55z96zg8759fdcz3vpm7yx25dyaqliawgqnj7"; depends=[ggplot2 gridExtra numDeriv Rcpp RcppArmadillo VineCopula]; }; pact = derive2 { name="pact"; version="0.5.0"; sha256="043hbydj5f6889xrfsrn8jrgid2nnbsz6d7jpn4hywwa97snw4ny"; depends=[glmnet survival]; }; - padr = derive2 { name="padr"; version="0.2.1"; sha256="18cv4pz8zkn2a4m85yz8k68clq1zfgb6y7f6skdsflhg05mxq2qs"; depends=[Rcpp]; }; + padr = derive2 { name="padr"; version="0.3.0"; sha256="00zh3k1rijmxkm3jj3frgwnihbw4ix1p1xd1vrd5fll1xiiy1n7l"; depends=[dplyr Rcpp]; }; paf = derive2 { name="paf"; version="1.0"; sha256="0wrqn67jfrjjxwcrkka6dljgi3mdk00vfjkzzcv2v7c97gx1zvwn"; depends=[survival]; }; + pafdR = derive2 { name="pafdR"; version="1.0"; sha256="1yimsd4h23hcf752p5flda3dqk8hgn6qm9k0pmbapxj4jbsw14w5"; depends=[curl exams stringr]; }; pagenum = derive2 { name="pagenum"; version="1.0"; sha256="0iqx6lgbzcz5girw8cl934jcah7l32zdrbs70cxx8gs2x5rbfwkz"; depends=[]; }; pageviews = derive2 { name="pageviews"; version="0.3.0"; sha256="031y67nqqvf3fa2273m7z2cldda0ijh63qwkh4gis3hz9hfril0v"; depends=[curl httr jsonlite]; }; paintmap = derive2 { name="paintmap"; version="1.0"; sha256="1qw5725yjymxmfhffqjx4lbmzj437c7qwr8xrzmf52f0m28nl3vk"; depends=[]; }; @@ -7750,7 +8107,7 @@ in with self; { palinsol = derive2 { name="palinsol"; version="0.93"; sha256="0k29sl2j7yf4yc0dhb047rxwg9np9l6pdwv6wyb4j80yc07vc9am"; depends=[gsl]; }; palm = derive2 { name="palm"; version="1.0.0"; sha256="0cjg5qal2bakl9v1qgs598rcvaa7qpwpqwxbbazfwy3yhmfrdd8v"; depends=[gsl mvtnorm R6 Rcpp spatstat]; }; palr = derive2 { name="palr"; version="0.0.6"; sha256="163c0kcsl0k3fp5q9afv3pb8246j2b3jzmd6g2vcgxb8nhs8wr2f"; depends=[]; }; - pals = derive2 { name="pals"; version="1.0"; sha256="06wfa6dbqir9353rx2yph4s8n8d14gf6bvl907c07z9i9ml719sj"; depends=[colorspace dichromat mapproj maps rgl]; }; + pals = derive2 { name="pals"; version="1.4"; sha256="1dbg5rvagmbxa0kbyp1c9sv6w7r8yc6zn6gqpy2yh6j2h1hiblll"; depends=[colorspace dichromat mapproj maps rgl]; }; pamctdp = derive2 { name="pamctdp"; version="0.3.2"; sha256="0qs8lj5g2fx5rfd0afv76x9x7wqm333qmjv6zzip6pf11dzkghyj"; depends=[ade4 FactoClass xtable]; }; pamm = derive2 { name="pamm"; version="0.9"; sha256="01dv70ca3zif2b2fkx4xjl24x9p9kc63wf0dj5agdjp5qgbkp1p5"; depends=[gmodels lattice lme4 lmerTest mvtnorm]; }; pampe = derive2 { name="pampe"; version="1.1.2"; sha256="092n04nrp886kd163v32f5vhp9r7gnayxzqb6pj57ilm5w1yrcsk"; depends=[leaps]; }; @@ -7764,6 +8121,7 @@ in with self; { papayar = derive2 { name="papayar"; version="1.0"; sha256="11vkjhazfwfixsr6dba5jrcsr3r3mqgvj5s070b4gp70d6k1z8s5"; depends=[htmltools neurobase oro_nifti servr]; }; papeR = derive2 { name="papeR"; version="1.0-2"; sha256="1pp6zzdqg9lj61f8p90sxl30vp9knmis7154fmfpm6pynbgr46ms"; depends=[car gmodels xtable]; }; paperplanes = derive2 { name="paperplanes"; version="0.0.1.9"; sha256="1d9grc95xqxn91lvk8v7w3z90bhl8savkhihwshyjp8ij2xpzfkl"; depends=[]; }; + parallelDist = derive2 { name="parallelDist"; version="0.1.1"; sha256="1y1pybn4fmzh4rk0dbl7qbh2irqm9i37p1n7a4vasyhl4nn5sng6"; depends=[Rcpp RcppArmadillo RcppParallel]; }; parallelMCMCcombine = derive2 { name="parallelMCMCcombine"; version="1.0"; sha256="05krkd643awqhfrylq9lxr2cmgvnm1msn2x8p1l1483n2gzyklz7"; depends=[mvtnorm]; }; parallelML = derive2 { name="parallelML"; version="1.2"; sha256="05j0rb81i8342m8drwgmgi1w30q96yf501d83cdq4zhjbchphbl1"; depends=[doParallel foreach]; }; parallelMap = derive2 { name="parallelMap"; version="1.3"; sha256="026d018fr2a43cbh8bi2dklzr9fxjzdw5qyq84g2i18v5ibr6bd5"; depends=[BBmisc checkmate]; }; @@ -7775,8 +8133,9 @@ in with self; { paran = derive2 { name="paran"; version="1.5.1"; sha256="0nvgk01z2vypk5bawkd6pp0pnbgb54ljy0p8sc47c8ibk242ljqk"; depends=[MASS]; }; parboost = derive2 { name="parboost"; version="0.1.4"; sha256="087b4as0w8bckwqpisq9mllvm523vlxmld3irrms13la23z6rjvf"; depends=[caret doParallel glmnet iterators mboost party plyr]; }; parcor = derive2 { name="parcor"; version="0.2-6"; sha256="10bhw50g8c4ln5gapa7wghhb050a3jmd1sw1d1k8yljibwcbbx36"; depends=[Epi GeneNet glmnet MASS ppls]; }; - parfm = derive2 { name="parfm"; version="2.7.1"; sha256="0a1fv89vzrziavsy23as6j6hyg4xn7swjrsgax8vpi2rbscy3g5x"; depends=[msm optimx sn survival]; }; + parfm = derive2 { name="parfm"; version="2.7.5"; sha256="1wnklksqybhaqwsfifwv8gmqjl6g9dm9s4z131mbjn4dm7bj1bra"; depends=[msm optimx sn survival]; }; parfossil = derive2 { name="parfossil"; version="0.2.0"; sha256="12gsc5n4ycvhzxvq5j0r3jnnrzw1q412dbvmakipyw2yx2l2s7jn"; depends=[foreach fossil]; }; + parlitools = derive2 { name="parlitools"; version="0.0.4"; sha256="1wwf3ry23wlg0s063vdm50h4f1x8ga94llwziwbhypl06w5vcm2z"; depends=[dplyr hansard httr jsonlite mnis sf stringi tibble]; }; parma = derive2 { name="parma"; version="1.5-3"; sha256="0yjpmxz20v6k107qylw42yf1b231hzym9dizjcq1kalivvscczc5"; depends=[corpcor nloptr quadprog Rglpk slam truncnorm]; }; parmigene = derive2 { name="parmigene"; version="1.0.2"; sha256="1fsm6pkr17jcbzkj1hbn91jf890fviqk1lq6ls8pihsdgah1zb4d"; depends=[]; }; parsec = derive2 { name="parsec"; version="1.1.2"; sha256="1hf3c23rnxckw4s2vqzbhkjgiir1nv1811saximj0mbih9w2vqpf"; depends=[]; }; @@ -7784,6 +8143,7 @@ in with self; { parsemsf = derive2 { name="parsemsf"; version="0.1.0"; sha256="0ijnnajcr7zyh0c1k6bz9qa4fkcly1fd44x3qj7mhlx58gnq4sa4"; depends=[dplyr lazyeval RSQLite stringr tidyr]; }; partDSA = derive2 { name="partDSA"; version="0.9.14"; sha256="1kp0cdsdjiay349jz22iqfzvspny8s343cfan8xahgf931k9h8p6"; depends=[survival]; }; partialAR = derive2 { name="partialAR"; version="1.0.10"; sha256="18hw0azhvd3737wi5cy8ympwfrj6ag01w1a4csy6kl2kifldg6b7"; depends=[data_table FKF ggplot2 MASS plot3D Rcpp tseries urca zoo]; }; + partialCI = derive2 { name="partialCI"; version="1.1.0"; sha256="00gdr25zz327iscasm74bxj0k6h94m59qwaf9vf8xcqfpp0n22wa"; depends=[data_table FKF ggplot2 glmnet MASS partialAR Rcpp TTR zoo]; }; partialOR = derive2 { name="partialOR"; version="0.9"; sha256="02vbvln8lswysaafpxq5rxb6crp7yhlc13i42kybv8fr10jaagjj"; depends=[nnet]; }; partitionMap = derive2 { name="partitionMap"; version="0.5"; sha256="0pi066xaaq0iqr0d7cncdzjd7bacmgrivc4qvhqx0y7q1vifrdjm"; depends=[randomForest]; }; partitionMetric = derive2 { name="partitionMetric"; version="1.1"; sha256="1wry9d3s814yp79ayab7rzf8z5l2mwpgnrc5j7d2sac24vp4pd48"; depends=[]; }; @@ -7807,11 +8167,13 @@ in with self; { pathmapping = derive2 { name="pathmapping"; version="1.0.2"; sha256="0kx4wxf6lhi58sif8fzr5w4wa0i5253fq4v0ynp721fv1hkvmhvz"; depends=[]; }; pathmox = derive2 { name="pathmox"; version="0.2.0"; sha256="0hcllnpjjays35yngz309f1gcx9qg5z9h302kg9mhxs90470x4w0"; depends=[plspm tester]; }; pathological = derive2 { name="pathological"; version="0.1-2"; sha256="07g7ps6zfxi98y98kwas95rr5ybfd4bpih5mhkjafc7bn99254n2"; depends=[assertive_base assertive_files assertive_numbers assertive_properties assertive_reflection assertive_strings assertive_types magrittr plyr stringi]; }; + patternator = derive2 { name="patternator"; version="0.1.0"; sha256="0s4vrhdfblllnhpz2awhhrkwm8d4170xg7fpsp7kvvqy8z8biwvi"; depends=[data_table]; }; patternize = derive2 { name="patternize"; version="0.0.1"; sha256="0xmz7ca555275a4x89vdmyk9x3m3sk964iwspv0dnxsmx5s1xmz7"; depends=[abind Morpho raster rgdal RNiftyReg sp]; }; patternplot = derive2 { name="patternplot"; version="0.1"; sha256="1k167vfwizwk6m0qpq9p0wq7y2g9ib6wi9j64wmvpqjw8k77l00r"; depends=[dplyr ggplot2 gtable jpeg png Rcpp RcppParallel]; }; pauwels2014 = derive2 { name="pauwels2014"; version="1.0"; sha256="1b7whn13lgydc69kg1fhnwkxirw0nqq75cfvii0yg0j4p8r1lw42"; depends=[deSolve ggplot2]; }; - pavo = derive2 { name="pavo"; version="1.0.1"; sha256="1kx83yxcrj2r1ahn74x5c6yadhyfqsjcj1w3idzdpqbad3vxh5wd"; depends=[geometry mapproj rcdd scatterplot3d]; }; + pavo = derive2 { name="pavo"; version="1.1.0"; sha256="0n4jk8dy5ydrdxmvigawfjpng4l7dq9ay4lassbg9qgc260cd45a"; depends=[geometry mapproj rcdd scatterplot3d]; }; pawacc = derive2 { name="pawacc"; version="1.2.2"; sha256="0d5k0bq8zmb7sjvba3ljp97mba2iycnw44rnsnn2aajs02l1c2xg"; depends=[SparseM]; }; + pawls = derive2 { name="pawls"; version="1.0.0"; sha256="01sf1cmd216ca5iwmw4hfnxi9lvh16r441cfcaa3n77zhq0i4w7n"; depends=[]; }; pbapply = derive2 { name="pbapply"; version="1.3-2"; sha256="1sdmjlnwxb99f95g5v8k8mirrkzw99yig377v0qi9lzwjgd6fqqr"; depends=[]; }; pbatR = derive2 { name="pbatR"; version="2.2-9"; sha256="1p8rj0lzm4pp1svgy7xia2sclkngzfjbgbikq94s6v92d582wncw"; depends=[rootSolve survival]; }; pbdBASE = derive2 { name="pbdBASE"; version="0.4-5"; sha256="0i7rav197787snhw2l5pyb2x0i9d1gl9d7lks2bk0dcxr0ndy9gm"; depends=[pbdMPI pbdSLAP]; }; @@ -7822,10 +8184,10 @@ in with self; { pbdPROF = derive2 { name="pbdPROF"; version="0.3-1"; sha256="0a7c31605si062vbwcwngv770axlwyhh00cvdfqw3hv421p61sj8"; depends=[]; }; pbdRPC = derive2 { name="pbdRPC"; version="0.1-1"; sha256="0ddn6ba9nvrh90jii2z9jx4graqaa985ja2q4h3q5q2d6dpm7j7r"; depends=[]; }; pbdSLAP = derive2 { name="pbdSLAP"; version="0.2-2"; sha256="0d7hj1rq4vmp9i4v7d3pjivqpw0pv06xjl4wlnjj42jfxdg70yvh"; depends=[pbdMPI rlecuyer]; }; - pbdZMQ = derive2 { name="pbdZMQ"; version="0.2-5"; sha256="12qgnzhc0lkzmkg143y0wlvpsa0qqw1rmv7x8c67ixd4pbwzcym7"; depends=[R6]; }; + pbdZMQ = derive2 { name="pbdZMQ"; version="0.2-6"; sha256="1kqpl8y55a9m2qkh56wb9qgxxwckwwjabj2m519nvwv55avkgy61"; depends=[R6]; }; pbivnorm = derive2 { name="pbivnorm"; version="0.6.0"; sha256="05jzrjqxzbcf6z245hlk7sjxiszv9paadaaimvcx5y5qgi87vhq7"; depends=[]; }; pbkrtest = derive2 { name="pbkrtest"; version="0.4-7"; sha256="1si3bhi59xc51a0pgjjglccq3h4aljyhw2k1b8574s145fnh7fsw"; depends=[lme4 MASS Matrix]; }; - pbmcapply = derive2 { name="pbmcapply"; version="1.2.1"; sha256="1dlpiphvl8rl08r7lml2mky137kahqij102wyjif1yk3xwdds8ca"; depends=[future]; }; + pbmcapply = derive2 { name="pbmcapply"; version="1.2.2"; sha256="05phx2pw5mp76lz8b189s58rrax3ivrfglna3f18mpgshzn08cz8"; depends=[future]; }; pbo = derive2 { name="pbo"; version="1.3.4"; sha256="0v522z36q48k4mx5gym564kgvhmf08fsadp8qs6amzbgkdx40yc4"; depends=[lattice]; }; pbs = derive2 { name="pbs"; version="1.1"; sha256="0cpgs6k5h8y2cia01zs1p4ri8r7ljg2z4x8xcbx73s680dvnxa2w"; depends=[]; }; pcIRT = derive2 { name="pcIRT"; version="0.2.2"; sha256="0sf6kkcsblc758sb1gkl4ryr72w0xhkd9nr4xdns8c9dfg9qcw1h"; depends=[combinat Rcpp]; }; @@ -7833,7 +8195,7 @@ in with self; { pcaBootPlot = derive2 { name="pcaBootPlot"; version="0.2.0"; sha256="1320d969znk9xvm1ylhc3a31nynhzyjpbg1fsryq72nhf8jxijaa"; depends=[FactoMineR RColorBrewer]; }; pcaL1 = derive2 { name="pcaL1"; version="1.5.1"; sha256="0c5y595jyf0wz290hg06r8fxii2r3mwl9437wvs4fvv1sxi2i3r0"; depends=[]; }; pcaPA = derive2 { name="pcaPA"; version="2.0.2"; sha256="14hi09qksr1z54l268yv4g2x5hlikir7zir4ccd9yi5z1918ksj5"; depends=[ggplot2 ltm mc2d polycor sfsmisc]; }; - pcaPP = derive2 { name="pcaPP"; version="1.9-61"; sha256="0afwi17grkac5yckipfsyqq1r1qgljzb3w5abc9mc6pzb7hrbhvx"; depends=[mvtnorm]; }; + pcaPP = derive2 { name="pcaPP"; version="1.9-72"; sha256="0i2822bv86dpqmk3q17x61nsp3gjjnn4nr8191rwvbiib7xhpgaq"; depends=[mvtnorm]; }; pcadapt = derive2 { name="pcadapt"; version="3.0.4"; sha256="031ql3xppjkqrm17bvccj61hyf38skjb4qv6rs0l1h2ib8jql8ka"; depends=[ggplot2 MASS robust vcfR]; }; pcalg = derive2 { name="pcalg"; version="2.4-5"; sha256="1gfwx26r76d5arqhs03wldaycx1yj55bdwlaam4w42g7hi5bzdbm"; depends=[abind bdsmatrix BH clue corpcor fastICA ggm gmp graph igraph RBGL Rcpp RcppArmadillo robustbase sfsmisc vcd]; }; pcdpca = derive2 { name="pcdpca"; version="0.2.1"; sha256="0vl661pjlfcgqmnw3c1032aci4akld1pqxchb2fh8y5wap1nhypa"; depends=[fda freqdom]; }; @@ -7852,7 +8214,7 @@ in with self; { pdfetch = derive2 { name="pdfetch"; version="0.2.1"; sha256="0d5707j4dq8ilab3ydqy3pd65mdsrwn6hf01hv4h85iv6zalm679"; depends=[httr jsonlite lubridate readr reshape2 stringr XML xml2 xts zoo]; }; pdfsearch = derive2 { name="pdfsearch"; version="0.1.1"; sha256="0k62j6ilv8rmmmasqyb3hklhjqg22jiyx0sxd7f8n0xmlfcjgfqi"; depends=[pdftools tibble]; }; pdftables = derive2 { name="pdftables"; version="0.1"; sha256="1gnwjijr89cczchc7yi4w5xiw0dalbymvj23rymm8cfra34iwn5p"; depends=[httr]; }; - pdftools = derive2 { name="pdftools"; version="1.2"; sha256="1fdw0rqz2yi2xslydb3qigv915zp16h56gw8ar792hxwwf33kyh6"; depends=[Rcpp]; }; + pdftools = derive2 { name="pdftools"; version="1.3"; sha256="0gaf51xfv56idw49pf9l0yzgncwmwxhg4idmbpj6xyzdbjdmr6hz"; depends=[Rcpp]; }; pdist = derive2 { name="pdist"; version="1.2"; sha256="18nd3mgad11f2zmwcp0w3sxlch4a9y6wp8dfdyzvjn7y4b4bq0dd"; depends=[]; }; pdmod = derive2 { name="pdmod"; version="1.0"; sha256="1czpaghp2lcad4j6wxswdfw0n9m0phngy966zr4fr3ciqpx3q129"; depends=[mco]; }; pdolsms = derive2 { name="pdolsms"; version="0.2"; sha256="18gwr1xnm7jbqna911b7haa9sv1i2qvq18w00dkbnj796rh0h78f"; depends=[reshape2]; }; @@ -7868,14 +8230,17 @@ in with self; { pedigree = derive2 { name="pedigree"; version="1.4"; sha256="1dqfvzcl6f15n4d4anjkd0h8vwsbxjg1lmlj33px8rpp3y8xzdgw"; depends=[HaploSim Matrix reshape]; }; pedigreemm = derive2 { name="pedigreemm"; version="0.3-3"; sha256="1bpkba9nxbaxnivrjarf1p2p9dcz6smf9k2djawis1wq9dhylvsb"; depends=[lme4 Matrix]; }; pedometrics = derive2 { name="pedometrics"; version="0.6-6"; sha256="1w9wa73wva6z0d56g221l8qmc5igfypwsa2xq4sn4r501bdy8qpq"; depends=[lattice latticeExtra Rcpp]; }; - pegas = derive2 { name="pegas"; version="0.9"; sha256="0vll6b4ha5l1mf3vpxrwz99m1fzgxwh6xn3z4jg9ggd9sh8jd2wd"; depends=[adegenet ape]; }; + pegas = derive2 { name="pegas"; version="0.10"; sha256="1qs2wxbgsraa6vqi7fh391hq2i4g1ysb06q4xqk0rkaymy5bp8ga"; depends=[adegenet ape]; }; pems_utils = derive2 { name="pems.utils"; version="0.2.17.8"; sha256="1qxsjzxb8gdw1hyxgd923s609k98pjdaxs6wm3pg4bl1w8sxqi8d"; depends=[ggplot2 lattice latticeExtra loa plyr RColorBrewer]; }; penDvine = derive2 { name="penDvine"; version="0.2.4"; sha256="0znpvsr7zy2wgy7znha1qiajcrz1z6mypi3f5hpims33z7npa7dl"; depends=[doParallel fda foreach lattice latticeExtra Matrix quadprog TSP]; }; penMSM = derive2 { name="penMSM"; version="0.99"; sha256="1xdcxnagvjdpgnfa5914gb41v5y4lsvh63lbz1d2l8bl9mpff3lm"; depends=[Rcpp]; }; + penRvine = derive2 { name="penRvine"; version="0.2"; sha256="0zjjc987anz5is7rxf17yqpgr44cx30pv790sdbd4rlzwdrzcjbw"; depends=[copula doParallel fda foreach igraph lattice latticeExtra Matrix quadprog]; }; penalized = derive2 { name="penalized"; version="0.9-50"; sha256="0q60pgmx2wbnc7i1zf1i0sxn1zy257hl73ii0abx83zpcywq9vb6"; depends=[Rcpp RcppArmadillo survival]; }; penalizedLDA = derive2 { name="penalizedLDA"; version="1.1"; sha256="1bw5wiixmmg1vr3v0d59vh67f0gy2rvr30bi58skvrkb25qcjq6l"; depends=[flsa]; }; penalizedSVM = derive2 { name="penalizedSVM"; version="1.1"; sha256="0zc36cgcrdy4rwhg4hhhahymqfalvc5v2zmqq56ikz5blln82qvq"; depends=[corpcor e1071 lhs MASS mlegp statmod tgp]; }; + penaltyLearning = derive2 { name="penaltyLearning"; version="2017.06.14"; sha256="0hrmzfsk8zh9zbd2zvlr6sjsm6h2vs6jbcrp0m92r44fyqfr6d19"; depends=[data_table geometry ggplot2]; }; pencopula = derive2 { name="pencopula"; version="0.3.5"; sha256="1cy36pprbrfabk9n3x4d1xbj1vd2dda7xq3ihj2hzniwn77j63wi"; depends=[fda lattice latticeExtra quadprog]; }; + pencopulaCond = derive2 { name="pencopulaCond"; version="0.2"; sha256="18hjjxnd0l2ms20ddqkghfbd4as5kq2rgwqzpz4y38k6nw76x511"; depends=[doParallel fda foreach igraph lattice latticeExtra pacotest quadprog TSP]; }; pendensity = derive2 { name="pendensity"; version="0.2.10"; sha256="023gl993jniv5r8l9nkaha7v6k2rb1hxm7z543dpr4186kjbi7zl"; depends=[fda lattice]; }; pensim = derive2 { name="pensim"; version="1.2.9"; sha256="10nrnxwfs41bhybs7j6xgnx0pq3c802n9k8irngmh8iy4w3wbhrq"; depends=[MASS penalized]; }; peperr = derive2 { name="peperr"; version="1.1-7"; sha256="01a6sxcmb8v2iz2xdwhdnr92k3w2vn3hr0hg9b6mkpzjf4n45q3k"; depends=[snowfall survival]; }; @@ -7887,14 +8252,16 @@ in with self; { performanceEstimation = derive2 { name="performanceEstimation"; version="1.1.0"; sha256="08jx2zl6xh0rp54xa70gb717wbfdzfrx9b47i3b3ly41qaf85vrc"; depends=[dplyr ggplot2 parallelMap tidyr]; }; pergola = derive2 { name="pergola"; version="1.0"; sha256="1650ipp2b455xdkznwm7bnxvimad7nbyr9i1lg2vdh64j1qfh7gl"; depends=[seriation]; }; perm = derive2 { name="perm"; version="1.0-0.0"; sha256="0075awl66ynv10vypg63fcxk33qzvxddrp8mi4w08ysvimcyxijk"; depends=[]; }; + permDep = derive2 { name="permDep"; version="1.0-0"; sha256="15jjxni14i3br0j5cqajgydkb71yd657fvz4m0jcr66g1sb77aij"; depends=[BB goft survival]; }; permGPU = derive2 { name="permGPU"; version="0.14.9"; sha256="10r2qxbvzjxv3520lrn6cwi5akhhwgkhz7yaqxi5vh2f5l0s49wy"; depends=[Biobase foreach RUnit survival]; }; - permGS = derive2 { name="permGS"; version="0.2.3"; sha256="0738jg5k370hjgychv7b93rhwb66xz10hlspbglcgb5w3p1r1rpl"; depends=[coin survival]; }; - permPATH = derive2 { name="permPATH"; version="1.0"; sha256="0893aanh39dw2hqwwhm9c3d30faidg6sa4srsr2f2gs1jin3nqkq"; depends=[R2HTML xtable]; }; + permGS = derive2 { name="permGS"; version="0.2.4"; sha256="02mywldcg22xv9fh00lnzmqimrp1f7r5fwjw82v0krixhaarsnnp"; depends=[coin survival]; }; + permPATH = derive2 { name="permPATH"; version="1.1"; sha256="06h1lqpmkg4ajjh4r837qp094h105n4mpvafnp2nsbv9yyayd4h8"; depends=[R2HTML xtable]; }; permubiome = derive2 { name="permubiome"; version="1.1"; sha256="02fg1g96pg6a87n8mhrls54xp0vnqqsgg39nnjirxr7hd74l71x9"; depends=[ggplot2]; }; permutations = derive2 { name="permutations"; version="1.0-2"; sha256="04lak21x0z1cskgm5w4xdyq59kmyrz64bwfpf332vfka54aiv8lk"; depends=[magic numbers partitions]; }; permute = derive2 { name="permute"; version="0.9-4"; sha256="1w8wzk1fg9q7wvisnfp2js70dg0m9wi12gkdhpyngpbdcgssahd5"; depends=[]; }; perry = derive2 { name="perry"; version="0.2.0"; sha256="1lfmcq2xsxmfs7cxvhgxcsggslgjicbaks4wcjw1yjh67n559j46"; depends=[ggplot2 robustbase]; }; persiandictionary = derive2 { name="persiandictionary"; version="1.0"; sha256="0rgi36ngpiax3p5zk4cdgf3463vgx7zg5wxscs2j7834yh37jwax"; depends=[]; }; + personalized = derive2 { name="personalized"; version="0.0.2"; sha256="1p7hs9fg8xbxmpj9xmjkcvzk5v527zzbka9dni40pvcsw8419r31"; depends=[gbm ggplot2 glmnet mgcv survival]; }; personograph = derive2 { name="personograph"; version="0.1.3"; sha256="07lrlbw4222l1d5rwn0hfqliyk8sqjf6ipz4n2zwcbk113bb8sy7"; depends=[grImport]; }; perspectev = derive2 { name="perspectev"; version="1.1"; sha256="175s1nq5z4gfs5qb39lq230g6n0v8fxzs5hr9j2rgx0knpbjfq03"; depends=[ape boot doParallel foreach ggplot2 mapproj sp]; }; perturb = derive2 { name="perturb"; version="2.05"; sha256="18ydmmp8aq4rf9834dmsr4fr9r07zyn97v8a1jqz3g9njza983la"; depends=[]; }; @@ -7916,49 +8283,53 @@ in with self; { ph2mult = derive2 { name="ph2mult"; version="0.1.1"; sha256="0w3w18fkr9xzv6mpb00cz5id33zgsnl6s8zgjpchzvrhmpjpp437"; depends=[clinfun]; }; phalen = derive2 { name="phalen"; version="1.0"; sha256="0awj9a48dy0azkhqkkzf82q75hrsb2yw6dgbsvlsb0a71g4wyhlr"; depends=[sqldf]; }; phangorn = derive2 { name="phangorn"; version="2.2.0"; sha256="02r1b65d1v05bi62wmq0mr99dnbg7gfq4lca81blqa14yld1mj1j"; depends=[ape fastmatch igraph magrittr Matrix quadprog Rcpp]; }; - phantom = derive2 { name="phantom"; version="0.1.1"; sha256="0illb6akja10ij2pc7sfaz5yb43jkky28yclkijk3r31dv075ylk"; depends=[cluster gplots MASS Matrix NMF RColorBrewer Rcpp RcppArmadillo]; }; - phase1RMD = derive2 { name="phase1RMD"; version="1.0.5"; sha256="0qn3zpq7r810j54718ffqg53dr776vcswjr0icdah1yacwn8zf6f"; depends=[boot coda mvtnorm rjags]; }; + phantom = derive2 { name="phantom"; version="0.1.2"; sha256="15b770awvzjp8x44psifngnvsn2fs8s43v2lxj336r6k2iswpc9x"; depends=[gplots MASS NMF RColorBrewer Rcpp RcppArmadillo]; }; + phase1RMD = derive2 { name="phase1RMD"; version="1.0.7"; sha256="155p00jbw0xyil9nkv8mdgnqx3r4fwbvva31c28kfnlrclpna6ln"; depends=[boot coda mvtnorm rjags]; }; phaseR = derive2 { name="phaseR"; version="1.3"; sha256="1hwclb7lys00vc260y3z9428b5dgm7zq474i8yg0w07rxqriaq2h"; depends=[deSolve]; }; phcfM = derive2 { name="phcfM"; version="1.2"; sha256="0i1vr8rmq5zs34syz2vvy8c9603ifzr9s5v2izh1fh8xhzg7655x"; depends=[coda]; }; pheatmap = derive2 { name="pheatmap"; version="1.0.8"; sha256="1ik0k69kb4n7xl3bkx4p09kw08ri93855zcsxq1c668171jqfiji"; depends=[gtable RColorBrewer scales]; }; phenability = derive2 { name="phenability"; version="2.0"; sha256="0can8qgdpfr4h6jfg23cnwh7hhmwv6538wg2jla9w138la7rhpd1"; depends=[calibrate]; }; - phenex = derive2 { name="phenex"; version="1.1-9"; sha256="14g81s4mh4ixxyv7w3wkcn0984c4kknar3mgl43vh5cjxj6v9gk2"; depends=[foreach]; }; + phenex = derive2 { name="phenex"; version="1.4-5"; sha256="00lsymflbmlxzxz8rxcpc94pc9zmhybial9f2xkz98h6h45zgrjl"; depends=[DEoptim foreach]; }; phenmod = derive2 { name="phenmod"; version="1.2-3"; sha256="0dxwx8c7zka29fq7svrvn8bghj8jh8grbrgsw4pvavx2439cldak"; depends=[gstat lattice pheno RColorBrewer]; }; pheno = derive2 { name="pheno"; version="1.6"; sha256="0xdya1g1ap7h12c6zn3apbkxr725rjhcp4gbdchkvcnwz4y9vw8c"; depends=[nlme quantreg SparseM]; }; pheno2geno = derive2 { name="pheno2geno"; version="1.3.1"; sha256="1k1hw5qxrwxy502zkcfcz0nxjqmvdk1fgghjc512vq7x5znblz3v"; depends=[mixtools qtl VGAM]; }; phenology = derive2 { name="phenology"; version="5.4"; sha256="0i528yhmlyyinczhkymchhmmmd9x6xm94i2dnad834jcdhhhr44y"; depends=[HelpersMG lmf numDeriv optimx]; }; + phenopix = derive2 { name="phenopix"; version="2.3.1"; sha256="1yy163nh2b74m0v7f2gkgxaplvw4whs2h30bkw4chl0zyrcrci86"; depends=[bcp doParallel foreach gtools iterators jpeg plyr raster SDMTools sp stringr strucchange zoo]; }; phia = derive2 { name="phia"; version="0.2-1"; sha256="0rv2akl5a488vax4sd9wnx765mch4vvcmg3iyxyljzl5kpqh5r00"; depends=[car Matrix]; }; + philentropy = derive2 { name="philentropy"; version="0.0.3"; sha256="00fpbmxg8m8apjb6cdrhh9rw3vp1j65ccvsqj1xlfcn1x5l1h3h8"; depends=[dplyr KernSmooth Rcpp]; }; phmm = derive2 { name="phmm"; version="0.7-5"; sha256="0dil0ha199yh85j1skwfdl0v02vxdmb0xcc1jdbayjr5jrn9m1zk"; depends=[lattice Matrix survival]; }; phonR = derive2 { name="phonR"; version="1.0-7"; sha256="0al2cbynnbvmd90lk1w1g1ppslqq0ng8vbb6bl7m4kqwd2lgv056"; depends=[deldir plotrix splancs]; }; phonTools = derive2 { name="phonTools"; version="0.2-2.1"; sha256="01i481mhswsys3gpasw9gn6nxkfmi7bz46g5c84m13pg0cv8hxc7"; depends=[]; }; phonenumber = derive2 { name="phonenumber"; version="0.2.2"; sha256="1m5idp538lvynmfp8m7l89js6hk5lpp26k419bdvj3hd3ap0n9lg"; depends=[]; }; phonics = derive2 { name="phonics"; version="0.7.4"; sha256="0s5v9w3dcscjc7snv4nlhd4zm2dhxwv9jp6xaxp5wpwys5mim1ms"; depends=[BH Rcpp]; }; - photobiology = derive2 { name="photobiology"; version="0.9.14"; sha256="1zh36mdm7bprl0zfyl3qaill3s1aw7p0w5zwhmx08i2imxcz60jj"; depends=[caTools dplyr lubridate plyr polynom splus2R tibble]; }; + photobiology = derive2 { name="photobiology"; version="0.9.16"; sha256="1s79ysx3lx194a06c9j9qqqa08f91kmy8hbv5ik5lg6fal3lkam5"; depends=[caTools dplyr lubridate plyr polynom splus2R tibble]; }; photobiologyInOut = derive2 { name="photobiologyInOut"; version="0.4.13"; sha256="1zagvdaiv8d5frwki20wwvbyw4a9in3k8560janbmd161xh13ii0"; depends=[colorSpec dplyr hyperSpec lazyeval lubridate pavo photobiology readr readxl reshape2 tibble]; }; photobiologyLEDs = derive2 { name="photobiologyLEDs"; version="0.4.2"; sha256="0m8bwpvr3g0xdcpjg0pm5qp7b941y85gdzw24vc1nhfmzwd0lxn0"; depends=[photobiology]; }; photobiologyLamps = derive2 { name="photobiologyLamps"; version="0.4.1"; sha256="19pzb12qisv5hy7rps0dp9bq8zanpyr2yn41i6rd8hk80fknjha6"; depends=[photobiology]; }; photobiologyPlants = derive2 { name="photobiologyPlants"; version="0.4.1"; sha256="0mpb5sv4wkvqzbhf193zkhap44yzlhxrnjx1p3j9iyjdg4bb1kka"; depends=[photobiology photobiologyWavebands]; }; photobiologyWavebands = derive2 { name="photobiologyWavebands"; version="0.4.2"; sha256="0l1784xi9hzsxmiqipv0zkb4lq1xd9f890rzsgsjb0km6js5x3q7"; depends=[photobiology]; }; - phrasemachine = derive2 { name="phrasemachine"; version="1.0.0"; sha256="0jdz8imcry78shhbayhw7vpcx3kj8sfin3jl4fz5bb1ncdpcrpbj"; depends=[NLP openNLP quanteda stringr]; }; + phrasemachine = derive2 { name="phrasemachine"; version="1.1.2"; sha256="1145c8ymarhbza8253rw4ybnq0k5pcckqxpdcr8s2y23pj182r1p"; depends=[NLP openNLP stringr]; }; phreeqc = derive2 { name="phreeqc"; version="3.3.10"; sha256="0hcdjj1wgfknqf5yx50b9vz5f72siw4dslyvk2xbrfnwbzzz4qib"; depends=[]; }; phtt = derive2 { name="phtt"; version="3.1.2"; sha256="1fvvx5jilq5dlgh3qlfsjxr8jizy4k34a1g3lknfkmvn713ycp7v"; depends=[pspline]; }; phuassess = derive2 { name="phuassess"; version="1.1"; sha256="0jplj9gih32dllx2hw5aqvc9b94sbrbv66s3a5r8mdbpjh93rhng"; depends=[]; }; phybreak = derive2 { name="phybreak"; version="0.1.1"; sha256="14dn5q4knqb1ijbspnvyggdjrplbhxmyqj5jix8a74bk01xwl9nj"; depends=[ape phangorn Rcpp]; }; - phyclust = derive2 { name="phyclust"; version="0.1-18"; sha256="1avw6vx3fmzvk8iwc47jz014hxjn0mm8b941a9y1xyip11x0b6dd"; depends=[ape]; }; + phyclust = derive2 { name="phyclust"; version="0.1-19"; sha256="109m7q393xv17x4rhcxvhz25x42c79smw9xr8zppmkqdzx6f75w0"; depends=[ape]; }; phyext2 = derive2 { name="phyext2"; version="0.0.4"; sha256="0j871kgqm9fll0vdgh071z77ib51y8pxxm0ssjszljvvpx1mb8rb"; depends=[ape phylobase]; }; phylin = derive2 { name="phylin"; version="1.1.1"; sha256="1hxmh5jgcz41bhmi8kvimw0b6m4p3yq85bh79hl7xbx2kshxmvzq"; depends=[]; }; phyloTop = derive2 { name="phyloTop"; version="2.0.1"; sha256="1mwifnmq4zk83vj7886ndz6i3xa9dyxsz9p4b0ah53cdvbcqcspd"; depends=[ape igraph NHPoisson phylobase]; }; - phylobase = derive2 { name="phylobase"; version="0.8.2"; sha256="0wspm8fv2lps2z6zhz3qrf3icad1mgpq4379gmbi3i614h25r5gp"; depends=[ade4 ape Rcpp rncl RNeXML]; }; + phylobase = derive2 { name="phylobase"; version="0.8.4"; sha256="00hh53ibr7ddck4rl1rz9bpjsvjym040c5f78l1yizv6q9rakhfp"; depends=[ade4 ape Rcpp rncl RNeXML]; }; phylocanvas = derive2 { name="phylocanvas"; version="0.1.0"; sha256="0h5cp37f2jzi30zpzyvd6h16592knkyp2jnvcdhhi37yhamzhgr6"; depends=[ape htmlwidgets magrittr phylobase]; }; phyloclim = derive2 { name="phyloclim"; version="0.9-4"; sha256="0ngg8x192lrhd75rr6qbh72pqijbrhrpizl27q0vr6hp7n9ch3zx"; depends=[ape raster]; }; - phylocurve = derive2 { name="phylocurve"; version="2.0.7"; sha256="0nffrhydz6jykph75nqciphsz3y8a5fq2hr1plbcl0lbfc60yjzx"; depends=[ape doParallel drc dtw foreach geiger geomorph GPfit Matrix mvnmle phylolm phytools Rcpp RcppArmadillo rgl]; }; + phylocurve = derive2 { name="phylocurve"; version="2.0.8"; sha256="183swpx0y07pd1dhhawj7fjiyd8mg52g112a4zyx480k253cxkbq"; depends=[ape doParallel drc dtw foreach geiger geomorph GPfit Matrix mvnmle phylolm phytools Rcpp RcppArmadillo rgl]; }; + phylodyn = derive2 { name="phylodyn"; version="0.9.0"; sha256="0rc6clx4m53kc7yqass7wcgysrcy814a4p5a6f7038h767bbvznp"; depends=[ape spam]; }; + phylogram = derive2 { name="phylogram"; version="1.0.1"; sha256="0hjniq91ivw82aqifb4sqqbw36scs0081s7xrjj37581rk0xamyl"; depends=[openssl Rcpp]; }; phyloland = derive2 { name="phyloland"; version="1.3"; sha256="10g40m6n2s4qvnzlqcwpy3k0j7bxdp79f586jj910b8p00ymrksp"; depends=[ape]; }; phylolm = derive2 { name="phylolm"; version="2.5"; sha256="0bffqzba6kcv8jyya7pja10mjnklhihczljhmj8q0pdrmd6qgqp8"; depends=[ape]; }; phylometrics = derive2 { name="phylometrics"; version="0.0.1"; sha256="1pmr6l3wmaf91wdlsc5m63l07fibngnly2qzkma0rdi463ii03il"; depends=[mvtnorm]; }; phylopath = derive2 { name="phylopath"; version="0.2.3"; sha256="1vspb20vwikql32nvj5vrixyz85y7zhc5sdbng1ff8r7yn1l2mrx"; depends=[ape DiagrammeR dplyr ggm ggplot2 igraph MuMIn nlme pbapply purrr tibble tidyr]; }; phylosignal = derive2 { name="phylosignal"; version="1.1"; sha256="039sdb5cyijsrvj13xznr0j7vcp780lif62xk5x5hpzxvpg1wwgk"; depends=[adephylo ape boot igraph phylobase Rcpp RcppArmadillo RCurl]; }; phylosim = derive2 { name="phylosim"; version="3.0.2"; sha256="148zm43cgdhr264ffcabjx4abykks07jix6lypqysqy25fbmdngk"; depends=[ape compoisson ggplot2 R_methodsS3 R_oo]; }; - phylotate = derive2 { name="phylotate"; version="1.0"; sha256="0mpqxydz4xh7vf54szi11ckqzfmhaiwz9h8v3y1kslvarn8bvpr4"; depends=[]; }; + phylotate = derive2 { name="phylotate"; version="1.1"; sha256="1lj7v05iblac2y9xggzbdm6hy99jzf60src5h3dwx3s8lm3490qm"; depends=[]; }; phylotools = derive2 { name="phylotools"; version="0.1.2"; sha256="19w7xzk6sk1g9br7vwv338nvszzh0lk5rdzf0khiywka31bbsjyb"; depends=[ape fields picante seqRFLP spaa]; }; phyndr = derive2 { name="phyndr"; version="0.1.0"; sha256="03y3j4ik6flrksqm2dwh2cihn12hzfdik0fsak4zbxjdzaqn5gim"; depends=[ape]; }; phyreg = derive2 { name="phyreg"; version="0.7"; sha256="0saynhq4yvd4x2xaljcsfmqk7da2jq3jqk26fm9qivg900z4kf35"; depends=[]; }; @@ -7970,24 +8341,29 @@ in with self; { picasso = derive2 { name="picasso"; version="0.5.4"; sha256="0y6d0wmgv4nhyxyp0nz2hmfwvm4laagr1jzvngw3h4na1sw10l6i"; depends=[igraph lattice MASS Matrix]; }; pid = derive2 { name="pid"; version="0.36"; sha256="1w6h09ddq8rv7k5xl4v6nhlkm0vnmim57mg0dzk2dv9dc4v8i141"; depends=[DoE_base FrF2 ggplot2 png]; }; piecewiseSEM = derive2 { name="piecewiseSEM"; version="1.2.1"; sha256="0c705ngyj2pf24vvqdld5rnf875pw64gs64l9f7nylbfrax39kbv"; depends=[lavaan lme4 nlme pbkrtest]; }; - pim = derive2 { name="pim"; version="2.0.0.2"; sha256="1fjnll2lfgdfak9427rh343y80awjzwpy46v33kpd6niz41zmra8"; depends=[BB nleqslv]; }; + pifpaf = derive2 { name="pifpaf"; version="1.0.0"; sha256="1xizy0m3rm11wp4q5431axbhphx4azahh1vs7kc5ry3mwivnafhz"; depends=[ggplot2 gridExtra MASS matrixcalc numDeriv sfsmisc]; }; + pim = derive2 { name="pim"; version="2.0.1"; sha256="1m804clxc8m4nyzi4hhfy118527lgf2sb7589qd61fb83yh6hi8p"; depends=[BB nleqslv]; }; pinbasic = derive2 { name="pinbasic"; version="1.1.0"; sha256="0ncbgkpgzp6w856y7ab0drci92rc9mx0j900vxd8ir69c00cm348"; depends=[fastcluster ggplot2 lubridate Rcpp reshape2 scales]; }; pinfsc50 = derive2 { name="pinfsc50"; version="1.1.0"; sha256="1fja8xdqwsm4g223wmb2yg5fqmsg94hchzjd4qrqah1zb8vbdfdn"; depends=[]; }; pingr = derive2 { name="pingr"; version="1.1.2"; sha256="17fh2gjlmwy6wy8i24q76fivjig8jm05g9kvfz81q0h6b5zxnpmg"; depends=[]; }; - pinnacle_API = derive2 { name="pinnacle.API"; version="2.0.4"; sha256="1qdxx9mpnffb7nf8477bkc557lw7c34g0nkjspbn8mn40n5488r0"; depends=[data_table httr jsonlite magrittr openssl purrr rjson uuid]; }; - pipe_design = derive2 { name="pipe.design"; version="0.4"; sha256="00znnjqvppvn0qmrxkksiljgd51mf1x5zkmib43myckzwp5cap3i"; depends=[ggplot2 gtools xtable]; }; + pinnacle_API = derive2 { name="pinnacle.API"; version="2.0.9"; sha256="1pq7q2wa4g8gxbyiascygnng53ihwmf5hsazwbyzjqgyyhi0hd9m"; depends=[data_table httr jsonlite magrittr openssl purrr rjson uuid]; }; + pinnacle_data = derive2 { name="pinnacle.data"; version="0.1.4"; sha256="1sl36i2857b3xwx7iwgy8mkgjvz7nfa74ch1n8kcxbj59ib7mp8p"; depends=[tibble]; }; + pinyin = derive2 { name="pinyin"; version="1.0.2"; sha256="0qicjig7x39frfvrwgljb75i5kp1sjrzfcb1l3p8fr0pyrq6rkd4"; depends=[]; }; + pipe_design = derive2 { name="pipe.design"; version="0.5.1"; sha256="0r0szkdzifxmnnbr6675w8ij4zwqgxj3gwahc7a74mxr51f7qh8j"; depends=[ggplot2 gtools xtable]; }; pipeGS = derive2 { name="pipeGS"; version="0.1"; sha256="0ixfj52nd9785ny78wgsyq7srygsj3yg3p95pcb4lrrammchqygk"; depends=[]; }; pipeR = derive2 { name="pipeR"; version="0.6.1.3"; sha256="16lj227x24pviqb4dcrj7a55l31p5mm0cbwsb6m3y3n6k5wcd2nh"; depends=[]; }; pipefittr = derive2 { name="pipefittr"; version="0.1.2"; sha256="0pzd7f0rhn0rydncki666zlajdwyiay3apa17cb0xy5454d99mvh"; depends=[magrittr miniUI rstudioapi shiny stringr]; }; pipeliner = derive2 { name="pipeliner"; version="0.1.1"; sha256="1cyyd1bin89dh0zrhic3i541bj8nnaphg6jq2jqkhnxn2nvax11g"; depends=[]; }; pirate = derive2 { name="pirate"; version="1.0.0"; sha256="160mmyqdwbc4g7n7q9i4xcqp6h9bcpcz7vavsgdcpvs2mjfhfpjx"; depends=[ggplot2 MASS plyr Rcpp RcppArmadillo]; }; pitchRx = derive2 { name="pitchRx"; version="1.8.2"; sha256="0lg0xab40r8wzrww986l5q9jkg1m83g4bhsbh0kr7f2rv90av662"; depends=[ggplot2 hexbin MASS mgcv plyr XML2R]; }; - pivottabler = derive2 { name="pivottabler"; version="0.1.0"; sha256="1fm8g4z2d3dmljk8r3cq0fh8bnkxpxqlkcvv95vdmirfjznrwr1x"; depends=[dplyr htmltools htmlwidgets jsonlite R6]; }; - pixiedust = derive2 { name="pixiedust"; version="0.7.4"; sha256="1v4biqbs18x7a8li85zqk8pwd4bxirvda6nrws8pyz0g77j74nj4"; depends=[broom checkmate dplyr Hmisc htmltools knitr lazyWeave magrittr stringr tidyr]; }; + piton = derive2 { name="piton"; version="0.1.1"; sha256="1265y4lv2m5nwrh25sahjkxwmivpxgh9shrdidlmaman7zs6cclr"; depends=[Rcpp]; }; + pivottabler = derive2 { name="pivottabler"; version="0.3.0"; sha256="0r72j3pp66ph19z16l1hx7b1xa8z8q2dndd4wg36pq7b93j8rr3p"; depends=[data_table dplyr htmltools htmlwidgets jsonlite R6]; }; + pixiedust = derive2 { name="pixiedust"; version="0.7.5"; sha256="07jrr20ch96dq09gbmmk63f7i44lydq1h0h2lryby8pnkz452nhf"; depends=[broom checkmate dplyr Hmisc htmltools knitr lazyWeave magrittr stringr tidyr]; }; pixmap = derive2 { name="pixmap"; version="0.4-11"; sha256="04klxp6jndw1bp6z40v20fbmdmdpfca2g0czmmmgbkark9s1183g"; depends=[]; }; pkgKitten = derive2 { name="pkgKitten"; version="0.1.4"; sha256="0c44zrvpyz87s5mjhsqdrkyrvyzhyldnq371bwnn9crbpbac3wnd"; depends=[]; }; pkgconfig = derive2 { name="pkgconfig"; version="2.0.1"; sha256="0h2sp93fqqjbfqgq82a3i94ybnndx6ghaal8pbf99firnsjb40mb"; depends=[]; }; pkgcopier = derive2 { name="pkgcopier"; version="0.0.1"; sha256="04vpjf8nvqnpry54f1wwrnmipd5m6gqd89c3vkryqx88jk85jd8s"; depends=[httr stringr]; }; + pkggraph = derive2 { name="pkggraph"; version="0.2.0"; sha256="1mb6vr177xvm3s00c9s7g4ilqz5ln0fv8jyjzrb0pkjm94f6l0vf"; depends=[curl dplyr ggnetwork ggplot2 htmltools igraph intergraph Matrix network networkD3 RColorBrewer tibble]; }; pkgmaker = derive2 { name="pkgmaker"; version="0.22"; sha256="0vrqnd3kg6liqvpbd969jjsdx0f0rvmmxgdbwwrp6xfmdg0pib8r"; depends=[codetools digest registry stringr xtable]; }; pkmon = derive2 { name="pkmon"; version="0.9"; sha256="1zcjz1h45qv81rwnjsgc9iwmrwpnsy917y7h66pz98wzszlxcsd2"; depends=[]; }; pkr = derive2 { name="pkr"; version="0.1.0"; sha256="0c8i9r1w23zldi04066pzdggxrbsqg9ydbxg3ig1z66jv17w76zq"; depends=[binr foreign forestplot]; }; @@ -7998,18 +8374,18 @@ in with self; { placement = derive2 { name="placement"; version="0.1.1"; sha256="1narjb90sb5prvzfv2x30bz8y9aq8hqggza91ghwi47m99vm1dg6"; depends=[base64enc digest jsonlite RCurl stringi urltools]; }; plan = derive2 { name="plan"; version="0.4-2"; sha256="0vwiv8gcjdbnsxd8zqf0j1yh6gvbzm0b5kr7m47ha9z64d7wxch6"; depends=[]; }; planar = derive2 { name="planar"; version="1.6"; sha256="0x5xdb2afpc1w8s217hy765mz938kg5b5j7vzqzhlsh2dzdjccpj"; depends=[cubature dielectric ggplot2 plyr Rcpp RcppArmadillo reshape2 statmod]; }; - planor = derive2 { name="planor"; version="1.3-6"; sha256="0anli2nrsfq9wzk4vgn7lfr6mi01d70ffb631fxrgh45p36im7dw"; depends=[bit64 conf_design Rcpp RcppArmadillo]; }; + planor = derive2 { name="planor"; version="1.3-7"; sha256="01qlfv33adf3qyg6yzpigr4mm891xix39z8nkfz5d9q9iyx6fmx6"; depends=[bit64 conf_design Rcpp RcppArmadillo]; }; plantecophys = derive2 { name="plantecophys"; version="1.1-8"; sha256="02425j4pgwqadg2zn7vyl4741panif236m89zm36p580chp23wir"; depends=[]; }; plaqr = derive2 { name="plaqr"; version="1.1"; sha256="0hkzfxph2lacrd4npqvf4pyaldr1z56hlfbj3gi7qjlflxqnv3xp"; depends=[quantreg]; }; - plater = derive2 { name="plater"; version="1.0.0"; sha256="0nbkfqrz78zgf06lsfzmwj50lfbq3dvi01j4rlbb6dwamx2cn3sf"; depends=[dplyr]; }; + plater = derive2 { name="plater"; version="1.0.1"; sha256="0v5b9r6iha18qvrjpbr1p8fy06nf31x63ch5cnb4axyqa0x5skpp"; depends=[dplyr]; }; platetools = derive2 { name="platetools"; version="0.0.2"; sha256="0xan3h3djhgjbqn8f7yzlkm25l0fzq86zhb5xwfib4yajnb2dspa"; depends=[dplyr ggplot2 plyr RColorBrewer]; }; playwith = derive2 { name="playwith"; version="0.9-54"; sha256="1zmm8sskchim3ba3l0zqfvxnrqfmiv94a8l6slcf3if3cf9kkzal"; depends=[cairoDevice gridBase gWidgets gWidgetsRGtk2 lattice RGtk2]; }; - pleiades = derive2 { name="pleiades"; version="0.1.0"; sha256="0y7y6c4605nx70xabwfqzmz7piqmvczzcf56y8skvr7qpx7iwhbp"; depends=[crul dplyr gistr jsonlite rappdirs RSQLite]; }; - pleio = derive2 { name="pleio"; version="1.1"; sha256="01w1z5m65z0wrlsdbs7jc9l5sp73jr55xwqdaqp76cf6kvbd6yb8"; depends=[Matrix]; }; - plfMA = derive2 { name="plfMA"; version="1.0.3"; sha256="10cb12kxzh9ymzk59d310wqn213d8syp8a4rd5ayzkp9wlf3lksn"; depends=[cairoDevice gWidgets gWidgetsRGtk2 limma]; }; - plfm = derive2 { name="plfm"; version="2.1"; sha256="19l5n7syp6xcj4d5qxccsard70d5q8ph1f87prj2zgpq5spyp7an"; depends=[abind sfsmisc]; }; + pleiades = derive2 { name="pleiades"; version="0.2.0"; sha256="1h3q4yf0w0al7n8l7ca4vgx2bhrrz8clli15svlds7n402s8rzp5"; depends=[crul DBI dbplyr dplyr gistr jsonlite rappdirs RSQLite]; }; + pleio = derive2 { name="pleio"; version="1.5"; sha256="1y9nkv5bzfkzbl373405v3xq54nz37wjz9zkxfzl8ggr5i9lcbqy"; depends=[Matrix rms]; }; + plfMA = derive2 { name="plfMA"; version="1.0.4"; sha256="0q6wiiknmgw812kcf9qq309zlizyry7ldn6m08lkw6xq6i4f4s85"; depends=[cairoDevice gWidgets gWidgetsRGtk2 limma RGtk2]; }; + plfm = derive2 { name="plfm"; version="2.2.1"; sha256="00x6yyr32rhh6696z5aazj98nyd01i26ij9hs2sxf6j677fmppdr"; depends=[abind sfsmisc]; }; plgp = derive2 { name="plgp"; version="1.1-7"; sha256="02g6saabrsd8pra0szbwcbilf6w5ywg2gxqb5zdvbxds2vw36hn0"; depends=[mvtnorm tgp]; }; - plink = derive2 { name="plink"; version="1.5-0"; sha256="0zn5k7p14ls38rwfhr8xn18316qzmxvgqj63pf3dbf6dddnbkapl"; depends=[lattice MASS statmod]; }; + plink = derive2 { name="plink"; version="1.5-1"; sha256="0rn2i9i8af9aq0xgxhpcdchs2952lq2d2sg8x3js0zi3vcml76k0"; depends=[lattice MASS statmod]; }; plm = derive2 { name="plm"; version="1.6-5"; sha256="00zipzxg1d8w6ih586hlqv6bkyn5d01ppik8z35by3r1q6rlkpx2"; depends=[bdsmatrix car Formula lattice lmtest MASS nlme sandwich zoo]; }; plmDE = derive2 { name="plmDE"; version="1.0"; sha256="19xxi0zzpxcrsdrbs0hiwqgnv2aaw1q3mi586wv27zz6lfqcr9lr"; depends=[limma MASS R_oo]; }; plmm = derive2 { name="plmm"; version="0.1-1"; sha256="1dfxd1mqqjy2mf7qc6mh4wx5ya9q8fkqgrf01apisb66xxx5zya7"; depends=[Formula nlme sm]; }; @@ -8018,17 +8394,18 @@ in with self; { plot3D = derive2 { name="plot3D"; version="1.1"; sha256="1xy4h9k1ddz040ns7dfqqckkmb165f2h4xfz44h8lfwazr59dzgg"; depends=[misc3d]; }; plot3Drgl = derive2 { name="plot3Drgl"; version="1.0.1"; sha256="12p4qc9vmhr86ssx6xnz3cmx84q5jgd28bw9dp4wjrn04n6l4va6"; depends=[plot3D rgl]; }; plotGoogleMaps = derive2 { name="plotGoogleMaps"; version="2.2"; sha256="0qv57k46ncg0wrgma0sbr3xf0j9j8cii3ppk3gs65ardghs3bf6b"; depends=[lattice maptools raster rgdal sp spacetime]; }; - plotKML = derive2 { name="plotKML"; version="0.5-6"; sha256="091zzk30bsdxqzfh2p3xvk6fhijcw1143ccrkyd5srp8vc97bxhz"; depends=[aqp classInt colorRamps colorspace dismo gstat pixmap plotrix plyr raster RColorBrewer rgdal RSAGA scales sp spacetime stringr XML zoo]; }; + plotKML = derive2 { name="plotKML"; version="0.5-8"; sha256="0rd9242li967w253xhfywg72d3v1n5dybjxldkjgdix17gddwn5k"; depends=[aqp classInt colorRamps colorspace dismo gstat pixmap plotrix plyr raster RColorBrewer rgdal RSAGA scales sp spacetime stringr XML zoo]; }; plotMCMC = derive2 { name="plotMCMC"; version="2.0-0"; sha256="0i4kcx6cpqjd6i16w3i8s34siw44qigca2jbk98b9ligbi65qnqb"; depends=[coda gplots lattice]; }; plotMElm = derive2 { name="plotMElm"; version="0.1.4"; sha256="17fif2rqsf4f9jr4s7nr7wikwg63nibz6yjkldf7yh1qqqfikd2g"; depends=[ggplot2 interactionTest]; }; plotROC = derive2 { name="plotROC"; version="2.0.1"; sha256="1r80712svlm8kfbnymv27wrn60bckxnmq1rva3caln5b58swzcdk"; depends=[ggplot2 gridSVG plyr shiny]; }; plotSEMM = derive2 { name="plotSEMM"; version="2.2"; sha256="08px2ng2lxhfkjmr6w26rxqzpqa18adjn59g14c29jqzx6s2m5h2"; depends=[MplusAutomation plotrix plyr Rcpp shiny]; }; - plotfunctions = derive2 { name="plotfunctions"; version="1.0"; sha256="16q5qzfkia4lhmx8wkajxcj6vn9nb6388fi8mr33g2n2pv721yax"; depends=[]; }; + plotfunctions = derive2 { name="plotfunctions"; version="1.2"; sha256="1kc551501f0j13z0i49hq9na1jzzjx65vw39fj3kasm8dww2npkl"; depends=[]; }; plotluck = derive2 { name="plotluck"; version="1.1.0"; sha256="0arbvldg50lyn98vkrys1yjkkraz8jracwal4r2mlw991pnaikpp"; depends=[ggplot2 hexbin Hmisc plyr quantreg RColorBrewer scales]; }; - plotly = derive2 { name="plotly"; version="4.5.6"; sha256="09yw977yxlcxv57kni3q899zrxyxa6pznr06cylr9lqkyr7llfhx"; depends=[base64enc digest dplyr ggplot2 hexbin htmlwidgets httr jsonlite lazyeval magrittr purrr scales tibble tidyr viridisLite]; }; - plotmo = derive2 { name="plotmo"; version="3.3.2"; sha256="030ba2c1g61a9wd4994pk8c32amj23ar7vghynkqz6ppb2nfzx8i"; depends=[plotrix TeachingDemos]; }; + plotly = derive2 { name="plotly"; version="4.7.0"; sha256="1z0qsccdyp0razk40d2yfmzvpvrx3a6ncbdnbf01756wni9szwns"; depends=[base64enc crosstalk data_table digest dplyr ggplot2 hexbin htmltools htmlwidgets httr jsonlite lazyeval magrittr purrr RColorBrewer scales tibble tidyr viridisLite]; }; + plotmo = derive2 { name="plotmo"; version="3.3.3"; sha256="0vhv0nim3p2y5liiny68xj0pc0z4cicv1rw5bwzvk38xm72gszsv"; depends=[plotrix TeachingDemos]; }; plotpc = derive2 { name="plotpc"; version="1.0.4"; sha256="1sf7n7mfyaijldm24bc8r8pfm8pp9cyaja7am14z2wpj2j9f9vyq"; depends=[]; }; - plotrix = derive2 { name="plotrix"; version="3.6-4"; sha256="1wxzjnzvkl3aga51ad2xhv4s7v46kvnp4z0nz4cb9cn10057sfw8"; depends=[]; }; + plotprotein = derive2 { name="plotprotein"; version="1.0"; sha256="14kfb4xxpfp8klz31kb7cpc39636ax2cx2483vqqkciccb28f0ks"; depends=[ade4 plotrix plyr seqinr XML]; }; + plotrix = derive2 { name="plotrix"; version="3.6-5"; sha256="01655y3qzy0283ppc85bi0g42g20zrqzcl0qb30cl6rcbflhymlb"; depends=[]; }; plotrr = derive2 { name="plotrr"; version="0.2.0"; sha256="12kab7w32hcdqmwh3nfpk1zqkgnvpx3p0292w47643ahl26s9whj"; depends=[dplyr ggplot2]; }; plotwidgets = derive2 { name="plotwidgets"; version="0.4"; sha256="1w7c9grw4pyyra230196yq32snr4wdg6xi8vh4dx5df2v500wz22"; depends=[]; }; pls = derive2 { name="pls"; version="2.6-0"; sha256="15j59p5x0rkdrk7iqzkipsy50rsyjl31w8zxc4w3v1j5gzxhi1rx"; depends=[]; }; @@ -8038,13 +8415,13 @@ in with self; { plsVarSel = derive2 { name="plsVarSel"; version="0.9.1"; sha256="0jwhdcrr68562q83528h7x3kjadfzn6j5l02axyfvflzgdnxwcnc"; depends=[bdsmatrix genalg MASS mvtnorm pls progress]; }; plsdepot = derive2 { name="plsdepot"; version="0.1.17"; sha256="1i00wxr451xpfy6dnvcm11aqf9106jsh5hj7gpds22ysgm4iq5w4"; depends=[]; }; plsdof = derive2 { name="plsdof"; version="0.2-7"; sha256="1z8z9m0nsnyy1fipzvm1srpxn3q6wjrlivmmki1f8plwkixkyc5y"; depends=[MASS]; }; - plsgenomics = derive2 { name="plsgenomics"; version="1.3-1"; sha256="0vddhzqfix8q692mdls227m2l6zjzbjwp1ia5j9shy71ycg2fzn9"; depends=[boot MASS]; }; - plspm = derive2 { name="plspm"; version="0.4.7"; sha256="0iy4qw4zjgqxg93a827qjcm32yipmnrl4gzn4hmskjd4khm9ngwd"; depends=[amap diagram shape tester turner]; }; + plsgenomics = derive2 { name="plsgenomics"; version="1.3-2"; sha256="1ihy4jp0hwi5v0s123ckbl0y6j8zhxh1im5sk46h1fdprfi5hxsa"; depends=[boot MASS]; }; + plspm = derive2 { name="plspm"; version="0.4.9"; sha256="03aj1ffq11hh931dbkxy9ba74xyvzmr1ylrj4fw1rbryrwqg89v6"; depends=[amap diagram shape tester turner]; }; plspm_formula = derive2 { name="plspm.formula"; version="1.0.1"; sha256="1i2d1q8pz21js1ci8afnqzcky430hh1iwf5f6jr3j9yr9gs365k5"; depends=[plspm]; }; plspolychaos = derive2 { name="plspolychaos"; version="1.1-1"; sha256="078arfv8z5nfrmsfi0n7hskmv394ysi6nhlskpy5cg37lqiwh0r1"; depends=[lhs MASS]; }; - pltesim = derive2 { name="pltesim"; version="0.1.2"; sha256="00iyxs4r5y08ss6q0yb6b1gq100xdx6zxksw0zmqxydj0sh64q2v"; depends=[coreSim ggplot2]; }; + pltesim = derive2 { name="pltesim"; version="1.0"; sha256="0mvqp8di2gwhd9wc9kvnnpxd3hkr9b9lj6g5qlkqcbrgkq6fjahs"; depends=[coreSim ggplot2]; }; plugdensity = derive2 { name="plugdensity"; version="0.8-3"; sha256="1jdmq4kbs8yzgkf9f5dc7c8c52ia68fgavw7nsnc2hnz5ylw1qy9"; depends=[]; }; - plumber = derive2 { name="plumber"; version="0.3.1"; sha256="0li34ldwc8qi7jg37pqaa4b5ql6ybci9a3wh2a48gb8nyb380r2b"; depends=[httpuv jsonlite R6 stringi]; }; + plumber = derive2 { name="plumber"; version="0.3.2"; sha256="0zwr98grh40ikm2a9kr03iyvd4839pnl4wg2zil0qplysp98d91h"; depends=[httpuv jsonlite R6 stringi]; }; plumbr = derive2 { name="plumbr"; version="0.6.9"; sha256="1avbclblqfy57pd72ximvj3zq92q1w8vszvyf6fw75j5rfwdaibk"; depends=[objectSignals]; }; plus = derive2 { name="plus"; version="1.0"; sha256="1l7lvnq7vahj8m7knmr4q3wj00ar7iq89j45a2dqn2bh0qyj68ls"; depends=[]; }; plusser = derive2 { name="plusser"; version="0.4-0"; sha256="1g100dh8cvn9q09j0jbkw4xmwjdp1lm4651369975fm99nrlp1j9"; depends=[lubridate plyr RCurl RJSONIO]; }; @@ -8052,8 +8429,6 @@ in with self; { pmc = derive2 { name="pmc"; version="1.0.2"; sha256="1pamxg2cwyg36w0xnggrv5w03lb12l25z2da7xm1jvr17h0ipqmh"; depends=[dplyr geiger ggplot2 ouch tidyr]; }; pmcgd = derive2 { name="pmcgd"; version="1.1"; sha256="1pybzvyjmzpcnxrjsas06diy3x83i1r5491s6ccyr63l56hs55d5"; depends=[mixture mnormt]; }; pmclust = derive2 { name="pmclust"; version="0.1-9"; sha256="1p506d3gs0i46zjdia0pc71wwfv6nrfkmk5qaan5sdz6vn24zjhj"; depends=[MASS pbdBASE pbdDMAT pbdMPI]; }; - pmfdR = derive2 { name="pmfdR"; version="1.0"; sha256="1h5dq84pm3ls4kz56l96p5h91njirkxm64jr4pc3m7mjzj9ajfdf"; depends=[curl exams stringr]; }; - pmg = derive2 { name="pmg"; version="0.9-43"; sha256="0i7d50m4w7p8ipyx2d3qmc54aiqvw0ls8igkk8s1xc7k8ympfqi6"; depends=[foreign gWidgets gWidgetsRGtk2 lattice MASS proto]; }; pmhtutorial = derive2 { name="pmhtutorial"; version="1.0.0"; sha256="0r1yw65ixm3zjpiwg800rfwr1p26i6apv4332pgfl84hj5vvp3ws"; depends=[mvtnorm Quandl]; }; pmlr = derive2 { name="pmlr"; version="1.0"; sha256="1z3hbw4wabpai1q8kbn77nzxqziag8y04cidlfiw7z969s4pkmgl"; depends=[]; }; pmml = derive2 { name="pmml"; version="1.5.2"; sha256="0yp9xhgsdfbkxl5xxzw6n5v9zbpn5819lynj1glzi32bfzjfiwk3"; depends=[stringr XML]; }; @@ -8071,6 +8446,7 @@ in with self; { pointdensityP = derive2 { name="pointdensityP"; version="0.2.1"; sha256="013vamdh987w56bmz0m6j2xas4ycv1zwxs860rs5z4i55dhgf9kh"; depends=[]; }; poio = derive2 { name="poio"; version="0.0-3"; sha256="1smbnqjlicaqq2hswl910yiirzb9zikbk4pqxm9pwpixywj0nkys"; depends=[assertive_base assertive_files assertive_properties assertive_sets assertive_strings assertive_types devtools digest dplyr magrittr R6 stringi tibble whoami]; }; poisDoubleSamp = derive2 { name="poisDoubleSamp"; version="1.1"; sha256="13wyj9jf161218y4zjv2haavlmanihp9l59cvh7x8pfr9dh2dwr8"; depends=[Rcpp]; }; + poisbinom = derive2 { name="poisbinom"; version="1.0.1"; sha256="0mjxg0s3nck7qrmq4bbrhwxfwr6fqml54s9k8q1mkfzlifa7qyf7"; depends=[Rcpp]; }; poisson = derive2 { name="poisson"; version="1.0"; sha256="1diyf1b84sr6iai3ghd3kcp6fc6w7fan49wzs1lzvxxsmp15ag2d"; depends=[]; }; poisson_glm_mix = derive2 { name="poisson.glm.mix"; version="1.2"; sha256="0328m279jfa1fasi9ha304k4wcybzr7hldww7wn0cl7anfxykbv8"; depends=[]; }; poistweedie = derive2 { name="poistweedie"; version="1.0"; sha256="18992fafypds3qsb52c09fasm3hzlyh5zya6cw32wnhipmda643m"; depends=[]; }; @@ -8078,19 +8454,20 @@ in with self; { poliscidata = derive2 { name="poliscidata"; version="1.2.0"; sha256="0vn9wdlh3bi24mcq0r4ani2b0hhlg1za1z6fw8ikz7952gpacqk8"; depends=[abind car descr ENmisc gplots Hmisc plotrix plyr survey weights xtable]; }; pollen = derive2 { name="pollen"; version="0.52.00"; sha256="1d1rr7rzc7lppw562lrn4n9syzgff21ws32s501g85f1zllkip5y"; depends=[dplyr lubridate purrr]; }; pollstR = derive2 { name="pollstR"; version="2.0.0"; sha256="0lcxhi1mazs8nh9hbbqyqx4axn5lji5fnp0kxrjwjxmzf59nksj8"; depends=[httr lubridate purrr stringr]; }; - polmineR = derive2 { name="polmineR"; version="0.7.2"; sha256="1frfjwqkdpjk0fl1ldh8zdvk38yyx8hnwsrn0cph7y8qhy6v9sfq"; depends=[data_table DT foreach Matrix R6 slam tm]; }; + polmineR = derive2 { name="polmineR"; version="0.7.3"; sha256="1h3yrbqgmhj6djl7w6ksrlhl6ba5lwxiaj151bvx0hj43h7qkg6r"; depends=[data_table DT Matrix R6 slam tm]; }; polspline = derive2 { name="polspline"; version="1.1.12"; sha256="0chg5f6fq5ngjp1kkm4kjyxjc3kk83ky2ky5k7q3rhd8rkhd4szw"; depends=[]; }; - polyCub = derive2 { name="polyCub"; version="0.5-2"; sha256="1j28ia53za3sh9q7q1g5bnmlb5mbzf44bcwzv0919lvkw01f2lvj"; depends=[sp spatstat]; }; + polyCub = derive2 { name="polyCub"; version="0.6.0"; sha256="1xmk87vfs9vwp8j3iywir5591dcz0hfdmxgzwcyi8416qfbc9d54"; depends=[sp spatstat]; }; polySegratio = derive2 { name="polySegratio"; version="0.2-4"; sha256="05kvj475zhlrmp7rm691cfs28igp4ac2cn2xxf7axx09v1nq33db"; depends=[gdata]; }; polySegratioMM = derive2 { name="polySegratioMM"; version="0.6-3"; sha256="1y4kzb1p3aw7ng8mv1hszpvb5hwwxy4vg34mhhk705ki4jy8jgvp"; depends=[coda gtools lattice polySegratio]; }; polyaAeppli = derive2 { name="polyaAeppli"; version="2.0"; sha256="0kyz3ap92xz7aqyviyrpggfmicy1gybrx7y19djsmixcwz53zqch"; depends=[]; }; - polyapost = derive2 { name="polyapost"; version="1.4-3"; sha256="1bzrc06llzr36zmvm9f5czfy5rdrspamqwqc3n3m8x08v4ch3y4y"; depends=[boot rcdd]; }; + polyapost = derive2 { name="polyapost"; version="1.5"; sha256="0r2h51l2y0sj0xahdzfy1lyq4kh166crh2j02sk85q577q9d883y"; depends=[boot rcdd]; }; polychaosbasics = derive2 { name="polychaosbasics"; version="1.1-1"; sha256="1kw5c4dmgpkbk2a30hh5n6xqpnbh6q2swxsdjkmcmhkwrzm4ylm2"; depends=[lhs MASS]; }; polyclip = derive2 { name="polyclip"; version="1.6-1"; sha256="07xxw5ik30ds18kv808hynzmz3w351k6lj4ifz9kak0s7xsaqfn3"; depends=[]; }; polycor = derive2 { name="polycor"; version="0.7-9"; sha256="0d0756faksviic5jrc47fg6l3wsm9r2wlbnxiw08563rv7shbvb7"; depends=[Matrix mvtnorm]; }; polyfreqs = derive2 { name="polyfreqs"; version="1.0.2"; sha256="13859vbpys5yj1qiapyzv9wlvi6x6k0rm335bsi1v07ch3x2bh3b"; depends=[Rcpp]; }; polynom = derive2 { name="polynom"; version="1.3-9"; sha256="1s4xxv5rvpigawknvq27v9vzvs83phfsj5h8mim2lmf5bj950nnk"; depends=[]; }; - polysat = derive2 { name="polysat"; version="1.6-0"; sha256="180hf1m2pd9jcz02q0jq3s5sv5h73qc20w3b2sx1psdbyzdk9006"; depends=[]; }; + polypoly = derive2 { name="polypoly"; version="0.0.2"; sha256="00c1hrnf575awvh0rlsnf6nkgi9p3fnqhd1knamkgb4icwi5s46d"; depends=[ggplot2 reshape2 rlang tibble]; }; + polysat = derive2 { name="polysat"; version="1.7-0"; sha256="018rabvdw2sf5gzcaxmzp61532p6ymzfx6l37ndfsy295swx7bvy"; depends=[]; }; polywog = derive2 { name="polywog"; version="0.4-0"; sha256="0wl9br0g4kgi3nz2fq28nsk6fw0ll0y715v4vz8lv3pvfwc7518j"; depends=[foreach Formula glmnet iterators Matrix miscTools ncvreg Rcpp stringr]; }; pom = derive2 { name="pom"; version="1.1"; sha256="02jv19apn0kmp1ric2cxajlaad2fmsz4nm4izd2c3691vzas7l83"; depends=[matrixcalc]; }; pomp = derive2 { name="pomp"; version="1.12"; sha256="1fvzd68pc1lhxikc16f6a0lhyf66rj54if80icfvx6z3zvqc5dgw"; depends=[coda deSolve digest mvtnorm nloptr subplex]; }; @@ -8103,28 +8480,30 @@ in with self; { popReconstruct = derive2 { name="popReconstruct"; version="1.0-4"; sha256="14lp0hfnzbiw81fnq7gzpr4lxyfh3g0428rm9jwjh631irz3fcc9"; depends=[coda]; }; popbio = derive2 { name="popbio"; version="2.4.3"; sha256="1c34izyp6gpic3yv1rhg1snv2irw0bj9r1w9b892l7x0mxxmn2bl"; depends=[]; }; popdemo = derive2 { name="popdemo"; version="0.2-3"; sha256="0r3qdvwjwqzqxk3zp9vfzxwmc5fhjzn0ka91b37g62nanwxiyayw"; depends=[expm]; }; - popgraph = derive2 { name="popgraph"; version="1.4"; sha256="1z6w6vj3vl2w10hvzwmkw4d475bqcd6ys92xnn445ag6vpq0cvxq"; depends=[ggplot2 igraph MASS Matrix sampling sp]; }; poplite = derive2 { name="poplite"; version="0.99.17.3"; sha256="0fqkwxlzj92rh187wns7zrygsgch1gw3l8kmnpvc59gdbk1wbbi7"; depends=[DBI dplyr igraph lazyeval RSQLite]; }; poppr = derive2 { name="poppr"; version="2.4.1"; sha256="05nds9srzkmdi33xfq3lfmyjirn8x3nacpkq1jymf6kzab0sgn8v"; depends=[ade4 adegenet ape boot dplyr ggplot2 igraph magrittr pegas phangorn reshape2 shiny vegan]; }; popprxl = derive2 { name="popprxl"; version="0.1.3"; sha256="1l842zgn04s8ghbcp8s2lzg7lgc809xd7hg9crnyp23c2cr0jlvi"; depends=[poppr readxl]; }; - popsom = derive2 { name="popsom"; version="4.0.1"; sha256="1qw6b00mz9i842askixc0288i41v8dfjwc58pa3cbgf6fhfjva9z"; depends=[class fields som]; }; + popsom = derive2 { name="popsom"; version="4.2"; sha256="11d6z3qsq94k0557pnwa0h4pc718360lvg9jkblp8abnj52lcvvv"; depends=[class fields ggplot2 som]; }; poptrend = derive2 { name="poptrend"; version="0.1.0"; sha256="0hypxpb18azg6q1mqrphbx3x262h9ybwhlkb8fyd6vr7jjb5wn3h"; depends=[mgcv]; }; population = derive2 { name="population"; version="0.1"; sha256="1xcm38hipasf6x5grsn7dqayy2g5mwppx2dvi5lwax5a6dqjk792"; depends=[abind]; }; - portes = derive2 { name="portes"; version="2.1-3"; sha256="0nqh6aync5igmvg7nr5inkv2cwgzd0zi6ky0vvrc3abchqsjm2ck"; depends=[]; }; + portes = derive2 { name="portes"; version="2.1-4"; sha256="09liy2bia76h5dh21s8skq9pj8k4wpq5agwrmr1pnvlpgc8m2b60"; depends=[]; }; portfolio = derive2 { name="portfolio"; version="0.4-7"; sha256="0gs1a4qh68xsvl7yi6mz67lamwlqyqjbljpyax795piv46kkm06p"; depends=[lattice nlme]; }; portfolioSim = derive2 { name="portfolioSim"; version="0.2-7"; sha256="1vf46882ys06ia6gfiibxx1b1g81xrg0zzman9hvsj4iky3pwbar"; depends=[lattice portfolio]; }; postGIStools = derive2 { name="postGIStools"; version="0.2.1"; sha256="1dmf77xpy61pqis3j9qzjjksmm9hkyhzxqdmjajpj7rkbqhl5qvp"; depends=[DBI jsonlite rgdal rgeos RPostgreSQL sp stringr]; }; + postlightmercury = derive2 { name="postlightmercury"; version="1.0"; sha256="1z69z9wfgycaahk2bfxbzvn4d13ckzaxij7ywcsmgvli7kalpq13"; depends=[httr pbapply tibble]; }; potts = derive2 { name="potts"; version="0.5-7"; sha256="194996wr4rnpr42xqfi5yrcnxvd82all2fxki95dklr2qfjxg98a"; depends=[]; }; poweRlaw = derive2 { name="poweRlaw"; version="0.70.0"; sha256="1p2la3hslxq2xa8jkwvci6zcpn47cvyr9xqd5agp1riwwp2xw5gh"; depends=[VGAM]; }; powell = derive2 { name="powell"; version="1.0-0"; sha256="160i4ki3ymvq08szaxshqlz7w063493j5zqvnw6cgjmxs7y0vj8y"; depends=[]; }; powerAnalysis = derive2 { name="powerAnalysis"; version="0.2.1"; sha256="0cma4v402n6wcb2gy9g1ymydzh8vimy9nfrrn8xhnjsf7x6jh215"; depends=[]; }; + powerCompRisk = derive2 { name="powerCompRisk"; version="0.1.1"; sha256="0qsgibjzf6qx778s126c2k7nbf8f10gsh4cfkkhkxcv344rqxg10"; depends=[MASS mvtnorm]; }; powerEQTL = derive2 { name="powerEQTL"; version="0.1.3"; sha256="1045vkzl5p20mqlsm0j6vnyyvfz5v6jyy443c38sw1cps0a09i1n"; depends=[powerMediation]; }; powerGWASinteraction = derive2 { name="powerGWASinteraction"; version="1.1.3"; sha256="1i8gfsk9qzx54yn661i4x9k7n7b6r1jd808wv1hcq7870mzyb27k"; depends=[mvtnorm pwr]; }; powerMediation = derive2 { name="powerMediation"; version="0.2.7"; sha256="1zqkwwlv57k5b86lcqjbdn11xgxayhsdqrq64n5pai8n4jxrkr5g"; depends=[]; }; powerSurvEpi = derive2 { name="powerSurvEpi"; version="0.0.9"; sha256="0f8i867zc1yjdp66rjb1cp92fcfrlq167z3d0c4iv355wv4s35az"; depends=[survival]; }; powerbydesign = derive2 { name="powerbydesign"; version="1.0.3"; sha256="0dv4j0kwdzvxnq587vs1dsy2yci3v3q2smncpscpcsalp38rvx4i"; depends=[gdata ggplot2 lme4 MASS plyr reshape2 stringr]; }; powerpkg = derive2 { name="powerpkg"; version="1.5"; sha256="0mbk2fda2fvyp1h5lk5b1fg398xybbjv0z6kdx7w7xj345misf7l"; depends=[]; }; - powerplus = derive2 { name="powerplus"; version="3.0"; sha256="0gm2iw6d7rpaxzpp66si9ra7vhw4gpwjm4b2dzf9fvq67bzdvcc6"; depends=[complexplus expm MASS Matrix phonTools]; }; + powerplus = derive2 { name="powerplus"; version="3.1"; sha256="0ayp6x34hkzgris4j3zbbs0r23n81bhww3wgfyy630ri4sk6brrn"; depends=[complexplus expm MASS Matrix phonTools]; }; + ppcc = derive2 { name="ppcc"; version="1.0"; sha256="022c8w7ws7fw6yy572rn6m8ki14d2ph7nd2hk2c6mmx2c4lbc20v"; depends=[]; }; ppcor = derive2 { name="ppcor"; version="1.1"; sha256="1x9b2kb8s0bp92b17gby0jwzzr3i4cf3ap9c4nq7m8fav72g0y3a"; depends=[MASS]; }; ppiPre = derive2 { name="ppiPre"; version="1.9"; sha256="07k2mriyz1wmxb5gka0637q4pmvnmd1j16mnkkdrsx252klgjsdw"; depends=[AnnotationDbi e1071 GO_db GOSemSim igraph]; }; ppls = derive2 { name="ppls"; version="1.6-1"; sha256="1r3h4pf79bkzpqdvyg33nwjabsqfv7r8a4ziq2zwx5vvm7mdy7pd"; depends=[MASS]; }; @@ -8133,25 +8512,26 @@ in with self; { pqantimalarials = derive2 { name="pqantimalarials"; version="0.2"; sha256="0azxkf1rvk9cyzr4gbp4y2vcxrxw3d4f002d5gjkvv1f4kx8faw1"; depends=[plyr RColorBrewer reshape2 shiny]; }; prLogistic = derive2 { name="prLogistic"; version="1.2"; sha256="1abwz7nqkz2qbyqyr603kl9a3rkad3f4vxhck6a9kl80xrmfrj9s"; depends=[boot Hmisc lme4]; }; prabclus = derive2 { name="prabclus"; version="2.2-6"; sha256="0qjsxrx6yv338bxm4ki0w9h8hind1l98abdrz828588bwj02jya1"; depends=[MASS mclust]; }; - pracma = derive2 { name="pracma"; version="2.0.4"; sha256="1z3i90mkzwvp9di17caf4934z2xlb2imm3hwxllcrbwvmnmhrwyc"; depends=[quadprog]; }; + pracma = derive2 { name="pracma"; version="2.0.7"; sha256="0hxa0rbbp54j0c05qj7vfwhqfdmiz5ax8vhqxd09g33x7c0hqbc5"; depends=[quadprog]; }; pragma = derive2 { name="pragma"; version="0.1.3"; sha256="1n30a346pph4d8cj4p4qx2l6fnwhkxa8yxdisx47pix376ljpjfx"; depends=[]; }; prais = derive2 { name="prais"; version="0.1.1"; sha256="0vv6h12gsbipi0gnq0w6xh6qvnvc0ydn341g1gnn3zc2n7cx8zcn"; depends=[]; }; praise = derive2 { name="praise"; version="1.0.0"; sha256="1gfyypnvmih97p2r0php9qa39grzqpsdbq5g0fdsbpq5zms5w0sw"; depends=[]; }; praktikum = derive2 { name="praktikum"; version="0.1"; sha256="0kkydgglvqw371fxh46fi86fmdndhwq1n8qj0ynbh2gz1cn86aw1"; depends=[]; }; prc = derive2 { name="prc"; version="2015.6-24"; sha256="0sf664zqcq6xylhd7rvm2l2xj3f4j6llaj7j4b4847wfxnas2j02"; depends=[kyotil nlme]; }; - prcbench = derive2 { name="prcbench"; version="0.6.2"; sha256="1dg4d5x7w368bllgblp1c9kahv9dd43vdfxvv8i3c9nz003z84bs"; depends=[assertthat ggplot2 gridExtra memoise precrec PRROC R6 rJava ROCR]; }; + prcbench = derive2 { name="prcbench"; version="0.7.3"; sha256="0xdmwjhxpcdaiqawhmlpr4ddlx22xk3rywa70jpm1vk5hc9pwivk"; depends=[assertthat ggplot2 gridExtra memoise precrec PRROC R6 rJava ROCR]; }; prclust = derive2 { name="prclust"; version="1.3"; sha256="0p0sf8248aigs99py8mpzz743jnrf7n1nv5shag15arxz9yx7zn3"; depends=[Rcpp]; }; - prcr = derive2 { name="prcr"; version="0.1.1"; sha256="1c6l8szjy9rd7gyjwpfsydi493is6nn93yiq9my097lla961254i"; depends=[dplyr ggplot2 tibble tidyr]; }; - pre = derive2 { name="pre"; version="0.1"; sha256="1y9mz0rp1rf595n8b2fy6rncrw7d41d8vlxi6phclfdawv9bkn9z"; depends=[Formula glmnet MatrixModels partykit]; }; - preText = derive2 { name="preText"; version="0.4.4"; sha256="0ivzm9mcwnf9yrgvwzjiaqkpfv8fr7v8ci61gn8x09jiw8w8l5j4"; depends=[cowplot ecodist ggplot2 gridExtra proxy quanteda reshape2 topicmodels vegan]; }; + prcr = derive2 { name="prcr"; version="0.1.4"; sha256="0yb0bi3kipq4r6g0fai2pb1gjxkd6gsjkf06irp2idx8r42ipl54"; depends=[dplyr ggplot2 tibble tidyr]; }; + pre = derive2 { name="pre"; version="0.2"; sha256="1mg8yqljx6cww7f0175qr4gbzy64maf66xca9gry309zgihjzdm9"; depends=[Formula glmnet MatrixModels partykit]; }; + preText = derive2 { name="preText"; version="0.5.0"; sha256="06pvbqawaaw20wlmljr2mc95g9nif42lqzcq1nrqqjixkfycykfd"; depends=[cowplot ecodist ggplot2 proxy quanteda reshape2 topicmodels vegan]; }; precintcon = derive2 { name="precintcon"; version="2.3.0"; sha256="1sf0mfqa77aqhbx3hg8pv582ibmfnv6vigqcd3xqsbq7nigy2ms9"; depends=[ggplot2 scales]; }; - precrec = derive2 { name="precrec"; version="0.7.1"; sha256="09b5718f3j0v3mkjq07lnyav935ggp2j1466v60b5ndn736bl3yx"; depends=[assertthat ggplot2 gridExtra Rcpp]; }; + precrec = derive2 { name="precrec"; version="0.8.0"; sha256="1kf9wg91dr4pb4lybfhjzvw9wc647h0ygkcw8balqayll7ynlwhn"; depends=[assertthat data_table ggplot2 gridExtra Rcpp]; }; predatory = derive2 { name="predatory"; version="1.1"; sha256="18nv8riw380acvgb8iz771wzdgrmkrwcvdxbxhkbczcdhgw1p0ig"; depends=[readr stringr]; }; prediction = derive2 { name="prediction"; version="0.2.0"; sha256="09jlwk3fh7lkka9vsbr0bp7bpaf2p7q96qb8mv56rcmfrsf5446c"; depends=[]; }; predictionInterval = derive2 { name="predictionInterval"; version="1.0.0"; sha256="029hc57cblfcbqckrghf95l2rkn7acgb4yr36da01bx8bmpww0bn"; depends=[ggplot2 MASS MBESS pbapply]; }; predictmeans = derive2 { name="predictmeans"; version="0.99"; sha256="1qfqh21d3m0k2491hv5rl5k4v49j5089xsdk3bxicp30l512rax0"; depends=[ggplot2 lattice lme4 nlme pbkrtest plyr]; }; predmixcor = derive2 { name="predmixcor"; version="1.1-1"; sha256="0v99as0dzn0lqnbbzycq9j885rgsa1cy4qgbya37bbjd01b3pykd"; depends=[]; }; prefeR = derive2 { name="prefeR"; version="0.1.1"; sha256="1wgbwbmghsnc2cargwndda0xhcdswvzd0nkjq5g895kl8zcwgpyf"; depends=[entropy mcmc]; }; + preference = derive2 { name="preference"; version="0.1.0"; sha256="15h5p86sdp3xm4qpqr4kh54j57cxw534qk1lxn27m1vyp8rs280k"; depends=[]; }; prefmod = derive2 { name="prefmod"; version="0.8-33"; sha256="0wklp3djy3z8lq0vrjrzqha6r8z00jwdm6d9ffyq5vhimmbirzj8"; depends=[colorspace gnm]; }; prepdat = derive2 { name="prepdat"; version="1.0.8"; sha256="19rxyss96cmjhzm69f6l1cd3vkw3wskzhxnbmrz4546x00gf9g5v"; depends=[dplyr psych reshape2]; }; preprocomb = derive2 { name="preprocomb"; version="0.3.0"; sha256="08dhzil8prmjb6if0yba9pjncfxf5zzvlrrabva7c5jhny806c5g"; depends=[arules caret clustertend DMwR doParallel e1071 foreach randomForest zoo]; }; @@ -8159,7 +8539,7 @@ in with self; { preproviz = derive2 { name="preproviz"; version="0.2.0"; sha256="0jb85qkzywsd2iyfynd8ngkc136m4qc38phc3fgxm2qw30dacmyh"; depends=[caret ClustOfVar DMwR ggdendro ggplot2 gridExtra randomForest reshape2]; }; prereg = derive2 { name="prereg"; version="0.2.0"; sha256="098352svjdf8cfmb9qwbv71xb4irxcr70r06bvnqdv5bliq9fzin"; depends=[rmarkdown]; }; presens = derive2 { name="presens"; version="2.1.0"; sha256="175nr9pqn3m6kh9bcc1gxqmqv05xdsqdw9lx385lmm1g947d2159"; depends=[marelac measurements]; }; - preseqR = derive2 { name="preseqR"; version="3.0.1"; sha256="1lbcczp17fc690mxfvvpn4iyrxhjh5g32x3860g3yrcyx81sayir"; depends=[polynom]; }; + preseqR = derive2 { name="preseqR"; version="3.1.0"; sha256="0jry6lp3q5ak9y7hzfg3m8hzxknylza6k4zw13ds52qj4639lzhc"; depends=[polynom]; }; prettyGraphs = derive2 { name="prettyGraphs"; version="2.1.5"; sha256="19jag5cymancxy5lvkj5mkhdbxr37pciqj4vdvmxr82mvw3d75m4"; depends=[]; }; prettyR = derive2 { name="prettyR"; version="2.2"; sha256="026cgbrqs799lg06qlwx1r9ramil790qxrb1cyl4w7mzf8sfpgn9"; depends=[]; }; prettycode = derive2 { name="prettycode"; version="1.0.0"; sha256="1zba83b5sk8jyag8jz8gipn6qpxwfsfg1xcxamfvpmzjicajzhbx"; depends=[crayon withr]; }; @@ -8175,6 +8555,7 @@ in with self; { primes = derive2 { name="primes"; version="0.1.0"; sha256="0hhkgpkadvai9xcivfalsvr5w0irsxygyz3p2zngwl3g5rvvh5g9"; depends=[Rcpp]; }; princurve = derive2 { name="princurve"; version="1.1-12"; sha256="19fprwpfhgv6n6ann978ilwhh58qi443q25z01qzxml4b5jzsd7w"; depends=[]; }; prinsimp = derive2 { name="prinsimp"; version="0.8-8"; sha256="074a27ml0x0m23hlznv6qz6wvfqkv08qxh3v1sbkl9nxrc7ak4vn"; depends=[]; }; + printr = derive2 { name="printr"; version="0.1"; sha256="13yqqcwfqnbhvcxwrr6j45qhnbxng3qwn2ygkr809gibg9grw471"; depends=[knitr]; }; prioritylasso = derive2 { name="prioritylasso"; version="0.1.0"; sha256="1mn7ywn8barxka119khiv9vxz81rqcjiz09960skwnnw9mksxnak"; depends=[glmnet survival]; }; prism = derive2 { name="prism"; version="0.0.7"; sha256="03z1m09vf2gd277xp3y5nhvgrp0fnbr2x0r9b92kp46ca09fq9y8"; depends=[ggplot2 httr raster]; }; pro = derive2 { name="pro"; version="0.1.1"; sha256="0f0iliq7bhf313hi0jbwavljic4laxfc0n3gac5y6hzm39gvvgag"; depends=[]; }; @@ -8184,9 +8565,12 @@ in with self; { probsvm = derive2 { name="probsvm"; version="1.00"; sha256="1k0zysym7ncmjy9h7whwi49qsfkpxfk7chfdjrydl6hn6pscis37"; depends=[kernlab]; }; proccalibrad = derive2 { name="proccalibrad"; version="0.14"; sha256="0vr55rpcqh9wvy3bklssrimp42x85w3sanjgshfij657v68vmx46"; depends=[]; }; processcontrol = derive2 { name="processcontrol"; version="0.1.0"; sha256="0c0bksgq24blfkdgp5bn49sjnaajrg5bag8qzb5zffxbhnm4s30x"; depends=[plyr]; }; + processmapR = derive2 { name="processmapR"; version="0.1.0"; sha256="0ng48vwjsn1kmviyz41v1x4d3wd4bwycyfim079hs6adf0wq6vys"; depends=[bupaR DiagrammeR dplyr edeaR ggplot2 ggthemes]; }; + processmonitR = derive2 { name="processmonitR"; version="0.1.0"; sha256="1ckr438yifpsh095j6bb65dq3rdm7cfm8k7qsjmcqwjkww4j74z8"; depends=[bupaR dplyr edeaR ggplot2 magrittr miniUI shiny]; }; + processx = derive2 { name="processx"; version="2.0.0"; sha256="1bcqqdyc3ia17fh3qpscfny5d4ns7i982qkm52990xm2c1mba9c3"; depends=[assertthat crayon debugme R6]; }; prodigenr = derive2 { name="prodigenr"; version="0.3.0"; sha256="1217l9r012xrgzna1bf9z31n2gw36h6grga3949kg7ghxrzjbm4q"; depends=[devtools]; }; prodlim = derive2 { name="prodlim"; version="1.6.1"; sha256="0m51rkivx1zr6whdqwj66jpnkmp4385m06kkha3dp8qqf4jna9iz"; depends=[KernSmooth lava Rcpp survival]; }; - productivity = derive2 { name="productivity"; version="0.1.0"; sha256="0hbysja40yv5ssiq4c3dn5bwypjhjdf1g3x56zms2ck78sk75zxk"; depends=[doParallel foreach Rglpk]; }; + productivity = derive2 { name="productivity"; version="0.2.0"; sha256="0fg5gsyszxfiqv7jdc96rcw6pqkqlk1kb8dpbsw5gklrs6f2my1g"; depends=[doParallel foreach Rglpk]; }; productplots = derive2 { name="productplots"; version="0.1.1"; sha256="1igs6d0qwgsfk0z3vxabgv5kva9w2kpzi535gjfdrbx34j4pf3gx"; depends=[ggplot2 plyr]; }; prof_tree = derive2 { name="prof.tree"; version="0.1.0"; sha256="0mjvxaacrgkzl0f1wn3fpgah4jh720safni66ri0dnriwcxis6rz"; depends=[data_tree]; }; profdpm = derive2 { name="profdpm"; version="3.3"; sha256="07lhjavrx4fa5950w928mfpddmmnmvdapl5n6mv49m8h3bxs4nmy"; depends=[]; }; @@ -8206,9 +8590,10 @@ in with self; { propagate = derive2 { name="propagate"; version="1.0-4"; sha256="18vyh4i4zlsmggfyd4w0zrznk75m84k08p1qa9crind04n5581j1"; depends=[ff MASS minpack_lm Rcpp tmvtnorm]; }; properties = derive2 { name="properties"; version="0.0-8"; sha256="1x7zln1indckl090p9kv40snamkac3b8q45387jdqxajmsallxmb"; depends=[]; }; prophet = derive2 { name="prophet"; version="0.1.1"; sha256="1knkkm3ai91rcak5c5199gjqazq3db8202knk7b846w0n4f77hn3"; depends=[dplyr extraDistr ggplot2 Rcpp rstan scales tidyr zoo]; }; - propr = derive2 { name="propr"; version="2.2.0"; sha256="084p7wxgg4dlphzydgn51wrq2dik0yqb0qax0bl992r78qalak4b"; depends=[fastcluster ggplot2 igraph Rcpp]; }; + proportion = derive2 { name="proportion"; version="2.0.0"; sha256="0a71f6hz6blb7550m9x0di84vp51yjhnn952301rwlrh3axf6dbr"; depends=[ggplot2 TeachingDemos]; }; + propr = derive2 { name="propr"; version="3.0.4"; sha256="1acfylhcjbvwfd9y3c1nxcq6d0zy9i2ljyl8h6a05fxm3q0y2z37"; depends=[fastcluster ggplot2 igraph Rcpp]; }; prospectr = derive2 { name="prospectr"; version="0.1.3"; sha256="18lh03xg6bgzsdsl56bjd63xdp16sqgr3s326sgifkkak8ffbv7q"; depends=[foreach iterators Rcpp RcppArmadillo]; }; - protViz = derive2 { name="protViz"; version="0.2.28"; sha256="1jnc2picmip1681pw9g9l1p7di65mvr10dybqdl0l9gidchn5p0n"; depends=[Rcpp]; }; + protViz = derive2 { name="protViz"; version="0.2.31"; sha256="05bmxc5hq2bpd8saqs36wwkmbywkw7rm3b4zl1dxpdpxmywsbf1a"; depends=[Rcpp]; }; proteomicdesign = derive2 { name="proteomicdesign"; version="2.0"; sha256="01s47pgwxy4xx10f3qmbfv59gbaj0qw017kpkpsn33s8w7ad63r0"; depends=[MASS]; }; proteomics = derive2 { name="proteomics"; version="0.2"; sha256="01cd4sb79gcx8gbzl624scvjbwhgcsca1wdvvfkhsv7jfwdd2ry2"; depends=[foreach ggplot2 plyr reshape2]; }; protiq = derive2 { name="protiq"; version="1.2"; sha256="1d5wr9w540a79i57nr0arn5xg7s6jhhy5nrgsk8r3ljidld2s2sa"; depends=[graph mvtnorm RBGL]; }; @@ -8218,17 +8603,18 @@ in with self; { protolite = derive2 { name="protolite"; version="1.6"; sha256="10ly0rscpmgdakzlr27h6d78d6ixvrh76xcyx68caffr3zydlfyq"; depends=[jsonlite Rcpp]; }; proton = derive2 { name="proton"; version="1.0"; sha256="1mgaw54is8l6ac1rf8s70rj7kv9xgsfdrlvjz01ggfwg7c6pyr3s"; depends=[digest]; }; prototest = derive2 { name="prototest"; version="1.1"; sha256="0v65abrn73wgwnrrf6gv9f7p0qy12xlk9ishq9lq4qal1wlsrrjs"; depends=[glmnet intervals MASS Rcpp RcppArmadillo]; }; - protr = derive2 { name="protr"; version="1.2-1"; sha256="08431v94p6c4sw2yqm6jc2v20kdgp5gn8kbl40am875z4a9q7c76"; depends=[]; }; - provenance = derive2 { name="provenance"; version="1.5"; sha256="16hy0wbksa85jvv13ksq9qhsv03vr45qsl0l20b33yapgj358v4z"; depends=[MASS]; }; + protr = derive2 { name="protr"; version="1.4-0"; sha256="1z37kn5mrn2l2ikdsga39zqk1rkrbyx490lqwv68m68vykyfywl3"; depends=[]; }; + proustr = derive2 { name="proustr"; version="0.1.0"; sha256="17cxkyy5xjg94lysfkbgfhzd4vajk1n1ri5yjb0ngjlhz3nndb8v"; depends=[tidyr]; }; + provenance = derive2 { name="provenance"; version="1.7"; sha256="01gf354zg403j8l0c8q57vbz13cvi3inkrqh6pm1xg04jfmh1n86"; depends=[MASS]; }; proxy = derive2 { name="proxy"; version="0.4-17"; sha256="0bg1fn96qrj8whmnl7c3gv244ksm2ykxxsd0zrmw4lb6465pizl2"; depends=[]; }; - prozor = derive2 { name="prozor"; version="0.1.1"; sha256="0yv9yzp8ldn888v2sg62qaq0vjg5xwjq9274x68idrlywzgplfgv"; depends=[doParallel foreach Matrix seqinr]; }; + prozor = derive2 { name="prozor"; version="0.2.3"; sha256="1686lfmzmzl1488xnppv95hfr83gf67xfzqsw49gdas0aba3plhh"; depends=[AhoCorasickTrie doParallel foreach Matrix plyr seqinr stringr]; }; pryr = derive2 { name="pryr"; version="0.1.2"; sha256="1in350a8hxwf580afavasvn3jc7x2p1b7nlwmj1scakfz74vghk5"; depends=[codetools Rcpp stringr]; }; psData = derive2 { name="psData"; version="0.2.2"; sha256="013hb6lk9rm2w08m5jbw90ndrcd4wyy2h125jx07c9bs60wh4mp4"; depends=[countrycode DataCombine reshape2 rio xlsx]; }; - psbcGroup = derive2 { name="psbcGroup"; version="1.3"; sha256="02h9ghmnmiyg46mi5c9fyz62psyp0l0rbh0pdvn9y0xyagrj7wln"; depends=[LearnBayes mvtnorm SuppDists]; }; + psbcGroup = derive2 { name="psbcGroup"; version="1.4"; sha256="0l1hmgw4sislryws8hv7r2nglhcs6g9khg0372a70djvhz2l6gfi"; depends=[LearnBayes mvtnorm SuppDists]; }; pscl = derive2 { name="pscl"; version="1.4.9"; sha256="15fij6n43hry1plgzrak9vmk9xbb7n4v2frv997bhwxbs6jhhfhf"; depends=[lattice MASS]; }; pscore = derive2 { name="pscore"; version="0.1-2"; sha256="1sfkxs2kv8lq87j3q9ci7j38c7gzfkp2l36lwcdhiidr2nls2x0c"; depends=[ggplot2 lavaan reshape2]; }; psd = derive2 { name="psd"; version="1.0-1"; sha256="1ssda4g98m0bk6gkrb7c6ylfsd2a84fq4yhp472n4k8wd73mkdn6"; depends=[RColorBrewer Rcpp RcppArmadillo signal zoo]; }; - pse = derive2 { name="pse"; version="0.4.6"; sha256="155s9ccns1i1nkfmx8112rx16i94f9kv9bak5gcnmi55r5wj7wmj"; depends=[boot Hmisc]; }; + pse = derive2 { name="pse"; version="0.4.7"; sha256="0kigfzsvx3gw7jwym4f19dydwwarwxgmha7hpy54gg0zzi4k9icl"; depends=[boot Hmisc]; }; pseudo = derive2 { name="pseudo"; version="1.1"; sha256="0dcx6b892cic47rwzazsbnsicpgyrbdcndr3q5s6z0j1b41lzknd"; depends=[geepack KMsurv]; }; pseval = derive2 { name="pseval"; version="1.3.0"; sha256="1iv3fa7ar9i7v9j5axbasmn8l8nvry4zvmb7fd8aql82f22szmbj"; depends=[survival]; }; psgp = derive2 { name="psgp"; version="0.3-6"; sha256="0h9gyadfy0djj32pgwhg8vy2gfn7i7yj5nnsm6pvfypc3k71s2wf"; depends=[automap gstat intamap Rcpp RcppArmadillo]; }; @@ -8236,11 +8622,11 @@ in with self; { pso = derive2 { name="pso"; version="1.0.3"; sha256="0alar695c6kc1rsvwipsrvlxc93f3sy9l0yhp0mggyqgxkkvy406"; depends=[]; }; psoptim = derive2 { name="psoptim"; version="1.0"; sha256="1yziabkd3h05cfl5jy5l8ji2y3w21acvxsq3inxyh0iwyr8qdkkl"; depends=[]; }; pspearman = derive2 { name="pspearman"; version="0.3-0"; sha256="1l5mqga7b5nvm6v9gbl1xsspdqsjqyhhdn4gc4qlz6ld7fqfq6cx"; depends=[]; }; - pspline = derive2 { name="pspline"; version="1.0-17"; sha256="1n3mhj6q7a1v2k8xkbwji27dihcy3845wp50sx14hy4nbay5kf1r"; depends=[]; }; + pspline = derive2 { name="pspline"; version="1.0-18"; sha256="1iwsw52miil1v1yl99mzl28qi8gdjr56rlasmh8faqjlpn9z477p"; depends=[]; }; pssm = derive2 { name="pssm"; version="1.1"; sha256="0r3d1mzc7bcz238lqq4y518400m2dqm5a1fb9gkfiari1ax099lv"; depends=[abind MASS MHadaptive numDeriv]; }; pstest = derive2 { name="pstest"; version="0.1.1"; sha256="0k8413ilpbz23v210wz80mli7ajpc8p7y4pbn1za371qw04b81c5"; depends=[harvestr]; }; psy = derive2 { name="psy"; version="1.1"; sha256="027whr670w65pf8f7x0vfk9wmadl6nn2idyi6z971069lf01wdlk"; depends=[]; }; - psych = derive2 { name="psych"; version="1.7.3.21"; sha256="1sncah07ms8ss2hgqqfgg1k023kgvys5hhyyhiw42zq99kapnwc9"; depends=[foreign lattice mnormt nlme]; }; + psych = derive2 { name="psych"; version="1.7.5"; sha256="0mzzd9qj57qn5cnmd3w31gyp7big70pyx7nkxiqv1q0ys3sg6i25"; depends=[foreign lattice mnormt nlme]; }; psychometric = derive2 { name="psychometric"; version="2.2"; sha256="1b7cx6icixh8k3bv60fqxjjks23qn09vlcimqfv2x3m3nkf8p1s9"; depends=[multilevel nlme]; }; psychomix = derive2 { name="psychomix"; version="1.1-4"; sha256="15yk3z11w4bzk6vljr13bkfhzycypww6blc1djb5iwl635xq1c49"; depends=[flexmix Formula lattice modeltools psychotools]; }; psychotools = derive2 { name="psychotools"; version="0.4-2"; sha256="04p5yb39c8j28q6brqsrw0dr1zvgpyzb7008v2kk3d5sncgl4dd0"; depends=[]; }; @@ -8253,21 +8639,23 @@ in with self; { ptw = derive2 { name="ptw"; version="1.9-12"; sha256="111b0s66p7fk6z6bnm3wckpfjxr1gshv0rqqy5wy6qg60hp7bcfd"; depends=[nloptr]; }; ptwikiwords = derive2 { name="ptwikiwords"; version="0.0.3"; sha256="129dad1vy52sf97dqrkwa49vjhv2kvs4pmd5zvq8pxd51hqm6wy9"; depends=[]; }; ptycho = derive2 { name="ptycho"; version="1.1-4"; sha256="1llk3rpk0lf80vwvs23d6dqhgyic3a6sfjc393csj69hh01nrdvc"; depends=[coda plyr reshape2]; }; - pubmed_mineR = derive2 { name="pubmed.mineR"; version="1.0.8"; sha256="0vr7r63i7xq6iqik4zdxjf78pfmsppnp4d9lmc6p1c19l9fcgljy"; depends=[boot R2HTML RCurl XML]; }; + pubmed_mineR = derive2 { name="pubmed.mineR"; version="1.0.9"; sha256="079lzyqxkhavirrnzw0khi6gilpp7778zyl7bcm3kb4jqn9isql1"; depends=[boot R2HTML RCurl XML]; }; pubprint = derive2 { name="pubprint"; version="0.2.1"; sha256="0lcav93i4lw0j491q8ga47iyski2kvmqvppq0jwa3144zfb3hnic"; depends=[stringr]; }; pullword = derive2 { name="pullword"; version="0.2"; sha256="14rln0nbd4k2cvf18iwvc56776b9g3m3cs67i7fgzabfrgj8y6db"; depends=[RCurl]; }; pulsar = derive2 { name="pulsar"; version="0.2.5"; sha256="1qmyhj32dygnvqvjysvlhlxv9y8lyfnm8hzaycmh8g3lhymk2k9c"; depends=[Matrix]; }; pumilioR = derive2 { name="pumilioR"; version="1.3.1"; sha256="1791r5lkr6hafd2rz9f9nfy5vc03c4833f292khvd2cg43sb0bfc"; depends=[RCurl XML]; }; purge = derive2 { name="purge"; version="0.2.1"; sha256="1faf8mkaxsnj63wnig5rs50hd3j6vzaj0xkdz8kn0j7y2vvshp9p"; depends=[]; }; - purrr = derive2 { name="purrr"; version="0.2.2"; sha256="0lss8q733nv7s154wargm6vnxq55qygnxakib8xdj4jv0y86sxc3"; depends=[BH dplyr lazyeval magrittr Rcpp]; }; + purrr = derive2 { name="purrr"; version="0.2.2.2"; sha256="1i1n651xf15489pd6xjdvyp8wyayn8p33d27br39mddn1xdjrpc1"; depends=[lazyeval magrittr Rcpp tibble]; }; + purrrlyr = derive2 { name="purrrlyr"; version="0.0.2"; sha256="1wkngb87xmlkghsqjr7l5fhlj3a54prvg6v6hd0prn768xw4rc1c"; depends=[BH dplyr lazyeval magrittr purrr Rcpp]; }; pushoverr = derive2 { name="pushoverr"; version="1.0.0"; sha256="1zazrx0szx21ymn7zlkfqkhid0ar8jblnpnf5nycj0p7dbh6d0bd"; depends=[assertthat httr]; }; pvar = derive2 { name="pvar"; version="2.2.2"; sha256="0a84nap9rwlfvhi4yj6mh7wrmzsi06w1zpmshw84lkm2h2ch02gy"; depends=[Rcpp]; }; - pvclass = derive2 { name="pvclass"; version="1.3"; sha256="1mlzvcbv1zvciz3hp01pwwanq3q8bapgn2dl90syhj15q5pzb4f7"; depends=[Matrix]; }; + pvclass = derive2 { name="pvclass"; version="1.4"; sha256="1g6x75qz3xybq1xnik0hzi7mcs0gzzqd3f0iwfkzi5d1zcddnw13"; depends=[Matrix]; }; pvclust = derive2 { name="pvclust"; version="2.0-0"; sha256="0hfpf257k5f1w59m0zq6sk0gaamflc3ldkw6qzbpyc4j94hiaihs"; depends=[]; }; - pvrank = derive2 { name="pvrank"; version="1.1.1"; sha256="07pk7xvvg51i30kzf0cyj6qa38gmdf32c2c2ljbhp95ldk4j07mi"; depends=[EnvStats Rmpfr]; }; pvsR = derive2 { name="pvsR"; version="0.3"; sha256="1ijmqlcsc8z0aphdd3j37ci8yqsy50wnr2fwn7h8fxbyd12ax2nj"; depends=[httr nnet XML]; }; pweight = derive2 { name="pweight"; version="0.0.1"; sha256="0pxxfrap1bmnhbfbmkddfbqwkpw42hq37s0y26zmkxqlx4wblira"; depends=[qqman]; }; pwr = derive2 { name="pwr"; version="1.2-1"; sha256="0k3jzx7jjgzha3vkpknj9nvx4yqlc9rq0mw25shvzi0xbr1y2cdb"; depends=[]; }; + pwr2 = derive2 { name="pwr2"; version="1.0"; sha256="0zfv7z5yymw310r1sqm8ivsc2pv6dgk2k4b1axmm92gsaj53cn7p"; depends=[]; }; + pwrAB = derive2 { name="pwrAB"; version="0.1.0"; sha256="0ifyw40m9gsijw3vm9qb8qk4yydmdixfdpdp45x2hk93j8v61jm1"; depends=[]; }; pwrRasch = derive2 { name="pwrRasch"; version="0.1-2"; sha256="13fr4yfk8aky1vv36pllx673l4lg9q7i661vbyn2zabyizd2rw3b"; depends=[]; }; pwt = derive2 { name="pwt"; version="7.1-1"; sha256="0926viwmwldmzlzbnjfijh00wrhgb0h4h0mlrls71pi5pjfldifa"; depends=[]; }; pwt8 = derive2 { name="pwt8"; version="8.1-1"; sha256="1iig0x90ilzh3hdki0h33qgrra8r94rw4bk1x8y7i6c1may8y0v6"; depends=[]; }; @@ -8289,7 +8677,7 @@ in with self; { qdap = derive2 { name="qdap"; version="2.2.5"; sha256="13isxmi9vknl5c71434r16j301i86zpbzcqch8hiay51x3wbf2f0"; depends=[chron dplyr gdata gender ggplot2 gridExtra igraph NLP openNLP plotrix qdapDictionaries qdapRegex qdapTools RColorBrewer RCurl reports reshape2 scales stringdist tidyr tm venneuler wordcloud xlsx XML]; }; qdapDictionaries = derive2 { name="qdapDictionaries"; version="1.0.6"; sha256="1icivvsi33494ycd7vfqm9zx2g2rc1m3dygs3bi0ndi798z1cvx2"; depends=[]; }; qdapRegex = derive2 { name="qdapRegex"; version="0.7.2"; sha256="1xa8q1way3gjadrjh3mv3xr4c6b4h16nd2c6lgl969difplpfz9p"; depends=[stringi]; }; - qdapTools = derive2 { name="qdapTools"; version="1.3.1"; sha256="0sfzqmds888r599mwm7j0qjsqfv6z59p4apmmg36hsyaxmw51233"; depends=[chron data_table RCurl XML]; }; + qdapTools = derive2 { name="qdapTools"; version="1.3.3"; sha256="0a28jn57d2fas3009cm10z07fq77ql3ffcrhcxsiimb57179wj0n"; depends=[chron data_table RCurl XML]; }; qdm = derive2 { name="qdm"; version="0.1-0"; sha256="0cfxyy8s5zfb7867f9xv9scq9blq2qnw68x66m7y7nqlrrff5xdr"; depends=[]; }; qfasar = derive2 { name="qfasar"; version="1.2.0"; sha256="067wnwwz8s0yxig13wrjq37w62kf8p5pa8my5lfpc1ik1b7iysby"; depends=[Rsolnp]; }; qgraph = derive2 { name="qgraph"; version="1.4.3"; sha256="1ymgi1ls2q22rwx1hv3h6flgfjx5l2dbmzh804jlq68wh8xf496j"; depends=[colorspace corpcor d3Network ellipse fdrtool ggm ggplot2 glasso gtools Hmisc huge igraph jpeg lavaan Matrix plyr png psych reshape2 sem sna]; }; @@ -8317,16 +8705,18 @@ in with self; { qrfactor = derive2 { name="qrfactor"; version="1.4"; sha256="0f02lh8zrc36slwqy11x03yzfdy94p1lk5jar9h5cwa1dvi5k8gm"; depends=[cluster maptools mgraph mvoutlier pvclust]; }; qrjoint = derive2 { name="qrjoint"; version="1.0-0"; sha256="18jmxb5wv16gy4vf0cgp4x885s53i3z3qmc46bdr4md513mc980w"; depends=[coda kernlab Matrix quantreg]; }; qrmdata = derive2 { name="qrmdata"; version="2016-01-03-1"; sha256="192dcsmvl3xbzlk658cfp2sk5fkgbjhjd4g1mrcs8s63hmzbwdzc"; depends=[xts]; }; - qrmtools = derive2 { name="qrmtools"; version="0.0-6"; sha256="14127svars3f7682mmbmqy0m51xs6syzcrki1mpjf9j1qv2s3jhf"; depends=[lattice Quandl quantmod rugarch xts zoo]; }; + qrmix = derive2 { name="qrmix"; version="0.9.0"; sha256="1r695d9bmmngvblh9jj0rnjymdaln9w0jywz51wla0bdssssf845"; depends=[MASS quantreg]; }; + qrmtools = derive2 { name="qrmtools"; version="0.0-7"; sha256="0c624jsdf6ypnip8z0hsdvrby29cdd9gpyp19asprdwsrmymmy6h"; depends=[lattice Quandl quantmod rugarch xts zoo]; }; qrng = derive2 { name="qrng"; version="0.0-3"; sha256="0xdhmcqvgjmrf4c72x76yz5kp0jiysy8q6f67lix1h4mvzr4q2qd"; depends=[]; }; qrnn = derive2 { name="qrnn"; version="1.1.3"; sha256="0phbazi47pzhvg7k3az958rk5dv7nk2wvbxqsanppxsvyxl0ykwf"; depends=[]; }; + qrsvm = derive2 { name="qrsvm"; version="0.2.1"; sha256="0qpj3c8qwrwr2asvp921av0mbdba1ayz0pdq4a52i1waqng4fgis"; depends=[doParallel foreach kernlab Matrix quadprog]; }; qtbase = derive2 { name="qtbase"; version="1.0.12"; sha256="0j3nzmh4xj0mzwlh9dsc3296yqbkhzn6qhzb8ismhi0bmx5hjydj"; depends=[]; }; - qte = derive2 { name="qte"; version="1.0.1"; sha256="15y6n0c9jinfz7hmm107palgy8fl15bc71gw0bcd3bawpydkrq2w"; depends=[]; }; - qtl = derive2 { name="qtl"; version="1.40-8"; sha256="05bj1x2ry0i7yqiydlswb3d2h4pxg70z8w1072az1mrv1m54k8sp"; depends=[]; }; + qte = derive2 { name="qte"; version="1.2.0"; sha256="1l911z52v3jp0b2agvwfny8d4yq0llrdp873j4mw696x50awj8py"; depends=[BMisc formula_tools ggplot2 Hmisc quantreg texreg]; }; + qtl = derive2 { name="qtl"; version="1.41-6"; sha256="067az4v432zxp6lxck8d7vlh9w4r13r0mvw5zsglyaqwsh3d9sad"; depends=[]; }; qtlDesign = derive2 { name="qtlDesign"; version="0.941"; sha256="138yi85i5xiaqrns4v2hw46b731bdgnb301wg2h4cfrxvrw4l0d5"; depends=[]; }; qtlbook = derive2 { name="qtlbook"; version="0.18-5"; sha256="0qvfi8q92n9pa3zbinkk54404m0awhxla9ccflczgaq0vij2n7wf"; depends=[qtl]; }; qtlc = derive2 { name="qtlc"; version="1.0"; sha256="17ij4alx4qg556b5kq7qsjygj5jf8iyx1f0v52pvx1z2sm6nppww"; depends=[plot3D rgl tiff]; }; - qtlcharts = derive2 { name="qtlcharts"; version="0.7-8"; sha256="144f2v97d60z381cnwmbpizig548cw29cqz5csqrk3vrr7j59l99"; depends=[htmlwidgets qtl]; }; + qtlcharts = derive2 { name="qtlcharts"; version="0.9-6"; sha256="021gx5qzrc7jbgpp91mn36czr7fsh37wf3c7cifcv3xwzc54j4dd"; depends=[htmlwidgets qtl]; }; qtlhot = derive2 { name="qtlhot"; version="0.9.0"; sha256="1043rksqqzgmr7q03j18wxgm706prqxq9ki9b9p2dxvc62vfcfih"; depends=[corpcor lattice mnormt qtl]; }; qtlmt = derive2 { name="qtlmt"; version="0.1-4"; sha256="1kx4iajhnjilciz9vda0s1mxqxa0h69vm3gpwdpbghgc5cj8d8kh"; depends=[]; }; qtlnet = derive2 { name="qtlnet"; version="1.3.6"; sha256="044a2p3mpp203kb85s2fr3qiyypm461lrzxkfi0hnzq44qqba169"; depends=[graph igraph pcalg qtl sem]; }; @@ -8335,19 +8725,20 @@ in with self; { quad = derive2 { name="quad"; version="1.0"; sha256="0fak12l19f260k0ygh6zimx8dabzsv7a9i2njw8hnfcs3ndffhv5"; depends=[PearsonDS]; }; quadmesh = derive2 { name="quadmesh"; version="0.1.0"; sha256="1k1midhszmi843krv9sdwbyhjmffgps0xx9aigkp7yw7mpif07vx"; depends=[dplyr raster]; }; quadprog = derive2 { name="quadprog"; version="1.5-5"; sha256="0jg3r6abmhp8r9vkbhpx9ldjfw6vyl1m4c5vwlyjhk1mi03656fr"; depends=[]; }; + quadprogXT = derive2 { name="quadprogXT"; version="0.0.1"; sha256="0q1yph4hri04i4k8rw5zpm60yc0irrb8nvxf0vipzd2chn4d9k6f"; depends=[quadprog]; }; quadrupen = derive2 { name="quadrupen"; version="0.2-5"; sha256="193hn3yf6c5i3p4n8gpg78nvsf2jdlcw40mm4p2ffxk7xzmv8xvl"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2 scales]; }; qualCI = derive2 { name="qualCI"; version="0.1"; sha256="09mzsy5ryyrn1gz9ahrh95cpfk7g09pmjjy0m82fh4xc7j5w6kpf"; depends=[combinat]; }; - qualV = derive2 { name="qualV"; version="0.3-2"; sha256="16pjn2la4da9466rafl5drlzx2rcf3vy68b5wz27aacyr15nvdcb"; depends=[KernSmooth]; }; + qualV = derive2 { name="qualV"; version="0.3-3"; sha256="1yyqk223ydcc0125gsn33a4mcdp8bd76fpn8kj9bfz9g78b8dqmx"; depends=[KernSmooth]; }; qualityTools = derive2 { name="qualityTools"; version="1.55"; sha256="1c2p78dhwqvzb2k01dvwb41a6hlr2iwpw6fv91036x30rphjzb88"; depends=[MASS Rsolnp]; }; - qualpalr = derive2 { name="qualpalr"; version="0.4.0"; sha256="0nbgcz6d57y6w7npfl064i561j9iw3r55q9md5g4hfdhazb1hf7d"; depends=[assertthat randtoolbox Rcpp RcppArmadillo RcppParallel]; }; - qualtRics = derive2 { name="qualtRics"; version="0.3"; sha256="1w2rbp3wxxp7yazf00wdjzm4d632n5iwdfcq1fsam5h0srrn18bz"; depends=[httr jsonlite stringr XML]; }; + qualpalr = derive2 { name="qualpalr"; version="0.4.1"; sha256="0n2279ryx9x90c63dbk76rr473rj16x19l32vvm91r59ia2zl948"; depends=[assertthat randtoolbox Rcpp RcppArmadillo RcppParallel]; }; + qualtRics = derive2 { name="qualtRics"; version="2.0"; sha256="140scg03k2mzhadjsr85dm1z36a2g971iyypc2srh14gvd2w1n5l"; depends=[assertthat httr jsonlite lubridate sjlabelled stringr yaml]; }; qualvar = derive2 { name="qualvar"; version="0.1.0"; sha256="07vpq5nyh40y1sq1fsg97z7bbardqakq6bx635v42pv00480h9sh"; depends=[]; }; quantable = derive2 { name="quantable"; version="0.2.2"; sha256="179bqqrga8mpigchfmhf11sc75frhd9nd6yqclz85lnd6gl16yd7"; depends=[caret e1071 gplots Matrix pROC RColorBrewer scales]; }; quantchem = derive2 { name="quantchem"; version="0.13"; sha256="1ga5xa7lsk04flfp1syjzpnvj3i2ypzh1m49vq1xkdwpm6axdy8n"; depends=[MASS outliers]; }; - quanteda = derive2 { name="quanteda"; version="0.9.9-24"; sha256="0wh7b3yj8qlgygy85sl98pf0inv9vxkd32k56k97bdiajz61cbmk"; depends=[ca data_table fastmatch ggplot2 Matrix proxy Rcpp RcppArmadillo RcppParallel SnowballC stringi wordcloud yaml]; }; + quanteda = derive2 { name="quanteda"; version="0.9.9-65"; sha256="1csj7fr42pibwnky85qcsqvg5b0chg0f8q2zzvna14ky4iah95z6"; depends=[data_table fastmatch ggplot2 Matrix Rcpp RcppArmadillo RcppParallel RSpectra SnowballC stringi wordcloud XML yaml]; }; quantification = derive2 { name="quantification"; version="0.2.0"; sha256="116cp88q9cmizxc2a8lsysa1vwyp1y86457fx5qkq5dcm4g721g8"; depends=[car]; }; quantileDA = derive2 { name="quantileDA"; version="1.1"; sha256="0jbklxsy33j7clcw97qq4ijwkrb94v2m11gjcfa38vplfxm9913q"; depends=[]; }; - quantmod = derive2 { name="quantmod"; version="0.4-8"; sha256="0jgd2i93k7pi8snqcs0lx668mq6wla3qaiv5a13m6fvb6clncp32"; depends=[TTR xts zoo]; }; + quantmod = derive2 { name="quantmod"; version="0.4-10"; sha256="12v83w2q8agvwwrjg9xwpamxmnqjays5xw51lhgbmnksasm40003"; depends=[curl TTR xts zoo]; }; quantoptr = derive2 { name="quantoptr"; version="0.1.2"; sha256="1hvr69ng8z7qhw3w0by95v6sckcismx8d5s69k2949rfg79z3dmh"; depends=[quantreg Rdpack rgenoud stringr]; }; quantreg = derive2 { name="quantreg"; version="5.33"; sha256="1dirmxa4cd05nb0yv0ga6ivw5hkr2zr2cb2lixl1nb6amqn024is"; depends=[Matrix MatrixModels SparseM]; }; quantreg_nonpar = derive2 { name="quantreg.nonpar"; version="1.0"; sha256="1f9120awnkwsgdiqg98lg7xs5l4y80930869x6k9q76595r5m92k"; depends=[fda mnormt quantreg Rearrangement]; }; @@ -8355,15 +8746,17 @@ in with self; { quantregGrowth = derive2 { name="quantregGrowth"; version="0.3-2"; sha256="1ga3qn8g7r465dlxl8wmvz1vlpq5639kmawancsgkm77f316wpzf"; depends=[quantreg]; }; quantspec = derive2 { name="quantspec"; version="1.2-1"; sha256="0kvwifdwy3big0lls5h3wcb48v3jvlfp1l0zjd07jnvj43zj3ysd"; depends=[abind quantreg Rcpp snowfall zoo]; }; quarrint = derive2 { name="quarrint"; version="1.0.0"; sha256="13fdmmrgn23xd9vpywmcl7pf729gmcxjfl1wxs30axsbp4h1s6rk"; depends=[neuralnet]; }; - questionr = derive2 { name="questionr"; version="0.6.0"; sha256="057akqpnvpm0ss650wfjd16j5xk6vxcs1micbqfyskajs295ql8l"; depends=[classInt highr htmltools labelled miniUI rstudioapi shiny]; }; + questionr = derive2 { name="questionr"; version="0.6.1"; sha256="0i53apcsqa90wl514a94bqm3ys01326483s6nf5cbzq1mkkx4x1v"; depends=[classInt DT highr htmltools labelled miniUI rstudioapi shiny]; }; queuecomputer = derive2 { name="queuecomputer"; version="0.8.1"; sha256="1c4xifg0wz09bn9j0y7xyn2rdr4fz2vr2r35r8bcajnmgs9hai3x"; depends=[dplyr Rcpp RcppArmadillo tidyr]; }; - queueing = derive2 { name="queueing"; version="0.2.9"; sha256="1k64j880jw9g28jklxf7nqnav4mpw83wp63fafx7zhzp4wq412bm"; depends=[]; }; + queueing = derive2 { name="queueing"; version="0.2.10"; sha256="0q7hnr5dkjfpy80m9s730k59b8wpajrv00frl5wy50xvg4a6shii"; depends=[]; }; quhomology = derive2 { name="quhomology"; version="1.1.0"; sha256="0acglmjp4x8f81iysxp8x7v5279p8gdidj308b9spn6xbmqgbr8z"; depends=[MASS numbers]; }; quickReg = derive2 { name="quickReg"; version="1.0.0"; sha256="0dgs0ja2srivrbzl11d3al45ncnrlx7940sk0h8c6lnnxv7nz77k"; depends=[ggplot2 nortest psych survival]; }; quickmapr = derive2 { name="quickmapr"; version="0.2.0"; sha256="1hxcq4h1rgdmypn3kgmwppzhacyspcj7iv2sy7s2xx5y69x62hf1"; depends=[httr raster rgdal rgeos sp]; }; + quickmatch = derive2 { name="quickmatch"; version="0.1.2"; sha256="03wnx6hifr4pmwm6fsxamcaf5ig59nfia9lyn6mzxplinfid71w6"; depends=[distances sandwich scclust]; }; quickpsy = derive2 { name="quickpsy"; version="0.1.4"; sha256="0zvi5g43dj1a3f6nysw9gc9nnhm0z5h6sfka4ggwr14fw6k0gz3l"; depends=[DEoptim dplyr ggplot2 MPDiR]; }; quint = derive2 { name="quint"; version="1.2.1"; sha256="1d9dnrjnl9cg2yn5snr6x9qr6lf74639j3ymsxpw0wn5c4fm8z46"; depends=[Formula partykit rpart]; }; quipu = derive2 { name="quipu"; version="1.9.0"; sha256="1py1qpbwp2smr5di8b3zmzxxhchfmr5qfhqkdiqig28mcnqcmp5n"; depends=[agricolae pixmap shiny stringr xtable]; }; + quotedargs = derive2 { name="quotedargs"; version="0.1.0"; sha256="1wnzcywrahcf2wwxnwqfxbfmrhzlq2ghfzbhs10gj9nsbbp1l0ch"; depends=[]; }; qut = derive2 { name="qut"; version="1.2"; sha256="1w6zsjphzfb1gby21cq20j8cclj15xklwga821sj07x3nchgn421"; depends=[flare glmnet lars Matrix]; }; qvcalc = derive2 { name="qvcalc"; version="0.9-0"; sha256="0gccxl6l6ibffxkjzfmh2scm8f3bnqwm1hr7ss7dqshhxw21kd5c"; depends=[]; }; qwraps2 = derive2 { name="qwraps2"; version="0.2.4"; sha256="18ail1y3kpiiwgkf7zn1acfz1ipz7wbk8pcmlganayr8p9yv7sh2"; depends=[dplyr ggplot2 knitr Rcpp tidyr]; }; @@ -8410,14 +8803,15 @@ in with self; { rJython = derive2 { name="rJython"; version="0.0-4"; sha256="13fpcw37cca738v9idqgi3gv9avfkfwfacxj54p2c4wyg46ghnah"; depends=[rJava rjson]; }; rKIN = derive2 { name="rKIN"; version="0.1"; sha256="1j6fdi5h869q4d1hq6ha6qyhisa0zk2qmhjrc4ahl9991d680dyn"; depends=[ggplot2 maptools MASS rgeos sp]; }; rLDCP = derive2 { name="rLDCP"; version="1.0.1"; sha256="0ldw6ybyyxhfsxbbjs8qzcf8dmha3q04h6mcxk90q1wlmlanqwf0"; depends=[XML]; }; - rLTP = derive2 { name="rLTP"; version="0.1.2"; sha256="1cr0r3v7d09bss16fxls341l71i9wkg91hr2hiyr4cl5fg35zzgb"; depends=[RCurl]; }; - rLakeAnalyzer = derive2 { name="rLakeAnalyzer"; version="1.8.3"; sha256="1rc8x6xqygfnr7sb2115g92djsjjjdwk5vssq3q3n9x7jzj878v5"; depends=[plyr]; }; + rLTP = derive2 { name="rLTP"; version="0.1.4"; sha256="04w432m03xwh0szshsrfw5h7wy43q4lj8z0y07k8w6gsf27cy5bx"; depends=[RCurl]; }; + rLakeAnalyzer = derive2 { name="rLakeAnalyzer"; version="1.8.7"; sha256="17vq8lapiviyibl1jm12a73qq98bgpnh7xp66jnv3lfksv9q3ck6"; depends=[plyr]; }; rLiDAR = derive2 { name="rLiDAR"; version="0.1"; sha256="1zm3c3xpxk1ll0cq589k1kf69wgn93qmaqkvpgcjib0ay35q7c7f"; depends=[bitops deldir geometry plyr raster rgl sp spatstat]; }; rLindo = derive2 { name="rLindo"; version="8.0.1"; sha256="05qyc4wvpjgw8jxmwn2nwybi695fjn0cdilkprwmjg07c82f0q5n"; depends=[]; }; rMR = derive2 { name="rMR"; version="1.0.4"; sha256="1md0xkl87qqylwh5zbx9awa5i4f573v4glgaf4k8h5ls4icaaav4"; depends=[biglm]; }; + rMouse = derive2 { name="rMouse"; version="0.1"; sha256="0pzxasap5kwxqq36mb4zi139jllsl4vk06dw2pv9xnwdxiszr3gp"; depends=[rJava]; }; rNMF = derive2 { name="rNMF"; version="0.5.0"; sha256="1nz6h0j5ywdh48m0swmhp34hbkycd7n13rclrxaw85qi9wc42597"; depends=[knitr nnls]; }; - rNOMADS = derive2 { name="rNOMADS"; version="2.3.5"; sha256="1p7y47dl92j284hbra6ik4bqfavnrqwdarf83k3lmqyqy89kh7yf"; depends=[fields GEOmap MBA RCurl rvest scrapeR stringr XML xml2]; }; - rPlant = derive2 { name="rPlant"; version="2.16"; sha256="0bi7p8w6v8gys8rab5f0c11r0rsp14nsf4mmm2bsz8kxfprh6vdp"; depends=[RCurl rjson seqinr]; }; + rNOMADS = derive2 { name="rNOMADS"; version="2.3.6"; sha256="007yha5ils7wdbld6id3gfgm99cks3vc64awammrv0kvq85c8g8k"; depends=[fields GEOmap MBA RCurl rvest scrapeR stringr XML xml2]; }; + rODE = derive2 { name="rODE"; version="0.99.4"; sha256="10lkrhaq0vfj5vw5q7asr52af6f57faz1b4xqnvjfgpz1bn528m9"; depends=[data_table]; }; rPowerSampleSize = derive2 { name="rPowerSampleSize"; version="1.0.1"; sha256="0yk61ck2br81cd40yvqxrzi9s680ii26wbl0wjdam04dyf0vh1cv"; depends=[mvtnorm ssanv]; }; rPref = derive2 { name="rPref"; version="1.2"; sha256="19b6rycz73rz3nxymb52gfddqsxprkxazwa8pb75vckk13q1cmj0"; depends=[dplyr igraph lazyeval Rcpp RcppParallel]; }; rPython = derive2 { name="rPython"; version="0.0-6"; sha256="1aw9jn45mw891cskr51yil60i55xv5x6akjvfdsbb9nwgdwwrqdp"; depends=[RJSONIO]; }; @@ -8431,17 +8825,17 @@ in with self; { rTensor = derive2 { name="rTensor"; version="1.3"; sha256="0ra34sn4g92r6asrn4la2wbsi2y0hnyx163wwi4v0j6f57bslhdw"; depends=[]; }; rUnemploymentData = derive2 { name="rUnemploymentData"; version="1.1.0"; sha256="0p5hba8iv060szp23s05hvpmwan518ykakm6vqzdcki0inxw0hyv"; depends=[choroplethr rvest stringr]; }; rWBclimate = derive2 { name="rWBclimate"; version="0.1.3"; sha256="0vs56hx7a85pw4jx8nb8bdlr9dbkl4zdhzhqsm0505xc3qz18vxh"; depends=[ggplot2 httr jsonlite plyr reshape2 rgdal sp]; }; - rWind = derive2 { name="rWind"; version="0.1.3"; sha256="15a9x1arfc6pfcn6z87mlnnds38zl8nb5b5ix081mssp0s0anm26"; depends=[raster shape]; }; + rWind = derive2 { name="rWind"; version="0.2.0"; sha256="0yv6r32fmjl0nvvllxm57zgwwy5rckamzj58bgrppl1q4zlqpvdm"; depends=[gdistance Matrix raster shape]; }; rYoutheria = derive2 { name="rYoutheria"; version="1.0.3"; sha256="1r63ggy4knwzxnpjkmsn7zwmwfaznm8mmxl7r9ph10wz4sblgygl"; depends=[plyr RCurl reshape2 RJSONIO]; }; race = derive2 { name="race"; version="0.1.59"; sha256="13jprlnngribgvyr7fbg9d36i8qf3cax85n71dl71iv0y24al1cy"; depends=[]; }; radar = derive2 { name="radar"; version="1.0.0"; sha256="1wh5j3cfbj01jx2kbm9ca5cqhbb0vw7ifjn426bllm4lbbd8l273"; depends=[]; }; radarchart = derive2 { name="radarchart"; version="0.3.1"; sha256="0gcxnbgj8ja1m4wzhbjy67m6zphf0c5ni9yx7sr7f0abm03ry753"; depends=[htmltools htmlwidgets]; }; - radiant = derive2 { name="radiant"; version="0.6.0"; sha256="037xskigyisr5sgsrr8xbgvqidl775vdw7vllwpsq4akyz9i6amc"; depends=[AlgDesign psych r_import radiant_basics radiant_data radiant_design radiant_model radiant_multivariate shiny]; }; - radiant_basics = derive2 { name="radiant.basics"; version="0.6.0"; sha256="00i78hxafp7s5hpv54frfsjsj690jn5awsj0k4hdaiphiqb4gmmp"; depends=[dplyr ggplot2 gridExtra magrittr psych r_import radiant_data scales shiny tidyr]; }; - radiant_data = derive2 { name="radiant.data"; version="0.6.0"; sha256="1iiby1472p8j2fprryvj0ifl6z7y2hpwhdb10krd3ywxv476z2cd"; depends=[base64enc broom car curl dplyr DT ggplot2 gridExtra jsonlite knitr lubridate magrittr markdown pryr psych r_import readr rmarkdown rstudioapi scales shiny shinyAce tibble tidyr]; }; - radiant_design = derive2 { name="radiant.design"; version="0.6.0"; sha256="0434zn42bkb2q01p63iw7imjkc45agnj909x3bfwm6y2kmgkvga9"; depends=[AlgDesign dplyr mvtnorm polycor r_import radiant_data shiny]; }; - radiant_model = derive2 { name="radiant.model"; version="0.6.0"; sha256="04jnbhmvwfkf80xz2r3mimzdyr1yw80l9sq9pr52vcf7r98j13gq"; depends=[car data_tree DiagrammeR dplyr ggplot2 gridExtra lubridate magrittr NeuralNetTools nnet pryr r_import radiant_basics radiant_data sandwich shiny stringr tidyr yaml]; }; - radiant_multivariate = derive2 { name="radiant.multivariate"; version="0.6.0"; sha256="01gzcvq5xq8ljbxkwx8qxcpd871nd03236fkv1gr5s1bw9lb0z6l"; depends=[car dplyr ggplot2 gridExtra magrittr MASS psych r_import radiant_data scales shiny wordcloud]; }; + radiant = derive2 { name="radiant"; version="0.8.0"; sha256="1v8anqn2q2ybv2wzb1c6la9hxmjyvg922xzikdv8491dgicd3dqh"; depends=[AlgDesign psych r_import radiant_basics radiant_data radiant_design radiant_model radiant_multivariate shiny]; }; + radiant_basics = derive2 { name="radiant.basics"; version="0.8.0"; sha256="1x2frv5srb8q3l9arhws861pxyjb4spiajxr9g8fmjq3jjhd63cg"; depends=[dplyr ggplot2 gridExtra magrittr psych r_import radiant_data scales shiny tidyr]; }; + radiant_data = derive2 { name="radiant.data"; version="0.8.1"; sha256="1ylina1jlrmvjkj8pwg0ip5jv1038vnzyckmf542xl7g11x8rvw1"; depends=[base64enc broom car curl dplyr DT ggplot2 gridExtra jsonlite knitr lubridate magrittr markdown pryr psych r_import readr rmarkdown rstudioapi scales shiny shinyAce tibble tidyr]; }; + radiant_design = derive2 { name="radiant.design"; version="0.8.0"; sha256="0n2a0jpjcxxmmr9sbky7v2cnzil3hv6b20yzkyc9lf4a48pqlm4l"; depends=[AlgDesign dplyr mvtnorm polycor r_import radiant_data shiny]; }; + radiant_model = derive2 { name="radiant.model"; version="0.8.0"; sha256="0zlb5ny3s15d1ngdhszkn5wzij4y5fz7c2lwkb9g619pr0ngrwr8"; depends=[car data_tree DiagrammeR dplyr e1071 ggplot2 gridExtra lubridate magrittr NeuralNetTools nnet pryr psych r_import radiant_basics radiant_data rpart sandwich shiny stringr tidyr yaml]; }; + radiant_multivariate = derive2 { name="radiant.multivariate"; version="0.8.0"; sha256="0l3rk5045apjb2jx04jf3mwjixg8cjwrgmz83km9627n93cabs2l"; depends=[car dplyr ggplot2 Gmedian GPArotation gridExtra magrittr MASS pryr psych r_import radiant_data radiant_model scales shiny wordcloud]; }; radiomics = derive2 { name="radiomics"; version="0.1.2"; sha256="1l9ribgyk0wgr7cy4fh7qp0hwzxcmkir9r2zwb0ha3rqqggd3xj7"; depends=[Rcpp reshape2 spatstat]; }; radir = derive2 { name="radir"; version="1.0.2"; sha256="09lcq8ax5x5yk3sqx15rvw3vyi8fyfzgs76kxjhf7hcw4qnib46d"; depends=[hermite]; }; radmixture = derive2 { name="radmixture"; version="0.0.1"; sha256="0rs60xjd43lg5c9972qhpg6bsqfg2578qvrz7gz3bdip10jb1ryj"; depends=[magrittr MCMCpack plyr quadprog]; }; @@ -8468,20 +8862,20 @@ in with self; { randomForestSRC = derive2 { name="randomForestSRC"; version="2.4.2"; sha256="17f9dr93vbmv4b1hmx4cw5mc3phm7wnjzw70yi8nbhmzlar3qj7v"; depends=[]; }; randomGLM = derive2 { name="randomGLM"; version="1.02-1"; sha256="031338zxy6vqak8ibl2as0l37pa6qndln0g3i9gi4s6cvbdw3xrv"; depends=[doParallel foreach MASS]; }; randomLCA = derive2 { name="randomLCA"; version="1.0-11"; sha256="076sjq74dhdr9vqlg8kns4apvkrv9qpvkixqkrkz2l7215k79fz7"; depends=[boot fastGHQuad lattice Matrix]; }; - randomNames = derive2 { name="randomNames"; version="0.4-0"; sha256="0419kjgin5yf58765rc6m8wcbp26yggkiarprzissqaf9sp0sh4p"; depends=[data_table]; }; + randomNames = derive2 { name="randomNames"; version="1.0-0.0"; sha256="12q5bs65qivddiaxbsp128j94h2vyrgjvmm80d52r36ffbaigl09"; depends=[data_table]; }; randomUniformForest = derive2 { name="randomUniformForest"; version="1.1.5"; sha256="1amr3m7h5xcb8gahrr58233chsnx1naf9x5vpjy9p5ivh71xcxf7"; depends=[cluster doParallel foreach ggplot2 gtools iterators MASS pROC Rcpp]; }; randomcoloR = derive2 { name="randomcoloR"; version="1.0.0"; sha256="15qgfzwc2cli2gjwzj1pf4h16qciiinihd9ib6ph74jbkpimyh11"; depends=[colorspace stringr V8]; }; randomizationInference = derive2 { name="randomizationInference"; version="1.0.3"; sha256="0x36r9bjmpx90fz47cha4hbas4b31mpnbd8ziw2wld4580jkd6mk"; depends=[matrixStats permute]; }; randomizeBE = derive2 { name="randomizeBE"; version="0.3-3"; sha256="0vdvgk2b1h1lsj0ka01lwldfxanngir91axc8ywa6pg12hrdkkb0"; depends=[]; }; randomizeR = derive2 { name="randomizeR"; version="1.3"; sha256="0s62r0fxi0f9jbwldvga2vn06cp0amxjhmqch7d892c4wa7r9fj0"; depends=[ggplot2 plotrix]; }; - randomizr = derive2 { name="randomizr"; version="0.4.1"; sha256="0shj50s88l96d0zl8iv2wdzgrszffi9hgv7hsmvcxh1jm051ipi9"; depends=[]; }; + randomizr = derive2 { name="randomizr"; version="0.6.0"; sha256="1hkazj25ipvrdcy9845lgqvnncw3ilrxrhzvh5lm865rk8z0i2cg"; depends=[]; }; randstr = derive2 { name="randstr"; version="0.2.0"; sha256="17593lbk6r089yasafd21i3v90ya9n92rflpzl0qicd2kqqk2gdh"; depends=[random stringi truncnorm]; }; randtests = derive2 { name="randtests"; version="1.0"; sha256="03z3kxl4x0l91dsv65ld9kgc58z82ld1f4lk18i18dpvwcgkqk82"; depends=[]; }; randtoolbox = derive2 { name="randtoolbox"; version="1.17"; sha256="107kckva43xpqncak8ll4h0mjm8lcks4jpf7dffgw5ggcc77ycrb"; depends=[rngWELL]; }; - rangeBuilder = derive2 { name="rangeBuilder"; version="1.3"; sha256="08v01b0wm5r73yp2qkxxvd8jsxba22rnqsbwwrqrkrm71c68j192"; depends=[alphahull raster rgdal rgeos sp stringi]; }; + rangeBuilder = derive2 { name="rangeBuilder"; version="1.4"; sha256="1jjy1d3kljysm3mqgdszdi6incbmg2di63akxswfaiqcp1m68a6y"; depends=[alphahull cleangeo pbapply raster Rcpp rgdal rgeos sp stringi]; }; rangeMapper = derive2 { name="rangeMapper"; version="0.3-1"; sha256="005r97zwz0czsp543h1g3zrys00s6wdyk0ji9pk7jn625i02cbdk"; depends=[classInt data_table foreach ggplot2 gridExtra lattice magrittr maptools raster RColorBrewer rgdal rgeos RSQLite sp]; }; rangemodelR = derive2 { name="rangemodelR"; version="1.0.1"; sha256="04zv8a4nhin9masvbw1cmbwdkls4wgq81xfw6kg0wdh1hpqjz1z0"; depends=[]; }; - ranger = derive2 { name="ranger"; version="0.7.0"; sha256="0g1rnpk4c06lmy0r5n0j7i2xna190kqalmxp42d9gnk3drnb1x43"; depends=[Rcpp]; }; + ranger = derive2 { name="ranger"; version="0.8.0"; sha256="1fdbm879wx3hlng8s4c4f8f2x5yxz57llakcqnpa0lymybidw3vz"; depends=[Matrix Rcpp RcppEigen]; }; rankFD = derive2 { name="rankFD"; version="0.0.1"; sha256="1zb9gxvsmv46mpw5znskhfjxnwkr59hdixcly6i3r78yaqgca0dz"; depends=[coin lattice MASS Matrix]; }; rankdist = derive2 { name="rankdist"; version="1.1.2"; sha256="1nr9nr5nfziia6jykk598hm5ngkfr6yx5mypq34iyfm24877gd3q"; depends=[hash optimx permute Rcpp]; }; rankhazard = derive2 { name="rankhazard"; version="1.1.0"; sha256="0kljn9b74alrd22b5pwfnamdbaqi2wa2z6yzpmgpfs3x0hv72fw7"; depends=[survival]; }; @@ -8492,22 +8886,24 @@ in with self; { raptr = derive2 { name="raptr"; version="0.0.3"; sha256="1ydk83w1sd60pb0a03938hlgdw87pk40l028cxwa8kzwrzi6gh1j"; depends=[adehabitatHR BH boot doParallel gdalUtils ggplot2 hypervolume ks Matrix mvtnorm PBSmapping plyr RandomFields raster RColorBrewer Rcpp RcppEigen rgdal rgeos RgoogleMaps scales shape sp testthat]; }; rareGE = derive2 { name="rareGE"; version="0.1"; sha256="0v3a2wns77q923ilddicqzg0108f8kmfdnsff1n65icin7cfzsny"; depends=[MASS nlme survey]; }; rareNMtests = derive2 { name="rareNMtests"; version="1.1"; sha256="13r2hipqsf8z9k48ha5bh53n3plw1whb7crpy8zqqkcac8444b2z"; depends=[vegan]; }; - rarhsmm = derive2 { name="rarhsmm"; version="1.0.2"; sha256="0npj9iysl32lhplpqp5a7h7gm35jz33div8vwksd7l6jr73rcqdg"; depends=[glmnet]; }; + rarhsmm = derive2 { name="rarhsmm"; version="1.0.4"; sha256="0fc22sg4b3r1fjcmgc6kvpw1vxb29i8a1qlrkic8jmd1370dh61w"; depends=[glmnet]; }; rasclass = derive2 { name="rasclass"; version="0.2.2"; sha256="1lsmv8kh519mz3szb4k9s17fz1480cw0i4qk12givhhm2rpzjy50"; depends=[car e1071 nnet randomForest RSNNS]; }; rase = derive2 { name="rase"; version="0.3-2"; sha256="1c8navn518prz8j644bg1fzx8q1jgnl5src5kagq53ln7fs6jq73"; depends=[ape mvtnorm polyCub rgl sm spatstat]; }; raster = derive2 { name="raster"; version="2.5-8"; sha256="1k34caqj8fab7am44zmp1szk0w15rjc04xz3phzm2l1lg2yjm6a7"; depends=[Rcpp sp]; }; rasterImage = derive2 { name="rasterImage"; version="0.3.0"; sha256="0csx7wqwxdsddypd1c9wv74gcyymasn9n6pn05a35j6xhqbk2zp3"; depends=[plotrix]; }; rasterKernelEstimates = derive2 { name="rasterKernelEstimates"; version="1.0.1"; sha256="1733ic1hxym3gyibk2ysy5zzq7s9rbf6jx63x7irnrcavq151f8s"; depends=[raster]; }; rasterVis = derive2 { name="rasterVis"; version="0.41"; sha256="0dsg8ypsxxa7qagy5yjcyqyjqqyy7xgfbmiijr3xbn2n1wp090n9"; depends=[hexbin lattice latticeExtra raster RColorBrewer sp viridisLite zoo]; }; - ratelimitr = derive2 { name="ratelimitr"; version="0.3.7"; sha256="19j43xz1arn8h7pni5797ds7hmcj7llbgaiw514qpwnsp0qx24f6"; depends=[assertthat]; }; + ratelimitr = derive2 { name="ratelimitr"; version="0.3.9"; sha256="0w6i9czcbj8ipd9nn4w4h4pqk6xd8anh00cn60hss9hs18fcb21d"; depends=[assertthat]; }; rateratio_test = derive2 { name="rateratio.test"; version="1.0-2"; sha256="1a2v12z2dr893ha80fhada1820z5ih53w4pnsss9r9xw3hi0m6k5"; depends=[]; }; raters = derive2 { name="raters"; version="2.0.1"; sha256="16jnx6vv39k4niqkdlj4yhqx8qbrdi99bwzxjahsxr12ab5npbp1"; depends=[]; }; - ratesci = derive2 { name="ratesci"; version="0.1-0"; sha256="15ar1jx026qn01yk1lnmn40wqkf8ngpjlqiqizi16mxz28rrgr6n"; depends=[]; }; + ratesci = derive2 { name="ratesci"; version="0.2-0"; sha256="0gviaiia2jih6xx1maf9ajizmgh4vdbca4r17h9m817v3xn21y7b"; depends=[]; }; rationalfun = derive2 { name="rationalfun"; version="0.1-0"; sha256="15949vs9pdjz7426zhgqn7y87xzn79ikrpa2vyjnsid1igpyh0mp"; depends=[polynom]; }; + ratios = derive2 { name="ratios"; version="1.0.0"; sha256="1mjwh68x0kkpgk4w4hyafam0xcsgprp80ms1wgvw2ylh67qa98cv"; depends=[data_table stringr]; }; rattle = derive2 { name="rattle"; version="4.1.0"; sha256="0ww4bwwvivpk049lpv6k29zxkb0islhwh2qnlrvasgh2b9yig25p"; depends=[magrittr RGtk2 stringi]; }; + rattle_data = derive2 { name="rattle.data"; version="1.0.2"; sha256="0cnmyzvy23jc4vz521c3jg0w4165waycvy5014l5773fy19zq75c"; depends=[]; }; raw = derive2 { name="raw"; version="0.1.4"; sha256="112fw1si708qrj6r91b1i8cwhxa20amri5838rc5azn6d5b9wcks"; depends=[]; }; rbamtools = derive2 { name="rbamtools"; version="2.16.6"; sha256="1sb18qx68fnj1d598lw8fkqnxp3c5s704g6cnhwy299gppj3xg1d"; depends=[refGenome]; }; - rbcb = derive2 { name="rbcb"; version="0.1.0"; sha256="1p6fmky5ci54is5abf9bqd8xd7jqskn8gic3hih8iangx6vcp4a2"; depends=[httr jsonlite tibble xml2 xts]; }; + rbcb = derive2 { name="rbcb"; version="0.1.1"; sha256="1y6rb39ljk45vbf8h1ggc3viplqn9ywzfg1fhqlplklxd7l6067q"; depends=[httr jsonlite tibble xml2 xts]; }; rbefdata = derive2 { name="rbefdata"; version="0.3.5"; sha256="12mcqz0pqgwfw5fmma0gwddj4zk0hpwmrsb74dvzqvgcvpfjnv98"; depends=[RColorBrewer RCurl rjson rtematres wordcloud XML]; }; rbenchmark = derive2 { name="rbenchmark"; version="1.0.0"; sha256="010fn3qwnk2k411cbqyvra1d12c3bhhl3spzm8kxffmirj4p2al9"; depends=[]; }; rbgm = derive2 { name="rbgm"; version="0.0.4"; sha256="0sqi42vz3fdgp7gpa4jjh8dxz3iwwagw9in70jpz6fc18ivizkp1"; depends=[dplyr geosphere raster sp tibble]; }; @@ -8523,51 +8919,54 @@ in with self; { rbundler = derive2 { name="rbundler"; version="0.3.7"; sha256="0wmahn59h9vqm6bq1gwnf6mvfkyhqh6xvdc5hraszn1419asy26f"; depends=[devtools]; }; rbvs = derive2 { name="rbvs"; version="1.0.2"; sha256="1wzxz2ca8f1phhbqr9p7c8sk09cyrdq5jc45g4ddrqvi2q29k28y"; depends=[]; }; rcanvec = derive2 { name="rcanvec"; version="0.2.1"; sha256="0gsk2cfiysxjw2lrnpl2l524lvhh9nhnyyh79n8p7vykyqj711yn"; depends=[rgdal sp]; }; - rcbalance = derive2 { name="rcbalance"; version="1.8.3"; sha256="0bksyjbxdllgaqkhpz29isslqkpp3y4xl3wqhpjy881lhlw40y1j"; depends=[MASS plyr]; }; + rcbalance = derive2 { name="rcbalance"; version="1.8.4"; sha256="1qkajg92yy5jp8gr4warrz6jmnp8p162br5lk4iiql2zv10rwxv1"; depends=[MASS plyr]; }; rcbsubset = derive2 { name="rcbsubset"; version="1.1.2"; sha256="0izvxbkjmhyp8jz4mlwa5grdgcd8q9pdc3jwrccby0xz0f5gw2x0"; depends=[MASS plyr]; }; rcc = derive2 { name="rcc"; version="1.0.0"; sha256="0a77d54c9qahhsjzpa0436ddsj4j44013r7rbxm0fjz04c0d2921"; depends=[]; }; rccdates = derive2 { name="rccdates"; version="1.0.0"; sha256="1f87qlw62am2qy1zzrz91vmsn8axhld44gak61xa7046675hm98s"; depends=[rccmisc]; }; rccmisc = derive2 { name="rccmisc"; version="0.3.7"; sha256="171s2ll759xjdnx0z24ih5ix2vcp4qnmf1nf107gij6wv8k450ab"; depends=[dplyr]; }; - rcdd = derive2 { name="rcdd"; version="1.1-13"; sha256="0dnijjbi79hi23rq6j9wlynbap275n4x4097x0zz52imkqfw03aj"; depends=[]; }; + rcdd = derive2 { name="rcdd"; version="1.2"; sha256="1s7idrfvl0hhyckrfiakszqw6fk34f9iiyxspzya3rqyhih014ay"; depends=[]; }; rcdk = derive2 { name="rcdk"; version="3.3.8"; sha256="0gwjb6ph7v94zl3kdh24dbk8hz48gi2y3xmj35wpjvzc496ldmbf"; depends=[fingerprint iterators itertools png rcdklibs rJava]; }; - rcdklibs = derive2 { name="rcdklibs"; version="1.5.13"; sha256="0ypfg4kzf07j1gi6nyifkss9s43hcb7jps9qh6990ci5qasw4z6a"; depends=[rJava]; }; + rcdklibs = derive2 { name="rcdklibs"; version="2.0"; sha256="05g0y00bw1bqykfbwn4q42krwcfl50jcavaw7yyw9a5m34hvw0l8"; depends=[rJava]; }; rchallenge = derive2 { name="rchallenge"; version="1.3.0"; sha256="1qn2pzch5yk771jsjcsmfsi5vddfb2w50vfqlkmsl6nf5z6sdq9k"; depends=[knitr rmarkdown]; }; rchess = derive2 { name="rchess"; version="0.1"; sha256="0qnvvvwcl02rmqra9m7qnhy40cbavswbq6i0jm47x6njmr1gpfhy"; depends=[assertthat dplyr ggplot2 htmlwidgets plyr R6 V8]; }; rcicr = derive2 { name="rcicr"; version="0.3.4.1"; sha256="1sa13sbhx64cf8szr2811iq4a1asb8d3k0igxw6fbssij2lwbxzp"; depends=[aspace dplyr jpeg matlab scales]; }; rclimateca = derive2 { name="rclimateca"; version="0.2"; sha256="1haczzx0hbah4vzbp10rih2yqq1x1s6w9f66xgk485sgyvkg5855"; depends=[digest httr lubridate prettymapr reshape2]; }; - rclinicaltrials = derive2 { name="rclinicaltrials"; version="1.4.7"; sha256="1y9naqi2bylihkasvfndkpwslnm393709645jwvwplzaaviy0hf7"; depends=[httr plyr XML]; }; rcmdcheck = derive2 { name="rcmdcheck"; version="1.2.1"; sha256="04gh0drvkikn91i5zmpixhrhyjnsyxwz8k8bx4kgwwrmh1dc7f2s"; depends=[callr clisymbols crayon digest withr]; }; - rcompanion = derive2 { name="rcompanion"; version="1.5.0"; sha256="1dnrnpmk0gqnz45xqp5ld1slgykd6bg44n2bby5l10s7kqqli4ql"; depends=[boot BSDA coin DescTools EMT FSA hermite lattice lmtest multcompView nortest ordinal plyr RVAideMemoire WRS2]; }; + rcompanion = derive2 { name="rcompanion"; version="1.5.7"; sha256="1x32yvgsn392rdflpampr8bfmffpllrhbll4d558p9r32cl4r70l"; depends=[boot BSDA coin DescTools EMT FSA hermite lattice lmtest multcompView nortest ordinal plyr RVAideMemoire WRS2]; }; + rcoreoa = derive2 { name="rcoreoa"; version="0.1.0"; sha256="13nfziqxxljnczn3idq3zlc9xkklalfnxbakvhs5bw19jmbd11ba"; depends=[crul jsonlite pdftools]; }; rcorpora = derive2 { name="rcorpora"; version="1.2.0"; sha256="0nxd2arzz2617xxcngvcrrrsky9f1b9zdmpv81zr89y08b3xh9f1"; depends=[jsonlite]; }; rcqp = derive2 { name="rcqp"; version="0.4"; sha256="1jpzp3cs17bwfabzg7jffa3hni867mjw8yxi0igxicrbz56j33jb"; depends=[plyr]; }; - rcrossref = derive2 { name="rcrossref"; version="0.6.0"; sha256="0fy1wkn6s5pkhcfhjydy5zvra89g1p2nf5j85czxhxbq60h1jd1b"; depends=[bibtex dplyr httr jsonlite miniUI plyr R6 rappdirs shiny stringr xml2]; }; + rcrossref = derive2 { name="rcrossref"; version="0.7.0"; sha256="09br2nmb1cz4x57w5vj0ggxyqna5898zxnyrjj4nafkqkwblycl5"; depends=[bibtex crul dplyr jsonlite miniUI plyr R6 shiny stringr xml2]; }; rcrypt = derive2 { name="rcrypt"; version="0.1.1"; sha256="002r5wr0bmqbj014iz8wacj883j6gqcxc786m6p9a7zdrjpx2pqi"; depends=[]; }; rcss = derive2 { name="rcss"; version="1.2"; sha256="08hiprjcjvc138laqrvlvrmn664b63x829ammzgrwjqcsj4kpmds"; depends=[Rcpp RcppArmadillo rflann]; }; rcure = derive2 { name="rcure"; version="0.1.0"; sha256="1pcdc168bwn0b90xy8sdwrm2yvhj26xj11wm8z84m48sxy56j4v8"; depends=[arm MASS plyr smcure survival]; }; + rcv = derive2 { name="rcv"; version="0.2.0"; sha256="1rysvcccnra2px99s83i5z657y6bsdfa1w189ngznd4964c8rxzb"; depends=[dplyr forcats readr stringr tibble tidyr]; }; rda = derive2 { name="rda"; version="1.0.2-2"; sha256="1g2q7c0y138i9r7jgjrlpqznvwpqsj6f7vljqqfzh2l6kcj43vjj"; depends=[]; }; rdatacite = derive2 { name="rdatacite"; version="0.1.0"; sha256="1h8zrgy3ig4rsrm4j9ivff71mdyabrdp71cflxahw7c3q9iyjxhf"; depends=[oai solrium]; }; rdatamarket = derive2 { name="rdatamarket"; version="0.6.5"; sha256="1y4493cvhcgyg2j5hadx1fzmv2lzwan78jighi2dzyxxzv6pxccn"; depends=[RCurl RJSONIO zoo]; }; rdataretriever = derive2 { name="rdataretriever"; version="1.0.0"; sha256="1a1dbzs1jravbhidv9wcs52qbd6zf7wf26hixpqjwiq8gsq9l5gh"; depends=[]; }; rdd = derive2 { name="rdd"; version="0.57"; sha256="1lpkzcjd18x51wzr4d1prdjfsw5978z6zap65psfs02nszy69nqp"; depends=[AER Formula lmtest sandwich]; }; - rddensity = derive2 { name="rddensity"; version="0.1"; sha256="16xfdaf43dp7xh65ay9sv5s2v1149c6ahyg1y7cnp9lncy6gvkny"; depends=[]; }; + rddensity = derive2 { name="rddensity"; version="0.2"; sha256="1svqraf92c821pv6wn8i81chhqbd046q1a0ry6d1b1z7q6lh0gjc"; depends=[ggplot2 lpdensity]; }; rddtools = derive2 { name="rddtools"; version="0.4.0"; sha256="1z9sl9fwsq8zs1ygmnjnh3p6h9hjkikbm4z7cdkxw66y0hxgn96s"; depends=[AER Formula ggplot2 KernSmooth lmtest locpol np rdd sandwich]; }; rdefra = derive2 { name="rdefra"; version="0.3.4"; sha256="05fskap0vvrq08m4gql9gczy04lc3dgxgjcsb57dgp3nng358sf6"; depends=[dplyr httr lubridate rgdal sp tibble xml2]; }; rdetools = derive2 { name="rdetools"; version="1.0"; sha256="0pkl990viv7ifr7ihgdcsww93sk2wlzp2cg931wywagfp8dijd02"; depends=[]; }; rdian = derive2 { name="rdian"; version="0.1.1"; sha256="0i4ljcqhmrwrqbhi321iffypxj4kndx47ssljnixr3fx2lmqh0q1"; depends=[curl httr]; }; - rdist = derive2 { name="rdist"; version="0.0.1"; sha256="1rdw0vpd8xc6n638cyfjq8ll5pkhvkcf14vbs3m8l75fdf7mxlbb"; depends=[Rcpp RcppArmadillo]; }; - rdlocrand = derive2 { name="rdlocrand"; version="0.1"; sha256="1vf9f7l9cjc2zwfpqvbxapcyyzb0vv9jvnai74z34clcwcmx6yrm"; depends=[AER sandwich]; }; + rdist = derive2 { name="rdist"; version="0.0.2"; sha256="0rwv8brambwki3jzpq250lk0k7nmvlzm80szy4nkhdl2zxwriv0a"; depends=[Rcpp RcppArmadillo]; }; + rdiversity = derive2 { name="rdiversity"; version="1.0"; sha256="0x6s9028v4xcc54yy4977yqw5mrsbqlrm5b9drj05c64mavhm4sq"; depends=[ape ggplot2 ggthemes phangorn phytools plyr reshape2 tibble tidyr]; }; + rdlocrand = derive2 { name="rdlocrand"; version="0.2"; sha256="1jad0b9qqlc88knd92yvjqklilbybp9zpkdq7jx1251m6hivs9sw"; depends=[AER sandwich]; }; rdnb = derive2 { name="rdnb"; version="0.1-1"; sha256="1mg40jad79mk95ndnljvfvyh9rhbxkw7inpg2vbsixf1ywdljri3"; depends=[brew httr xml2]; }; rdomains = derive2 { name="rdomains"; version="0.1.5"; sha256="0xz6vdci2yxmc2850jlgj7c27cndwvk645kwky0whisg6cbv8wdg"; depends=[aws_alexa curl glmnet Matrix RSelenium urltools virustotal XML]; }; + rdoxygen = derive2 { name="rdoxygen"; version="1.0.0"; sha256="16907969w66xvy62k45rw10qfv4x8z6jkkc6i97vppkgnlvf4d4b"; depends=[devtools]; }; rdpla = derive2 { name="rdpla"; version="0.1.0"; sha256="0h3m2f5rdyvdgb767hnmck4z1wq1y4hvbcwgfh7zfjcd9zns42h1"; depends=[data_table httr jsonlite tibble]; }; - rdrobust = derive2 { name="rdrobust"; version="0.97"; sha256="0l4gjpmy7lv2zhwh346pjci6d5vbp4n47plchfi48m8afn4w1v6k"; depends=[]; }; + rdrobust = derive2 { name="rdrobust"; version="0.98"; sha256="0yyb1mr8hn8ssp8h1ypylyd00mcxkdhxp64kp11hi0j2mzpp5pcy"; depends=[]; }; rdrop2 = derive2 { name="rdrop2"; version="0.7.0"; sha256="03r3iqi796y7s8bnyca6nya2ys7s1rdxm00sy9c7l7sh0z6npcq4"; depends=[assertthat data_table dplyr httr jsonlite magrittr]; }; rdryad = derive2 { name="rdryad"; version="0.2.0"; sha256="16wbf0hpb4pgjcq84s7ac0y1cm5i33l8n6li5z8ynivdj9w9fb46"; depends=[httr oai solr xml2]; }; - rdwd = derive2 { name="rdwd"; version="0.7.0"; sha256="0mqnf88y6g25q1a7k71ldd7szl4pm5s44cid1494m4xfdk50limb"; depends=[berryFunctions]; }; + rdwd = derive2 { name="rdwd"; version="0.8.0"; sha256="1j5yz5qlf7xv722rh8qsbazksgs7mwv2s789lnlpr8cv127qfh8d"; depends=[berryFunctions pbapply]; }; reGenotyper = derive2 { name="reGenotyper"; version="1.2.0"; sha256="13g4fhj25kdk6wbl1hcabcaxcpv0dj0hj2l502wl1aywk1fvmy8m"; depends=[gplots MatrixEQTL zoo]; }; reReg = derive2 { name="reReg"; version="1.0-0"; sha256="0xd78frrzykdrdwj39vv5m11s5v3xg9fym200gz7sffw8vjv3z96"; depends=[aftgee BB MASS SQUAREM survival]; }; reactR = derive2 { name="reactR"; version="0.1.2"; sha256="011ga8f72qq0ljqc7j0qvcbbr2jg167ri1yny65n55dls80flmng"; depends=[htmltools]; }; read_dbc = derive2 { name="read.dbc"; version="1.0.5"; sha256="1vrvxkcrk3iw5am9rsadxzf0wsr7z2mdpa5wb0v9jbhda710b4yf"; depends=[foreign]; }; - readBrukerFlexData = derive2 { name="readBrukerFlexData"; version="1.8.3"; sha256="0yisrg2gdd053xf1w0ssw7r4wdarqzbsqzrcngb0dl7ah0y5w7vb"; depends=[]; }; + readBrukerFlexData = derive2 { name="readBrukerFlexData"; version="1.8.5"; sha256="1qmimfxwh6d7s5qrnnk20i2f9l5j1ci3wpfs3qlmggz69jzf589m"; depends=[]; }; readHAC = derive2 { name="readHAC"; version="1.0"; sha256="0z80ai6xfswwgdfh83l9sq279c97n0wz25bk2l7xfb6w0sndzq53"; depends=[]; }; readJDX = derive2 { name="readJDX"; version="0.2.3"; sha256="0qqzplyhpyhf24111y12r0h299wz86scjymfrym2ycxm04116vw5"; depends=[stringr]; }; readMLData = derive2 { name="readMLData"; version="0.9-7"; sha256="0l752j1jq37j9pdcsbmcb23b5l8fkfsbisfr3yjy3q4rxsphc7k6"; depends=[XML]; }; @@ -8578,14 +8977,15 @@ in with self; { readbitmap = derive2 { name="readbitmap"; version="0.1-4"; sha256="08fqqsdb2wsx415mnac9mzl5sr5and0zx72ablnlidqfxv8xsi9d"; depends=[bmp jpeg png]; }; readbulk = derive2 { name="readbulk"; version="1.1.0"; sha256="0m02isvja0ihvy1fscjdl5f9gfdlmfmabgvpirgd2m9j3lz6mi8s"; depends=[plyr]; }; reader = derive2 { name="reader"; version="1.0.6"; sha256="1x489q3ljap4zpny68mx83mgxaqiwlkglcy57whwhnh33dd7qp4h"; depends=[NCmisc]; }; - readr = derive2 { name="readr"; version="1.1.0"; sha256="1g7g3gdmvq7nj8asw6fi13k38c420sy9696nqgkrhlvv5h13yqs7"; depends=[BH hms R6 Rcpp tibble]; }; - readstata13 = derive2 { name="readstata13"; version="0.8.5"; sha256="1hkbh7kia7bgshhlq2n683s0gs4rw4wzyfwrbp0hq1xirqnypj0a"; depends=[Rcpp]; }; + readr = derive2 { name="readr"; version="1.1.1"; sha256="1cvw5wdcqk88cp5fyv678mnmp66l3whcd2yh33p2qvx0168bja8s"; depends=[BH hms R6 Rcpp tibble]; }; + readstata13 = derive2 { name="readstata13"; version="0.9.0"; sha256="06qx40v4n217wi379d08w7kc9wlbxlyz9jqcsc85099vgab7l993"; depends=[Rcpp]; }; + readtext = derive2 { name="readtext"; version="0.50"; sha256="1il7zfm092vvns8manz8lkj34q1w4gw931agkpk83cvf1618l5nl"; depends=[antiword data_table httr jsonlite pdftools readODS readxl streamR stringi tibble XML]; }; readxl = derive2 { name="readxl"; version="1.0.0"; sha256="1bf7gxw9r11m4llyymplxiaa4gzgyj4bwmwad5in756pzq3jzmpv"; depends=[cellranger Rcpp tibble]; }; reams = derive2 { name="reams"; version="0.1"; sha256="07hqi0y59kv5lg0nl75xy8n48zw03y5m71zx58aiig94bf3yl95c"; depends=[leaps mgcv]; }; - rebird = derive2 { name="rebird"; version="0.3.0"; sha256="0srny28mdd5zpk10pic5w0h0z21w2651rrdqsf87h7idm12j9zsw"; depends=[dplyr httr jsonlite]; }; - rebmix = derive2 { name="rebmix"; version="2.9.1"; sha256="1qsyizjjhinm5ds3cgfl3h3vd0vf0pd0ni9nzzznvdvci7blb9jk"; depends=[mvtnorm]; }; - rebus = derive2 { name="rebus"; version="0.1-2"; sha256="18vqq535dsakchwid6k2wb6jl50yf1vsqlaryadf1j0ivgawl6av"; depends=[rebus_base rebus_datetimes rebus_numbers rebus_unicode]; }; - rebus_base = derive2 { name="rebus.base"; version="0.0-2"; sha256="15yxh7wxb8hfbr5mhpcpyi817b5r6g6ki60hkycvxp13ss770qwn"; depends=[]; }; + rebird = derive2 { name="rebird"; version="0.4.0"; sha256="1awwjr0gsd7hksh84fz5p17qwd857zn03fc2q0kzncy6q6iiw481"; depends=[dplyr httr jsonlite]; }; + rebmix = derive2 { name="rebmix"; version="2.9.2"; sha256="1vwral852bxb45ms7zvxd6q40ybnf8yjxklipzgw4ygk322mziww"; depends=[mvtnorm]; }; + rebus = derive2 { name="rebus"; version="0.1-3"; sha256="0ms3dm6g0fq3jycpgjl7q7kyljxc97cczy2jj0lyviwmipdgjg9d"; depends=[rebus_base rebus_datetimes rebus_numbers rebus_unicode]; }; + rebus_base = derive2 { name="rebus.base"; version="0.0-3"; sha256="1n2khszcya9k6379bdkq47xi2nw9jngiwj7z8a14wfswqydczv6y"; depends=[]; }; rebus_datetimes = derive2 { name="rebus.datetimes"; version="0.0-1"; sha256="09lv41mywm13avxb0xp8x1a2xz50zxazh3lpg27m16d4cgijmhm5"; depends=[rebus_base]; }; rebus_numbers = derive2 { name="rebus.numbers"; version="0.0-1"; sha256="0drgszz0824j49c6jk9ry0cfjky7g843ldlxrx3g2vjp0v7hznj3"; depends=[rebus_base]; }; rebus_unicode = derive2 { name="rebus.unicode"; version="0.0-2"; sha256="185313wh4zpp6addfdr78pjhxzazlfwgsddwk02zrzblf4iwzjdm"; depends=[rebus_base]; }; @@ -8599,12 +8999,14 @@ in with self; { recommenderlabJester = derive2 { name="recommenderlabJester"; version="0.1-2"; sha256="0kr9xc2gih2myn1a8h8dxxmdhibv1sjwjsvlrj9d5hvd1mgfhks5"; depends=[recommenderlab]; }; reconstructr = derive2 { name="reconstructr"; version="2.0.0"; sha256="1pa6b8zns9495f1bdifvx19hsy5808hqbxb2bn1srwnr4s3ma1zi"; depends=[openssl Rcpp]; }; recosystem = derive2 { name="recosystem"; version="0.4.1"; sha256="1gnq2gq47qwinack3f95d7c8877qia44zk9pnj1sx83jjs8sxk8p"; depends=[Rcpp]; }; - red = derive2 { name="red"; version="1.0.1"; sha256="159zjqk2fns41n8vsz4x9jl6f0ln0c70894lvxm7pzsbm43n1ix3"; depends=[BAT dismo geosphere jsonlite maptools raster rgdal rgeos sp]; }; + red = derive2 { name="red"; version="1.1.1"; sha256="05png61f8fwlhrvvhmv9yzq2m4pa8vwh3cbn9ig1rlivkhmh28s4"; depends=[BAT dismo geosphere jsonlite maptools raster rgdal rgeos sp]; }; + redR = derive2 { name="redR"; version="1.0.0"; sha256="01safawd9ai34fqxjpc161yzpsk31hfyl8ybcfvdj7a9vdbvcb5i"; depends=[imager]; }; reda = derive2 { name="reda"; version="0.3.1"; sha256="0313x4vm0jm0lgzspv0ldsblmjgy13dqbsafpikkh603k5pkq1js"; depends=[ggplot2 splines2]; }; redcapAPI = derive2 { name="redcapAPI"; version="1.3"; sha256="08js2lvrdl9ig0pq1wf7cwkmvaah6xs65bgfysdhsyayx0lz5rii"; depends=[chron DBI Hmisc httr stringr]; }; reddPrec = derive2 { name="reddPrec"; version="0.3"; sha256="01dsgd28ps1f32l3ppz4fbzihs5i79zb1nqg9r3b21fsx1ly44d6"; depends=[snowfall]; }; redist = derive2 { name="redist"; version="1.3-1"; sha256="0rivfi3jpjvhd36rkhlazx4vr7wsig9lf3im1masjmzd4s00zrd8"; depends=[coda doParallel foreach Rcpp RcppArmadillo sp spdep]; }; redland = derive2 { name="redland"; version="1.0.17-9"; sha256="01jx6r7zznb6cpi2bx36fpsgig3bkc1nv9afz5s2nfqisxiq48w5"; depends=[roxygen2]; }; + redux = derive2 { name="redux"; version="1.0.0"; sha256="0p2hn7pphsfl6lyh1l8a8pp4frgfrfv2fxgkisyam331i7ns3r4h"; depends=[R6]; }; ref = derive2 { name="ref"; version="0.99"; sha256="0f0yz08pqpg57mcm7rh4g0rbvlcvs5fbpjkfrq7fmj850z1ixvw0"; depends=[]; }; refGenome = derive2 { name="refGenome"; version="1.7.3"; sha256="15p0ra2p1pwhy5ixbhsz1g79c5sc2aap4i4c8kil0m2syg9y45sn"; depends=[DBI doBy RSQLite]; }; referenceIntervals = derive2 { name="referenceIntervals"; version="1.1.1"; sha256="04199nxh216msaghkp66zsi96h76a7c42ldml0fm66v2vamcslg8"; depends=[boot car extremevalues outliers]; }; @@ -8621,10 +9023,11 @@ in with self; { reghelper = derive2 { name="reghelper"; version="0.3.3"; sha256="0lsdsxi3nawqdzs7k1xma95mmywl86k517cihiv8q2s4maihsja3"; depends=[ggplot2 lme4 nlme]; }; registry = derive2 { name="registry"; version="0.3"; sha256="0c7lscfxncwwd8zp46h2xfw9gw14dypqv6m2kx85xjhjh0xw99aq"; depends=[]; }; reglogit = derive2 { name="reglogit"; version="1.2-4"; sha256="0ma1wddxhmja268ddkpcvskqf4lwq61brswnm600fms8ks7r78d3"; depends=[boot Matrix mvtnorm]; }; + regnet = derive2 { name="regnet"; version="0.1.1"; sha256="1gx3r1i3rsdwws0palfjn7a5nn9g7v7d1kndfn9gwlrlcn2nbx4k"; depends=[glmnet]; }; regpro = derive2 { name="regpro"; version="0.1.1"; sha256="02axbq63hsqwg3q2ixr0lpsdai9q6wj57s5k1343q9m0pw90vr73"; depends=[denpro]; }; - regress = derive2 { name="regress"; version="1.3-14"; sha256="0qnks28fr8siq95iiiqyvz82cbdg14i18rj7g9rqyjhiam12fshl"; depends=[]; }; + regress = derive2 { name="regress"; version="1.3-15"; sha256="1cgr0r49cmr8nzs2lr2cm8lli1i8azyas0lbnf1681kyab15c0r7"; depends=[]; }; regsel = derive2 { name="regsel"; version="0.2"; sha256="0wwwpawqsqimaldy0zxnqsy23nwp30ypa5dnrnndwhbs4qz99c9w"; depends=[elasticnet glmnet]; }; - regsem = derive2 { name="regsem"; version="0.7.0"; sha256="1niwal7dn99kkjm1dj03jfa3lkj747ihy29ay7jcwzin7nnkw9c5"; depends=[lavaan Rcpp RcppArmadillo]; }; + regsem = derive2 { name="regsem"; version="0.8.1"; sha256="14y69n0br9dz40kppwhc47g46r0naqxvz03l9pf62idl9ivgkqsf"; depends=[lavaan Rcpp RcppArmadillo]; }; regspec = derive2 { name="regspec"; version="2.4"; sha256="18i6k2wqaddrc0dz7v8x3s9205dcfwanqhpnxa9hkpyqzbb17pd3"; depends=[]; }; regsubseq = derive2 { name="regsubseq"; version="0.12"; sha256="0879r4r8kpr8jd6a3fa9cifm7cv0sqzz8z1alkm1b2fr1625md3g"; depends=[]; }; regtest = derive2 { name="regtest"; version="0.05"; sha256="1wrrpp2hvkas0yc512gya3pvd0v97pn4v51k5jxkwyd1pp68zd1q"; depends=[]; }; @@ -8632,7 +9035,7 @@ in with self; { rehh = derive2 { name="rehh"; version="2.0.2"; sha256="00wxx6w9ahddrg3lz14cqyg3dn0rfcxwy1z8arhdp1pn8d48pahw"; depends=[gplots rehh_data]; }; rehh_data = derive2 { name="rehh.data"; version="1.0.0"; sha256="1jkvwmnnmfa7iyvrabgcfzw3vfzx0dlgq47s6yf4zayi437v4di0"; depends=[]; }; reinstallr = derive2 { name="reinstallr"; version="0.1.4"; sha256="1fcmy2cyqy4zwh815j2jbmziaiq6kypwsnj5bx0f10dlq3522m5q"; depends=[]; }; - rel = derive2 { name="rel"; version="1.3.0"; sha256="11wn28bjsmajvypz77iikwzwhm79pnc7kn15h996y9mxhx20izkd"; depends=[]; }; + rel = derive2 { name="rel"; version="1.3.1"; sha256="1a3gffa9jgfm92q0ba9slwdp8r1n5kycywxp0jbjkpvkdpmacnd4"; depends=[]; }; relMix = derive2 { name="relMix"; version="1.2.3"; sha256="07fcbvhxdfa94ixxvnrkhlm0xxz7wa1lv7xdjp97ajxxp9fy69yl"; depends=[Familias gWidgets paramlink tkrplot]; }; relSim = derive2 { name="relSim"; version="0.2-0"; sha256="0cqcp7r263sk874l17wz84mzm4b1dxbfbsk74937rcz1wfc623k5"; depends=[Rcpp]; }; rela = derive2 { name="rela"; version="4.1"; sha256="00ksm7zh1mpd2d5c5d823id3sxj0h3x0ccg6a40fadibvr1ay3ny"; depends=[]; }; @@ -8648,25 +9051,27 @@ in with self; { reliaR = derive2 { name="reliaR"; version="0.01"; sha256="000nafjp386nzd0n57hshmjzippiha6s6c4nfrcwl059dzmi088i"; depends=[]; }; relimp = derive2 { name="relimp"; version="1.0-5"; sha256="0ydn82g8xdqzhf34187080bbpcpw1zdjbj2i3dv1d6d35vvprb5c"; depends=[]; }; relsurv = derive2 { name="relsurv"; version="2.0-9"; sha256="1laykfmzv4yfkj406iag0s8cdms662y9fdrxfd29spj47zniy9ym"; depends=[date survival]; }; - rem = derive2 { name="rem"; version="1.1.2"; sha256="0m0lhv8hc6p0d7nmjig2678n7qrb9c15jkdqrx946f42k1f1dz6f"; depends=[flexsurv Rcpp survival]; }; + rem = derive2 { name="rem"; version="1.2.8"; sha256="1w0lkxjhyssl9343z6lw7dn0cazz9firglvcf74nls4ngkgv0bbd"; depends=[doParallel foreach Rcpp]; }; remMap = derive2 { name="remMap"; version="0.2-0"; sha256="1k2niiaq2lr4inrx443clff9cqqvyiiwd45k7yqjd8ixnbaa3mrk"; depends=[]; }; rematch = derive2 { name="rematch"; version="1.0.1"; sha256="0y3mshvpvz9csmq8hk8jbabx4nxlv5sckvfzvm6920ndg34xw2d4"; depends=[]; }; + rematch2 = derive2 { name="rematch2"; version="2.0.1"; sha256="16k0i5p7fa3qfxv59ijyn638wpz8n4jrkrnilqmh5g9l8f8bn4h6"; depends=[tibble]; }; remindR = derive2 { name="remindR"; version="0.0.1"; sha256="0b27v2qm3z8l9vcng8f0rkphjidxkw5n017ysflx180qjizqq632"; depends=[assertthat]; }; remix = derive2 { name="remix"; version="2.1"; sha256="0s1gaf7vj08xd4m7lc9qpwvk0mpamabbxk71970mfazx6hk24dr0"; depends=[ascii Hmisc plyr survival]; }; remote = derive2 { name="remote"; version="1.2.1"; sha256="1ihzjxbvas7396cwsi9am4pl94naxa9dnhbnh8k0l5p4a50mk33w"; depends=[gridExtra latticeExtra mapdata raster Rcpp scales]; }; remoter = derive2 { name="remoter"; version="0.3-2"; sha256="0r7hm5cdbmkfn8lv07mn0lb1qq1g92l0hznjih1ykymjm3h6qyh0"; depends=[assertthat getPass pbdZMQ]; }; remotes = derive2 { name="remotes"; version="1.0.0"; sha256="03qwh7wb5zn08r1n5bylnb9615p0qsbx1ca644b528mf0pm7i7yc"; depends=[]; }; - rentrez = derive2 { name="rentrez"; version="1.0.4"; sha256="03gfq6d0vs3np1x292lzdahhc70npqvzbg9aj9c80amiyhs7c1ad"; depends=[httr jsonlite XML]; }; + rentrez = derive2 { name="rentrez"; version="1.1.0"; sha256="0mlxrbds8bjgi91yxxgsn0dxzjwghnhwjzvvg0z4lpdhrc1nrm4d"; depends=[httr jsonlite XML]; }; repeated = derive2 { name="repeated"; version="1.1.0"; sha256="0cdyzhhv89186q5nwablcjbqvm7ncq2w5d09iidbajrac9wd1y60"; depends=[rmutil]; }; repfdr = derive2 { name="repfdr"; version="1.1-3"; sha256="15f7x7vqwlpyzvzsybyz825a9dmglbrngjmajrsqlwffypgxjvi8"; depends=[]; }; repijson = derive2 { name="repijson"; version="0.1.0"; sha256="16iypvsmh5r9pk2k6npp17ya5dgkxihsj29pppd3zvdpm3vvd8k1"; depends=[geojsonio ggplot2 jsonlite OutbreakTools plyr sp]; }; replicatedpp2w = derive2 { name="replicatedpp2w"; version="0.1-1"; sha256="0q6mfrdjpx6nh4xgr5i7ka3xvnx9585xdhni020q4pm05rhimid2"; depends=[spatstat]; }; replicationInterval = derive2 { name="replicationInterval"; version="2.0.1"; sha256="1jyvyqr8r2fs1cmbz7zjcc8p116bnkslvx27pqi92y5pxgqvsqvr"; depends=[ggplot2 MASS MBESS pbapply]; }; - replyr = derive2 { name="replyr"; version="0.2.5"; sha256="084lpqjklk4b9zpcyv9w47g18w6sfxz01vn1kn510p8kzazbcdci"; depends=[dplyr wrapr]; }; + replyr = derive2 { name="replyr"; version="0.4.0"; sha256="1mw9mfbbydljg11la7scz8riad9f46jq1imcl1kkc66k3s94wiyv"; depends=[DBI dplyr RSQLite wrapr]; }; repmis = derive2 { name="repmis"; version="0.5"; sha256="0z5mjbsl24yjbl0aawr35grcal44rf2xbwv1hy7bdkms94ix79b5"; depends=[data_table digest httr plyr R_cache]; }; repo = derive2 { name="repo"; version="2.0.2"; sha256="1rgcgl1a0sz3mnj0ny7507bkrlxbbh7ab39jwfm99ssipia12jjh"; depends=[digest]; }; repolr = derive2 { name="repolr"; version="3.4"; sha256="13kmy09c7lk8p1mkdss0krcsfb6d7zcnqpwnl38zkanvh8q3fqhm"; depends=[Matrix Rcpp RcppArmadillo]; }; reportROC = derive2 { name="reportROC"; version="1.0"; sha256="0w570vvpwnz78kx4pfgri4lfx7l8xn6zjclimx2rskx5c2z3q5w7"; depends=[pROC]; }; + reportReg = derive2 { name="reportReg"; version="0.1.0"; sha256="1xnrc7c73d5gwz6381z2nikg7jy1sygm6iw6raah8yrdzv5d816d"; depends=[]; }; reportRx = derive2 { name="reportRx"; version="1.0"; sha256="0npiflql0lq8sqp6xgydxbw7xdr0zdxj1s2h4bnpmn4clc05r7m4"; depends=[aod cmprsk geoR reshape stringr survival xtable]; }; reportr = derive2 { name="reportr"; version="1.2.2"; sha256="1fl4hy4ck4aapy152vn9gjd7w5vgvh2gz2ky6p0wwahah7m9b255"; depends=[ore]; }; reports = derive2 { name="reports"; version="0.1.4"; sha256="0r74fjmdqax2x5fhbkdxb8gsvzi6v794fh81x4la9davz6w1fnxh"; depends=[]; }; @@ -8678,7 +9083,7 @@ in with self; { reproducer = derive2 { name="reproducer"; version="0.1.8"; sha256="1yw6d81xg8zqc91x737z0mfx10xcfvd0sr0vs8afvhbqnxbjk3jg"; depends=[ggplot2 gridExtra lme4 MASS metafor openxlsx xtable]; }; request = derive2 { name="request"; version="0.1.0"; sha256="1q7zd6q00gdqmgq7s7nq1ixmns8zn2amr5zah9rwnsn8dkllj9yh"; depends=[curl httr jsonlite lazyeval magrittr R6 whisker]; }; requireR = derive2 { name="requireR"; version="1.0.0.1"; sha256="192l7i3q7s2a6n737an3fn258agjsdzh0q2w0vc8jbz7v4f3i92d"; depends=[]; }; - rerddap = derive2 { name="rerddap"; version="0.3.4"; sha256="1rfcql21kd39q5r1827scqxs124x3vkvxazdqp13g5qyalmdvb30"; depends=[data_table digest dplyr httr jsonlite ncdf4 xml2]; }; + rerddap = derive2 { name="rerddap"; version="0.4.2"; sha256="0jn5fqjjn4nqn6hyaiadq8xdg7vd23l09h9ax6nq8r5iiizpv249"; depends=[data_table digest dplyr hoardr httr jsonlite ncdf4 tibble xml2]; }; resample = derive2 { name="resample"; version="0.4"; sha256="1rckzm2p0rkf42isc47x72j17xqrg8b7jpc440kn24mqw4szgmgh"; depends=[]; }; resampledata = derive2 { name="resampledata"; version="0.2.0"; sha256="1s683jhrpkhcn7cxjx5cipgkrbmhk5jr7hxniwc8ka7cbq3y22wl"; depends=[]; }; resemble = derive2 { name="resemble"; version="1.2.2"; sha256="189a6b1y720w9ff8cyqazd2d3v1msbfw8zdqr5rmilxvxmnspccs"; depends=[foreach iterators Rcpp RcppArmadillo]; }; @@ -8686,15 +9091,15 @@ in with self; { reshape = derive2 { name="reshape"; version="0.8.6"; sha256="1f1ngalc22knhdm9djv1m6abnjqpv1frdzxfkpakhph2l67bk7fq"; depends=[plyr]; }; reshape2 = derive2 { name="reshape2"; version="1.4.2"; sha256="0swvjmc9f8cvkrsz463cp6snd8bncbv6q8yrfrb4rgkr0dhq6dvd"; depends=[plyr Rcpp stringr]; }; reshapeGUI = derive2 { name="reshapeGUI"; version="0.1.0"; sha256="0kb57isws8gw0nlr6v9lg06c8000hqw0fvhfjsjyf8w6zwbbq3zs"; depends=[gWidgets gWidgetsRGtk2 plyr reshape2]; }; - respirometry = derive2 { name="respirometry"; version="0.3.1"; sha256="1v2i86zz2avyh0q3h2mjq6b967yi26xv7vwa66c390viiqrv4hpg"; depends=[birk lubridate marelac measurements seacarb]; }; + respirometry = derive2 { name="respirometry"; version="0.4.0"; sha256="0qrirnzyszmn6g392gkan1w0dn7sm7y69wmsy2v61v7g2slffkl6"; depends=[birk lubridate marelac measurements seacarb]; }; + restfulr = derive2 { name="restfulr"; version="0.0.11"; sha256="02i99f0xjfpmgnc3ckk4l0smcl0rg68wzvrqrwz2smha6akg0dg6"; depends=[RCurl rjson S4Vectors XML yaml]; }; restimizeapi = derive2 { name="restimizeapi"; version="1.0.0"; sha256="1ss6fng5pmqg6cafc256g9ddz8f660c68ysxfan6mn4gdaigz7lb"; depends=[RCurl RJSONIO]; }; restlos = derive2 { name="restlos"; version="0.2-2"; sha256="083w1ldax8bnf3w4119damma2nz75c3ki187b0275i1mqxqrixp7"; depends=[geometry igraph limSolve rgl som]; }; - restorepoint = derive2 { name="restorepoint"; version="0.1.7"; sha256="101lh84jsz84q0ch0j5adsjgza4ggv9xvwbq0d5wik7z5wa39pa6"; depends=[]; }; restrictedMVN = derive2 { name="restrictedMVN"; version="1.0"; sha256="0qynkg244gzq0yjb0716w7g1sxdq66i11ss8jij86h2mz3ykj137"; depends=[MASS]; }; restriktor = derive2 { name="restriktor"; version="0.1-55"; sha256="1yrzx7w14s04ppc16iw2hialx1k6k45ag9702vm8cnf31hm14kxp"; depends=[boot ic_infer lavaan MASS mvtnorm quadprog]; }; resumer = derive2 { name="resumer"; version="0.0.3"; sha256="0ilya3v75989zqm16x69w4599ax2s5j2n6f16bmhwydrmzxs1g48"; depends=[dplyr rmarkdown useful]; }; rethinker = derive2 { name="rethinker"; version="1.0.0"; sha256="0a28r0rkg4m6jsrvczkkpdqrca3q5l5pgb4wyz6pvy5scjlvmpls"; depends=[rjson]; }; - reticulate = derive2 { name="reticulate"; version="0.7"; sha256="1jzpipfhnvjcs2vj55d99y86x4y276i6ij3dlz1pngw524079971"; depends=[Rcpp]; }; + reticulate = derive2 { name="reticulate"; version="0.9"; sha256="0cpcrhw6gchlbydd45pklcjrfwxfdj4mgzp2analsimc8ma1z026"; depends=[Rcpp]; }; retimes = derive2 { name="retimes"; version="0.1-2"; sha256="019sllyfahlqnqry2gqw4w5cy4cavrqnwpwrbb25cgjpdb19raja"; depends=[]; }; retistruct = derive2 { name="retistruct"; version="0.5.10"; sha256="1wg2a906y09hcqba42hh9r2x59w35dms2aa5mw44avigc1nwm0s2"; depends=[foreign geometry png R_matlab rgl RImageJROI RTriangle sp ttutils]; }; reutils = derive2 { name="reutils"; version="0.2.3"; sha256="09dhf4s7wz3anrkzqi16abx64gk8ck2142kfd8pv71mjy3x548l7"; depends=[assertthat jsonlite RCurl tibble XML]; }; @@ -8702,11 +9107,12 @@ in with self; { revdbayes = derive2 { name="revdbayes"; version="1.1.0"; sha256="08rz1w98vm0rckxcg4f9hvpqhzyyk71grvklwl8qbqmm7319bjxz"; depends=[bayesplot rust]; }; revealedPrefs = derive2 { name="revealedPrefs"; version="0.2"; sha256="1f871y4wkjznzgwxfbnmrfiafq43cyf0i5hjy68ybxc7bbvfryxc"; depends=[Rcpp RcppArmadillo]; }; revealjs = derive2 { name="revealjs"; version="0.9"; sha256="0h4csxrcl1rzmj3g01nf0mr990zc8swrf4jvmxwqsyzx9v2cqbnc"; depends=[rmarkdown]; }; + revgeo = derive2 { name="revgeo"; version="0.11"; sha256="1ybphg00ja2xysh8f1s8cz855689b7vybsic07fj7q8wzrbqda3f"; depends=[RCurl RJSONIO]; }; reweight = derive2 { name="reweight"; version="1.2.1"; sha256="0fv7q1zb3f4vplg3b5ykb1ydwbzmiajgd1ihrxl732ll8rkkfa4v"; depends=[]; }; rex = derive2 { name="rex"; version="1.1.1"; sha256="0cs13hqv2wb549rhq84psky401pz8r41ia7c0pnyvhxfa2l6zrr8"; depends=[lazyeval magrittr]; }; rexpokit = derive2 { name="rexpokit"; version="0.24.1"; sha256="143zi6qb0l8vbx87jf58v1zfxqmvv6x4im1knd6q4dpp9gffqs22"; depends=[Rcpp SparseM]; }; rfPermute = derive2 { name="rfPermute"; version="2.1.5"; sha256="0c7yi395j640mvnr1qlm9hy1w6vva33fa2lqb3amzkafy4j1cs63"; depends=[abind ggplot2 gridExtra randomForest reshape2 swfscMisc]; }; - rfUtilities = derive2 { name="rfUtilities"; version="2.0-1"; sha256="1g11fr7vwdzmllgcjy7jy3vwgxa9mm18r41p2nckbjkq8yp5kmj3"; depends=[randomForest]; }; + rfUtilities = derive2 { name="rfUtilities"; version="2.1-0"; sha256="0zjk7rb9k0fpamdll57zxrihvxykn1821v7xkwgfhkwl9rxi8s0f"; depends=[randomForest]; }; rfigshare = derive2 { name="rfigshare"; version="0.3.7"; sha256="1qgzn0mpjy4czy0pnbi395fxxx84arkg8r7rk8aidmd34584gjiq"; depends=[ggplot2 httpuv httr plyr RJSONIO XML yaml]; }; rfishbase = derive2 { name="rfishbase"; version="2.1.2"; sha256="1w8jk6qfhyzzmxf8qnqqwckm4syrqimi8k6dqmwflgxz6bsxcz0v"; depends=[dplyr httr lazyeval tidyr]; }; rfisheries = derive2 { name="rfisheries"; version="0.2"; sha256="16j3hn1py8khqadmh81qsg76c62wzqkaq3fn39z0z5mgynmcm62j"; depends=[assertthat data_table ggplot2 httr rjson]; }; @@ -8719,7 +9125,7 @@ in with self; { rgam = derive2 { name="rgam"; version="0.6.3"; sha256="0mbyyhhyr7ijv2sq9n7g0vaxivngwf4nbb5398xpsh7fxvgw5zdw"; depends=[Rcpp RcppArmadillo]; }; rgbif = derive2 { name="rgbif"; version="0.9.8"; sha256="17pixyx2wicxdwqz7mziharanqdv865hmb9lz2kfqy1gzpv29jp2"; depends=[crul data_table geoaxe ggplot2 jsonlite magrittr oai tibble whisker wicket xml2]; }; rgcvpack = derive2 { name="rgcvpack"; version="0.1-4"; sha256="1vlvw9slrra18qaizqk2xglzky0i6z3bsan85x908wrg8drss4h5"; depends=[]; }; - rgdal = derive2 { name="rgdal"; version="1.2-6"; sha256="0icg0d1ll5k894f0phjcsybp9dkkspff4f62dn9f7iw20zah78h1"; depends=[sp]; }; + rgdal = derive2 { name="rgdal"; version="1.2-7"; sha256="0lxr8ydzkgfjp2kkfzki958grs5kwxlxinby7ki8b2hcri0fbr7l"; depends=[sp]; }; rgenoud = derive2 { name="rgenoud"; version="5.7-12.4"; sha256="19y0297fsxggjrdjv8n3a5klbqf8y3mq4mmdz6xx28cz3k65dk4n"; depends=[]; }; rgeoapi = derive2 { name="rgeoapi"; version="1.1.0"; sha256="0k8p1l0vrgx0bifbc2i9gxxwih513vbqhjh7fiifyfq3r74i4j7k"; depends=[httr magrittr rjson]; }; rgeolocate = derive2 { name="rgeolocate"; version="1.0.0"; sha256="0mac4rzgw4lp47rp9nxs7dgw0dzdxnb144an2zj8fcsnvm462vjg"; depends=[httr Rcpp]; }; @@ -8745,12 +9151,13 @@ in with self; { ridge = derive2 { name="ridge"; version="2.2"; sha256="01yldzzlqg0xqha31l3py62lyq7fw5xfsbmz6ifzff24gqsf029x"; depends=[]; }; ridigbio = derive2 { name="ridigbio"; version="0.3.5"; sha256="0526nscxynl3857zybpms1wr3230qby29kxglm919pcdvpjb5kz5"; depends=[httr jsonlite plyr]; }; riem = derive2 { name="riem"; version="0.1.1"; sha256="0lwhsxb4pm26kb65hs8pa63bsbrgy0zchqm4i6pq9f2r9h8vsm1m"; depends=[httr jsonlite lubridate tibble]; }; - rif = derive2 { name="rif"; version="0.1.0"; sha256="1y7zqxl00wp0nbldrhlqj2fyiflxxhqm7zgjncfwd6nkv1pvkkq9"; depends=[crul data_table jsonlite tibble]; }; + rif = derive2 { name="rif"; version="0.2.0"; sha256="0vk3dmg3qzw3i27wbpfih66rx8sdxq033l7h59h3hy960av4hawh"; depends=[crul data_table jsonlite tibble]; }; rinat = derive2 { name="rinat"; version="0.1.5"; sha256="14ql90f8wrxz9nlykbzfpar1yfwh7p71vks7vhhn8ys09wvj30zk"; depends=[ggplot2 httr jsonlite maps plyr]; }; rindex = derive2 { name="rindex"; version="0.12"; sha256="1k9zihvrp955c4lh70zjlsssviy2app8w6mv5ln4nawackbz0six"; depends=[regtest]; }; + ring = derive2 { name="ring"; version="1.0.0"; sha256="03sbgxwzms20gp0hkm5s0dihqkx3qf6bw0jrays7jjzrrwzl5657"; depends=[R6]; }; rintrojs = derive2 { name="rintrojs"; version="0.1.2"; sha256="16i6s0km8l22rx2n9kn90z76himfckj387az47snhzbgnwlby3yc"; depends=[jsonlite shiny]; }; - rio = derive2 { name="rio"; version="0.4.16"; sha256="030y9hxsdapwsp9lhz013pyz2kgkrymad09bkc6rzykzqswsf61n"; depends=[csvy curl data_table foreign haven jsonlite openxlsx readODS readr readxl urltools xml2 yaml]; }; - rioja = derive2 { name="rioja"; version="0.9-9"; sha256="19b8j49qsrvcmhlwdaf1xqvwampn8b02dp876czzcgxhgkxvc6yw"; depends=[gdata lattice mgcv vegan]; }; + rio = derive2 { name="rio"; version="0.5.5"; sha256="1wh2lq2zvfhilhy70g9n5lih0yjdgl7vzb7a3bl34vk67w0xzmf3"; depends=[curl data_table foreign haven openxlsx readxl tibble]; }; + rioja = derive2 { name="rioja"; version="0.9-15"; sha256="1yd0vcis1wsjk2cqkkd07xs0vmkxjw2yz4nnv08gf2cy5hvfsqas"; depends=[mgcv vegan]; }; ripa = derive2 { name="ripa"; version="2.0-2"; sha256="0n1gaga0d4bb9qdlm7gksa1nwi4y28kbgwr3icwqgihf1bfb9m81"; depends=[Rcpp]; }; riskR = derive2 { name="riskR"; version="1.1"; sha256="1qadfyb07idfw0bs006kb3917rzda83di6jmsr22941gv78z1wyv"; depends=[]; }; riskRegression = derive2 { name="riskRegression"; version="1.3.7"; sha256="0zk0k0xx7d72bsrava7n7wadpkx8aaawg44fignmsh8mpzhwwhav"; depends=[cmprsk data_table doParallel foreach ggplot2 lava prodlim Rcpp RcppArmadillo rms survival]; }; @@ -8760,7 +9167,7 @@ in with self; { ritis = derive2 { name="ritis"; version="0.5.4"; sha256="04vjbjqp5b9apafns2snh04hplgcfydzn52v63jgllyrn101vrjk"; depends=[data_table httr jsonlite solrium tibble]; }; riv = derive2 { name="riv"; version="2.0-4"; sha256="1c9k62plqgxcgcm2j1s26hqvgww96n6bfjz2yk7m3p2wf8gkkyam"; depends=[MASS quantreg rrcov]; }; riverdist = derive2 { name="riverdist"; version="0.14.0"; sha256="1j9yi27zwkgx329rj7bl6284390ajwmpj6fdsh7vz5pac4q4kcds"; depends=[rgdal sp]; }; - rivernet = derive2 { name="rivernet"; version="1.0"; sha256="0za5k00k9vivpq4wr1xqc4aw7mlcxhjj2b3iiip1qy13fg7bhbjm"; depends=[]; }; + rivernet = derive2 { name="rivernet"; version="1.1"; sha256="1brdgm2fbdq4qw85va6isj7p9bva4sj3spgsx8nsqvc8vaa90y4p"; depends=[]; }; riverplot = derive2 { name="riverplot"; version="0.6"; sha256="0q1icpny8nkxyjhawyjzwrw8qlz0ayn2xyrsqrm4vkxyv6c9xk8z"; depends=[]; }; rivervis = derive2 { name="rivervis"; version="0.46.0"; sha256="19jsl5g46jcbc0kg47bsif1wrw9z9brgvwdcxqjc89shnx3hzzfv"; depends=[]; }; rivr = derive2 { name="rivr"; version="1.2"; sha256="0ankpfixggwdv17ba8i5iln0zzmngqrhvh3dg8lis9kqg6wa89yr"; depends=[Rcpp]; }; @@ -8771,12 +9178,13 @@ in with self; { rjson = derive2 { name="rjson"; version="0.2.15"; sha256="1vzjyvf57k1fjizlk28rby65y5lsww5qnfvgnhln74qwda7hvl3p"; depends=[]; }; rjsonapi = derive2 { name="rjsonapi"; version="0.1.0"; sha256="0qshll0y8b6lbfrqmp69w9kc9hgfrz94dk68nddshk9ilg14lx4d"; depends=[crul jsonlite plumber R6]; }; rjstat = derive2 { name="rjstat"; version="0.3.0"; sha256="0r772p0a0x6g96k6r26vb6vjxa68mzjslwg71r0wysa9kqhvypm4"; depends=[checkmate jsonlite]; }; - rkafka = derive2 { name="rkafka"; version="1.0"; sha256="02h3nlffgd48xm38i2arlrgbilraf6r7k65s35906v33i0kjzrgg"; depends=[rJava rkafkajars RUnit]; }; - rkafkajars = derive2 { name="rkafkajars"; version="1.0"; sha256="0ss9gjjq92hba6nkhnda0pbm3a5bqm00hy0zbj4kivg5dlsf30q0"; depends=[rJava RUnit]; }; + rkafka = derive2 { name="rkafka"; version="1.1"; sha256="0c0hszsmmd876jcfamjcfb7bxw7869zgy99j4i6ksb8za232nmmw"; depends=[rJava rkafkajars RUnit]; }; + rkafkajars = derive2 { name="rkafkajars"; version="1.1"; sha256="121qnzxhipgv145lhmr6h356jpdd6knsx7f21cv9a8r5r009d42z"; depends=[rJava RUnit]; }; rknn = derive2 { name="rknn"; version="1.2-1"; sha256="1x9r01314q0wgqwqzd7d13ycjzb4jzghzd3whgjvm2rsmnabai95"; depends=[gmp]; }; rkt = derive2 { name="rkt"; version="1.5"; sha256="1rgf7dnk4d1b46rns2mb2s1ilxq7hqrh057vrrl00324r4h8bs1k"; depends=[]; }; rkvo = derive2 { name="rkvo"; version="0.1"; sha256="0ci8jqf9nc8hb063nckxdnp0nlyr4ghby356lxm00anw44jlmw8v"; depends=[Rcpp]; }; - rlas = derive2 { name="rlas"; version="1.1.1"; sha256="121pbapz36k7vak715dlhd4yccl0ib26zwccx3m3c3gcjv6qrvba"; depends=[data_table Rcpp]; }; + rlang = derive2 { name="rlang"; version="0.1.1"; sha256="0grwqy3zkvz96mvpwfbfyqid4jkfrqh3ldy2n6dpv2kjd1fzj0ar"; depends=[]; }; + rlas = derive2 { name="rlas"; version="1.1.4"; sha256="0cf5ixz7hpjwfny23yf622z7d1l282las5q8jh675v5ai67ayyb0"; depends=[data_table Rcpp]; }; rld = derive2 { name="rld"; version="1.0"; sha256="1glv4q25z14hcwifwg623h77p4awpsn3nk843pnph4sb3p5qbmn3"; depends=[emdbook MASS survival]; }; rleafmap = derive2 { name="rleafmap"; version="0.2"; sha256="1i2qczipg7lr6fl35lcl896r54jia7libxx83darrfzc1hd9sdcq"; depends=[knitr raster sp]; }; rlecuyer = derive2 { name="rlecuyer"; version="0.3-4"; sha256="0d5mcdzn6f5nhwzs165a24z36d0b8gd0cyfyzffvr6p96h8qydy7"; depends=[]; }; @@ -8786,12 +9194,12 @@ in with self; { rly = derive2 { name="rly"; version="1.4.2"; sha256="0mppl3y808k9ydn1lwng2bqmdzbbsla2p9p8qk73mp0xyq8iq9sm"; depends=[futile_logger R6]; }; rmaf = derive2 { name="rmaf"; version="3.0.1"; sha256="0w247mamwgibr5576p5c2lzaiz2lv2c25n7gw9q99s7rc4bps7j7"; depends=[]; }; rmapshaper = derive2 { name="rmapshaper"; version="0.2.0"; sha256="0s5av8hic3b61ch6skvcxkpn9s2r0ylfxilxg8i2dvg4dk13qkna"; depends=[geojsonio geojsonlint readr rgdal sp V8]; }; - rmarkdown = derive2 { name="rmarkdown"; version="1.4"; sha256="1dvs9cq88g61wfimifagq6y98yxavxzjan39jvpdsg98mafckq9g"; depends=[base64enc caTools evaluate htmltools jsonlite knitr rprojroot yaml]; }; + rmarkdown = derive2 { name="rmarkdown"; version="1.6"; sha256="0p8ph5z5pifk1nxc1bppkfs1ir5gjc6ap9n64b4255m2fdaqfrc7"; depends=[base64enc caTools evaluate htmltools jsonlite knitr rprojroot stringr yaml]; }; rmatio = derive2 { name="rmatio"; version="0.11.0"; sha256="0cmlh16nf3r94gpczq0j46g4dgjy9q1c647rqd9i14hvfrpxzcfa"; depends=[lattice Matrix]; }; - rmcfs = derive2 { name="rmcfs"; version="1.2.4"; sha256="0m9cs5fwqggq1cj78rwvk6nwc4ps6n8sg0rbd8wcnl3l4alb809y"; depends=[dplyr ggplot2 igraph reshape2 rJava yaml]; }; + rmcfs = derive2 { name="rmcfs"; version="1.2.5"; sha256="1g0gv1h0fqfpi57xkwy8ah97hwzl9bqqjmgyj9kq8p5hyl18d44g"; depends=[dplyr ggplot2 igraph reshape2 rJava yaml]; }; rmcorr = derive2 { name="rmcorr"; version="0.1.0"; sha256="0hrlamr527r02vj86xsip5n7gilrb8y33fy0xi1lkc66hf714vgw"; depends=[mnormt psych pwr RColorBrewer]; }; rmdHelpers = derive2 { name="rmdHelpers"; version="1.2"; sha256="1ahzbs8z7wvh1dwbq1kq8wrjrknxi2gck63k70gj0swjvgk0ih5r"; depends=[dplyr knitr]; }; - rmdformats = derive2 { name="rmdformats"; version="0.3.2"; sha256="128xlbarph2l03b55f4gk8r5gnkjjy3fd1lnihsvz4m1pcg88q4q"; depends=[bookdown htmltools knitr questionr rmarkdown]; }; + rmdformats = derive2 { name="rmdformats"; version="0.3.3"; sha256="06nyrdhy26mvgfb1bnlbd8hslybpc01a30a40wwlc3ay7yp0nzrj"; depends=[bookdown htmltools knitr questionr rmarkdown]; }; rmdshower = derive2 { name="rmdshower"; version="2.0.0"; sha256="0prxq0zakcm5lh1ki15d1d267yxr43295zcxigpy011lawccaglm"; depends=[rmarkdown]; }; rmeta = derive2 { name="rmeta"; version="2.16"; sha256="1s3n185kk0ddv8v6c7mbc7cpj6yg532r7is6pjf9vda7317rxywy"; depends=[]; }; rmetasim = derive2 { name="rmetasim"; version="3.0.5"; sha256="0a5pn146ds4biswh59kaddzryd80l54rhcaqsryhmv6pp4ywg5a1"; depends=[ade4 adegenet gtools pegas]; }; @@ -8800,10 +9208,10 @@ in with self; { rmngb = derive2 { name="rmngb"; version="0.6-1"; sha256="1wyq8jvzqpy1s6w0j77ngh5x2q7mpj0ib01m8mla20w6yr6xbqjk"; depends=[Hmisc]; }; rmp = derive2 { name="rmp"; version="2.0"; sha256="1cs5ylh5z9mfj3r0yvxxd38ksna2dxk9nnfgqkry1kxibnd1b4ff"; depends=[]; }; rmpw = derive2 { name="rmpw"; version="0.0.1"; sha256="0h5h77hh6v6nfhivmrs5dyks9krwqyh32kmp0mlwialrpshs0hp3"; depends=[]; }; - rms = derive2 { name="rms"; version="5.1-0"; sha256="1ibbpdclxc5vayl7hz176xc03snklx6ymiqzmpvi09y3bv92qnrx"; depends=[ggplot2 Hmisc htmlTable htmltools lattice multcomp nlme polspline quantreg rpart SparseM survival]; }; + rms = derive2 { name="rms"; version="5.1-1"; sha256="1qxzs640yq61629d0fb9ydbx222fbd7q922jrw5v8d64yn6r92f4"; depends=[ggplot2 Hmisc htmlTable htmltools lattice multcomp nlme polspline quantreg rpart SparseM survival]; }; rms_gof = derive2 { name="rms.gof"; version="1.0"; sha256="1n0h3nrp11f2x70mfjxpk2f3g4vwjaf4476pjjwy49smxxlxwz82"; depends=[]; }; rmsfact = derive2 { name="rmsfact"; version="0.0.3"; sha256="05s23rfs9prr2ia3h4h9y614xhv91lbgppgf3mrrssxkwz220kd5"; depends=[]; }; - rmumps = derive2 { name="rmumps"; version="5.0.1.12-3"; sha256="1smv80kg2ra31rj5pd6lxnqzh9mp17dsdcmwhbhfd58qpsfkkgq1"; depends=[Rcpp]; }; + rmumps = derive2 { name="rmumps"; version="5.1.1-1"; sha256="150z7g0fw5yi0lpr3w7isqjhpwjxi0w5cywhkk45gywjwkicrvgw"; depends=[Rcpp]; }; rmutil = derive2 { name="rmutil"; version="1.1.0"; sha256="0f30afqbzrsgbnfpniwhbw4b8hlzc5zyaixvn9giggzwczfnf29k"; depends=[]; }; rnaseqWrapper = derive2 { name="rnaseqWrapper"; version="1.0-1"; sha256="1fa3hmwrpccf09dlpginl31lcxpj5ypxspa0mlraynlfl5jrivch"; depends=[ecodist gplots gtools]; }; rnaturalearth = derive2 { name="rnaturalearth"; version="0.1.0"; sha256="193b31a7n9jhc607mhwxbpx5gr0fpj3qasm9dbi6kcc7vac3ilgm"; depends=[sf sp]; }; @@ -8812,15 +9220,15 @@ in with self; { rneos = derive2 { name="rneos"; version="0.3-2"; sha256="0m5mmhwnrk9ifv91s5ngmlvqqd7bw1n7glzkgk5i72cw0siiwmh0"; depends=[RCurl XML]; }; rnetcarto = derive2 { name="rnetcarto"; version="0.2.4"; sha256="0fk5rym6zp049bl1f7bkl2231mjh3pgnxn0nhvmzpsah08rh4rr6"; depends=[]; }; rngSetSeed = derive2 { name="rngSetSeed"; version="0.3-2"; sha256="00mqjjkhbnvxqkf1kz16gipsf98q62vmhx9v8140qs7c4ljbhc3a"; depends=[]; }; - rngWELL = derive2 { name="rngWELL"; version="0.10-4"; sha256="0ayrkd2yllsgl7iqqbhiyrnyyqk13f4wh1np23iz0zj650yjqdq8"; depends=[]; }; + rngWELL = derive2 { name="rngWELL"; version="0.10-5"; sha256="0b4ys525gksgqwqx9id4bdgyi9mwj6n3r87xdzf4fc9hp3cc16jb"; depends=[]; }; rngtools = derive2 { name="rngtools"; version="1.2.4"; sha256="1fcgfqrrb48z37xgy8sffx91p9irp39yqzxv7nqp1x2hnwsrh097"; depends=[digest pkgmaker stringr]; }; rngwell19937 = derive2 { name="rngwell19937"; version="0.6-0"; sha256="0m6icqf7nckdxxvmqvwfkrpjs10hc7l8xisc65q8iqpnpwl5p2f6"; depends=[]; }; rnn = derive2 { name="rnn"; version="0.8.0"; sha256="04924zn448x9rc3z9vh033l4rv9lz0hxv1bhfl0gn6gvd5wavlc7"; depends=[shiny sigmoid]; }; - rnoaa = derive2 { name="rnoaa"; version="0.6.6"; sha256="1b66jjvh6qk6xn0xfyd2prn4favhkfjmvi0qs76gdcxngy3kph2k"; depends=[dplyr ggplot2 gridExtra httr isdparser jsonlite lubridate rappdirs scales tibble tidyr XML xml2]; }; + rnoaa = derive2 { name="rnoaa"; version="0.7.0"; sha256="0mha1izbzfa6vq44wjsc4p018k83zw99f6bpkhc275c5v09pxvmr"; depends=[crul dplyr geonames ggplot2 gridExtra hoardr httr isdparser jsonlite lubridate rappdirs scales tibble tidyr XML xml2]; }; rnpn = derive2 { name="rnpn"; version="0.1.0"; sha256="10xx8fxgdknv71ks42xxvf38xsmjy6s87y67wi21673v0n07fxb5"; depends=[data_table httr jsonlite plyr]; }; rnrfa = derive2 { name="rnrfa"; version="1.3.0"; sha256="1zrj7y0qh57r7r9c5pspz238w0j1kaicd2l6vcg92lgxi8b9i558"; depends=[ggmap ggplot2 httr plyr rjson sp stringr xml2 xts]; }; - roadoi = derive2 { name="roadoi"; version="0.1"; sha256="0y3aqzrqy31dj06clkjaxrm7b8b3y5zxmjr0pq0f39w4qvsy43ms"; depends=[dplyr httr jsonlite plyr]; }; - roahd = derive2 { name="roahd"; version="1.2"; sha256="1b38x7mrld4bnz04d2h3nlk7ksyja9pj9aa6d2k3p8i1k458aqqd"; depends=[robustbase scales]; }; + roadoi = derive2 { name="roadoi"; version="0.2"; sha256="0rkr38jrikjdyg3w0lf6szxdm9k11i6gh4l55wnb1l4cg2sfsqqw"; depends=[dplyr httr jsonlite miniUI plyr shiny]; }; + roahd = derive2 { name="roahd"; version="1.3"; sha256="1pn2xzc5fnp2hb3fw3gpqng0x9rvpd4qfhx9gclf31algpzaidbb"; depends=[robustbase scales]; }; robCompositions = derive2 { name="robCompositions"; version="2.0.3"; sha256="0zm1qkrncp4k87mcbn72arr68xpif2y7f9m8smrcma4x52npfpfi"; depends=[car cluster cvTools data_table e1071 fpc GGally ggplot2 kernlab MASS mclust pls Rcpp robustbase rrcov sROC VIM]; }; robcor = derive2 { name="robcor"; version="0.1-6"; sha256="1hw8simv93jq8a5y79hblhqz157wr8q9dzgm0xhvvv5nkzyqkpzf"; depends=[]; }; robeth = derive2 { name="robeth"; version="2.7"; sha256="03pnwd3xjb9yv8jfav0s4l9k5pgpampp15ak7z0yvkjs20rvfq3d"; depends=[]; }; @@ -8829,8 +9237,9 @@ in with self; { robmed = derive2 { name="robmed"; version="0.1.1"; sha256="1716vzci0lmim4n28bc2pjky1shjxqrclgllj3hc4dzf8j22dxbz"; depends=[boot ggplot2]; }; robotstxt = derive2 { name="robotstxt"; version="0.3.2"; sha256="01nff1m1hs30rzm6y92pi97cp33k2k8a1k11kqms54wkpkglyr55"; depends=[httr stringr]; }; robreg3S = derive2 { name="robreg3S"; version="0.3"; sha256="0rv8qh98wws1f40d1kmysyy9qin0ngsvwq63cnxbwi290wsnrvls"; depends=[GSE MASS robustbase]; }; - robumeta = derive2 { name="robumeta"; version="1.8"; sha256="0fqwif0rwrcfzzid8md2p9b04p7w2bk7asqjxnnag5ywf8f3aj6n"; depends=[]; }; - robust = derive2 { name="robust"; version="0.4-16"; sha256="0psai9d6w7yi0wfm57cc7b2jd5i7wbk2xagrhnvhxknw0dwzf2jh"; depends=[fit_models lattice MASS robustbase rrcov]; }; + robumeta = derive2 { name="robumeta"; version="2.0"; sha256="1ynlfxlzh442jd1cf02j0f948m16d536a30gb4bf7208baqri1vg"; depends=[]; }; + robust = derive2 { name="robust"; version="0.4-18"; sha256="1b7qh1aff500nd6dh4y2ipmjgdiq8991shflb63pc39vpc0ny6g4"; depends=[fit_models lattice MASS robustbase rrcov]; }; + robustBLME = derive2 { name="robustBLME"; version="0.1.2"; sha256="02wlycmq86sl4r9880z2845rmkn6ayq9l7y7a5whzhb0s3r2dpji"; depends=[doParallel foreach iterators lme4 mvtnorm numDeriv Rcpp RcppArmadillo]; }; robustDA = derive2 { name="robustDA"; version="1.1"; sha256="1yys6adkyms5r4sw887y78gnh97qqr7sbi5lxv5l9bnc4ggcfiz6"; depends=[MASS mclust Rsolnp]; }; robustETM = derive2 { name="robustETM"; version="1.0"; sha256="1dlj79v08bls500lb81rya6vwx58h97rpq1sy9zwd3mfl9b6awp9"; depends=[]; }; robustHD = derive2 { name="robustHD"; version="0.5.1"; sha256="14v6l0appy206zx1jcv7m14r2z9g12dpkm6zxzv756rca2yj8fp5"; depends=[ggplot2 MASS perry Rcpp RcppArmadillo robustbase]; }; @@ -8843,7 +9252,7 @@ in with self; { robustloggamma = derive2 { name="robustloggamma"; version="1.0-2"; sha256="1cifyasrik010zs8jsz0kzzmwm3qmc0y7h2dahg2ibpwxfcqfcpq"; depends=[numDeriv RobustAFT robustbase survival]; }; robustrank = derive2 { name="robustrank"; version="2016.11-9"; sha256="11x9smfkbq4f0p2n3gxhwzs2xsd019pilxrds601yshz754ccj98"; depends=[]; }; robustrao = derive2 { name="robustrao"; version="1.0-1"; sha256="03bigs7sc7d6ah1dp3mrkklhwih80wbr841klilwkfkajp7q97h9"; depends=[doParallel foreach gmp igraph iterpc quadprog]; }; - robustreg = derive2 { name="robustreg"; version="0.1-9"; sha256="1jjydpiz7wwyvivq7vbyrlyf6y9pd036p2xls0kkq7w1d3vpzjwk"; depends=[Matrix Rcpp RcppArmadillo]; }; + robustreg = derive2 { name="robustreg"; version="0.1-10"; sha256="1zwfgmla6wna48vq5hbz7c7fvmb29y949790w2j6x8pkjzr781sz"; depends=[Matrix Rcpp RcppArmadillo]; }; robustsae = derive2 { name="robustsae"; version="0.1.0"; sha256="0fi1fpqnfj6vkmidlr90kqbn1bxxxqb5qpqqrz9rrimlsvrc4ddl"; depends=[coda lattice MCMCpack mvtnorm pscl]; }; robustvarComp = derive2 { name="robustvarComp"; version="0.1-2"; sha256="187mcpih509hx15wjjr7z2h6h76mz2v0d8xgsxjd8wz7l3dnlp2f"; depends=[GSE numDeriv plyr robust robustbase]; }; rocNIT = derive2 { name="rocNIT"; version="1.0"; sha256="18vxyh1wcq6dv62xf2dyl4226cd00n4hlbaqnynl9j5gnrmmsvi1"; depends=[]; }; @@ -8854,20 +9263,20 @@ in with self; { rodd = derive2 { name="rodd"; version="0.2-1"; sha256="01zrkw4lr21vxk2grfc37iyrcipfdcj5m0i7gnxsvs435y9fqagd"; depends=[Matrix matrixcalc numDeriv quadprog rootSolve]; }; rodeo = derive2 { name="rodeo"; version="0.7.1"; sha256="0q76dnwc5bixbl2wh6km7085rivfzjpzl6c3w48wq5b23k1v7pfr"; depends=[deSolve R6]; }; rodham = derive2 { name="rodham"; version="0.0.3"; sha256="1rc3k2qsa1rb11fk0va635czslqk1nxpcykrqc5p225makisaxv1"; depends=[jsonlite plyr splitstackshape]; }; - roll = derive2 { name="roll"; version="1.0.6"; sha256="0123ihl9b4x65azbr4hvm69q53sh753mgf0j54wq98y0f8kx757v"; depends=[Rcpp RcppArmadillo RcppParallel]; }; + roll = derive2 { name="roll"; version="1.0.7"; sha256="059n1pl7692grzv4pmnj8s6cs2zi98lr1s5zi9pxg5vpw7r6h2v9"; depends=[Rcpp RcppArmadillo RcppParallel]; }; rollbar = derive2 { name="rollbar"; version="0.1.0"; sha256="1q2ym0vkgbdnibxmwx0bp9c20g3bm8fzwwgs3j4bxg1ydg3gnkj4"; depends=[httr]; }; rollply = derive2 { name="rollply"; version="0.5.0"; sha256="01rh4x9352ixdhrqdysapqx5ynksknyf8n230b340pxwaz2d7xhc"; depends=[plyr Rcpp stringr]; }; rolr = derive2 { name="rolr"; version="1.0.0"; sha256="04nm4q0mlr4w6jb0frykzlyknfn3gn02ysqr5ll5jch6wawichy2"; depends=[survival]; }; rolypoly = derive2 { name="rolypoly"; version="0.1.0"; sha256="11nf7in6n03675l11ynl4rp20rlzy7jli3m518s4sqqxdm8f8ci7"; depends=[data_table dplyr foreach ggplot2 glmnet MASS Matrix matrixcalc]; }; rootSolve = derive2 { name="rootSolve"; version="1.7"; sha256="08ic6ggcc5dw4nv9xsqkm3vnvswmxyhnqnv1rdjv1h2gy1ivpcq8"; depends=[]; }; - rootWishart = derive2 { name="rootWishart"; version="0.3.0"; sha256="0jifnk6ysq0603pjjyn73gcib0yrlf8apk1isl8wm5xbqc91m859"; depends=[BH Rcpp RcppEigen]; }; + rootWishart = derive2 { name="rootWishart"; version="0.4.0"; sha256="028k1h6vibbcnmh35kg0z388c991k8v78ac0fbrv1k2ajqrrl4lg"; depends=[BH Rcpp RcppEigen]; }; rope = derive2 { name="rope"; version="1.0"; sha256="06qp6h8cjnz0yacm4r39k99hrw74iyq16h5mqfcki7sf3zqbfm7r"; depends=[]; }; - ropenaq = derive2 { name="ropenaq"; version="0.1.4"; sha256="011xcm65005a3hplnflpw75d1smfza8dkvdh3zh7bsdwfpcqysh4"; depends=[crul dplyr jsonlite lazyeval lubridate tidyr]; }; + ropenaq = derive2 { name="ropenaq"; version="0.2.1"; sha256="1kyqm0zwaxx0wzd16szcfg2c2kw318i9gr8la30slw65qhxr18f9"; depends=[crul dplyr jsonlite lazyeval lubridate tidyr]; }; ropensecretsapi = derive2 { name="ropensecretsapi"; version="1.0.1"; sha256="0d4yl0h4am3blskdnzk119hk374c3vx0cg99r20w07yh8jfafrw7"; depends=[RCurl RJSONIO]; }; ropercenter = derive2 { name="ropercenter"; version="0.1.0"; sha256="0rp2dwdkl3qlwm8di0q184ppr77zs6i7njyr305pnxmbad119w9d"; depends=[dplyr foreign haven httr rvest stringr xml2]; }; rorcid = derive2 { name="rorcid"; version="0.3.0"; sha256="1c4di3cgx9b86v5fnsahf7gd1shb6klrg4mfyhf4irndn7b1r562"; depends=[httr jsonlite tibble]; }; rorutadis = derive2 { name="rorutadis"; version="0.4.2"; sha256="13a7xj4qw1nd8xgrqhrki3php960lgy9gy38sg4kpvs4j2rwijzc"; depends=[ggplot2 gridExtra hitandrun Rglpk]; }; - rosetteApi = derive2 { name="rosetteApi"; version="1.5.0"; sha256="1mwvqgfc6l1bqa8ik9nx6mk380hnrplbls8hc5yign8wqlw8rql5"; depends=[httr jsonlite]; }; + rosetteApi = derive2 { name="rosetteApi"; version="1.7.0"; sha256="0iqir8cbk2fx0wmkz52cb850fpvxr3rjldyf0m45n4fp041rd8mp"; depends=[httr jsonlite]; }; rosm = derive2 { name="rosm"; version="0.2.2"; sha256="0carzc8rn8997vdqgcf7a6lcpmw7dldhnh6n0rjyb09and8yca7r"; depends=[abind curl jpeg plyr png prettymapr rgdal rjson sp]; }; rospca = derive2 { name="rospca"; version="1.0.2"; sha256="0cw5qwzjkg1a7597vpr1qr34f5azx61jx39g9f5yw9b9iprwwd83"; depends=[elasticnet mrfDepth mvtnorm pcaPP pracma robustbase rrcov rrcovHD]; }; rotationForest = derive2 { name="rotationForest"; version="0.1.3"; sha256="1z2wk3mcs5hrahsxralidbc0dd8gxdbwjpr2f71g4g3isfx1ic8d"; depends=[rpart]; }; @@ -8878,11 +9287,12 @@ in with self; { roxygen2 = derive2 { name="roxygen2"; version="6.0.1"; sha256="0xpzziminf225kjwhyl51kgkzhplyzhk5farhf5s822krl2xqbfj"; depends=[brew commonmark desc digest R6 Rcpp stringi stringr xml2]; }; royston = derive2 { name="royston"; version="1.2"; sha256="1rywc89qzx0hldbq10201bjdhz60pq2gmgd9b9j52mza3w4canjz"; depends=[moments nortest]; }; rpanel = derive2 { name="rpanel"; version="1.1-3"; sha256="1wm0dcbyvxz4ily8skz2yda44n74x2nmc4pg11ja0yvk038gjfns"; depends=[]; }; - rpart = derive2 { name="rpart"; version="4.1-10"; sha256="119dvh2cpab4vq9blvbkil5hgq6w018amiwlda3ii0fki39axpf5"; depends=[]; }; - rpart_plot = derive2 { name="rpart.plot"; version="2.1.1"; sha256="0bxn67an7xkg2cml32kll3gwzbs87hzia1jkx0dwg7vmkkvm1ab3"; depends=[rpart]; }; + rpart = derive2 { name="rpart"; version="4.1-11"; sha256="165djqj7lk81jr7z5fwccq3h7ayys26hx1kj9hndvg2rkyaq1arq"; depends=[]; }; + rpart_plot = derive2 { name="rpart.plot"; version="2.1.2"; sha256="1hn8s0fawwsr6j4m7wf38q7a608bjf9v1w706p49a08189baqdxz"; depends=[rpart]; }; rpart_utils = derive2 { name="rpart.utils"; version="0.5"; sha256="00ahvmly6cdf7qhhcic0dbjlljqq8kbhx15rc7vrkd3hzd55c0im"; depends=[rpart]; }; rpartScore = derive2 { name="rpartScore"; version="1.0-1"; sha256="15zamlzbf6avir8zfw88531zg5c0a6sc5r9v5cy9h08ypf34xf4y"; depends=[rpart]; }; rpartitions = derive2 { name="rpartitions"; version="0.1"; sha256="1gklsi4pqhk16xp9s49n1lr9ldm1vx61pvphjqsqkzrlxwcpx3j8"; depends=[hash]; }; + rpatrec = derive2 { name="rpatrec"; version="1.0.1"; sha256="0zj461frf6n5s97zq7r52q0blsn2xq2759impgz6v4pr87gmq0si"; depends=[np]; }; rpca = derive2 { name="rpca"; version="0.2.3"; sha256="135q3g8jmn9rwamrc9ss45cnbfyw8kxcbrf0kinw8asz70fihj9z"; depends=[]; }; rpcdsearch = derive2 { name="rpcdsearch"; version="1.0"; sha256="17g3x15qgv2hamlj451sb88i83n8svw5vnmjpijp5cnn5d1jx0d6"; depends=[assertthat combinat dplyr stringr xlsx]; }; rpdo = derive2 { name="rpdo"; version="0.2.2"; sha256="1yzvi4givrwpbs56p2vf0gciaigq50qq0r0n5lyaqk73azzhnhxc"; depends=[curl datacheckr dplyr lubridate magrittr readr stringr tidyr]; }; @@ -8894,41 +9304,44 @@ in with self; { rpivotTable = derive2 { name="rpivotTable"; version="0.2.0"; sha256="0h7za8bmyg7b150l7a2jz6czxdh4gi0q0gv6ddpdlgk86slw9nmh"; depends=[htmlwidgets]; }; rplos = derive2 { name="rplos"; version="0.6.4"; sha256="0jqvm212clh02g9sk239l467xg0b83c1zbnhfwgzmvbvk630na1b"; depends=[dplyr ggplot2 httr jsonlite lubridate plyr reshape2 solr whisker]; }; rplotengine = derive2 { name="rplotengine"; version="1.0-6"; sha256="1x9lf5h6cmjyi5xyvmk2ii2dwkwmjqbg0m1fhfabay0flqc7qdm0"; depends=[xtable]; }; - rpms = derive2 { name="rpms"; version="0.2.0"; sha256="15l7n9qddzk71s0si0mxmpzvl2h0sdb2z2x058cif4i4kgly9h7d"; depends=[Rcpp RcppArmadillo]; }; + rpms = derive2 { name="rpms"; version="0.2.1"; sha256="14fljzxpxbsx5x06aq39rdq8h25n0z6bq7g7ncgjp1lgk9ml6gdq"; depends=[Rcpp RcppArmadillo]; }; rpn = derive2 { name="rpn"; version="1.0"; sha256="0wk8y4yk6wqzbq5bqv6zncfp9az5vn8xgwh426pk3bxm3v4xi16i"; depends=[BBmisc checkmate]; }; rpnf = derive2 { name="rpnf"; version="1.0.5"; sha256="07byg0ym4d2cr6fp74z379jhsaw4c0xrwf622dvhwa4frn4anl60"; depends=[]; }; rportfolios = derive2 { name="rportfolios"; version="1.0-1"; sha256="00xxh85jpl0rw8fv84i7zmq0psc92pq7hharnr4szbmhgz8kbc35"; depends=[truncdist]; }; - rpostgis = derive2 { name="rpostgis"; version="1.2.0"; sha256="1p77706qan77f6nw93hkgjscfiby50m581cq7mpaib5xjxw4w37g"; depends=[DBI raster rgeos RPostgreSQL sp]; }; - rpostgisLT = derive2 { name="rpostgisLT"; version="0.4.0"; sha256="108payblzqiqy4i4w5hwv2v45rmhw1lylkc8mdkfyg64cx7kl7pp"; depends=[adehabitatLT DBI rpostgis RPostgreSQL sp testthat]; }; + rpostgis = derive2 { name="rpostgis"; version="1.2.1"; sha256="11sfx9sjb6naqlyjn10myz9zjplh05gjjkapjq8nsdj4d49cf8rn"; depends=[DBI raster rgeos RPostgreSQL sp]; }; + rpostgisLT = derive2 { name="rpostgisLT"; version="0.5.0"; sha256="0dvzprhwdqm763b0n82vzj4blns9chlcpp7wkrsm1w67zakn02mk"; depends=[adehabitatLT DBI rpostgis RPostgreSQL sp testthat]; }; rpql = derive2 { name="rpql"; version="0.5"; sha256="1d5mr04jk08l617zkqn13njglwj0w9an1rix937bcxw69blshahi"; depends=[gamlss_dist lme4 MASS Matrix mvtnorm]; }; rprev = derive2 { name="rprev"; version="0.2.3"; sha256="14p79f0mkvgwk8bwjnr7gvkvs8c632z7hddcyyrwldpilwyjnsgc"; depends=[doParallel dplyr foreach ggplot2 lazyeval magrittr rms survival tidyr]; }; rprime = derive2 { name="rprime"; version="0.1.0"; sha256="1v6n1qi0i7x8xgizbyvp1mnwc316lsan4rvam44fgjj45fcd79gd"; depends=[assertthat plyr stringi stringr]; }; rprintf = derive2 { name="rprintf"; version="0.2.1"; sha256="0rwqpln0igxb4m6d6jyp7h3shfb8sbp0kj7cgkffjp88hn9qm4h3"; depends=[stringi]; }; rprojroot = derive2 { name="rprojroot"; version="1.2"; sha256="1fgyxv1zv04sllcclzz089xl6hpdzac7xk61l0l4acb7rqsx5d18"; depends=[backports]; }; rpsftm = derive2 { name="rpsftm"; version="1.1.0"; sha256="028y67pri687xwxf2k32qhyfz45gv49aj3qm3y67c5znsdagj2c0"; depends=[ggplot2 survival]; }; + rpst = derive2 { name="rpst"; version="1.0.0"; sha256="10cbgj67lqgh5bawwa0nwj9kfl3jg4vdm121kc61q199v8dw7nrz"; depends=[plotrix survival]; }; rpsychi = derive2 { name="rpsychi"; version="0.8"; sha256="1h40kbqvvwwjkz5hrclj6j22zhav3yyfbbhqahs1whwjkksnam4w"; depends=[gtools]; }; - rptR = derive2 { name="rptR"; version="0.9.1"; sha256="0vwwdr0z1yyajisiy4ib1zksl0s1wjqf4pp9ymy8g5gnn1j2dx8i"; depends=[lme4 pbapply]; }; + rptR = derive2 { name="rptR"; version="0.9.2"; sha256="0qa9ml4kmmm0r06akf9azra0z3903w1qfi2zkvzhxahp508l20gs"; depends=[lme4 pbapply]; }; rpubchem = derive2 { name="rpubchem"; version="1.5.10"; sha256="06j9ir65ykky5hdbyv74fnddwqd39jxvr6jig0kjqisc75k4spjz"; depends=[base64enc car data_table fingerprint iterators itertools RCurl RJSONIO stringr XML]; }; - rqPen = derive2 { name="rqPen"; version="1.5.1"; sha256="10lmbxz5wsfczxr1n8hclvschqm9mfzdgdac5r0b87a2xglqrizv"; depends=[quantreg regpro]; }; + rqPen = derive2 { name="rqPen"; version="2.0"; sha256="13m21v753njaramgpbhn0lb793b6946crv5v8vl127w38q0z3wyd"; depends=[quantreg regpro]; }; rr = derive2 { name="rr"; version="1.4"; sha256="1c2h6ibjfwrjfqh1if3c90pdh0g2rf3p71j4p9w23xbbrx2l80pl"; depends=[arm coda magic MASS]; }; - rrBLUP = derive2 { name="rrBLUP"; version="4.4"; sha256="0h0mqfb524kglaibgj4d0g05lrnzgz6x87irs31dwl28j4kxcz4w"; depends=[]; }; + rrBLUP = derive2 { name="rrBLUP"; version="4.5"; sha256="19xzlmbi43nywyxcydcjzbs9a175fcwps5ndnvkz7xp2g3lnpcdq"; depends=[]; }; rrBlupMethod6 = derive2 { name="rrBlupMethod6"; version="1.3"; sha256="1qwv954mhry46ff2ax48xcmnasygi5alv8d413g3qbk2da6i0d8l"; depends=[]; }; rrcov = derive2 { name="rrcov"; version="1.4-3"; sha256="0kagqggi634mvrhd67ia7mpjrj5v6w2wq0z3kyppg5xkvzh335nq"; depends=[cluster lattice mvtnorm pcaPP robustbase]; }; + rrcov3way = derive2 { name="rrcov3way"; version="0.1-10"; sha256="0ybl759mfva185z2mjs5s8cjim9h8dk4gkqnva2rj9kxp7i45srd"; depends=[robustbase rrcov ThreeWay]; }; rrcovHD = derive2 { name="rrcovHD"; version="0.2-5"; sha256="1wv50lcjf0fsxb1zagxbrcx68ilfmnmkc8ccpy9hw3qql5p368ij"; depends=[pcaPP pls robustbase robustHD rrcov spls]; }; rrcovNA = derive2 { name="rrcovNA"; version="0.4-9"; sha256="1qc9xqm5x55dqjx1y7s4a2nwc07v32rygicbb8469knxasf92cs3"; depends=[cluster lattice norm robustbase rrcov]; }; rrecsys = derive2 { name="rrecsys"; version="0.9.5.4"; sha256="0g3mz5k1ya72qc32wwh8hy809yzxigz8rkcp9rnxdr71fk604a04"; depends=[knitr MASS proxy registry]; }; rredis = derive2 { name="rredis"; version="1.7.0"; sha256="0wzamwpmx20did8xj8x9dllri2ps83viyqjic18ari7i4h1bpixv"; depends=[]; }; rredlist = derive2 { name="rredlist"; version="0.3.0"; sha256="1w59rqwgx3hr9icw8pzwc95117vrqkj3mq197kp0qy8xbkf83h8v"; depends=[crul jsonlite]; }; rrefine = derive2 { name="rrefine"; version="1.0"; sha256="1lh3vddrp5k9bhz5spv93w0qm9z5lskpdgxfksys0l3275hzx1lm"; depends=[httr readr rlist]; }; - rrepast = derive2 { name="rrepast"; version="0.5.0"; sha256="1df6dgbfrh9ks4z22lm25m8v2baq78nq32f8v1cfkq1ygr6n2k99"; depends=[digest ggplot2 gridExtra lhs rJava sensitivity xlsx]; }; + rrepast = derive2 { name="rrepast"; version="0.6.0"; sha256="1d6nk6437c4bxbyvpzdlgd1kxh651979m0k7aadi9fl77i5k2x3w"; depends=[digest ggplot2 gridExtra lhs rJava sensitivity xlsx]; }; rriskDistributions = derive2 { name="rriskDistributions"; version="2.1.2"; sha256="1d9dwgw8la8wwq9cdnl7qibkzbdl4cj0qvf05x7w13ip973dwpaq"; depends=[eha mc2d msm tkrplot]; }; rrlda = derive2 { name="rrlda"; version="1.1"; sha256="06n9jah190cz25n93jlb5zb0xrx91bjvxgswwdx9hdf0fmwrpkvz"; depends=[glasso matrixcalc mvoutlier pcaPP]; }; + rrpack = derive2 { name="rrpack"; version="0.1-5"; sha256="0iil5bzx774fjimlzqwpf8d4jybkifg9g3hxghpvb06rrmjryfdg"; depends=[ggplot2 glmnet lassoshooting MASS Rcpp RcppArmadillo]; }; rrr = derive2 { name="rrr"; version="1.0.0"; sha256="0sv6k70mv325yjm8yjy4dw8cqc0xc071iiv94fk1l1yfz0n67prz"; depends=[dplyr GGally ggplot2 magrittr MASS plotly Rcpp]; }; rsae = derive2 { name="rsae"; version="0.1-5"; sha256="1f3ry3jwa6vg2vq2npx2pzzvfwadz8m48hjrqjk860nfjrymwgx5"; depends=[]; }; rsatscan = derive2 { name="rsatscan"; version="0.3.9200"; sha256="00vgby24jknq8nl7rnqcwg7gawcxhwq8b7m98vjx2hkqx39n4g21"; depends=[foreign]; }; - rscala = derive2 { name="rscala"; version="1.0.15"; sha256="1gx3xqz505l5kw5hwgkjbsm0aj5p3ycghjmfqcihsxpvai7hzlza"; depends=[]; }; + rscala = derive2 { name="rscala"; version="2.2.2"; sha256="00l57nh8gmpfz34n1fr7qn40a9brlsnharj18zy7xpvnwk4dxyyx"; depends=[]; }; rscimark = derive2 { name="rscimark"; version="1.0"; sha256="1jsjz4d5bnxb90qqzz42m4nyvm8d8w8bs0m1r5g2n78zmckqb8vy"; depends=[checkmate]; }; - rsconnect = derive2 { name="rsconnect"; version="0.7"; sha256="104c83qq12kp1hzfs7k6nzlripsydwidqgdd3kakc4wy6dsr8bhn"; depends=[digest packrat PKI RCurl RJSONIO rstudioapi yaml]; }; + rsconnect = derive2 { name="rsconnect"; version="0.8"; sha256="1ac9sgqcafy22fyx09vkf7kga276lndhz28kd9wiii67yp2ns7zy"; depends=[digest packrat PKI RCurl RJSONIO rstudioapi yaml]; }; rscopus = derive2 { name="rscopus"; version="0.4.6"; sha256="0s8ahdp884yy2hpa5kq9d4kcnr0hx662wp7h0qi399pc0y1rydwm"; depends=[httr plyr]; }; rscorecard = derive2 { name="rscorecard"; version="0.3.5"; sha256="1fhcp8xdhgjgpbfwc6bygq0z1z49w9c3bh12s8rml30597b8gc26"; depends=[dplyr jsonlite lazyeval magrittr]; }; rsdepth = derive2 { name="rsdepth"; version="0.1-5"; sha256="064jbb6gnx0sm41w3sbi6mvsbzsfkjqfici6frk8sfm9ybvm591j"; depends=[]; }; @@ -8943,57 +9356,59 @@ in with self; { rsm = derive2 { name="rsm"; version="2.8"; sha256="1hnlaj5jwqxki07b1kzl716qkmqwap57cch2lwsb6gqqsjir8xfx"; depends=[estimability lsmeans]; }; rsml = derive2 { name="rsml"; version="1.3"; sha256="0a1y41jq0yzr19mb2scwhlp9gx5vngm4q12yxp1fcwk2cqhnsda6"; depends=[rgl XML]; }; rsnps = derive2 { name="rsnps"; version="0.2.0"; sha256="10g1b2i2mp0b4p78iiy83sz2jwz73xfjkhc6ih4ag2wmbdmwf9pb"; depends=[httr jsonlite plyr stringr XML]; }; - rsoi = derive2 { name="rsoi"; version="0.2.1"; sha256="18hjaz26in2h6n4vx57rczzfpr5fbx9i7ph58p2gyh6j8972a04i"; depends=[lubridate]; }; - rspa = derive2 { name="rspa"; version="0.1.8"; sha256="1zgk1v1yk9c51wbsl3skqfrznqj84146dzfwg7q3jy2hpdgf1cg6"; depends=[editrules]; }; + rsoi = derive2 { name="rsoi"; version="0.2.3"; sha256="0644pycb31qgk9fa44zw0x8c4k3f59gwbiwa30hxbpb9aa50d0g9"; depends=[lubridate tibble]; }; + rsolr = derive2 { name="rsolr"; version="0.0.4"; sha256="1kgjsqsa847fhdr17q3y6f4aa3rpdsjzi01q07hbq2xmia2m4yjq"; depends=[BiocGenerics graph RCurl restfulr rjson S4Vectors XML]; }; + rspa = derive2 { name="rspa"; version="0.2.1"; sha256="0m3h25jxfccdqy4gf3cls4wcdpw580yfmb3lvw4ndfva8lj2q6sy"; depends=[lintools validate]; }; rsparkling = derive2 { name="rsparkling"; version="0.2.0"; sha256="1d3p4zcff41m7qjx4j8bs0dvaal5j20sm4y8fipfnjizbdk72vb7"; depends=[h2o sparklyr]; }; rsq = derive2 { name="rsq"; version="1.0"; sha256="151f7pngx54wpawb5hchacj0rbymdzyki16fkj9291cfz1cqbcx9"; depends=[MASS]; }; rstack = derive2 { name="rstack"; version="1.0.0"; sha256="19vbfmkd6ymadah1y1w5rn52f4hviddccyc6qj2cv5viqwbwws2z"; depends=[R6]; }; rstackdeque = derive2 { name="rstackdeque"; version="1.1.1"; sha256="0i1qqbfj0yrqbkad8bqc1qlxmyxpn7zycbnq83cdmfbilcmi87ql"; depends=[]; }; rstan = derive2 { name="rstan"; version="2.15.1"; sha256="1svixidzqcdwpg6j1cfvy2xql99vw3fpvf78n4zp2r6kpynnhgrg"; depends=[BH ggplot2 gridExtra inline Rcpp RcppEigen StanHeaders]; }; - rstanarm = derive2 { name="rstanarm"; version="2.15.2"; sha256="0x5p7hwrdn1lpyb9lb50mw5ffb34wkc13afmpssn9xsxi88zr1lb"; depends=[bayesplot BH ggplot2 lme4 loo Matrix nlme Rcpp RcppEigen rstan rstantools shinystan StanHeaders]; }; + rstanarm = derive2 { name="rstanarm"; version="2.15.3"; sha256="00x4ayqp31sypzhbdg6pv627w1p134qlgn7jvgxszihc7dcfb7fg"; depends=[bayesplot BH ggplot2 lme4 loo Matrix nlme Rcpp RcppEigen rstan rstantools shinystan StanHeaders]; }; rstantools = derive2 { name="rstantools"; version="1.2.0"; sha256="1b0x0diik2zm6kfdbv3gg48mha3x7lq88f3rjmsy4ql26yvr155w"; depends=[]; }; rstatscn = derive2 { name="rstatscn"; version="1.1.1"; sha256="0aj4x3lyrldpgh90v90qbxylndacn5ri5yqff3qy53q45ar7yji3"; depends=[httr jsonlite]; }; rstiefel = derive2 { name="rstiefel"; version="0.10"; sha256="0b2sdgpb3hzal34gd9ldd7aihlhl3wndg4i4b3wy6rrrjkficrl1"; depends=[]; }; rstpm2 = derive2 { name="rstpm2"; version="1.3.4"; sha256="0vm5w597lz3zzklm21avxm88lqgrn9k2hlfh4yvmqk4vmwp4qkcc"; depends=[bbmle fastGHQuad mgcv numDeriv Rcpp RcppArmadillo survival]; }; - rstream = derive2 { name="rstream"; version="1.3.4"; sha256="1sgwk9mh3v3vv8gm537hfng6p2sqafd9ykraiw00s0z60fa80jnx"; depends=[]; }; + rstream = derive2 { name="rstream"; version="1.3.5"; sha256="1wprsnwl63cc4a6j5h18r09wlh32bq5z6hj6r5klp7rkpjchsplp"; depends=[]; }; rstudioapi = derive2 { name="rstudioapi"; version="0.6"; sha256="1zkvz72z6nw0xc8bhb21y5x1nk6avijs0w8n4vsbvw9sn76wc96s"; depends=[]; }; rsubgroup = derive2 { name="rsubgroup"; version="0.6"; sha256="1hz8rnbsl97ch6sjwxdicn2sjyn6cajg2zwmfp03idzpb3ixlk7l"; depends=[foreign rJava]; }; rsunlight = derive2 { name="rsunlight"; version="0.4.2"; sha256="1m4ya960zjqxbjcjj42gjmdy40ac7m471fkfsd0r6w675qbiiw87"; depends=[httr jsonlite plyr stringr]; }; + rsurfer = derive2 { name="rsurfer"; version="0.1"; sha256="1qxnvhlwdiianzkj3hidg1qkqzai0ds8k1y67cvjlfcdyy4f01w9"; depends=[gdata stringr]; }; rsvd = derive2 { name="rsvd"; version="0.6"; sha256="0vrsgxbbk5n51i1s80bixcxph2ws86zpbdqs81yfvnzghrc99nas"; depends=[]; }; rsvg = derive2 { name="rsvg"; version="1.1"; sha256="17jfspbvlfp2cdw9s4m128rqw5kvb7i5h335569n3518spqmgi4f"; depends=[]; }; rt3 = derive2 { name="rt3"; version="0.1.2"; sha256="1fqbymkz4csavkxrs26glzrh0kw3qy9x5smgddgda9a1dxh9ljkm"; depends=[]; }; rtable = derive2 { name="rtable"; version="0.1.5"; sha256="1a9x0qcbp96wg86nbvx25yh5viwvf5sqb41z3cvr5i7br2ji8n5i"; depends=[knitr ReporteRs shiny tidyr xtable]; }; rtape = derive2 { name="rtape"; version="2.2"; sha256="0q7rs7pc1k1kayr734lvh367j5qig2nnq5mgak1wbpimhl7z3wm7"; depends=[]; }; - rtdists = derive2 { name="rtdists"; version="0.6-6"; sha256="173yzgvzcfdhkk4zf1d8cxnk707dbr6n5fpwzhcn4qx35sgq26jd"; depends=[evd gsl msm pracma]; }; + rtdists = derive2 { name="rtdists"; version="0.7-3"; sha256="13fd49c92yh5pb3lnqf7abikp1jzzainqpbs555dg532i7f2j9zx"; depends=[evd gsl msm Rcpp]; }; rtematres = derive2 { name="rtematres"; version="0.2"; sha256="1d0vrprvnlk4hl2dbc6px9xn9kx9d1qvlqxd798hzda6qg5wwvf2"; depends=[gdata plyr RCurl XML]; }; rtext = derive2 { name="rtext"; version="0.1.20"; sha256="0455rwfxmpgb4qb925ildqr4km4ndgqjxgvk90x2dhfivgmmn60k"; depends=[digest hellno magrittr R6 Rcpp RSQLite stringb]; }; rtf = derive2 { name="rtf"; version="0.4-11"; sha256="04z0s5l9qjlbqahmqdaqv7mkqavsz4yz25swahh99xfwp9plknfl"; depends=[R_methodsS3 R_oo]; }; rtfbs = derive2 { name="rtfbs"; version="0.3.5"; sha256="0sdxlw1pkwwlzz2zcw4v8zhlm97lw2j5hbkqssialpa53jwyibyc"; depends=[rphast]; }; - rticles = derive2 { name="rticles"; version="0.2"; sha256="09cc0xfsvraw2vxl3icql8060nw4136cbp2iicm0bhhrvyxpvl5r"; depends=[knitr rmarkdown yaml]; }; - rtide = derive2 { name="rtide"; version="0.0.3"; sha256="0zbm4mza5093ixwaiza16lr1wd92fpgrl9ixxsmp0whnl4g2mwl2"; depends=[abind datacheckr dplyr lubridate magrittr plyr stringr tibble tidyr]; }; + rticles = derive2 { name="rticles"; version="0.4.1"; sha256="1f2a60jmlsiga377ihhy8sm9amqn7fd91sd4vx682b97hfh3zn39"; depends=[knitr rmarkdown yaml]; }; + rtide = derive2 { name="rtide"; version="0.0.4"; sha256="0i3mf3818s62mmn315brv2axpwiiz646k5hv8z26z7s4ahxavrc0"; depends=[abind datacheckr lubridate magrittr plyr stringr tibble tidyr]; }; rtiff = derive2 { name="rtiff"; version="1.4.5"; sha256="0wpjp8qwfiv1yyirf2zj0696zb7m7fpzn953ii8vbmgzhakgr8kw"; depends=[pixmap]; }; - rtimes = derive2 { name="rtimes"; version="0.3.0"; sha256="141i8zjsdzk7jdjf9wf3pa6d9ixjg1m4chk44iznmjpig4gbq2n9"; depends=[dplyr httr jsonlite]; }; + rtimes = derive2 { name="rtimes"; version="0.4.0"; sha256="0pi24kniig6h201wzjvdn7wfx2nh1i2fmp73wq6sip6kpv74a2xg"; depends=[data_table dplyr httr jsonlite tibble]; }; rtip = derive2 { name="rtip"; version="1.0.0"; sha256="1xkw0m4fnwbsqqyhvxhsia3hlpjb2qhs6y0c4g7f7qa7f0ibcbja"; depends=[boot ggplot2 mvtnorm plyr]; }; rtk = derive2 { name="rtk"; version="0.2.5.1"; sha256="17wqlplpqc9df5lg48xvqiny9wvn2h0drl8rj02iv50m14vrvpk1"; depends=[Rcpp]; }; - rtkore = derive2 { name="rtkore"; version="1.2.2"; sha256="139an16z4aipq94vxa9mjbrwh934qp5ql9f4ii263dswrala2h5s"; depends=[Rcpp]; }; + rtkore = derive2 { name="rtkore"; version="1.3.1"; sha256="01jxw1lhnzm25xgm90677gv247ps6x9ky2mcllnj54lsbk8j7gqj"; depends=[Rcpp]; }; rtop = derive2 { name="rtop"; version="0.5-10"; sha256="0h35f3wpvsdvvymb2sl8g2wljzqzgis66bkf42njhxry7wavqf17"; depends=[gstat rgdal sp]; }; rtrends = derive2 { name="rtrends"; version="0.1.0"; sha256="04xdggf36m294drb9z8khdjr6fgsg4bwkb4mmbbvqfzjpq4mq4y1"; depends=[dplyr lubridate tidyr]; }; rtrie = derive2 { name="rtrie"; version="0.1.1"; sha256="092ir1bm193x8ah2zbyik6vfavdqwzkda5kx4m7mv1gxcy4s64vr"; depends=[]; }; rtrim = derive2 { name="rtrim"; version="1.0.1"; sha256="134j5sv9dvcq1n37rry7615nr3pa54by6r7ss7fagcmy4lnma2ps"; depends=[]; }; - rts = derive2 { name="rts"; version="1.0-18"; sha256="1dryx7pb86b6d0z271girvl3k9ahxv0llxcmaypk9x077gzyxx94"; depends=[raster sp xts zoo]; }; + rts = derive2 { name="rts"; version="1.0-27"; sha256="1kshnvpr3q1zwlijypa2dbs126ckhzgnjpsn6al7ycjfh5xzgml9"; depends=[raster sp xts zoo]; }; rtson = derive2 { name="rtson"; version="1.3"; sha256="1gwvk7nmq9bz90jy1zh7lhr735iw804pmwxykdpaigcsnxk7zx03"; depends=[R6]; }; rtweet = derive2 { name="rtweet"; version="0.4.0"; sha256="19sb8l7xllicagy8i1rwxkfbbl9klv3m9kkxvlc3slg1j3aprvpz"; depends=[httr jsonlite magrittr openssl]; }; rtype = derive2 { name="rtype"; version="0.1-1"; sha256="0wjf359w7gb1nrhbxknzg7qdys0hdn6alv07rd9wm6zynnn1vwxy"; depends=[]; }; - rtypeform = derive2 { name="rtypeform"; version="0.2.0"; sha256="08hrhdd7zabga7338pvkkcy47kkvc2nbqb2v0sp3r4jqg7438a07"; depends=[httr jsonlite]; }; + rtypeform = derive2 { name="rtypeform"; version="0.3.0"; sha256="0fld8mfdipdw4aw7gklw4kx0gaq4q450s9ibg4mjjabqvaxsfarm"; depends=[httr jsonlite purrr]; }; rucm = derive2 { name="rucm"; version="0.6"; sha256="1n6axmxss08f2jf5impvyamyhpbha13lvrk7pplxl0mrrrl5g0n8"; depends=[KFAS]; }; - rucrdtw = derive2 { name="rucrdtw"; version="0.1.1"; sha256="1531i3n3a0hj6smi6lbhqx9zk4rf3zyi6nhaihcgp3sb9vk7zdlf"; depends=[Rcpp]; }; + rucrdtw = derive2 { name="rucrdtw"; version="0.1.2"; sha256="1rsiaqf8m5s3ffrm6jwc4s75hc1078aankadvlrfvkdn1k4pd220"; depends=[Rcpp]; }; rugarch = derive2 { name="rugarch"; version="1.3-6"; sha256="0ysycv0qldp4dnj8yh22v860d40ycp2c0la87zblgl86r7g4f03b"; depends=[chron expm ks nloptr numDeriv Rcpp RcppArmadillo Rsolnp SkewHyperbolic spd xts zoo]; }; runittotestthat = derive2 { name="runittotestthat"; version="0.0-2"; sha256="15zdcvqkr5ivq6wk6dw8k6diginc6z7mdc18pswim90d99j2g9sm"; depends=[assertive RUnit]; }; runjags = derive2 { name="runjags"; version="2.0.4-2"; sha256="035sxmh0b0m6dwz8qbpsmw2p7ihkx3cxgkhj27i0j6dsjryl3x4p"; depends=[coda lattice]; }; rusda = derive2 { name="rusda"; version="1.0.8"; sha256="0xx72jjf1pyixwpnvvgx5n2vc5gl46bam1caav043iqki68wb338"; depends=[foreach httr plyr RCurl stringr taxize testthat XML]; }; - rust = derive2 { name="rust"; version="1.1.0"; sha256="0ii7a4cygzx5ww064papwxcby0j9maw4rjf40z1jgr6xr5x0dfny"; depends=[spatstat]; }; + rust = derive2 { name="rust"; version="1.2.2"; sha256="0q2wc9jvlf063lkf3m1qz587wsgjiba8bfl6hw0v3myshjqx08xm"; depends=[Rcpp RcppArmadillo spatstat]; }; ruv = derive2 { name="ruv"; version="0.9.6"; sha256="12zi775nx6k1j9sz691x6r9r0arfnhwddf5nxbr1xk25dj9qa210"; depends=[]; }; - rv = derive2 { name="rv"; version="2.3.1"; sha256="0bjqwk7djl625fws3jlzr1naanwmrfb37hzkyy5szai52nqr2xij"; depends=[]; }; + rv = derive2 { name="rv"; version="2.3.2"; sha256="108s9q19h5ypxb9w4a8nk97js261izag1sf75g4xfqblwxxrbflc"; depends=[]; }; rvHPDT = derive2 { name="rvHPDT"; version="3.0"; sha256="05nrfnyvb8ar7k2bmn227rn20w1yzkp1smwi4sysc00hyjrlyg8s"; depends=[gtools]; }; rvTDT = derive2 { name="rvTDT"; version="1.0"; sha256="09c2fbqnlwkhaxfmgpsdprl0bb447ajk9xl7qdlda201fvxkdc8v"; depends=[CompQuadForm]; }; rvalues = derive2 { name="rvalues"; version="0.6"; sha256="075lfbqjzi103wh87i78x914iyrvrmmdz8z9f6391rbpip6bjpr3"; depends=[]; }; @@ -9001,21 +9416,21 @@ in with self; { rversions = derive2 { name="rversions"; version="1.0.3"; sha256="0i2gi05nrvknr7g89rbppkswyfcwwd4r9gp75fdfhpah8sgq1l11"; depends=[curl xml2]; }; rvertnet = derive2 { name="rvertnet"; version="0.5.0"; sha256="0bvf76i11kkjdy0vvx2fbv478nbzybljsw40l9mg3i9dcdmz3gjc"; depends=[dplyr ggplot2 httr jsonlite maps]; }; rvest = derive2 { name="rvest"; version="0.3.2"; sha256="04mv99z8dixywx96kfy4215g6ib23s7qvd77hcf9pxqxzcvqhvhd"; depends=[httr magrittr selectr xml2]; }; - rvg = derive2 { name="rvg"; version="0.1.3"; sha256="0zf976imapnd0x2bwf8fwnaiam88a57a2afdjsy77nzmiigxsqnn"; depends=[gdtools officer Rcpp xml2]; }; + rvg = derive2 { name="rvg"; version="0.1.4"; sha256="0jrnikx1d523amx32r34h4p64ipxs7i722rmlsg1nq39cb4dc36v"; depends=[gdtools officer Rcpp xml2]; }; rvgtest = derive2 { name="rvgtest"; version="0.7.4"; sha256="1lhha5nh8fk42pckg4ziha8sa6g20m0l4p078pjj51kz0k8929ng"; depends=[]; }; - rvsel = derive2 { name="rvsel"; version="0.2.1"; sha256="04whdpn0cg60y7f744qlxg60hczww7asq3c8kmf379xxf5p5zdpq"; depends=[]; }; rwars = derive2 { name="rwars"; version="1.0.0"; sha256="0kmwpr6gn3xsf0pqx153vblpjbhc34mzlgyv8xb2nw78nf8znfij"; depends=[httr]; }; rwfec = derive2 { name="rwfec"; version="0.2"; sha256="0wmalfms59zi8jdn2s2qbcdckfkifl9vg19hzx4389mm5gk6qsbh"; depends=[Rcpp]; }; rworldmap = derive2 { name="rworldmap"; version="1.3-6"; sha256="1q1h0n9qr0m5pdx10swrh9ddsvdj8kv5nqngrf3lnx9rg9iwivjk"; depends=[fields maptools sp]; }; rworldxtra = derive2 { name="rworldxtra"; version="1.01"; sha256="183z01h316wf1r4vjvjhbj7cg4xarn4b8qbmnn5y7nrrdndzi163"; depends=[sp]; }; rwt = derive2 { name="rwt"; version="1.0.0"; sha256="112wp682z4gkxsd3bqnlkdrh42bfzwnnhzyangxi2dh0qw63bgcr"; depends=[matlab]; }; rwty = derive2 { name="rwty"; version="1.0.1"; sha256="1w66jlcbn8javlr2l0qinah3cxxadpjzvbz088saysyg277ikfxm"; depends=[ape coda GGally ggdendro ggplot2 phangorn plyr reshape2 viridis]; }; + rwunderground = derive2 { name="rwunderground"; version="0.1.6"; sha256="1q6dn635xshr0sp7iswya1fqqrj5y5xgzyssmmijmrb2s8v52sdr"; depends=[countrycode dplyr httr]; }; rxSeq = derive2 { name="rxSeq"; version="0.99.3"; sha256="0g0n2pzbssz61psghjp1vrlspgph4s39x1k1zhcz7ivdn5pjb2nx"; depends=[MASS numDeriv VGAM]; }; ryouready = derive2 { name="ryouready"; version="0.4"; sha256="1d9z3paxcrkwsgn5g83x57jwz2iqarks30x0bwg48i5ispw6xbr3"; depends=[car ggplot2 stringr]; }; rysgran = derive2 { name="rysgran"; version="2.1.0"; sha256="1l2mx297iyipap8cw2wcw5gm7jq4076bf4gvgvij4q35vp62m85z"; depends=[lattice soiltexture]; }; - rzmq = derive2 { name="rzmq"; version="0.9.1"; sha256="0k0b7dija04c9hyxpspqgz96l565b83h76lh7csfsf43da2za5bx"; depends=[]; }; + rzmq = derive2 { name="rzmq"; version="0.9.2"; sha256="0vlh9q5d5mddajxn87nbmjmxx99hn5bsj29pzwkn4mvxs1xa80bi"; depends=[]; }; s2 = derive2 { name="s2"; version="0.1-1"; sha256="1k6329ra119ygb0z496894s4yra7f4dsg1ghpdk8k3ashd9yh6gd"; depends=[Rcpp]; }; - s20x = derive2 { name="s20x"; version="3.1-19"; sha256="1v16j3c38iak1wf887s02233g27fvwb06dyvdbg15g4dqh09sn7s"; depends=[]; }; + s20x = derive2 { name="s20x"; version="3.1-22"; sha256="0z4dplpx9586308i89hgqcbqxk1qpkcad240ri7nbcacd2zgfqw9"; depends=[]; }; s2dverification = derive2 { name="s2dverification"; version="2.8.0"; sha256="13cjzxrjwahjhdw5q8lpbwgywgswqrcnj7rkff9kraan9lj83bkk"; depends=[abind bigmemory GEOmap geomapdata mapproj maps NbClust ncdf4 plyr SpecsVerification]; }; s4vd = derive2 { name="s4vd"; version="1.1-1"; sha256="1rp3z42nxmrvb942h3c5cl544lngzx7nrnnr4zjw7dq495bym7yp"; depends=[biclust foreach irlba]; }; sAIC = derive2 { name="sAIC"; version="1.0"; sha256="1ih63cfs98kb61gwbmrx2yq7iacb5qa1qrh1a264041qd27r5pj5"; depends=[]; }; @@ -9025,7 +9440,7 @@ in with self; { sExtinct = derive2 { name="sExtinct"; version="1.1"; sha256="1l6232z6c4z3cfl1da94wa6hlv9hj5mcb85fj1y0yparkvvl8249"; depends=[lattice]; }; sFFLHD = derive2 { name="sFFLHD"; version="0.1.1"; sha256="19zhx0rc6h44301a5q68r9jbxzh12ci3387d1c319vdiw05nschy"; depends=[conf_design DoE_base]; }; sGPCA = derive2 { name="sGPCA"; version="1.0"; sha256="16aa5jgvkabrlxaf1p7ngrls79mksarh6di3vp26kb3d3wx087dx"; depends=[fields Matrix]; }; - sNPLS = derive2 { name="sNPLS"; version="0.1.5"; sha256="1gkpgz57pyxhrllbb4p1w79nrzqfh6hx05nn5hj7d7ans9qsgw53"; depends=[car ks MASS Matrix pbapply plotrix rgl]; }; + sNPLS = derive2 { name="sNPLS"; version="0.1.8"; sha256="0511542q4sda0vhgbl5jzcp2xyin3fzgmhhx1mkah8khmndxiq2p"; depends=[car ks MASS Matrix pbapply plotrix rgl]; }; sROC = derive2 { name="sROC"; version="0.1-2"; sha256="0cp6frhk9ndffb454dqp8fzjrla76dbz0mn4y8zz1nbq1jzmz0d3"; depends=[]; }; sSDR = derive2 { name="sSDR"; version="1.2.0"; sha256="1fqsglqzsbzdvcdnwwf7mg6x20zfpw66x63r6avac3w1pz3n7kvx"; depends=[MASS Matrix]; }; sValues = derive2 { name="sValues"; version="0.1.4"; sha256="0y2cv3wls2y3zpbm2d098xj5n098yjl32yi7mwha6mhfwfa4y99l"; depends=[caTools ggplot2 reshape2]; }; @@ -9033,14 +9448,15 @@ in with self; { sac = derive2 { name="sac"; version="1.0.1"; sha256="1rl5ayhg5y84fw9w3zf43dijjlw9x0g0w2z4haw5xmxfni72ms8w"; depends=[]; }; saccades = derive2 { name="saccades"; version="0.1-1"; sha256="138a6g3hjmcyvflpxx1lhgxnb8svrynplrjnvzij7c4bzkp8zip6"; depends=[zoom]; }; sadists = derive2 { name="sadists"; version="0.2.3"; sha256="17jlzx5h5l1w7riz0rs99w31n6lxnnxwzbzqn2z5r292j2nxvmkw"; depends=[hypergeo orthopolynom PDQutils]; }; - sads = derive2 { name="sads"; version="0.3.1"; sha256="17ndy8li01qgd86l3wvmkwjs2iz982bmrkxikv6y69s8mznd82qp"; depends=[bbmle GUILDS MASS poilog VGAM]; }; + sads = derive2 { name="sads"; version="0.4.0"; sha256="1pqbdg2vxh18lg0vpi5yrh6j0nv58yzjrzahic3bdyy1lwaahdg3"; depends=[bbmle GUILDS MASS poilog VGAM]; }; sae = derive2 { name="sae"; version="1.1"; sha256="1izww27cqd94yrfbszbzy44plznxsirzn0752ag7xw7qzm5ywp3d"; depends=[MASS nlme]; }; sae2 = derive2 { name="sae2"; version="0.1-1"; sha256="0fbbh2s0gjhyhypaccnd37b5g2rhyzq7mrm6s0z36ldg1pzi4dd9"; depends=[MASS]; }; saeRobust = derive2 { name="saeRobust"; version="0.1.0"; sha256="1zin9ix4wx3qbx2mfjyn61l0g1k4dgn4ps79qn21y6l9r647ya9q"; depends=[aoos assertthat ggplot2 magrittr MASS Matrix memoise modules Rcpp RcppArmadillo spdep]; }; - saeSim = derive2 { name="saeSim"; version="0.8.0"; sha256="1yabhhrmp0d9vzs7cn7ngdilmyli10zqyv5ys2sx9s5pqqlvgbij"; depends=[dplyr functional ggplot2 MASS parallelMap spdep]; }; + saeSim = derive2 { name="saeSim"; version="0.9.0"; sha256="19l41qpwspccphmgxi20p7f473lxxh8d86b0wyy5jq24phhd8awx"; depends=[dplyr functional ggplot2 MASS parallelMap spdep]; }; saemix = derive2 { name="saemix"; version="1.2"; sha256="1whwn54iiapdfig6qpzji3z3skir6jrs34dq78zlynibgrg95hx6"; depends=[]; }; saery = derive2 { name="saery"; version="1.0"; sha256="09x1v627llqbpiwkh1wr0z7gsndfdrjzag2hprhq1adbzh05k47z"; depends=[]; }; safeBinaryRegression = derive2 { name="safeBinaryRegression"; version="0.1-3"; sha256="1g68r6pp5l41rbgyfqgcha1gpsisnl0ybdmdqr4ylr43f61dpgvd"; depends=[lpSolveAPI]; }; + safer = derive2 { name="safer"; version="0.1.0"; sha256="04hwncx9g9c6lb4l9f12nyld5wq4fqr8v4w0m64qhwyiv0zi8sh1"; depends=[assertthat base64enc sodium]; }; safi = derive2 { name="safi"; version="1.0"; sha256="1km58w57kdmyfj4a97zhnjcka4q4pxm8r2br01qq2niaihpbzp98"; depends=[]; }; sampSurf = derive2 { name="sampSurf"; version="0.7-3"; sha256="165y2z9bhf7cyrh177fk87apqpgzyn69gf53f9mmii931cyykihw"; depends=[boot raster rasterVis sp]; }; sampleSelection = derive2 { name="sampleSelection"; version="1.0-4"; sha256="0by6l20hsaqvkcxpvn7lr6p2g78lb1464dygp7x4h8sq1fc4j4av"; depends=[Formula maxLik miscTools mvtnorm systemfit VGAM]; }; @@ -9051,7 +9467,7 @@ in with self; { samplingDataCRT = derive2 { name="samplingDataCRT"; version="1.0"; sha256="0ah3fi2sn642c8nicikhjhl1hdsjzshrf1j02swq0jaqggcqjdvk"; depends=[mvtnorm]; }; samplingEstimates = derive2 { name="samplingEstimates"; version="0.1-3"; sha256="1srdchlpxksfdqhf5qdvl7nz0qsxkxww7hzqj0q71asbzlq3am3p"; depends=[samplingVarEst]; }; samplingVarEst = derive2 { name="samplingVarEst"; version="1.0-2"; sha256="182y1srz2cs6rn8kh6nns5v29q0ww2jmv0yfp8b110qq23wd5mnd"; depends=[]; }; - samplingbook = derive2 { name="samplingbook"; version="1.2.1"; sha256="0xjsmsqj3ik2ffih8f2cpq6m5rpk603y697mh5m42frg20cqa87w"; depends=[pps sampling survey]; }; + samplingbook = derive2 { name="samplingbook"; version="1.2.2"; sha256="1szx9bdlxxn2yhy9i362fcscn5cydvrkw9kggr7yqb715k5n1j6n"; depends=[pps sampling survey]; }; samr = derive2 { name="samr"; version="2.0"; sha256="0rsfca07pvmhfn7b49yk2ycw00wsq6dmrpv9haxz8q0xv7n5n2q9"; depends=[impute matrixStats]; }; sand = derive2 { name="sand"; version="1.0.3"; sha256="0h7djria9v75gqcygjcfznpchqgxjqc6b43arvq9ni1xjrq8sszf"; depends=[igraph igraphdata]; }; sandwich = derive2 { name="sandwich"; version="2.3-4"; sha256="0kbdfkqc8h3jpnlkil0c89z1192q207lii92yirc61css7izfli0"; depends=[zoo]; }; @@ -9059,9 +9475,10 @@ in with self; { sankey = derive2 { name="sankey"; version="1.0.0"; sha256="0wm10f514sg3gfrz291k720kznnyssznyvr49c15i26bhb82m0q0"; depends=[simplegraph]; }; sanon = derive2 { name="sanon"; version="1.5"; sha256="1iikm7ivlz87kbq0ax9r1dz29zdq1kmhxd2imzc4hkvr1rwgciv6"; depends=[]; }; sapa = derive2 { name="sapa"; version="2.0-2"; sha256="056xlh14dnzq4x7sbp7ff2k61jxy7110a742b502vz549qfrr5ds"; depends=[ifultools splus2R]; }; - sarima = derive2 { name="sarima"; version="0.4-3"; sha256="1y4wz4c27lmxkwc87diy5fvj25jzmflfji5b4ajx6pql3d3ral4s"; depends=[FitAR FitARMA ltsa PolynomF portes]; }; + sarima = derive2 { name="sarima"; version="0.4-5"; sha256="1qhw9csfci1z9wsf3rylhfhw59180qhn575xlwmi1zvp179hlmrj"; depends=[FitAR FitARMA lagged ltsa PolynomF portes]; }; sas7bdat = derive2 { name="sas7bdat"; version="0.5"; sha256="0qxlapb6wdhzpwlmzlhscy3av7va3h6gkzsppn4sx5q960310an3"; depends=[]; }; satellite = derive2 { name="satellite"; version="0.2.0"; sha256="00znkb9wsg7yqxykb5bhl1chqir26h4ixhcqzxg6j1c4hpd2sakk"; depends=[plyr raster Rcpp]; }; + satscanMapper = derive2 { name="satscanMapper"; version="1.0.0"; sha256="0yjz00nnkyp6q96r3nnizvglblxqg9rprbrc7rh9bpvydps3xxiy"; depends=[foreign RColorBrewer SeerMapper sp stringr]; }; saturnin = derive2 { name="saturnin"; version="1.1.1"; sha256="0cjp4h1s9ivn17v8ar48mxflaj9vgv92c8p9l2k5bc9yqx9mcs36"; depends=[Rcpp RcppEigen]; }; saves = derive2 { name="saves"; version="0.5"; sha256="1b4mfi2851bwcp0frx079h5yl6y1bhc2s8ziigmr8kwy1y1cxw10"; depends=[]; }; saws = derive2 { name="saws"; version="0.9-6.1"; sha256="0w40j6xczqs74z1z3na4510w06px7yn55s2mw9mddd6736l56fv1"; depends=[gee]; }; @@ -9081,23 +9498,23 @@ in with self; { scam = derive2 { name="scam"; version="1.2-1"; sha256="039iym85khym5m6g712lbd5s0c6dfw9xlpvlj29rwlcl1dkr1g7v"; depends=[Matrix mgcv]; }; scan = derive2 { name="scan"; version="0.20"; sha256="1xyng9dlfmp7n2h91n4xy9lx3jm205gjiizdqk1yj1qw8mmahvqc"; depends=[nlme]; }; scanstatistics = derive2 { name="scanstatistics"; version="0.1.0"; sha256="0snscxaw2j406bi29ns0z34lb3q39fq3wikkdnps6gkvxg97614i"; depends=[data_table gamlss_dist magrittr plyr sets]; }; - scape = derive2 { name="scape"; version="2.2-0"; sha256="0dgbh65fg6i5x4lpfkshn382zcc4jk1wp62pwd2l2f59pyfb92a3"; depends=[coda Hmisc lattice]; }; + scape = derive2 { name="scape"; version="2.3-1"; sha256="0maccnkhn7wf6brwnb5b7nh2yx3afx0h7kji2475mvg19909mddq"; depends=[coda Hmisc lattice]; }; scar = derive2 { name="scar"; version="0.2-1"; sha256="04x42414qxrz8c7xrnmpr00r46png2jy5giwicdx6gx8jwrkzhzs"; depends=[]; }; scatterD3 = derive2 { name="scatterD3"; version="0.8.1"; sha256="1fyk2z8ari73nbah2r4c677nm3v0whfia6sh39gr674cczp6vc8q"; depends=[digest ellipse htmlwidgets]; }; scatterpie = derive2 { name="scatterpie"; version="0.0.7"; sha256="0bfzhpakdwlps900dnsp6b5hrrmi02jcmk31afp4pixyj3r7h3c8"; depends=[ggforce ggplot2 tidyr]; }; - scatterplot3d = derive2 { name="scatterplot3d"; version="0.3-39"; sha256="02fjwb2832s2059iiaw3n9ka8i5s94z80gz4bzwl93vp8sjrp6sh"; depends=[]; }; - scclust = derive2 { name="scclust"; version="0.1.0"; sha256="122i4w8hij6715p8m6yxlcigg1xaygndxfzric3b8lpbbb675v15"; depends=[distances]; }; + scatterplot3d = derive2 { name="scatterplot3d"; version="0.3-40"; sha256="0ababcj87kx7860mica9y2ydlhskxmgj9n46crx036cila512jc2"; depends=[]; }; + scclust = derive2 { name="scclust"; version="0.1.1"; sha256="1bml4qyyspwaqxzwjhqy8i450614p3f3dj0s0qdkv6psa60h0w5z"; depends=[distances]; }; scdhlm = derive2 { name="scdhlm"; version="0.3.1"; sha256="1b5x4kqvmkpb8wbgfhnwqakisw6hfnvama2bsnd8kvw4alfanxhm"; depends=[nlme]; }; scenario = derive2 { name="scenario"; version="1.0"; sha256="0v1b00kiny21yx4qkk2x51cy1zqibdnd68z76qia7h5py28yhxsi"; depends=[]; }; schoRsch = derive2 { name="schoRsch"; version="1.4"; sha256="19k34i74ira71v0r5gz9rfnbadnjzi0wpxcm4zqqn7y6jpmfbd11"; depends=[]; }; scholar = derive2 { name="scholar"; version="0.1.4"; sha256="088clkpllpjv9rjb45v46dga4ig11ifvfyclgfgcgqvxy5cn92jr"; depends=[dplyr httr R_cache rvest stringr xml2]; }; schoolmath = derive2 { name="schoolmath"; version="0.4"; sha256="06gcmm294d0bs5whvknrq48sk7li961lzy4bcncjg052zbbpn67x"; depends=[]; }; - schumaker = derive2 { name="schumaker"; version="0.3"; sha256="0y2jyy3za7xi8l9kc0z35mqc7a29lbxmaqgax8frljmqsnwkwwhp"; depends=[]; }; + schumaker = derive2 { name="schumaker"; version="1.0"; sha256="0qsbpza1x6kjs4jizg9fvhg0q5s05b5s6jv7r4fjajq9552dc83c"; depends=[]; }; schwartz97 = derive2 { name="schwartz97"; version="0.0.6"; sha256="0l34f30l75zrg3n377jp0cw7m88cqkgzy6ql78mrx8ra88aspfzn"; depends=[FKF mvtnorm RUnit]; }; scidb = derive2 { name="scidb"; version="2.0.0"; sha256="079akdsxxjnca5jsv0grw1c2nd3dl368xhy4mzm94mh5j6ghi57l"; depends=[bit64 curl data_table digest openssl]; }; scientoText = derive2 { name="scientoText"; version="0.1"; sha256="0f18hg9s50lbbgl0fqjv45yhynpnsxj8wwm07g126snzr68gbd21"; depends=[stringr tm]; }; scio = derive2 { name="scio"; version="0.6.1"; sha256="0h15sscv7k3j7qyr70h00n58i5f44k96qg263mxcdjk9mwqr0y65"; depends=[]; }; - sciplot = derive2 { name="sciplot"; version="1.1-0"; sha256="0na4qkslg3lns439q1124y4fl68dgqjck60a7yvgxc76p355spl4"; depends=[]; }; + sciplot = derive2 { name="sciplot"; version="1.1-1"; sha256="1ydwx9kh778z3x7s3i6gqinqi6bmsf6bslaf0mgszj0nrgcmj6y3"; depends=[]; }; sclero = derive2 { name="sclero"; version="0.2"; sha256="1vqysby822s958msnwcqmz78193vrgmpf6si1jnfb9cj90hh7wgg"; depends=[plyr RImageJROI spatstat]; }; scmamp = derive2 { name="scmamp"; version="0.2.55"; sha256="17qhj9l1akxachaimy9d5rls8adph8aalj3qr6ckip29a8ma9gf7"; depends=[ggplot2 graph reshape2 Rgraphviz]; }; score = derive2 { name="score"; version="1.0.2"; sha256="1p289k1vmc7qg70rv15x05dyb92r7s6315whr1ibi40sqln62a5s"; depends=[msm]; }; @@ -9106,6 +9523,7 @@ in with self; { scoringRules = derive2 { name="scoringRules"; version="0.9.2"; sha256="04vkw2azyj1xsnyr58cgagajcd2f7r0843i9v77p4wvzv96rl851"; depends=[MASS Rcpp RcppArmadillo]; }; scout = derive2 { name="scout"; version="1.0.4"; sha256="0vr497g7g1xhf75cwjbjsns2fvdzy86iibbf5w0g2xylw82s4lh2"; depends=[glasso]; }; scphaser = derive2 { name="scphaser"; version="1.0.0"; sha256="1n5ihdpjclpiwg2i6v8m46ysjg53fzsr0j60ijnvrq328y0iqis4"; depends=[BiocParallel cluster Hmisc R_utils]; }; + scpm = derive2 { name="scpm"; version="1.0-1"; sha256="16f2wsv6vrgnhky969nd7k0l7z8c0jw85yf9zbrvg1lcxgv9kg8i"; depends=[geoR interp lattice MASS Matrix mvtnorm RandomFields rgl]; }; scrapeR = derive2 { name="scrapeR"; version="0.1.6"; sha256="1rqgqpn9rc43rh356z9gb51pjhdczr9a9mgv0i078nniq156rmlb"; depends=[RCurl XML]; }; scrime = derive2 { name="scrime"; version="1.3.3"; sha256="1vp7ai10m0f3s0hywyqh0yllxj6z6p795zqpr6vp58fh6yq20x73"; depends=[]; }; scriptests = derive2 { name="scriptests"; version="1.0-16"; sha256="11l145gvzkxqwbzw976rq94krly1p4lahqw051dwaacarq4hnrdg"; depends=[]; }; @@ -9118,8 +9536,8 @@ in with self; { sdPrior = derive2 { name="sdPrior"; version="0.3"; sha256="0d3w75p3r2h07xhp7fj4si1y4sav8vs0lq6h2h4fn4f2inn3l0vl"; depends=[caTools GB2 MASS]; }; sda = derive2 { name="sda"; version="1.3.7"; sha256="1v0kp6pnjhazr8brz1k9lypchz8k8gdaby8sqpqzjsj8klghlcjp"; depends=[corpcor entropy fdrtool]; }; sdat = derive2 { name="sdat"; version="1.0"; sha256="1rp2s3y44f3vj0p16j1k2rrs44kmnzy9k0lpcm9ga801nbv93saz"; depends=[]; }; - sdcMicro = derive2 { name="sdcMicro"; version="5.0.1"; sha256="1krl7685wpfgibf8hwf9ni483nvwgsi3pmdjlgpd2cbqsrmnlc45"; depends=[car cluster data_table DT e1071 ggplot2 haven knitr MASS prettydoc Rcpp rhandsontable rmarkdown robustbase sets shiny shinyBS xtable]; }; - sdcTable = derive2 { name="sdcTable"; version="0.22.4"; sha256="1pshzqns4d2kd388rf2kz1y8q3gjm2n77c2bdapbmf2v8mkw2vmd"; depends=[data_table lpSolveAPI Rcpp Rglpk slam stringr]; }; + sdcMicro = derive2 { name="sdcMicro"; version="5.0.2"; sha256="094qpgpwb0lmlgrbvglf87q48xq1xzdd4bxmi4kjlsz8hq4kkhki"; depends=[car cluster data_table DT e1071 ggplot2 haven knitr MASS prettydoc Rcpp rhandsontable rmarkdown robustbase sets shiny shinyBS xtable]; }; + sdcTable = derive2 { name="sdcTable"; version="0.22.6"; sha256="09yxsmdyrilrin81bnww8wsjqf6fjyfmf2i5ccz0sn8q8dgfajln"; depends=[data_table lpSolveAPI Rcpp Rglpk slam stringr]; }; sdcTarget = derive2 { name="sdcTarget"; version="0.9-11"; sha256="18cf276mh1sv16xn0dn8par4zg8k7y8710byxiih6db4i616fjpi"; depends=[doParallel foreach magic tuple]; }; sddpack = derive2 { name="sddpack"; version="0.9"; sha256="1963l8jbfwrqhqcpif73di9i5mb996r4f8smjyil6l7sdir7cg9l"; depends=[]; }; sde = derive2 { name="sde"; version="2.0.15"; sha256="0gxyhq9lafd62y68h7fd746a3jz3jdsm0shgwm2ylmp4a2f5cdmm"; depends=[fda MASS zoo]; }; @@ -9131,31 +9549,32 @@ in with self; { sdprisk = derive2 { name="sdprisk"; version="1.1-5"; sha256="1c6mipq8sh8347i7m7dh47f69fr21xkrsk8yjgsdvcy41h8zijmf"; depends=[numDeriv PolynomF rootSolve]; }; sdtoolkit = derive2 { name="sdtoolkit"; version="2.33-1"; sha256="0pirgzcn8b87hjb35bmg082qp14idc5pfvm6dikpgkswag23hwh8"; depends=[]; }; sdwd = derive2 { name="sdwd"; version="1.0.2"; sha256="0l0w4jn2p9b7acp8gmlv4w8n662l397kbrm4glslik0vnmjv151w"; depends=[Matrix]; }; - seacarb = derive2 { name="seacarb"; version="3.1.1"; sha256="1q7r9b6f38lnabfifyjvhc0aiphdp9z2lbh02da1vgpz538bv5zj"; depends=[oce]; }; + seacarb = derive2 { name="seacarb"; version="3.2"; sha256="048wbzap9pc7iv7lh9rzdxawbnnjd6lmw7bfadry5xnw26p6vnad"; depends=[gsw oce]; }; sealasso = derive2 { name="sealasso"; version="0.1-2"; sha256="0cjy3fj170p5wa41c2hwscmhqxwkjq22vhg9kbajnq7df2s20jcp"; depends=[lars]; }; searchConsoleR = derive2 { name="searchConsoleR"; version="0.2.1"; sha256="1hf87x3jfwl12d1gspnrgpzh90hpci5gh54hasi6bx6z8xw44ssb"; depends=[googleAuthR stringr]; }; searchable = derive2 { name="searchable"; version="0.3.3.1"; sha256="0xc87i2q42j7dviv9nj4hkgjvpfiprkkjpgzwsy47vp7q8024dv0"; depends=[magrittr stringi]; }; seas = derive2 { name="seas"; version="0.4-3"; sha256="1n0acg6fvaym4nx1ihw0vmb79csds0k4x9427qmcyxbl9hxxmllp"; depends=[]; }; season = derive2 { name="season"; version="0.3-5"; sha256="08f382kq51r5g9p5hsnjf17dwivhx1vfgmmwp1vzmbqx1drlqkzx"; depends=[coda ggplot2 MASS mgcv survival]; }; - seasonal = derive2 { name="seasonal"; version="1.5.1"; sha256="0gwjzp7syg20qbv7jp97ibd51905fkxdsfvpjmvk4zgxd5p69cfm"; depends=[x13binary]; }; - seasonalview = derive2 { name="seasonalview"; version="0.2"; sha256="1gmg9641niazf3vs4ranqyi9i4bv23msxp11r6dyhcm9apxqlyxs"; depends=[dygraphs htmlwidgets openxlsx seasonal shiny shinydashboard xtable xts zoo]; }; + seasonal = derive2 { name="seasonal"; version="1.6.1"; sha256="1nvavn84f2zb0f6n352br52wcrcmnxv6vprzcpymrnzik7pyp8y6"; depends=[x13binary]; }; + seasonalview = derive2 { name="seasonalview"; version="0.3"; sha256="1l705yc7ssldsfckbgnvd95sh3zzhpkmf1rr6ar2s60s3wsyly4n"; depends=[dygraphs htmlwidgets openxlsx seasonal shiny shinydashboard xtable xts zoo]; }; seawaveQ = derive2 { name="seawaveQ"; version="1.0.0"; sha256="19vm1f0qkmkkbnfy1hkqnfz6x2a7g9902ka76bhpcscynl69iy56"; depends=[lubridate NADA survival]; }; - secr = derive2 { name="secr"; version="2.10.4"; sha256="034ad8w9p478552ax7gr5yp3fh6r968b92rmisjnags8x1vsynda"; depends=[abind MASS mgcv nlme raster sp]; }; + secr = derive2 { name="secr"; version="3.0.1"; sha256="0pb388kp6w54zm4a6xycl6gd6xa6jvzcqqwchsbdniaq2vz8r64q"; depends=[abind MASS mgcv nlme raster sp]; }; secrdesign = derive2 { name="secrdesign"; version="2.4.0"; sha256="0v9d94ra614884imv29qwhr4zkx3dzssdpz8nv86k1kigx51w1xp"; depends=[abind secr]; }; - secrlinear = derive2 { name="secrlinear"; version="1.0.5"; sha256="084d0spshf3lh1m50kyb0r8x9lz4yrfj6b7snywffxhqyjw147hf"; depends=[igraph maptools MASS secr sp]; }; + secret = derive2 { name="secret"; version="1.0.0"; sha256="09b28f7ndc167bbanbdydralykq718fixnrgs5xr9d3fbdhz1vdl"; depends=[assertthat curl jsonlite openssl rprojroot]; }; + secrlinear = derive2 { name="secrlinear"; version="1.1.0"; sha256="0crzpsm8c42v8r0xf9rnrxcinjh22sywgv7cc3pq5s5l2526d5dj"; depends=[igraph maptools MASS rgdal secr sp]; }; secure = derive2 { name="secure"; version="0.5"; sha256="16pv5m7rrcs8hcjj3kylq7smyzf2qk8rkg9m1b421w0ac7lg04x1"; depends=[MASS Rcpp RcppArmadillo]; }; seeclickfixr = derive2 { name="seeclickfixr"; version="1.1.0"; sha256="1agsqq2msrqrssffc6liyjjs6nqm90xy2inlcjbkdac5dhinjc4n"; depends=[jsonlite RCurl]; }; seedy = derive2 { name="seedy"; version="1.3"; sha256="1a21sl8i7z12cjaqj08lkq3viazxlgxv82vaarm58fgbpsvdi0m0"; depends=[]; }; seeg = derive2 { name="seeg"; version="1.0"; sha256="1d45vl075p4qbd74gpaa8aw1h82p9n633fym10yp9bmcv4gwksg6"; depends=[car sgeostat spatstat]; }; - seem = derive2 { name="seem"; version="1.0"; sha256="0cjdi9c89bqvrx9gzxph958cfqicc1qfnzsair0gvsk3cxsrw6bf"; depends=[]; }; seewave = derive2 { name="seewave"; version="2.0.5"; sha256="1ml0jcqb6i6v0xgarvzg51rgax6lsf6y2255jq1kfz4v8n39vnh0"; depends=[tuneR]; }; seg = derive2 { name="seg"; version="0.5-1"; sha256="0gsdbq7b5wpknhlilrw771japr63snvx4vpirvzph4fjyby1c7rg"; depends=[sp splancs]; }; segmag = derive2 { name="segmag"; version="1.2.4"; sha256="1i717xg1z7s35pkwzywgjf9wx7zj9xksv0k87h7p1q62y073qbqm"; depends=[plyr Rcpp]; }; - segmented = derive2 { name="segmented"; version="0.5-1.4"; sha256="1740cvx2q4v23g4q0zkvg50s5bv8jcrlzzhm7fac4xn0riwmzp5i"; depends=[]; }; + segmented = derive2 { name="segmented"; version="0.5-2.1"; sha256="1i576xksc761nyv2dmq86nwbgqvp0plz6bjcn69nkdwq2wbizmw8"; depends=[]; }; seismic = derive2 { name="seismic"; version="1.0"; sha256="02d11c3filzghi8cvryikaidmk40d4z3qxsqs7bjdhxyf814caw8"; depends=[]; }; seismicRoll = derive2 { name="seismicRoll"; version="1.1.2"; sha256="183lx9lgmi06lv1l4gbmlmblfgjzhph4aavdnxrykpp6122hsq61"; depends=[Rcpp]; }; sejmRP = derive2 { name="sejmRP"; version="1.3.4"; sha256="1j3sadbp12fip3n96s0hx1sg4kzwx8z01p1c905kv8gffhkz9bh0"; depends=[cluster DBI dplyr factoextra RPostgreSQL rvest stringi tidyr XML xml2]; }; selectMeta = derive2 { name="selectMeta"; version="1.0.8"; sha256="0i0wzx5ggd60y26lnn4qk4n8h27ahll9732026ppks1djx14cdy0"; depends=[DEoptim]; }; + selectapref = derive2 { name="selectapref"; version="0.1.0"; sha256="09kqrr814261mvpzc9x7v0fcnd4wf8fcl52jsx6snf1qp336hw26"; depends=[]; }; selection = derive2 { name="selection"; version="1.0"; sha256="1w2mzb16frcbh55icc5g8ai3hri9j6dhp7h0kc96iaspphnfw4n8"; depends=[fifer norm]; }; selectiongain = derive2 { name="selectiongain"; version="2.0.591"; sha256="11gd9xdn3jl3mg3c9ykw8bqvcxhihn19iqsy8dl8bacijjv84bva"; depends=[mvtnorm]; }; selectiveInference = derive2 { name="selectiveInference"; version="1.2.2"; sha256="1rmrvwa54xj3rxmfnhr2vwdxv9s3xlv35pqf08iiy525nqd2hsy5"; depends=[glmnet intervals survival]; }; @@ -9164,7 +9583,7 @@ in with self; { seleniumPipes = derive2 { name="seleniumPipes"; version="0.3.7"; sha256="1krpzh2gy3yl07c2n1d8q21xjc2qcv5ac1kv7212710bxkdyfad6"; depends=[httr jsonlite magrittr whisker xml2]; }; selfea = derive2 { name="selfea"; version="1.0.1"; sha256="0zyxbd5vg8nhigill3ndcvavzbb9sbh5bz6yrdsvzy8i5gzpspvx"; depends=[ggplot2 MASS plyr pwr]; }; selfingTree = derive2 { name="selfingTree"; version="0.2"; sha256="18ylxmg2ms4ccgm4ahzfl65x614wiq5id7zazjjz5y75h8gs7gzj"; depends=[foreach]; }; - sem = derive2 { name="sem"; version="3.1-8"; sha256="17qid9jvkmccgnw56jwxmkc6hmanc7vp1c6acj5nv9j47f4bc3jv"; depends=[boot MASS matrixcalc mi]; }; + sem = derive2 { name="sem"; version="3.1-9"; sha256="1f9c6g6pfx66gd2pappcsqh484ah6a0x4z47hpd46rah0817hcsa"; depends=[boot MASS matrixcalc mi]; }; semGOF = derive2 { name="semGOF"; version="0.2-0"; sha256="1lsv72yaza80jqadmah7v2cpfqfay57y12hcz6brvia6bmr5qagb"; depends=[MASS matrixcalc sem]; }; semPLS = derive2 { name="semPLS"; version="1.0-10"; sha256="0q5linjyv5npkw4grx3vq58iq2q1grf06ikivhkg8w7rvb7pqn6b"; depends=[lattice]; }; semPlot = derive2 { name="semPlot"; version="1.1"; sha256="0fzz580an7mmq6vycxbcvfdqbii0qz0nghlidb6in05j8dppsnsn"; depends=[colorspace corpcor igraph lavaan lisrelToR OpenMx plyr qgraph rockchalk sem semTools XML]; }; @@ -9184,6 +9603,7 @@ in with self; { sensitivity2x2xk = derive2 { name="sensitivity2x2xk"; version="1.01"; sha256="1r829k939zzmi0j4chdaniajchcflmmjrl3a9hwnkg0wkfnjbvdl"; depends=[BiasedUrn mvtnorm]; }; sensitivityPStrat = derive2 { name="sensitivityPStrat"; version="1.0-6"; sha256="0rfzvkpz7dll3173gll6np65dyb40zms63fkvaiwn0lk4aryinlh"; depends=[survival]; }; sensitivityfull = derive2 { name="sensitivityfull"; version="1.5.6"; sha256="0g2gc4rms6gd34d23kxj50pjh0yq1h6yiybj4dxwyf6i2652irhq"; depends=[]; }; + sensitivitymult = derive2 { name="sensitivitymult"; version="1.0.1"; sha256="0x07r9xwkbcxhqa1cg9d7gz5k7a81v9999fbxkf0p380rknzcidc"; depends=[]; }; sensitivitymv = derive2 { name="sensitivitymv"; version="1.3"; sha256="1bxf85q91smnsl2lsig43vk0c63c805d8ry1xh3w6q675djj14ad"; depends=[]; }; sensitivitymw = derive2 { name="sensitivitymw"; version="1.1"; sha256="1bknnfkkqgmchabcjdfikm37sn5k41ar8lpnjw58i8qh7yzq237i"; depends=[]; }; sensors4plumes = derive2 { name="sensors4plumes"; version="0.9"; sha256="1fyf020bl6p9wdvnsfkmdlllhdwj3l4h9h2paq9dwd7hsr7av48p"; depends=[automap conf_design emdist FNN genalg gstat lattice raster rgdal sp]; }; @@ -9193,32 +9613,36 @@ in with self; { seqCBS = derive2 { name="seqCBS"; version="1.2"; sha256="1kywi3kvvl9y6nm7cwf6fj8gz9gzznp5va336g1akzgy77k82d8v"; depends=[clue]; }; seqDesign = derive2 { name="seqDesign"; version="1.1"; sha256="1694swd8ik9fbiflmnw4xpq82kq18rqzkw0dv5pvq30c47xjgamv"; depends=[survival xtable]; }; seqHMM = derive2 { name="seqHMM"; version="1.0.7"; sha256="1pap3i2zxgnxr3frw648hkzbhn4rnz20lzhhvrp89vhc77vh4ds1"; depends=[gridBase igraph Matrix nloptr numDeriv Rcpp RcppArmadillo TraMineR]; }; + seqICP = derive2 { name="seqICP"; version="1.0"; sha256="16xw567kg0vl0gby54yiaxwcic5krajsqbnphn58wxaksj7w7qmd"; depends=[dHSIC mgcv]; }; seqMeta = derive2 { name="seqMeta"; version="1.6.7"; sha256="11dscdrlnk5jzg0q2g59qis4xjr4xs86bi463jmhq53n9gsb4i1l"; depends=[CompQuadForm coxme Matrix survival]; }; seqPERM = derive2 { name="seqPERM"; version="1.0"; sha256="1i8ai4gxybh08wxjh96m6xlqxhh7ch0xihjs879snmy4zqfi0pap"; depends=[]; }; seqRFLP = derive2 { name="seqRFLP"; version="1.0.1"; sha256="1i98hm8wgwr8b6hd237y2i9i0xgn35w4n2rxy4lqc5zq71gkwkvk"; depends=[]; }; seqinr = derive2 { name="seqinr"; version="3.3-6"; sha256="13d0qxm2244wgdl2dy2s8vnrnf5fx4n47if9gkb49dqx6c0sx8s2"; depends=[ade4 segmented]; }; - seqminer = derive2 { name="seqminer"; version="5.9"; sha256="0sfkxrc9gy5a8fadzyzfzh7l5grasm8cj6cd2nnpv85ws6mqr6qd"; depends=[]; }; + seqminer = derive2 { name="seqminer"; version="6.0"; sha256="057j1l6dip35l1aivilapl2zv9db677b3di2pb3sfgq2sxg0ps3l"; depends=[]; }; seqmon = derive2 { name="seqmon"; version="2.1"; sha256="0p7vbrx0l59wyxhg59a8nnnk1z46inys30rpchj0v5ggadaazjkx"; depends=[]; }; seqtest = derive2 { name="seqtest"; version="0.1-0"; sha256="1bdfww9szh7h278id5xpfc39mxkcix3yvsdwc68wx3q3x0wxhqhq"; depends=[]; }; sequences = derive2 { name="sequences"; version="0.5.9"; sha256="17571m525b6a3k4f0m936wfq401181gx1fpb7x4v0fhaldzdmk3a"; depends=[Rcpp]; }; sequenza = derive2 { name="sequenza"; version="2.1.2"; sha256="0f3aj96qvbr1wqimlv6rxg0v34zlrgc6pbdy7sfkwfzs1n44q1xf"; depends=[copynumber squash]; }; sequoia = derive2 { name="sequoia"; version="0.8.1"; sha256="0raznn4h0k50idvxfx74fb4df5357kgwwb9794ys6bm3lfi0jpjl"; depends=[plyr]; }; serial = derive2 { name="serial"; version="1.2"; sha256="1zjzm5ym8z9g97sff6bg9p5dhjpj6g26wam9j9gklffiry8dd9li"; depends=[]; }; - seriation = derive2 { name="seriation"; version="1.2-1"; sha256="1h3zl3imrymz4kdzccnplc6w6b793csgq5r9cfjc37gbmjg3jf1j"; depends=[cluster colorspace dendextend gclus gplots MASS qap registry TSP]; }; + seriation = derive2 { name="seriation"; version="1.2-2"; sha256="1b6glraxi5zrqzihnh39bbdnzsbd925r9hjpi020d470266g2c8f"; depends=[cluster colorspace dendextend gclus gplots MASS qap registry TSP]; }; seroincidence = derive2 { name="seroincidence"; version="1.0.5"; sha256="07lphrp7r3i87633q8g6svk2mxbsvq4blrf8gnm0p99hkmz8wgg9"; depends=[]; }; - servr = derive2 { name="servr"; version="0.5"; sha256="1ixcl9xjc1k9zvl6v6bsw4kpramr1h53b4s46qg8kahkqy6kqd8a"; depends=[httpuv jsonlite mime]; }; + servr = derive2 { name="servr"; version="0.6"; sha256="0sqz3wssxa19g9mpmf9s4gx2a5rvzl8nrd11qkgpz5v3iqsc6ysr"; depends=[httpuv jsonlite mime]; }; sesem = derive2 { name="sesem"; version="1.0.2"; sha256="0b1xzv38wpkhhlq87xrvlh45b8ksbi8bg4ar5hrf8gxa19r9rmi5"; depends=[gplots lavaan mgcv]; }; session = derive2 { name="session"; version="1.0.3"; sha256="04mcy1ac75fd33bg70c47nxqxrmqh665m9r8b1zsz5jij1sbl8q5"; depends=[]; }; + sessioninfo = derive2 { name="sessioninfo"; version="1.0.0"; sha256="00g3lbvk1cjjzckl70fn5n3579qb301im4lbm3cip5c2v8k283dk"; depends=[clisymbols withr]; }; setRNG = derive2 { name="setRNG"; version="2013.9-1"; sha256="02198cikj769yc32v8m2qrv5c01l2fxmx61l77m5ysm0hab3j6hs"; depends=[]; }; sets = derive2 { name="sets"; version="1.0-17"; sha256="1ib7wyzrdadxz7d29prr0k0dpx8yqgj9b1rnjn6lankjdlw7m08p"; depends=[]; }; setter = derive2 { name="setter"; version="0.0-1"; sha256="10fwrx8yysp99rrkbnn3rbz79vyzr2h3p7zxxlqapw1k2lllp0r5"; depends=[assertive_base]; }; settings = derive2 { name="settings"; version="0.2.4"; sha256="092sv6nccm6p2d695l9w0zfi2xgymk12c8p8lhl9nb86mxrb3nry"; depends=[]; }; severity = derive2 { name="severity"; version="2.0"; sha256="1mp19y2pn7nl9m8xfljc515kk5dirv0r2kypazpmd956lcivziqq"; depends=[]; }; - sf = derive2 { name="sf"; version="0.4-1"; sha256="0qsyg7yhrhdfdcgh2z89xb2v0b1wvs7jh530bs8b2vjsaql5fkay"; depends=[DBI magrittr Rcpp units]; }; + sf = derive2 { name="sf"; version="0.5-1"; sha256="1yz7a8pk0pxianivyr6sw83g0n7dhv9krbzf0zk3g74rdh2c8zxg"; depends=[DBI magrittr Rcpp units]; }; sfa = derive2 { name="sfa"; version="1.0-1"; sha256="1acqxgydf8j5csdkx0yf169x3yaa31r0ccdrqarh6vj1hacm89ad"; depends=[]; }; + sfadv = derive2 { name="sfadv"; version="1.0.1"; sha256="1rfpm6km5pckwhqgpvidm6qsj5sjdaqqj5b0sgvpslivfa4c80cr"; depends=[gmm minpack_lm]; }; sfc = derive2 { name="sfc"; version="0.1.0"; sha256="0cm4mfcfd9bhf2j5fppsihzrfipnldb6q3xradd88z9pwgrkfx2a"; depends=[dplyr sna tidyr triangle zoo]; }; + sfdct = derive2 { name="sfdct"; version="0.0.3"; sha256="00vm68w8fxwxkw69lay25mpd7zw86a15v5pi3nxnay8jx7vrmbhc"; depends=[dplyr RTriangle sf sp tibble]; }; sfinx = derive2 { name="sfinx"; version="1.7.9"; sha256="0gnli24mi9zh5j9ycpraksf4z7crr27sv6j3ycww7jfq5lfhg8kp"; depends=[]; }; - sfsmisc = derive2 { name="sfsmisc"; version="1.1-0"; sha256="0580piv4n1nispl3pa8nfjjfnb8iwaqky2dzdy0aqnxrxgrhqhvz"; depends=[]; }; + sfsmisc = derive2 { name="sfsmisc"; version="1.1-1"; sha256="0jzmbywlyzfxs7hlmyd0iynghfc9qp5sa5lnhr73y8r360yv1ahf"; depends=[]; }; sft = derive2 { name="sft"; version="2.0-7"; sha256="1fq1b32f08i4k9bv4hh7rhk1jj7kgans6dwh1bmawaqkchyab3jr"; depends=[fda]; }; sgPLS = derive2 { name="sgPLS"; version="1.4"; sha256="0yx3vg9rfm6jvrgfaky2dlbrbksa5475gx3g11x6i35nd2nb2p5z"; depends=[mixOmics]; }; sgRSEA = derive2 { name="sgRSEA"; version="0.1"; sha256="0vyypnq81l36x0j44q2l9wbf3x4krz4fzypi7vyqhaq97mkzaw5j"; depends=[]; }; @@ -9232,7 +9656,8 @@ in with self; { sgr = derive2 { name="sgr"; version="1.3"; sha256="0zxmrbv3fyb686hcgfy2w1w2jffxf41ab8yc90dsgf931s9c55wn"; depends=[MASS]; }; sgt = derive2 { name="sgt"; version="2.0"; sha256="0qb3maj5idwafs40fpdfrwzkadnh5yg8fvfzfs51p9yy69kbmlkx"; depends=[numDeriv optimx]; }; shades = derive2 { name="shades"; version="0.2.0"; sha256="1r2xbz1h144pg53g3ayy7n08091gv5zj52p02gv7kihir2kzxj0w"; depends=[]; }; - shadow = derive2 { name="shadow"; version="0.3.0"; sha256="0zvdyfa0i167kpwlwcm0dkjc9c01wiygvi75sx2ai4g2v8yqw7hj"; depends=[raster rgeos sp]; }; + shadow = derive2 { name="shadow"; version="0.3.3"; sha256="1685n637sr3717iyl9ws89cxflbyzr5lddy1vip3xaljigqa3xwy"; depends=[raster rgeos sp]; }; + shallot = derive2 { name="shallot"; version="0.3.2"; sha256="0mbrwmkjxqqysdndyp3ha3q13hbb6kb61xzx9rssxc9nacxlsy7p"; depends=[commonsMath rscala]; }; shape = derive2 { name="shape"; version="1.4.2"; sha256="0yk3cmsa57svcvbnm21pyr0s0qbhnllka8nmsg4yb41frjlqph66"; depends=[]; }; shapeR = derive2 { name="shapeR"; version="0.1-5"; sha256="17fq4gsdvyniq7n4x1xdvb5kk50184i7why3pdf1djjhknym087j"; depends=[gplots jpeg MASS pixmap vegan wavethresh]; }; shapefiles = derive2 { name="shapefiles"; version="0.7"; sha256="08ghndihs45kylbzd9wnxffn8ixvxjhjnjldjyd526ai2sj8xcgf"; depends=[foreign]; }; @@ -9240,8 +9665,9 @@ in with self; { sharpeRratio = derive2 { name="sharpeRratio"; version="1.1"; sha256="0rgsad8idhjyjgwlzk358jlqkqf6sk7g6vl3fchkamjzxnhbb8p9"; depends=[ghyp Rcpp]; }; sharpshootR = derive2 { name="sharpshootR"; version="1.0"; sha256="1x9cava7b9lg8qpmjqlbkqmpc9a2dn8k4kl71s4himr4wzp9z4y3"; depends=[ape aqp circular cluster digest Hmisc igraph lattice latticeExtra plyr RColorBrewer reshape2 scales soilDB sp vegan]; }; sharx = derive2 { name="sharx"; version="1.0-5"; sha256="10sfjg6946jfk4051da0w1v89503av40wckqaabr12syf8kn0aw8"; depends=[dclone dcmle Formula]; }; - shazam = derive2 { name="shazam"; version="0.1.5"; sha256="14srkwmghpiy85wnwb50g11i5z90kxm1gv2v1rgl7c9xpwrgg68v"; depends=[alakazam ape data_table doParallel dplyr foreach ggplot2 igraph iterators kedd KernSmooth lazyeval scales SDMTools seqinr stringi tidyr]; }; - shiny = derive2 { name="shiny"; version="1.0.2"; sha256="150ffkr7vjigxkkzqjn9gij9w5p44446kwm9992bwyqxsaxim5x4"; depends=[digest htmltools httpuv jsonlite mime R6 sourcetools xtable]; }; + shazam = derive2 { name="shazam"; version="0.1.7"; sha256="0q0ydkk8zdsyx54p7qc1xli741xyrqyjmcrwv9jzim4qilypcxdl"; depends=[alakazam ape doParallel dplyr foreach ggplot2 igraph iterators kedd KernSmooth lazyeval scales SDMTools seqinr stringi tidyr]; }; + shiny = derive2 { name="shiny"; version="1.0.3"; sha256="11j4ay1k200hkcb76yx1ahvmkvjrg9k5iy0fchdvmkyv6x25lais"; depends=[digest htmltools httpuv jsonlite mime R6 sourcetools xtable]; }; + shiny_semantic = derive2 { name="shiny.semantic"; version="0.1.1"; sha256="0jd00z817cccz3wfhcmz61wsy5fjw6yyan2ywkf06xqcdpnr8iwh"; depends=[htmltools htmlwidgets purrr shiny]; }; shinyAce = derive2 { name="shinyAce"; version="0.2.1"; sha256="0ycka8rsw0178q9klfid97vdn5cbyx3r778nis5s3dqipdyazdm9"; depends=[shiny]; }; shinyBS = derive2 { name="shinyBS"; version="0.61"; sha256="0rhim4mbp4x9vvm7xkmpl7mhb9qd1gr96cr4dv330v863ra2kgji"; depends=[htmltools shiny]; }; shinyDND = derive2 { name="shinyDND"; version="0.1.0"; sha256="0nkvz4hmjzmxlzj4vkjrdy8xlbxapg1amk180irgvwicqldi4jpm"; depends=[htmltools shiny]; }; @@ -9253,12 +9679,13 @@ in with self; { shinyShortcut = derive2 { name="shinyShortcut"; version="0.1.0"; sha256="101wz9s4rk7fbaqgm0r2v3v8za20vdxwq4vhkz8xr7y5pr65sxiq"; depends=[]; }; shinyTime = derive2 { name="shinyTime"; version="0.2.1"; sha256="0gpa6kypchvvlq71nnlilciclcrhaa488prjz46sddrsxjy09mp7"; depends=[htmltools shiny]; }; shinyTree = derive2 { name="shinyTree"; version="0.2.2"; sha256="08n2s6pppbxn23ijp6vms609p4qwlmfh9g0k5hdfqsqxjrz1nndi"; depends=[shiny]; }; - shinyWidgets = derive2 { name="shinyWidgets"; version="0.2.0"; sha256="1qsrmc89k12d09zx41fnb08y3gzsyhb1kspb7h10hcv9gk1f3m2c"; depends=[htmltools jsonlite shiny]; }; + shinyWidgets = derive2 { name="shinyWidgets"; version="0.3.0"; sha256="1g1l9afqchqxn1pl11vp67npwb9c3d7cdgq92r10pfgx437gwmv2"; depends=[htmltools jsonlite shiny]; }; shinybootstrap2 = derive2 { name="shinybootstrap2"; version="0.2.1"; sha256="17634l3swlvgj1sv56nvrpgd6rqv7y7qjq0gygljbrgpwmfj198c"; depends=[htmltools jsonlite shiny]; }; - shinydashboard = derive2 { name="shinydashboard"; version="0.5.3"; sha256="0anw22qxbis69zm0ls6alsc3ann27hvgs5mv1wvr4ppk7q8cg4l2"; depends=[htmltools shiny]; }; + shinycssloaders = derive2 { name="shinycssloaders"; version="0.2.0"; sha256="1bpzsm7m7c366sjl1qndp4m5dg2vlm68rjgdy9n1ija9xbp0r2g4"; depends=[digest glue shiny]; }; + shinydashboard = derive2 { name="shinydashboard"; version="0.6.1"; sha256="14zi7g5wrngy6lwi9xpvaid7727m6rfdijbb89al9likfhjqzqqy"; depends=[htmltools shiny]; }; shinyjqui = derive2 { name="shinyjqui"; version="0.1.0"; sha256="0jx0wbgw981pr60fpsd0jrhg0kj3zjp1cg1wp6201kq40mar70zg"; depends=[htmlwidgets jsonlite shiny]; }; - shinyjs = derive2 { name="shinyjs"; version="0.9"; sha256="1hh9djpcq80srxxy6ysy3pnwiyc5mx1xmhvs0jacbr3cszq1m6kk"; depends=[digest htmltools jsonlite miniUI shiny]; }; - shinymaterial = derive2 { name="shinymaterial"; version="0.1.0"; sha256="0vj0hnq05mrjsr0wmgacy3dl1nsgm768ygpi9wy78cszh1kf5knh"; depends=[shiny]; }; + shinyjs = derive2 { name="shinyjs"; version="0.9.1"; sha256="0h90k4f93lbfraldjxlbhjyjr54c3hiv7gyrbqz70j08s0bhyama"; depends=[digest htmltools jsonlite miniUI shiny]; }; + shinymaterial = derive2 { name="shinymaterial"; version="0.2.1"; sha256="0g36qgvvb8y9jikramz39h4qnzcllyqq4pq2nri7bcn2i8994d2r"; depends=[shiny]; }; shinystan = derive2 { name="shinystan"; version="2.3.0"; sha256="1xianpv9s4xjv5lsnagcx7gsnba38psv9kgik9z6k7z9g7bg91rs"; depends=[bayesplot colourpicker DT dygraphs ggplot2 gridExtra gtools markdown reshape2 rsconnect rstan shiny shinyjs shinythemes threejs xtable xts]; }; shinythemes = derive2 { name="shinythemes"; version="1.1.1"; sha256="0i220y051dq763idh1j5zhpb5cpv3jr11jd9akmry9aadyys5pz6"; depends=[shiny]; }; shinytoastr = derive2 { name="shinytoastr"; version="2.1.1"; sha256="01j2z4gf1wxblrjayykwxdr2s8394i7k930x8g4hmrj7c9pv264n"; depends=[shiny]; }; @@ -9274,7 +9701,8 @@ in with self; { siar = derive2 { name="siar"; version="4.2"; sha256="1c4z72jr81dzkp9xqyrrkwjsalvvksl67pnbaadkc52v84fhzx3r"; depends=[bayesm coda hdrcde MASS mnormt spatstat]; }; sicegar = derive2 { name="sicegar"; version="0.1"; sha256="15l1ffggqlaywqyk6wx745yrhfxkdljycz1l8vsp15i65w03xd0q"; depends=[dplyr fBasics ggplot2 minpack_lm]; }; sideChannelAttack = derive2 { name="sideChannelAttack"; version="1.0-6"; sha256="1xcsy1h8gc8a4f9nzs7zv8x6v55g1pg8vy1kg64iqxm0gnz2f20l"; depends=[ade4 corpcor infotheo MASS mmap]; }; - sidier = derive2 { name="sidier"; version="3.0.1"; sha256="1vl28biy7inycn74kzq0gm3r2fd5ylkndl863jy8b3jvdrq9achk"; depends=[ape ggmap ggplot2 gridBase igraph network]; }; + sidier = derive2 { name="sidier"; version="4.0.2"; sha256="1zzlgd20aw2asbsb3g9m5gvlmmgkai3bqrxyn48mphc2ncl4y7w0"; depends=[ape ggmap ggplot2 gridBase igraph network]; }; + sidrar = derive2 { name="sidrar"; version="0.2.1"; sha256="0w270dgr05gs0ys8mrhrmf41hkafxd8gcif9zrzyfp9yz8292m84"; depends=[dplyr magrittr RCurl rjson rvest stringr tidyr xml2]; }; sievetest = derive2 { name="sievetest"; version="1.2.2"; sha256="0mbgkf014m6bc7qg60vf065i6mvl5n4a0bvg8vb7dw531vsw2771"; depends=[]; }; sig = derive2 { name="sig"; version="0.0-5"; sha256="084wwpj5mnmq4k98ijbv23z80sj4axadc7c6hn3917dazsaa6ngn"; depends=[]; }; sigclust = derive2 { name="sigclust"; version="1.1.0"; sha256="0151v7lr4n4yyn93j0s06gzc9jh9xhdgvfw6kvpfy24jl6wdii7g"; depends=[]; }; @@ -9284,12 +9712,14 @@ in with self; { signalHsmm = derive2 { name="signalHsmm"; version="1.4"; sha256="1plyvx0pdid4zydxjwph6v96c8ilzgn55vcdszkslp3a4s2sns65"; depends=[Rcpp seqinr shiny]; }; signmedian_test = derive2 { name="signmedian.test"; version="1.5.1"; sha256="05n7a4h2bibv2r64cqschzhjnm204m2lm1yrwxvx17cwdp847hkm"; depends=[]; }; sigora = derive2 { name="sigora"; version="2.0.1"; sha256="1sgjafr2f7carwnvp0vsvp80jn2bzwlkay38ch63qk9gapsh4imh"; depends=[]; }; - sigr = derive2 { name="sigr"; version="0.1.5"; sha256="07684isbpqnlpi0dqrcl0a6idqxakqiwyyarhdqcks8yp67y4aqi"; depends=[]; }; + sigr = derive2 { name="sigr"; version="0.1.6"; sha256="1bkizghzh4jfpakn4vh1f5v0yzdgx985ky6shwfa4czq4kk8kxjb"; depends=[]; }; + simEd = derive2 { name="simEd"; version="1.0.1"; sha256="102zpcrzh9phcmjx585zzasr3ygvr61i0fc08naznrhl6i9lygwp"; depends=[rstream]; }; simFrame = derive2 { name="simFrame"; version="0.5.3"; sha256="154d4k6x074ib813dp42l5l8v81x9bq2c8q0p5mwm63pj0rgf5f3"; depends=[lattice Rcpp]; }; simLife = derive2 { name="simLife"; version="0.3"; sha256="0bqhixr4zg7mwgxdsjk0h5a82dyfkhiv9xafw43w2bpnmyxywdia"; depends=[splancs unfoldr]; }; + simMP = derive2 { name="simMP"; version="0.17.3"; sha256="1pzg79dd08ds3pfzxnk9h95gaibicv00mnm0jb4i8v5is4gzrdhr"; depends=[Biostrings BSgenome doParallel foreach GenomeInfoDb GenomicRanges IRanges XVector]; }; simMSM = derive2 { name="simMSM"; version="1.1.41"; sha256="04icijrdc269b4hwbdl3qz2lyxcxx6z63y2wbak1884spn6bzbs8"; depends=[mvna survival]; }; simPATHy = derive2 { name="simPATHy"; version="0.2"; sha256="0ai5wmjz8k0glbwkclgg3m3ncsjghja4iys2mn1psn3r8gxk79yc"; depends=[ggm graph gRbase htmlwidgets igraph mvtnorm qpgraph R_utils shiny shinydashboard]; }; - simPH = derive2 { name="simPH"; version="1.3.9"; sha256="0hvg8m0d57x9s8ix7j7v0zdcxxww7bmd2mh8n059da3mph8hf288"; depends=[data_table dplyr ggplot2 gridExtra lazyeval MASS mgcv quadprog stringr survival]; }; + simPH = derive2 { name="simPH"; version="1.3.10"; sha256="0br32m28ynmhr4xal69bsv925rlmih898rk5bskn1s6bhsshalqq"; depends=[data_table dplyr ggplot2 gridExtra lazyeval MASS mgcv quadprog stringr survival]; }; simPop = derive2 { name="simPop"; version="0.6.0"; sha256="0ndcwg3yj0n7wyhgs3n02jr7m4sks9n8bjbcgkzrxkqfg6696b62"; depends=[colorspace data_table doParallel e1071 EnvStats fitdistrplus foreach laeken lattice MASS nnet party plyr ranger Rcpp vcd VIM]; }; simSummary = derive2 { name="simSummary"; version="0.1.0"; sha256="1ay2aq6ajf1rf6d0ag3qghxpwj0f8b3fhpr2k0imzmpbyag1i3gj"; depends=[abind gdata svUnit]; }; simTool = derive2 { name="simTool"; version="1.0.3"; sha256="1x018p5mssrhz2ghs3ly9wss12503h93gl7zk0mqh1bcrzximh0k"; depends=[plyr reshape]; }; @@ -9297,11 +9727,12 @@ in with self; { simboot = derive2 { name="simboot"; version="0.2-6"; sha256="0bgibrqb9j62p1chldi1lvdsgc6sgsr7afyq4lvyrc2h861f3j9d"; depends=[boot mvtnorm]; }; simcausal = derive2 { name="simcausal"; version="0.5.3"; sha256="1k0cbnkgd8sn5vjvmpa496yir868xldhcnkynfqdcs4qsfywfrzs"; depends=[assertthat data_table igraph Matrix R6 stringr]; }; simctest = derive2 { name="simctest"; version="2.5"; sha256="038ipxww0n09sh8al5isbm1fikr8kazwxn9cj2d0wgm6cdpy681n"; depends=[]; }; - simecol = derive2 { name="simecol"; version="0.8-7"; sha256="0p6kmv65k3zy5q4v8casc2cp3c2ckblmycd1y1nnn7z7fnd57g8h"; depends=[deSolve minqa]; }; - simest = derive2 { name="simest"; version="0.3"; sha256="1bxgrr0sncsi1swmj5l4kqyd2v80py50d5xynv6544r1qnfpwk69"; depends=[nnls]; }; + simecol = derive2 { name="simecol"; version="0.8-9"; sha256="1r4nivm6nicqskx2d2jdlszifhlpjkp6iyzppqkavnrhib7g600j"; depends=[deSolve minqa]; }; + simest = derive2 { name="simest"; version="0.4"; sha256="1wp08dkbshn5parq69d7iizp4g16qzpdim37kcg09pgsc3aghwaj"; depends=[cobs nnls]; }; simex = derive2 { name="simex"; version="1.5"; sha256="01706vbmfgcg13w1kq8v5rnk5xggbd1n7fv50c6bvhdyc1dly313"; depends=[]; }; simexaft = derive2 { name="simexaft"; version="1.0.7"; sha256="13w9m35qrrp8kkz4gqp7fg9jv8fs99y19n21bdxsd3f5mlkbvqgl"; depends=[mvtnorm survival]; }; - simmer = derive2 { name="simmer"; version="3.6.1"; sha256="0hcp7bnq7shxnnxvx6qkbnhhl7mlfficn3an3d9nnz721vvd3g5v"; depends=[BH magrittr R6 Rcpp]; }; + simglm = derive2 { name="simglm"; version="0.5.0"; sha256="1nx1i9knsh9c2wfppdaizxgvixl6pdr4fda7jy4bxhmqvsax36bv"; depends=[dplyr Matrix purrr tibble tidyr]; }; + simmer = derive2 { name="simmer"; version="3.6.2"; sha256="0h3am2c6043sajdbk9qsfqjrph69dwh6bv6fil174bpm00rxckhb"; depends=[BH magrittr R6 Rcpp]; }; simmer_plot = derive2 { name="simmer.plot"; version="0.1.9"; sha256="0xgry3x94b8h5cg9p7a8f4xjrbs61wjk1pc8drlvjjs5dazq310f"; depends=[DiagrammeR dplyr ggplot2 scales simmer tidyr]; }; simmr = derive2 { name="simmr"; version="0.3"; sha256="18ycrd7qbz7frvd3bgbqaaapslw1jw89fy3np5qyb9sswyk08w9m"; depends=[boot coda compositions ggplot2 MASS reshape2 rjags viridis]; }; simone = derive2 { name="simone"; version="1.0-3"; sha256="1l38xbcf50kjh0k4dc4xsxkjr54jz4s98az99mzcsdarqd6kz9kg"; depends=[mixer]; }; @@ -9312,31 +9743,34 @@ in with self; { simplegraph = derive2 { name="simplegraph"; version="1.0.0"; sha256="1gcpbljp1fgaprxnmq23izf1h2x3p5dnxlylwqsnlcj50bvm46gq"; depends=[]; }; simplexreg = derive2 { name="simplexreg"; version="1.3"; sha256="1zkh00xbddhgz0qn0a5pj12n0hpx4f5kihpfj71x92pmxpzglcxh"; depends=[Formula plotrix]; }; simplr = derive2 { name="simplr"; version="0.1-1"; sha256="14gv2cwygjjfc9yjdrcn68scgyh469kypmf4mqy5p18gsxfj3h1c"; depends=[]; }; - simputation = derive2 { name="simputation"; version="0.2.1"; sha256="1a0kcwg4jl7xnp9b0hrj2m5mcrvqgxi0283fvw17b11bl7mkh43m"; depends=[gower MASS rpart]; }; + simputation = derive2 { name="simputation"; version="0.2.2"; sha256="0bn5pq3gbsjc7sdivki98k9cb0sp5wkpm0bwi4mdnvpd7r2psb1n"; depends=[gower MASS rpart]; }; simr = derive2 { name="simr"; version="1.0.2"; sha256="03rbq16x91y79xp1cw8z1b01pv6w0h344g4a9na5xipfm1x97kqf"; depends=[binom car iterators lme4 pbkrtest plotrix plyr RLRsim stringr]; }; simrel = derive2 { name="simrel"; version="1.0-1"; sha256="0905rjqh8c08vyg090h0i7sx89vdryignslldzfz2r5yrszl4ga8"; depends=[FrF2 sfsmisc]; }; simsalapar = derive2 { name="simsalapar"; version="1.0-9"; sha256="0h46acf797lp1hvs8x91nzll3zxiiczfl6vdxxrwizr109jzggcj"; depends=[colorspace gridBase sfsmisc]; }; simsem = derive2 { name="simsem"; version="0.5-13"; sha256="0v6gbfp4659gbpzc1vffg687c8bcd45ddb7jhd0bgx66m28853kk"; depends=[lavaan]; }; simstudy = derive2 { name="simstudy"; version="0.1.2"; sha256="08350rd4nd4vckd51n2k4q28p4wi3a366xr2kgrjxr7xpx12m6zw"; depends=[data_table mvnfast Rcpp]; }; simulator = derive2 { name="simulator"; version="0.2.0"; sha256="18x0c9bf9anbykq9f46fxnnx7g36bh01s4cdmrn7mdygs6ac9c8z"; depends=[magrittr]; }; - simule = derive2 { name="simule"; version="1.0.0"; sha256="0b0h85swd9kwqw53ggfm6w3pqy4an6v0qvwzprnj7lfkqiksgzxl"; depends=[lpSolve pcaPP]; }; - sinaplot = derive2 { name="sinaplot"; version="1.0.0"; sha256="1s87ykgad56f7l7janxx1x0y98dycpwk7mflyqxncq46awrd1ai0"; depends=[plyr]; }; + simule = derive2 { name="simule"; version="1.1.0"; sha256="0kyzaiix4jfmyyym7650q32ba9pdl747iqzjdfw22nyhs70qcqcs"; depends=[igraph lpSolve pcaPP]; }; + sinaplot = derive2 { name="sinaplot"; version="1.1.0"; sha256="0zfq6l8wjvdj7rndsfyh0a2xjlxmn2ij1q50hg3xjfpwrjxcsck8"; depends=[plyr]; }; + sinew = derive2 { name="sinew"; version="0.2.1"; sha256="18vdl10r5mhgmdkx01q8xqjxs418ndjzrwgrvnfm98264pkycpk3"; depends=[rstudioapi]; }; + sinib = derive2 { name="sinib"; version="1.0.0"; sha256="08x2a5hn41vcsai3r36w1kgzka4ks53pkp6dxn90bsqh40ydb0db"; depends=[]; }; siplab = derive2 { name="siplab"; version="1.2"; sha256="0r7gk9qsmbc3ln67cb8p87bq3s2rx6fbavlly1fpzqqv2isf5pq9"; depends=[spatstat]; }; sirad = derive2 { name="sirad"; version="2.3-3"; sha256="0vhmk2fmq4797gj6c8803zw1ipmdxfvdfgi2bygzxbn5bqd4da2n"; depends=[raster zoo]; }; - sirt = derive2 { name="sirt"; version="1.15-41"; sha256="00l8xv10isbk150gmp0b3rppzy0rnrhfn6w1j8whwdgws5fa3vl3"; depends=[CDM coda combinat gtools ic_infer igraph lavaan lavaan_survey MASS Matrix MCMCpack mirt mvtnorm pbivnorm plyr psych Rcpp RcppArmadillo sfsmisc sm survey TAM]; }; - sisVIVE = derive2 { name="sisVIVE"; version="1.3"; sha256="17q6dl8wiwf01g6jm93w72jvp1madd0fww1yiazjcbkmz0j3kdbl"; depends=[lars]; }; + sirt = derive2 { name="sirt"; version="2.0-25"; sha256="0290zlc0kcbi6h27zrn6ysc06814fdg2ixskc3v43yvpadh7pm2h"; depends=[CDM coda combinat gtools ic_infer igraph lavaan lavaan_survey MASS Matrix mirt mvtnorm pbivnorm plyr psych Rcpp RcppArmadillo sfsmisc sm survey TAM]; }; + sisVIVE = derive2 { name="sisVIVE"; version="1.4"; sha256="1vh53irxgk8ahw52cdqbbm89dvmzyf54izg4lm8a3v92k5p6nzwz"; depends=[lars]; }; sisal = derive2 { name="sisal"; version="0.46"; sha256="00szc3l69i0cksxmd0lyrs4p6plf05sl4vxs3nl4gkbja5y4lvpc"; depends=[boot digest lattice mgcv R_matlab R_methodsS3]; }; sisus = derive2 { name="sisus"; version="3.9-13"; sha256="0lz9ww07dvdx6l3k5san8gwq09hycc3mqwpgzmr2ya9z8y27zadr"; depends=[coda gdata gtools MASS moments polyapost rcdd RColorBrewer]; }; sitar = derive2 { name="sitar"; version="1.0.9"; sha256="1yjiqykrx0dm0zkssagv50kyp4wj9b0sjmrpgbn9wzimqdb5ijph"; depends=[nlme quantreg]; }; - sitmo = derive2 { name="sitmo"; version="1.0.0"; sha256="11az1zncpnalp1vkyxz75asqk6jd9wsn6kifjcqigm21kg8wcf7j"; depends=[Rcpp]; }; + sitmo = derive2 { name="sitmo"; version="1.2.0"; sha256="0y8g93wccr5fw4dv9f1cdrkgy5559wms2kzn6vrlcdk9lx5zv6ni"; depends=[Rcpp]; }; sitools = derive2 { name="sitools"; version="1.4"; sha256="0c0qnvsv06g6v7hxad96fkp9j641v8472mbphvaxa60k3xc7ackb"; depends=[]; }; sitree = derive2 { name="sitree"; version="0.1-1"; sha256="1g5q8kq4sk6akzyvaa6gbj9fddzwhw13s5qhh53gk99xn658zl8j"; depends=[data_table lattice latticeExtra]; }; sivipm = derive2 { name="sivipm"; version="1.1-3"; sha256="1l0j1bi38s09ax4kwikk615lyd074gzg1aa1j2jfmhr3igannm3z"; depends=[seqinr]; }; sizeMat = derive2 { name="sizeMat"; version="0.3.0"; sha256="0766wxcc1980ivlib2saagl20y9dm0ar7i43qcqk2jpdbbaky33z"; depends=[MASS matrixStats mcmc MCMCpack]; }; sjPlot = derive2 { name="sjPlot"; version="2.3.1"; sha256="1alhwzqp748iffgbbbldgzgdcv1ilhx4jszqg6dlk94kw38jn4px"; depends=[broom dplyr effects ggplot2 knitr lme4 MASS merTools modelr nlme psych purrr scales sjmisc sjstats tibble tidyr]; }; sjdbc = derive2 { name="sjdbc"; version="1.6.0"; sha256="17ncgj2s2pjn3w3c1dgxv8g7y17h4p78iic86gsj2ahn0xpsmkcc"; depends=[rJava]; }; - sjmisc = derive2 { name="sjmisc"; version="2.4.0"; sha256="0s7w6l2na7rk2lyjz7f31m4qay8r5q39lwv8bs1288xw01n8rqk1"; depends=[broom dplyr haven magrittr psych purrr stringdist stringr tibble tidyr]; }; - sjstats = derive2 { name="sjstats"; version="0.10.0"; sha256="097g6ggr6ydphmyx5s0aqb2bin06l51pwl5sb2r5xk8hp996ia72"; depends=[broom coin dplyr lme4 lmtest MASS Matrix modelr nlme purrr sandwich sjmisc tibble tidyr]; }; + sjlabelled = derive2 { name="sjlabelled"; version="1.0.0"; sha256="0bnl9346h1fmklfg74lja2ajldwv3vn2wivb3kbiqhrja4mb07fb"; depends=[dplyr haven magrittr purrr tibble]; }; + sjmisc = derive2 { name="sjmisc"; version="2.5.0"; sha256="150c065diawp6xdcianim2nlvp15w7z56k4qpskj2pb898slf004"; depends=[broom dplyr haven magrittr psych purrr rlang sjlabelled stringdist stringr tibble tidyr]; }; + sjstats = derive2 { name="sjstats"; version="0.10.2"; sha256="160d3jh1xdp4xkh4bahi455s4isgm7mciwxga8vf1b4wlyb7zkmx"; depends=[broom coin dplyr glmmTMB lme4 lmtest MASS Matrix modelr nlme purrr rlang sandwich sjlabelled sjmisc tibble tidyr]; }; skda = derive2 { name="skda"; version="0.1"; sha256="0a6mksr1d0j3pd0kz4jb6yh466gvl4fkrvgvnlmvivpv6b2gqs3q"; depends=[]; }; skeleSim = derive2 { name="skeleSim"; version="0.9.5"; sha256="1m0jwr63v989dalchiv90sfpi6g19rj0x2zgp0bgmjpq3xyamykf"; depends=[adegenet ape hierfstat igraph markdown pegas reshape2 rmetasim shiny shinyFiles strataG swfscMisc]; }; skeletor = derive2 { name="skeletor"; version="1.0.4"; sha256="1jfbfbkjx8mdwamsrkhvcnyn470in702vgcyw3g2dbgs84gl29q8"; depends=[]; }; @@ -9351,13 +9785,13 @@ in with self; { sleekts = derive2 { name="sleekts"; version="1.0.2"; sha256="0syk244xrsv8hz5sxm7wizk0kyn1nc6z4c63c8xn57fz130zj75k"; depends=[]; }; slfm = derive2 { name="slfm"; version="0.2.2"; sha256="01n9y6kyl7z1ynckp2hkrv2yl9jf30zcbbi3sx9jrcha557fg1cf"; depends=[coda lattice Rcpp RcppArmadillo]; }; slickR = derive2 { name="slickR"; version="0.1.0"; sha256="0jk9h58v30cl64sfd5730ccv54bsw39d8d57085wrx1kqadsampy"; depends=[base64enc htmlwidgets xml2]; }; - slim = derive2 { name="slim"; version="0.1.0"; sha256="1d39hcsb6qxi36x7fkl67vy7r8n7ij275z7jnrb2n3pjnqkzjmzi"; depends=[data_table MASS]; }; + slim = derive2 { name="slim"; version="0.1.1"; sha256="0x9bk6w6lmw15s85gw9g8d1wlb57kkvnmx1wsyasn93x9llkjva1"; depends=[data_table MASS]; }; slimrec = derive2 { name="slimrec"; version="0.1.0"; sha256="1qzcvk7z8y11hwmybvppk1gf8di596zxy7qs22fclp6h6y18s377"; depends=[assertthat bigmemory glmnet Matrix pbapply]; }; slp = derive2 { name="slp"; version="1.0-5"; sha256="0i9iv0s1wdp9cyzr8qixh6c7qvrj025vll13gyf8dfbidrp6hryl"; depends=[mgcv]; }; sm = derive2 { name="sm"; version="2.2-5.4"; sha256="0hnq5s2fv94gaj0nyqc1vjdjd64vsp9z23nqa8hxvjcaf996rwj9"; depends=[]; }; smaa = derive2 { name="smaa"; version="0.2-5"; sha256="1mwahjgslk82f8bl6qcjs1yadhbnqrxxhvkffkgc2fv3s6lh5d9m"; depends=[]; }; smac = derive2 { name="smac"; version="1.0"; sha256="1inn7i5k0q5vln24kazh3gl3szf6lxwnjr2rw70jcyn9dr9iy952"; depends=[]; }; - smacof = derive2 { name="smacof"; version="1.8-13"; sha256="0b9kf8z1ll0ak5b9ms2pkv7fl9qhc1nb5cxaarfjc2xi7zkyanyi"; depends=[colorspace Hmisc MASS nnls polynom weights]; }; + smacof = derive2 { name="smacof"; version="1.9-6"; sha256="19x11011w8kwdbd0jp7y7zqhmn0a5bhc9gh7jkcpxij8ppiigh8y"; depends=[candisc colorspace ellipse Hmisc MASS nnls plotrix polynom weights wordcloud]; }; smacpod = derive2 { name="smacpod"; version="1.4.1"; sha256="17f28nax92nkfgs972gqcjnnz6sw4p8n36rrhx00dy19vr569kp5"; depends=[plotrix SpatialTools spatstat]; }; smallarea = derive2 { name="smallarea"; version="0.1"; sha256="0jcv0xbh8v4g6zxxs4yyd0divwzk9d2w7g01r4s65khxvy3av7yx"; depends=[MASS]; }; smam = derive2 { name="smam"; version="0.3-0"; sha256="1sdr0ki2y9smiwfglgh97kj6y0n1z3blyyxk823xp3467byk1rnb"; depends=[Matrix numDeriv Rcpp]; }; @@ -9366,7 +9800,7 @@ in with self; { smatr = derive2 { name="smatr"; version="3.4-3"; sha256="0iiazln4albj7k5w67slvyn98cqg4f6k409mml0n1pvlkki0h7gy"; depends=[plyr]; }; smbinning = derive2 { name="smbinning"; version="0.3"; sha256="0993lnp7iks39z4mshh4gdrbvig6pnsc2jag58cbqfh40ignx748"; depends=[Formula gsubfn partykit sqldf]; }; smcUtils = derive2 { name="smcUtils"; version="0.2.2"; sha256="0d1kmg386j0zrpp8vgxjwvpf1i25l86xrh82767xkp0n9qj8srwq"; depends=[]; }; - smcfcs = derive2 { name="smcfcs"; version="1.2.1"; sha256="1v143di0y8c0dcsjham1dmsyh1k0583nhw4qzlignxpg8nf6n4xc"; depends=[MASS survival VGAM]; }; + smcfcs = derive2 { name="smcfcs"; version="1.3.0"; sha256="1860qzhfpdr78a8ha8537izbkm0dx9j63l9fv6mswcs5sjl25i09"; depends=[MASS survival VGAM]; }; smco = derive2 { name="smco"; version="0.1"; sha256="1sj3y1x6pc32cwzyhn9gaxs964xh5xl4vw08hsa8kfcxhh2r0s99"; depends=[]; }; smcure = derive2 { name="smcure"; version="2.0"; sha256="1j7fxnb0sx57a0l929c3haz4f1y829ymlq0cvdh0cia4qp6ydv60"; depends=[survival]; }; smdata = derive2 { name="smdata"; version="1.1"; sha256="1hcr093xfkp88fn75imjkmfnp9cfsng5ndxpa8m2g0l29qhpxfvk"; depends=[]; }; @@ -9375,11 +9809,10 @@ in with self; { sme = derive2 { name="sme"; version="0.8"; sha256="1djrs3z699p6q2y1hfywh27csqc9cp1cfm3lxkigmmvxqjhyshz6"; depends=[lattice]; }; smerc = derive2 { name="smerc"; version="0.2.2"; sha256="0x1n1plnq63grs09cijhy265xqrfg9az1pp9n5dg5wqlj6gf9rzi"; depends=[fields igraph maps smacpod SpatialTools spdep]; }; smfsb = derive2 { name="smfsb"; version="1.1"; sha256="0khd23b6k9zgxz2x6g6c6k2g32mbpli32izdq6fgk1a990kdsp6j"; depends=[]; }; - smint = derive2 { name="smint"; version="0.4.2"; sha256="0sfk8r4jzvfs63z1vka280hdmhcbcrspr9zxwc5az9hkj65g1n0f"; depends=[lattice Matrix]; }; smirnov = derive2 { name="smirnov"; version="1.0-1"; sha256="09mpb45wj8rfi6n6822h4c335xp2pl0xsyxgin1bkfw97yjcvrgk"; depends=[]; }; smnet = derive2 { name="smnet"; version="2.1.1"; sha256="0fa47zgm7jxvs3jfai54wsc6qa9ycqw4f3yr941fvkczwzh4ch02"; depends=[DBI RSQLite spam SSN]; }; - smoof = derive2 { name="smoof"; version="1.4"; sha256="18li9l62lmpsva0whw6d5wr46w90w3z70wywiy785sla00g06sp2"; depends=[BBmisc checkmate ggplot2 mco ParamHelpers plot3D plotly RColorBrewer Rcpp RcppArmadillo]; }; - smooth = derive2 { name="smooth"; version="1.9.0"; sha256="0h9g78bi07x42lfkl1yh88f7sim79i2mmv2pibrfg8kq1fa78axd"; depends=[forecast nloptr Rcpp RcppArmadillo zoo]; }; + smoof = derive2 { name="smoof"; version="1.5"; sha256="0k2h07gpldbdzn5fypzwqxn333s6n59flf8mcp4j04cfzidsswwv"; depends=[BBmisc checkmate ggplot2 mco ParamHelpers plot3D plotly RColorBrewer Rcpp RcppArmadillo RJSONIO]; }; + smooth = derive2 { name="smooth"; version="1.9.9"; sha256="1wh0kv8b1a4ipy3j7715w1w2qn1p7ncbw30kcaj3bn6pmi8mw47q"; depends=[forecast nloptr Rcpp RcppArmadillo zoo]; }; smoothAPC = derive2 { name="smoothAPC"; version="0.1"; sha256="06lpjp408ggj27yw6mw7f96kxly7r8kzikbsdp0y1gzig1qq8nbs"; depends=[colorspace lmtest quantreg rgl SparseM]; }; smoothHR = derive2 { name="smoothHR"; version="1.0.2"; sha256="0l33xg3p9pyfrp4rhavz8m1jakk4wr8i14g6jjiizb03rpxdpzqy"; depends=[survival]; }; smoothSurv = derive2 { name="smoothSurv"; version="1.6"; sha256="1s25gpih0nh8waw4r3iw53n3rc44mlzixkh4i2cykbg5rdrs8pnf"; depends=[survival]; }; @@ -9392,12 +9825,13 @@ in with self; { smss = derive2 { name="smss"; version="1.0-2"; sha256="04lgfdcvnzpnpplyl62fy7slyiy8wkqpjjrzmclgqis3c9zkkncp"; depends=[]; }; sn = derive2 { name="sn"; version="1.5-0"; sha256="0fh7xjsfd2x8d9lbnss7raldh24b72b3pvcv7zqa1qprzg7zfr01"; depends=[mnormt numDeriv]; }; sna = derive2 { name="sna"; version="2.4"; sha256="1ks8819qvpdfansfqj9p32s1rhvl26frvbi78m4rx1wd1qcv74i2"; depends=[network statnet_common]; }; + snakecase = derive2 { name="snakecase"; version="0.4.0"; sha256="0dklyqmn4w4wnj5hl88f4kpv3niazzswcxhyrk6zfxg0fcnp038n"; depends=[magrittr purrr stringr]; }; snapshot = derive2 { name="snapshot"; version="0.1.2"; sha256="0cif1ybxxjpyp3spnh98qpyw1i5sgi1jlafcbcldbqhsdzfz4q10"; depends=[]; }; snht = derive2 { name="snht"; version="1.0.4"; sha256="01gdqicvazfd27f992j4ngv60sqywwplilqxwrsw21wi7y7c6cfv"; depends=[ggplot2 gridExtra mgcv plyr reshape2 zoo]; }; snipEM = derive2 { name="snipEM"; version="1.0"; sha256="0f98c3ycl0g0l3sgjgk7xrjp6ss7n8zzlyzvpcb6agc60cnw3w03"; depends=[GSE MASS mvtnorm Rcpp RcppArmadillo]; }; snn = derive2 { name="snn"; version="1.1"; sha256="0yywn3v1iz9xizwli3gmzprkx66b5a813mbp8hq2vsj8n4lfj8r5"; depends=[]; }; snow = derive2 { name="snow"; version="0.4-2"; sha256="1mxbrkpnmq32x4wd0194d541661yvfrrjlr3lsf7qq53ms3h21zf"; depends=[]; }; - snowFT = derive2 { name="snowFT"; version="1.4-0"; sha256="0gw2kn80jh1a6sg6ni9kj6ikvyq29c9dmx52k9m6gzcfpa7l0qbk"; depends=[rlecuyer snow]; }; + snowFT = derive2 { name="snowFT"; version="1.6-0"; sha256="00rq2xibzhx7441v9jg138a4fkmx28hifs4yyj3pwi8najf0df4n"; depends=[rlecuyer snow]; }; snowboot = derive2 { name="snowboot"; version="0.5.2"; sha256="07mly89x9mj5cvpmi45xmlr4d1l1d2fdcagmniviqqqhmllc50pi"; depends=[igraph Rcpp VGAM]; }; snowfall = derive2 { name="snowfall"; version="1.84-6.1"; sha256="13941rlw1jsdjsndp1plzj1cq5aqravizkrqn6l25r9im7rnsi2w"; depends=[snow]; }; snp_plotter = derive2 { name="snp.plotter"; version="0.5.1"; sha256="16apsqvkah5l0d5qcwp3lq2jspkb6n62wzr0wskmj84jblx483vv"; depends=[genetics]; }; @@ -9408,7 +9842,7 @@ in with self; { snplist = derive2 { name="snplist"; version="0.17"; sha256="0h419r4b62wdf63z12ai1n9zd3n36l9vgrbvlg1m72bbzrj5k8yz"; depends=[biomaRt DBI R_utils Rcpp RSQLite]; }; sns = derive2 { name="sns"; version="1.1.2"; sha256="132zd57xb2y0nshw4lakf49r2mvvkv7j32f7l7hqrh91mw7wyqpr"; depends=[coda mvtnorm numDeriv]; }; soc_ca = derive2 { name="soc.ca"; version="0.7.3"; sha256="0z3phmvgwd3s6swfaywq851my12a2n48i6k26vhggc6pf9d28phl"; depends=[ellipse ggplot2 ggrepel gridExtra reshape2 shiny]; }; - sodavis = derive2 { name="sodavis"; version="0.1"; sha256="1cci7aq2yqxb97ah5nycmhvg3d47fsicdgmgnw4yz88y61b3ndll"; depends=[MASS nnet]; }; + sodavis = derive2 { name="sodavis"; version="1.0"; sha256="1mhmrg7c0chwjw117pzjya5y0ml8mm9ps5b64q5cjchlxr8900nx"; depends=[MASS mvtnorm nnet]; }; sodium = derive2 { name="sodium"; version="1.1"; sha256="1zxzi8xvxnhgcd5qrylf08nz1cdq3aslrswjas440qg63ypmbf6w"; depends=[]; }; sofa = derive2 { name="sofa"; version="0.2.0"; sha256="0jjc3r25qprxrhwwzx4b70i51v8gygxwx3x9d1zydx9hw1plk0mb"; depends=[httr jsonlite mime R6]; }; softImpute = derive2 { name="softImpute"; version="1.4"; sha256="07cxbzkl08q58m1455i139952rmryjlic4s2f2hscl5zxxmfdxcq"; depends=[Matrix]; }; @@ -9416,7 +9850,8 @@ in with self; { softmaxreg = derive2 { name="softmaxreg"; version="1.2"; sha256="0y1r4n83sv2744lpli65aip0c0cq823asb8gw9yy9yjjc9sbyr9s"; depends=[]; }; soil_spec = derive2 { name="soil.spec"; version="2.1.4"; sha256="129iqr6fdvlchq56jmy34s6qc2j5fcfir6pa5as5prw0djyvbdv0"; depends=[GSIF hexView KernSmooth pls sp wavelets]; }; soilDB = derive2 { name="soilDB"; version="1.8-7"; sha256="0v0f9yngqjsagk5dw734aigwhld7fpadj6521bdk49j74ha0girr"; depends=[aqp Hmisc plyr raster reshape2 sp XML]; }; - soilphysics = derive2 { name="soilphysics"; version="3.0"; sha256="1b6wzdb63qq0h1aaw08i2qg7410997i2cszr012g5f4dnmrwamln"; depends=[boot MASS rpanel tkrplot]; }; + soilcarbon = derive2 { name="soilcarbon"; version="1.0.0"; sha256="068irig0q7xwhl7ry4w995v2n12zj6wqr1vj9pgbjy643xm0bkpa"; depends=[devtools ggplot2 openxlsx shiny]; }; + soilphysics = derive2 { name="soilphysics"; version="3.1"; sha256="11c094bqbwhggh0n3hdva1321gqzz2k1b7v3767wyyk1xpgzg98r"; depends=[boot MASS rpanel tkrplot]; }; soilprofile = derive2 { name="soilprofile"; version="1.0"; sha256="0sdfg6m2m6rb11hj017jx2lzcgk6llb01994x749s0qhzxmvx9mb"; depends=[aqp lattice munsell splancs]; }; soiltexture = derive2 { name="soiltexture"; version="1.4.1"; sha256="1rvrji3xrs6smxcgggl6phnbx595wl1s2d8djnvzfca20k9q6a1q"; depends=[MASS sp]; }; soilwater = derive2 { name="soilwater"; version="1.0.2"; sha256="0rkyh7rcaapp1bxih88ivbaqnrig9jy32694jbg8z04b115hmdpm"; depends=[]; }; @@ -9426,44 +9861,46 @@ in with self; { solidearthtide = derive2 { name="solidearthtide"; version="1.0.2"; sha256="0274f7vyjymx6hd7ik68hznip57ni4cxp1bw7z91v1jzp3ch17rv"; depends=[]; }; solr = derive2 { name="solr"; version="0.1.6"; sha256="0hlysi1yw4l98dcb1shznzrgia9pqzfj0p1hmnfz5gz2j64lf4h4"; depends=[assertthat httr plyr rjson XML]; }; solrium = derive2 { name="solrium"; version="0.4.0"; sha256="1jjvwwgyq335mhc4pff2l604x1k2260zwxl6k6k9lfzgcgqylbbw"; depends=[dplyr httr jsonlite plyr tibble xml2]; }; - solvebio = derive2 { name="solvebio"; version="0.3.0"; sha256="1y3raw38888jii2c4x1mvdwscyss8qc9fpyl96y0hpmxj4yg1d4l"; depends=[httr jsonlite]; }; + solvebio = derive2 { name="solvebio"; version="0.4.1"; sha256="1mvbxrbpsx3k1k19w9y71yxfbigj08f9f6g6z22s1pgjwwslsaah"; depends=[digest dplyr httr jsonlite mime]; }; som = derive2 { name="som"; version="0.3-5.1"; sha256="1fbza1jxvwrkf5x3inkj36vshhkn7mz0ajqlxalbfmk6ngjw1x56"; depends=[]; }; som_nn = derive2 { name="som.nn"; version="1.1.0"; sha256="0mw2c2lqvdq9bhndpjyawjy43l4x7clcsx2350j45g7fnchhy602"; depends=[class hexbin kohonen som]; }; soma = derive2 { name="soma"; version="1.1.1"; sha256="1mc1yr9sq9h2z60v40aqmil0xswj5hgxfdh4racq297qw3a97my4"; depends=[reportr]; }; someKfwer = derive2 { name="someKfwer"; version="1.2"; sha256="0widny5l04ja91fy16x4giwrabwqhx0fs3yl48pv9xh4zj6sx563"; depends=[]; }; someMTP = derive2 { name="someMTP"; version="1.4.1"; sha256="19bsn8rny1vv9343bvk8xzhh82sskl0zg0f5r59g9k812q5llchn"; depends=[]; }; somebm = derive2 { name="somebm"; version="0.1"; sha256="1iwwc94k6znh4d3bbjnvwp4chc4wg0iy4v2f99cs4jasrsimb4p8"; depends=[]; }; - sommer = derive2 { name="sommer"; version="2.7"; sha256="1cn173fja9w7rw169xwfv4dmfajka51d6vla72wjhyc454amqg0d"; depends=[MASS Matrix]; }; + sommer = derive2 { name="sommer"; version="2.8"; sha256="01q7glmxb8gccia23j0cfdf8fh5aap9yw4b5zkcal6r2kp29cd8v"; depends=[MASS Matrix]; }; somplot = derive2 { name="somplot"; version="1.6.4"; sha256="06c8p2lqz3yxmxdl7ji8a3czvxnsbl7bwyiig76pkwc3a5qqfbb9"; depends=[hexbin]; }; sonar = derive2 { name="sonar"; version="1.0.2"; sha256="1f0f5iqi3y9vnxyym14nm8dqxw0vcpnxmvvkx4sm612i4fclg1f9"; depends=[]; }; sonicLength = derive2 { name="sonicLength"; version="1.4.4"; sha256="1v46xzx3jxxxs2biyrq6xbv2lhpz1i95la93hj6dl4jfyikmx0im"; depends=[]; }; sonify = derive2 { name="sonify"; version="0.0-1"; sha256="1wkqqgf8fhhaz1dmri2zzr8cdwmx3cgrxbprrz3yily5r1m17d15"; depends=[tuneR]; }; soobench = derive2 { name="soobench"; version="1.0-73"; sha256="1y2r061pd4kr0kdgp8db3qy2aj07jdiyvy2py4fmwg6b8pcf9y0l"; depends=[]; }; sophisthse = derive2 { name="sophisthse"; version="0.7.0"; sha256="08vr5y5cvn2q7410krg7620cqv7jmprh96bv43yhh3mk6ixd21dl"; depends=[dplyr RCurl stringr XML zoo]; }; + soptdmaeA = derive2 { name="soptdmaeA"; version="1.0.0"; sha256="03n1y82myq0rz14awjnx9nx1dz3dxqq58m13cw7a7ncap7fmw9r5"; depends=[igraph MASS Matrix]; }; soql = derive2 { name="soql"; version="0.1.1"; sha256="12wvbxy9xx140b7mga4ma7hkg4q6kv549gkq15fnf4dn8q43x8nf"; depends=[]; }; sortinghat = derive2 { name="sortinghat"; version="0.1"; sha256="1wrxwhdp3gj1ra0rgldnmc0w019bnjb6z9j20c5p1ab09x4dmlny"; depends=[bdsmatrix MASS mvtnorm]; }; sorvi = derive2 { name="sorvi"; version="0.7.26"; sha256="19lfrc4bdiljs437w3a2bpf7abnkv0934dh929bbj2w1w8rzghjn"; depends=[dplyr ggplot2 RColorBrewer reshape2]; }; sos = derive2 { name="sos"; version="1.4-1"; sha256="13swys0bzcxsbr4vg0svs6ans7jdyphcyjix70brmmk6l309y8c0"; depends=[brew]; }; sos4R = derive2 { name="sos4R"; version="0.2-11"; sha256="0r4lficx8wr0bsd510z4cp6la32xf928rsiznbywpxghnypsrcgg"; depends=[RCurl sp XML]; }; - sotkanet = derive2 { name="sotkanet"; version="0.9.21"; sha256="0x3dg38i2naf270qjc7dzmvf32ziihsa6m8yv1wh0l7sbk78h7cv"; depends=[RCurl rjson]; }; + sotkanet = derive2 { name="sotkanet"; version="0.9.48"; sha256="1jw9agj92zzgad5kk9z6smjacimwinci6aaqlzmshivb8g8rv8zp"; depends=[RCurl rjson]; }; + sotu = derive2 { name="sotu"; version="1.0.2"; sha256="0aqwkawaydsm91hz13msjg1a5llg7xmv6hxmfmsaganrl7iaym3c"; depends=[]; }; sound = derive2 { name="sound"; version="1.4.4"; sha256="1mxwcr978k11p0dznv1gbvb894nixkl4gvhgj015gcl1s63ar5n4"; depends=[]; }; soundecology = derive2 { name="soundecology"; version="1.3.2"; sha256="1ig04hdxwailsp4lv5y9q73x7vb6hl4dw9zlb05gbccvid5vmdsh"; depends=[ineq oce pracma seewave tuneR vegan]; }; source_gist = derive2 { name="source.gist"; version="1.0.0"; sha256="03bv0l4ccz9p41cjw18wlz081vbjxzfgq3imlhq3pgy9jdwcd8fp"; depends=[RCurl rjson]; }; - sourceR = derive2 { name="sourceR"; version="1.0.0"; sha256="118v608cimphsm5p84f1j1i3s6yv0xa7qfqrd13j59pvzbfbplka"; depends=[cluster dplyr gplots gtools hashmap R6 SPIn uuid]; }; + sourceR = derive2 { name="sourceR"; version="1.0.1"; sha256="01qxa44s9szaxl0rdcx4p0wn4vby17hdzdjzpsbls3prsnr0jaad"; depends=[assertthat cluster dplyr gplots gtools hashmap R6 reshape2 SPIn tensorA]; }; sourcetools = derive2 { name="sourcetools"; version="0.1.6"; sha256="0l8c6fql82cb246qh7hfgxb4s35qn0qfgy6dzvkx0zkz1cpqvx69"; depends=[]; }; - sp = derive2 { name="sp"; version="1.2-4"; sha256="0crba3j00mb2xv2yk60rpa57gn97xq4ql3a6p9cjzqjxzv2cknk2"; depends=[lattice]; }; + sp = derive2 { name="sp"; version="1.2-5"; sha256="09yydnacp33yx0kn537k96fjlbf75fjafqfknpa5gvci4l888bqd"; depends=[lattice]; }; sp23design = derive2 { name="sp23design"; version="0.9"; sha256="1ihvcld19cxflq2h93m9k9yaidhwixvbn46fqqc1p3wxzplmh8bs"; depends=[mvtnorm survival]; }; sp500SlidingWindow = derive2 { name="sp500SlidingWindow"; version="0.1.0"; sha256="0m4fg7vwscm1575zq7s8sycr742lbwwhcr7s4gm4vcawz9sfvhkl"; depends=[dplyr FinCal gdata lubridate magrittr]; }; spAddins = derive2 { name="spAddins"; version="0.1.7"; sha256="1ci246770j40zzmsjwjqwkwi6b2w5qwb0n4f4wah5rjf6zjwkd5r"; depends=[rstudioapi]; }; spBayes = derive2 { name="spBayes"; version="0.4-0"; sha256="1qnn2jpc22594zvqr99m3r8sl5cab1khbcrk8w6i2s91kbwc0qyh"; depends=[abind coda Formula magic]; }; - spBayesSurv = derive2 { name="spBayesSurv"; version="1.1.0"; sha256="0zxs39b5s5pz1vdfjnsdp357qx0g0r42h7wqnsrpdfh88ry82s2l"; depends=[coda fields MASS Rcpp RcppArmadillo survival]; }; + spBayesSurv = derive2 { name="spBayesSurv"; version="1.1.1"; sha256="0pcfy3w2aqld10w9jdcizcy0rdpmdaj8z7qwpam4s2f6sap1q26b"; depends=[coda fields MASS Rcpp RcppArmadillo survival]; }; spMC = derive2 { name="spMC"; version="0.3.8"; sha256="1glkyv6wmh766ssdlm4z7dck32r0284kwah0ksmmkwxkfw1qx7xb"; depends=[]; }; spTDyn = derive2 { name="spTDyn"; version="1.0"; sha256="0yrnbf9g1n1hrrra2vp6412wfky1bhy3b6raif9k82xvi9p9m6pz"; depends=[coda sp]; }; spTest = derive2 { name="spTest"; version="0.2.4"; sha256="1pfyrim6m0pcwsxpin9z09569yzil49hsz5mndp723c9wkk8vn5h"; depends=[geoR sp]; }; spThin = derive2 { name="spThin"; version="0.1.0"; sha256="06qbk0qiaw7ly1ywbr4cnkmqfasymr7gbhvq8jjbljm0l69fgjpp"; depends=[fields knitr spam]; }; spTimer = derive2 { name="spTimer"; version="2.0-1"; sha256="15yrbxx44cqphhr71b5hiimwwjiwwpzny16xjb87nn2lc4mb53by"; depends=[coda sp]; }; spa = derive2 { name="spa"; version="2.0"; sha256="1np50qiiy3481xs8w0xfmyfl3aypikl1i1w8aa5n2qr16ksxrnq3"; depends=[cluster MASS]; }; - spaMM = derive2 { name="spaMM"; version="2.0.0"; sha256="0d453paflsbrwjpd6xh97k4fxc76ys0rrsv4kcwy2zxqxy7mzqgq"; depends=[MASS Matrix nlme nloptr proxy Rcpp RcppEigen]; }; + spaMM = derive2 { name="spaMM"; version="2.1.0"; sha256="1nr9rclwhi76npsjq00rk9n1f60icmsdq50ykpxyhwqwhglr2dsp"; depends=[MASS Matrix nlme nloptr proxy Rcpp RcppEigen]; }; spaa = derive2 { name="spaa"; version="0.2.2"; sha256="163iipz1knxx1lzby9a3n1f014yqkf25z1wpwwy4gbx7sia499d5"; depends=[]; }; space = derive2 { name="space"; version="0.1-1"; sha256="1qigfz62xz47hqi43aii3yr4h7ddvaf11a5nil7rqprgkd0k6mv3"; depends=[]; }; spaceExt = derive2 { name="spaceExt"; version="1.0"; sha256="0lp8qmb7vcgxqqpsi89zjy7kxpibg3x2mq205pjmsrbbh7saqzr4"; depends=[glasso limSolve]; }; @@ -9471,10 +9908,11 @@ in with self; { spacetime = derive2 { name="spacetime"; version="1.2-0"; sha256="1qd9bvnqknw8kaqz7xr5gkkhi3h1f2dvd70zax44g912nha13f7h"; depends=[intervals lattice sp xts zoo]; }; spacodiR = derive2 { name="spacodiR"; version="0.13.0115"; sha256="0c0grrvillpwjzv6fixviizq9l33y7486ypxniwg7i5j6k36nkpl"; depends=[colorspace picante Rcpp]; }; spacom = derive2 { name="spacom"; version="1.0-5"; sha256="0b6yh4q9f0ibwlwyckwaya9m645j22x6bdz9mz3chass8qza6bls"; depends=[foreach iterators lme4 Matrix nlme spdep]; }; + spacyr = derive2 { name="spacyr"; version="0.9.0"; sha256="1d2bfsmkpb3aqfqiiqdxmw85aqdq7880s0f81vs0jy6i64an90x6"; depends=[data_table reticulate]; }; spaero = derive2 { name="spaero"; version="0.2.0"; sha256="0srkah89z23j30y2smlnyhf97mm123apma8vgmgfarbx188bkwpn"; depends=[]; }; spam = derive2 { name="spam"; version="1.4-0"; sha256="0c278q2rmrxwhax58n8987j3rlg7c8bnxnn8r96y9kv4hjj1pjsk"; depends=[]; }; spanel = derive2 { name="spanel"; version="0.1"; sha256="1riyvvfij277mclgik41gyi01qv0k466wyk2wbqqhlvrlj79yzsc"; depends=[]; }; - spanr = derive2 { name="spanr"; version="1.0"; sha256="1x29hky347kvmk9q75884vf6msgcmfi3w4lyarq99aasi442n1ps"; depends=[plyr stringr survival]; }; + spant = derive2 { name="spant"; version="0.3.0"; sha256="0q5sc662w6mipwzsdb2qcpbp5yzck8k088is7hmaw5ik87xxiimd"; depends=[abind complexplus foreach matrixcalc minpack_lm nnls plyr pracma signal smoother stringr svd]; }; sparc = derive2 { name="sparc"; version="0.9.0"; sha256="0jsirrkmvrfxav9sphk8a4n52fg0d1vnk3i8m804i4xl0s7lrg8s"; depends=[]; }; sparcl = derive2 { name="sparcl"; version="1.0.3"; sha256="1348pi8akx1k6b7cf4bhpm4jqr5v8l5k086c7s6rbi5p6qlpsrvz"; depends=[]; }; spareserver = derive2 { name="spareserver"; version="1.0.1"; sha256="094q5i6v4v37hzfdyps8zni394z312r802hl04jw0xzzps922rq4"; depends=[assertthat httr pingr]; }; @@ -9482,27 +9920,27 @@ in with self; { spark_sas7bdat = derive2 { name="spark.sas7bdat"; version="1.2"; sha256="1kvzfjhf1q5jzlq5d04s7d96j63vnvqqrh8s03rwkl79h1dhqhhp"; depends=[sparklyr]; }; sparkTable = derive2 { name="sparkTable"; version="1.3.0"; sha256="1fc2nihxfrjpmxm9g9296mz5czd3ydvi1v37g8qgb20j7b73c64h"; depends=[boot Cairo ggplot2 gridExtra pixmap Rglpk RGraphics shiny StatMatch xtable]; }; sparkline = derive2 { name="sparkline"; version="2.0"; sha256="0lrr1lm7603di7x3mf53cp13d9ssjh9gmb43wa6z9yqapis2djm2"; depends=[htmltools htmlwidgets]; }; - sparklyr = derive2 { name="sparklyr"; version="0.5.3"; sha256="1gwp1x9lgwkv8kvbywj6hafkpw93b9hiw6hims69b5krfir6d9n7"; depends=[assertthat base64enc config DBI digest dplyr httr jsonlite lazyeval rappdirs readr rprojroot withr]; }; + sparklyr = derive2 { name="sparklyr"; version="0.5.6"; sha256="1qgiyxn8q1hf3lpjm3cf2xw5f94xr0dcbq0wlndvyffvlk7vvmsd"; depends=[assertthat base64enc config DBI dbplyr digest dplyr httr jsonlite lazyeval rappdirs readr rlang rprojroot rstudioapi shiny withr]; }; sparktex = derive2 { name="sparktex"; version="0.1"; sha256="0r6jnn9fj166pdhnjbsaqmfmnkq0qr1cjprihlnln9jad05mrkjx"; depends=[]; }; sparkwarc = derive2 { name="sparkwarc"; version="0.1.1"; sha256="07b66f12fz19042kj7d9p32j9sy3103zvil36xkf21hm9iyg6xph"; depends=[DBI sparklyr]; }; sparr = derive2 { name="sparr"; version="0.3-8"; sha256="1vsfk769f6227wrxfpq3qbs9h8farfnmgq94pl2ra4hgvpvygsmr"; depends=[MASS rgl spatstat]; }; sparseBC = derive2 { name="sparseBC"; version="1.1"; sha256="1w60n2875n809lbrn0hd4kdmsyfd64aikgzxchza8b59x77l0psy"; depends=[fields glasso]; }; - sparseFLMM = derive2 { name="sparseFLMM"; version="0.1.0"; sha256="1wrpjhb20mrkg9a5302phy4hrn5qfndjl78dx1v4a811clgfid8q"; depends=[data_table MASS Matrix mgcv refund]; }; + sparseFLMM = derive2 { name="sparseFLMM"; version="0.1.1"; sha256="03j1rvgbzmscs043iyzblfk601bv2vf90sfbii14yqm0mrf27r28"; depends=[data_table MASS Matrix mgcv refund]; }; sparseHessianFD = derive2 { name="sparseHessianFD"; version="0.3.3"; sha256="13v8zia1i0k6faiz6faikqmlrp16riwv637yygjq2cq8fcm75pyf"; depends=[Matrix Rcpp RcppEigen]; }; sparseLDA = derive2 { name="sparseLDA"; version="0.1-9"; sha256="1k3sw9kc40yxnfss4vrsx34qxmv8ssddyhbfjhxrdldvblhbwchb"; depends=[elasticnet MASS mda]; }; sparseLTSEigen = derive2 { name="sparseLTSEigen"; version="0.2.0"; sha256="11llmrkq0pnrdphgjvhmg269bq3xbbn4s7kd7xhvk62sigvspkcj"; depends=[Rcpp RcppEigen robustHD]; }; - sparseMVN = derive2 { name="sparseMVN"; version="0.2.0"; sha256="12g387bvpy4249kwq946v006ab095zsmgfsrkc1yqncxhmjwrgqn"; depends=[Matrix]; }; + sparseMVN = derive2 { name="sparseMVN"; version="0.2.1"; sha256="1k4jiday24rdiscprwifrc0py13h707ijavspz15jannvjaz9qdh"; depends=[Matrix]; }; sparseSEM = derive2 { name="sparseSEM"; version="2.5"; sha256="0ig8apsi94kvbcq3i8nzmywbdizlss7c6r9bppcyl9lxgikc3cds"; depends=[]; }; sparseSVM = derive2 { name="sparseSVM"; version="1.1-2"; sha256="1bv9ipfs275vr1hmz7g7w4rimvbkg15wjh3xj3cx1zam91k384k9"; depends=[]; }; sparsebn = derive2 { name="sparsebn"; version="0.0.4"; sha256="0msd12gnxijkgazg4dyfqfravsacskbshp00fa4g2vkzmsjai1y0"; depends=[ccdrAlgorithm discretecdAlgorithm sparsebnUtils]; }; sparsebnUtils = derive2 { name="sparsebnUtils"; version="0.0.4"; sha256="0473pxzb95ygvhwkvs97d0zmfwlmxnxn3xp125bycv3ns3rgpssy"; depends=[Matrix nnet]; }; - sparsediscrim = derive2 { name="sparsediscrim"; version="0.2.3"; sha256="1sh6g1086l040547yajgyp4hq8yzlspdb6jmw4w1sv0zsmca25sv"; depends=[bdsmatrix corpcor dplyr ggplot2 mvtnorm]; }; sparsenet = derive2 { name="sparsenet"; version="1.2"; sha256="106a2q4syrcnmicrx92gnbsf2i5ml7pidwghrpl6926glj59j248"; depends=[glmnet shape]; }; sparsepp = derive2 { name="sparsepp"; version="0.1.1"; sha256="0wzj4z333ns18a1byii601fp46dlq9q4dbprkc95yl30xpzmdx0b"; depends=[]; }; sparsereg = derive2 { name="sparsereg"; version="1.2"; sha256="1ipsang2fppmjx4h5ljgzx3c44z3lggc376ghrqqgmxb5ql8bcp3"; depends=[coda ggplot2 GIGrvg glmnet gridExtra MASS MCMCpack msm Rcpp RcppArmadillo VGAM]; }; sparsestep = derive2 { name="sparsestep"; version="1.0.0"; sha256="0f3wrwiyn990sn3x9r50zgs8cr76nmyisdc7qismgx1nn5yx5z0g"; depends=[Matrix]; }; sparsesvd = derive2 { name="sparsesvd"; version="0.1-1"; sha256="09qpky8vxkpycj6c4vn3nqlidhblgksh3n6w8sww4yhn0pm3rzn5"; depends=[Matrix]; }; sparsevar = derive2 { name="sparsevar"; version="0.0.10"; sha256="069r0kbypmx7pw3z2v9l17qidw3d73rzf5zs6yn1adyvpsddjxi8"; depends=[doParallel flare ggplot2 glmnet Matrix mvtnorm ncvreg picasso reshape2]; }; + sparsio = derive2 { name="sparsio"; version="1.0.0"; sha256="12nbydgzl3qlanlsfdy8bvg6rxa439lv0z0vbyqssqwky3mmg5c3"; depends=[Matrix Rcpp]; }; spartan = derive2 { name="spartan"; version="2.3"; sha256="09j5f9f068m83279ncfxpyg8bnk25qjz20a9xlap8dpm50iidr24"; depends=[]; }; spass = derive2 { name="spass"; version="1.0"; sha256="1pgv4yzbdv475gp53qz40ys731v9960cyxbp84gff6y5f2y4axah"; depends=[geepack MASS multcomp mvtnorm Rcpp]; }; spatcounts = derive2 { name="spatcounts"; version="1.1"; sha256="0rp8054aiwc62r1m3l4v5dh3cavbs5h2yb01453bw9rwis1pj2qm"; depends=[]; }; @@ -9516,29 +9954,27 @@ in with self; { spatialEco = derive2 { name="spatialEco"; version="0.1-7"; sha256="0l8nshsapbgfzli1rpls3j3s8gyqy2nzsgqf2x4v1r699r419i5k"; depends=[cluster MASS RANN raster RCurl rgdal rgeos rms SDMTools sp SpatialPack spatstat spdep yaImpute]; }; spatialTailDep = derive2 { name="spatialTailDep"; version="1.0.2"; sha256="107yldc43pgbadxdisnc7vq8vyvcps1b1isyvxd0kyf59xldiq47"; depends=[cubature mvtnorm SpatialExtremes]; }; spatialfil = derive2 { name="spatialfil"; version="0.15"; sha256="01fbn9zblz7rjsgqy3ikdqpf0p0idvb6m96mf7m7qi2ps5f48vzj"; depends=[abind fields]; }; - spatialkernel = derive2 { name="spatialkernel"; version="0.4-19"; sha256="0gbl6lrbaxzv2f975k0vd6ghrljgf1kjazld3hm7781kv1f87lji"; depends=[]; }; spatialnbda = derive2 { name="spatialnbda"; version="1.0"; sha256="14mx5jybymasyia752f3vnr5vmswcavbz8bpqr69vlxphw27qkwk"; depends=[mvtnorm SocialNetworks]; }; spatialprobit = derive2 { name="spatialprobit"; version="0.9-11"; sha256="1cpxxylc0pm7h9m83m2cklrh4jni5x79r5m5gibxi6viahwxn9kc"; depends=[Matrix mvtnorm spdep tmvtnorm]; }; spatialsegregation = derive2 { name="spatialsegregation"; version="2.44"; sha256="02s75q6ylzm6xzr1q23fhps3svlb0ix86dzgr23wf42369gs7h0g"; depends=[spatstat]; }; - spatstat = derive2 { name="spatstat"; version="1.50-0"; sha256="0xlql98fplrh1rcn7y0nvbxsn84adqgdzidh3y89iyv6jcnzziwc"; depends=[abind deldir goftest Matrix mgcv nlme polyclip rpart spatstat_utils tensor]; }; + spatstat = derive2 { name="spatstat"; version="1.51-0"; sha256="00lgx9q3bhffw70ngallnp2w8n7zbnqzxn9bx3hi5m16pxf9d97f"; depends=[abind deldir goftest Matrix mgcv nlme polyclip rpart spatstat_utils tensor]; }; spatstat_local = derive2 { name="spatstat.local"; version="3.5-6"; sha256="0yb3k2szk2z61h2scyj4h78y13qvbd9b1hvwp9n2983w77y0k5dz"; depends=[spatstat spatstat_utils tensor]; }; - spatstat_utils = derive2 { name="spatstat.utils"; version="1.4-1"; sha256="0f03dnf3d1p0g8qi5c3siz0lk5jya6jjdh0q9im7mpvz3gij1p4l"; depends=[]; }; + spatstat_utils = derive2 { name="spatstat.utils"; version="1.6-0"; sha256="097xjylngcjarb4zrv8fi2zs8iss5s7i55733g3jwx9jyivsiic7"; depends=[]; }; spatsurv = derive2 { name="spatsurv"; version="1.1"; sha256="0fakhz2qc5vb7ym2ik7hilv8g5fn3z7s16hzngq1n591xza5b74g"; depends=[fields geostatsp iterators lubridate Matrix OpenStreetMap RandomFields raster RColorBrewer rgeos rgl sp spatstat stringr survival]; }; - spbabel = derive2 { name="spbabel"; version="0.4.5"; sha256="0qgng4w0jjm5rkq0arw4icv6xp9fhpv0b0kmy4wzh54qr3zhh2ja"; depends=[dplyr sp tibble]; }; + spbabel = derive2 { name="spbabel"; version="0.4.7"; sha256="05iqzn0cl7alswdz923sskcsizsifmjf8bwn2mjsjhp2hqlr5qmv"; depends=[dplyr sp tibble]; }; spc = derive2 { name="spc"; version="0.5.3"; sha256="0y730vh04j4cyz5zfyx4xqfw07ic1l93197640q543adnmil40vf"; depends=[]; }; spcadjust = derive2 { name="spcadjust"; version="1.1"; sha256="016i3zaaq800x4niz4fixa57nfj1m10sz5xskff4vq4v9fjn2sl0"; depends=[]; }; spcosa = derive2 { name="spcosa"; version="0.3-6"; sha256="0zj5yr0by1pbixs4z6w3c6yr1k55k5gqmvjkwiq2gsgq00vs7q94"; depends=[ggplot2 rJava sp]; }; spcov = derive2 { name="spcov"; version="1.01"; sha256="1brmy64wbk56bwz9va7mc86a0ajbfy09qpjafyq2jv7gm7a35ph5"; depends=[]; }; spcr = derive2 { name="spcr"; version="2.0"; sha256="1n0lva9brpzxysw6p7l88cj8d46jng2zd7zvr5brqldzd3yl63l9"; depends=[]; }; spd = derive2 { name="spd"; version="2.0-1"; sha256="00zxh4ri47b61jkcjf5idl9hhlfld6rhczsnhmjsax59884f2i8m"; depends=[KernSmooth]; }; - spdep = derive2 { name="spdep"; version="0.6-12"; sha256="15376wqwiy09300rj797xy8966ljdy1m1wl8jq9yklh20213cz9f"; depends=[boot coda deldir expm gmodels LearnBayes MASS Matrix nlme sp]; }; + spdep = derive2 { name="spdep"; version="0.6-13"; sha256="1i7igp3csdc9jy4snmivdxhifvy419gv5dky315hdfm7gr65yd7d"; depends=[boot coda deldir expm gmodels LearnBayes MASS Matrix nlme sp]; }; spdownscale = derive2 { name="spdownscale"; version="0.1.0"; sha256="0pl560km9629iwy13h7359ab7ixzs09hg986kvk0xbnc348srb86"; depends=[]; }; - spdplyr = derive2 { name="spdplyr"; version="0.1.2"; sha256="056rdnz6qj24x8gl3aigcd84rk5c06r76wkcgn1rkaacs5b20qmq"; depends=[dplyr lazyeval sp spbabel tibble]; }; + spdplyr = derive2 { name="spdplyr"; version="0.1.3"; sha256="1f34yzj9z4f1dj7pqaayk0mvabzwa6kc3kwi1pmpikl1afgsyv25"; depends=[dplyr lazyeval rlang sp spbabel tibble]; }; spduration = derive2 { name="spduration"; version="0.16.0"; sha256="1nyv6ffrky8cwwlfq0b4w17ibni6xq61zrc1s7s2hizlp41cnscd"; depends=[corpcor MASS plyr Rcpp RcppArmadillo separationplot xtable]; }; spdynmod = derive2 { name="spdynmod"; version="1.1.3"; sha256="0qh0kkxs6hk344k3fys0g9yy0xl0kwnwl18bgiak53fd1k7whskq"; depends=[animation deSolve raster sp]; }; spe = derive2 { name="spe"; version="1.1.2"; sha256="0xyx42n3gcsgqmy80nc9la6p6gq07anpzx0afwffyx9fv20fvys0"; depends=[]; }; - speaq = derive2 { name="speaq"; version="1.2.3"; sha256="01xihbj9qx24ql0kn1hafkgbsjl9hw16jh8vxqygmv0lvxljlzvy"; depends=[MassSpecWavelet]; }; - speaq2 = derive2 { name="speaq2"; version="0.1.0"; sha256="0rrqh90vqi7l1nbwivzvygd292nnkgk26nyh2kw71pl3gfakmnml"; depends=[cluster data_table doSNOW foreach MassSpecWavelet mQTL]; }; + speaq = derive2 { name="speaq"; version="2.0.0"; sha256="1yf8pjwr1gn0mh0km7xwpl15619xvn1dasckrd8xiyldi8g3c7ik"; depends=[cluster data_table doSNOW foreach ggplot2 gridExtra MassSpecWavelet mQTL reshape2]; }; spec = derive2 { name="spec"; version="0.1.3"; sha256="0i1c5wjrca36zf5ak95i8n57hy1jj8w0qkkpnjqpn3xv3nvqccr2"; depends=[csv encode magrittr]; }; speccalt = derive2 { name="speccalt"; version="0.1.1"; sha256="0j7rbidmmx78vgwsqvqjbjjh92fnkf2sdx0q79xlpjl2dph7d6l6"; depends=[]; }; speciesgeocodeR = derive2 { name="speciesgeocodeR"; version="1.0-4"; sha256="033877l9sxcvvzpyf9aw19sj8qfscim663j2y2az8bl9c79xw4ph"; depends=[maps raster sp]; }; @@ -9548,17 +9984,17 @@ in with self; { spectral_methods = derive2 { name="spectral.methods"; version="0.7.2.133"; sha256="0k8kpk94d2qzqdk3fnf6h9jmwdyp8h3klr0ilm5siwq5wkcz339l"; depends=[abind DistributionUtils foreach JBTools ncdf_tools nnet raster RColorBrewer RNetCDF Rssa]; }; spectralGP = derive2 { name="spectralGP"; version="1.3.3"; sha256="1jf09nsil4r90vdj7n1k6ma9dzzx3bwv0fa7svil9pxrd2zlbkbs"; depends=[]; }; speedglm = derive2 { name="speedglm"; version="0.3-2"; sha256="1b25zimk0z7ad62yacqdg0zk0qs0jja4i918ym942xfw4j1z3jjz"; depends=[MASS Matrix]; }; - spef = derive2 { name="spef"; version="1.0-1"; sha256="0nf6kw5w6ifv2xp515cmd7p8l2dd224vzhh3fzcvykibqk49fdsp"; depends=[ggplot2 nleqslv plyr survival]; }; + spef = derive2 { name="spef"; version="1.0-3"; sha256="18hwsk1gkkwdn0c9f8kvrbkimkxnp4wi1d7xj1002a5x5pyvrkvs"; depends=[BB ggplot2 nleqslv plyr sm SQUAREM survival]; }; speff2trial = derive2 { name="speff2trial"; version="1.0.4"; sha256="0dj5mh2sdp6j4ijgv14hjr39rasab8g83lx1d9y50av11yhbf2pw"; depends=[leaps survival]; }; spellcheckr = derive2 { name="spellcheckr"; version="0.1.2"; sha256="09snc1ymzr4njnr3w502b84dqwjjd414higjxqi48jvh27br5k1l"; depends=[data_table dplyr stringr]; }; sperich = derive2 { name="sperich"; version="1.5-7"; sha256="1apgq5nsl6nw674dy7bc7r7z962wcmqsia5n67a8n6c5lcgcif3f"; depends=[foreach rgdal SDMTools sp]; }; - sperrorest = derive2 { name="sperrorest"; version="1.0.0"; sha256="0z5f8x9y9swnp13fph8jbd8cx0jr8d47wxr1gnnpgzj3s3kn115s"; depends=[doParallel foreach pbapply ROCR rpart]; }; - spex = derive2 { name="spex"; version="0.1.0"; sha256="1d4dbj87ka7hrl4kmxll3al58i3k3ynxkmy25g95by6v8dfn7zb5"; depends=[raster sp]; }; + sperrorest = derive2 { name="sperrorest"; version="2.0.0"; sha256="101q7fj3smf21m1g7kwrqlycqd7c8rdbrvy166dhzw1ygl8ha168"; depends=[doFuture foreach future gdata magrittr pbapply pbmcapply purrr ROCR rpart stringr]; }; + spex = derive2 { name="spex"; version="0.3.0"; sha256="1ikq7k6mxv9m2szr2s471fd3bq00l25sq4jljyfk5zazzalpwzcn"; depends=[quadmesh raster sp]; }; spfrontier = derive2 { name="spfrontier"; version="0.2.3"; sha256="0br54kkva4m3yyqfjh3cs5wf4kk3ax6yg0h8cl5qiy38dvssa5qd"; depends=[ezsim moments mvtnorm numDeriv optimx spdep tmvtnorm]; }; spftir = derive2 { name="spftir"; version="0.1.0"; sha256="07vw8igy698jx671cj6hmf6ll9xvaq81fb6la7j95pqbd6jl284z"; depends=[pracma]; }; spgrass6 = derive2 { name="spgrass6"; version="0.8-9"; sha256="05xvdhisad0d7c69mvahzg6pvgvmb6dph50r34981palykic7qhn"; depends=[sp XML]; }; spgs = derive2 { name="spgs"; version="1.0"; sha256="1f75dvp6m5w5phg158ykvl4myvw6q4vysb2pc3bgm0f9fpcadfip"; depends=[]; }; - spgwr = derive2 { name="spgwr"; version="0.6-30"; sha256="0kxk3layivphwg262n6xxkiwz3rcydr7r3xsj9drmml40qgwgyis"; depends=[sp]; }; + spgwr = derive2 { name="spgwr"; version="0.6-31"; sha256="021h5qzz7gifxhripyd3alw6z7a9rj4r7c23dr7vk0szyd9shmgl"; depends=[sp]; }; sphereplot = derive2 { name="sphereplot"; version="1.5"; sha256="1i1p20h95cgw5wqp9bwfs9nygm4dxzsggz08ncjs1xrsvhhq9air"; depends=[rgl]; }; sphet = derive2 { name="sphet"; version="1.6"; sha256="0149wkak7lp2hj69d83rn05fzh9bsvyc1kyg0d3b69sx92kqlwr0"; depends=[Matrix nlme sp spdep]; }; spi = derive2 { name="spi"; version="1.1"; sha256="0gc504f7sji5x0kmsidnwfm7l5g4b1asl3jkn2jzsf2nvjnplx1z"; depends=[]; }; @@ -9566,12 +10002,12 @@ in with self; { spikeSlabGAM = derive2 { name="spikeSlabGAM"; version="1.1-11"; sha256="1f16jvdj6kbiiypnbbj10nj7l88kkrxasrribqpjv7ai62dlximn"; depends=[akima cluster coda ggplot2 gridExtra MASS MCMCpack mvtnorm R2WinBUGS reshape scales]; }; spikes = derive2 { name="spikes"; version="1.1"; sha256="080sna0sgii61kai5sirs6cijnvk1012djwfw705di9y2lvk1hqk"; depends=[emdbook]; }; spikeslab = derive2 { name="spikeslab"; version="1.1.5"; sha256="0dzkipbrpwki6fyk4hqlql3yhadwmclgbrx00bxahrmlaz1vjzh2"; depends=[lars randomForest]; }; - spind = derive2 { name="spind"; version="2.0.1"; sha256="18zxmaq1ssg48fgpmpzz1rfp7gvjqavgm9nfg2rqngm0qhqx0m0r"; depends=[gee geepack lattice MASS rje sp splancs stringr waveslim]; }; + spind = derive2 { name="spind"; version="2.1.0"; sha256="0mq7c0ps62498cjwxwask3a7mggvcvzhkglw6alps9vz3p1qmi3i"; depends=[gee geepack ggplot2 lattice MASS RColorBrewer rje sp splancs stringr waveslim]; }; spinyReg = derive2 { name="spinyReg"; version="0.1-0"; sha256="0kbg7rncrrl5xdsaw9vj909x97mfp77mjnvghczplmnwmmanyn72"; depends=[]; }; splancs = derive2 { name="splancs"; version="2.01-40"; sha256="0qs3lwyllrkahnvqbm8bzrf03bm9zk4s7p1n19s638y4xf0l6x3r"; depends=[sp]; }; splines2 = derive2 { name="splines2"; version="0.2.5"; sha256="048c43dhrri0xc02897jxgqw7c5ai2nyylhx3bvwsqg0hrj3c7rv"; depends=[]; }; splitfngr = derive2 { name="splitfngr"; version="0.1.1"; sha256="0gz65acnkil9xjspl2kzpzyhj7lslga9g3p0k79xh25ia6qal5ws"; depends=[lbfgs]; }; - splithalf = derive2 { name="splithalf"; version="0.1.0"; sha256="037fxw65sbmclzkkh9a2gb5w5h9nmhijpg92r1dv5pw5pf7vm0qb"; depends=[plyr]; }; + splithalf = derive2 { name="splithalf"; version="0.2.0"; sha256="1bpw8mw88aryk4n0bdm4f356wsix6npdpl91qfbwayhdh0g5302f"; depends=[plyr]; }; splitstackshape = derive2 { name="splitstackshape"; version="1.4.2"; sha256="0m9karfh0pcy0jj3dzq87vybxv9gmcrq5m2k7byxpki95apbrsmg"; depends=[data_table]; }; splm = derive2 { name="splm"; version="1.4-6"; sha256="1vclsx622zq7kdgb84dd74i6a1b27d0jnx29blzba77d24adyzmh"; depends=[bdsmatrix ibdreg MASS Matrix maxLik nlme plm spam spdep]; }; spls = derive2 { name="spls"; version="2.2-1"; sha256="0zgk9qd825zqgikpkg13jm8hi6ncg48qw5f985bi145nwy9j19xs"; depends=[MASS nnet pls]; }; @@ -9579,36 +10015,34 @@ in with self; { splusTimeDate = derive2 { name="splusTimeDate"; version="2.5.0-137"; sha256="0bpzv6a05hnqnnz2znnkb3f34r56krhc595zjnn82azxj4a53njh"; depends=[]; }; splusTimeSeries = derive2 { name="splusTimeSeries"; version="1.5.0-74"; sha256="0aikw6ckc0a7lrgjlcdmqspgrx0fc4iysd7jynd2lsf1hxy4pz35"; depends=[splusTimeDate]; }; spm12r = derive2 { name="spm12r"; version="2.3.1"; sha256="1fkm961phkxy5rmv2vav0a7vy9j89i0gwgfi2rjg682xl473j3gk"; depends=[git2r matlabr neurobase oro_nifti R_utils]; }; - spmoran = derive2 { name="spmoran"; version="0.1.0"; sha256="0jwnsjf165213212bg4n17jmp20jvzgrfdz0smrk0zvxhisas35g"; depends=[fields Matrix vegan]; }; + spmoran = derive2 { name="spmoran"; version="0.1.1"; sha256="1l5rigjvh1swj203fh410gsi3vdw42z1544g47jx9cs4s0273saa"; depends=[doParallel fields foreach ggplot2 Matrix vegan]; }; spnet = derive2 { name="spnet"; version="0.9.1-0"; sha256="1fy0fpgz2k985brfqyza1l49y0w2j9z308n542pgmkzqsnsdscpw"; depends=[shape sp]; }; - spocc = derive2 { name="spocc"; version="0.6.0"; sha256="0xrwwac2d8j4c4qy6br9l6i9bqlqbmzmq34dp25xwhw1nla6mhvs"; depends=[data_table httr jsonlite lubridate rbison rebird rgbif ridigbio rvertnet tibble V8 whisker]; }; + spocc = derive2 { name="spocc"; version="0.7.0"; sha256="0ar107c7snbh1iaib3xddng88861h3gc56whicx5krl3zf2xgjqa"; depends=[crul data_table jsonlite lubridate rbison rebird rgbif ridigbio rvertnet tibble whisker wicket]; }; spongecake = derive2 { name="spongecake"; version="0.1.1"; sha256="1bf2106ik4dp9xl68s8wzj5w6yl3syx8i39zxpp24rywb6f2i8n0"; depends=[ggplot2 jpeg magrittr plyr]; }; sporm = derive2 { name="sporm"; version="1.1"; sha256="07sxz62h4jb7xlqg08sj4wpx121n9jfk65196mnxdvb36lqmb4hp"; depends=[]; }; sppmix = derive2 { name="sppmix"; version="1.0.1"; sha256="0l9hmjrb0yl4c6y9l39h6kggxda9qz6xspf719hjc30zq76h4k1a"; depends=[fields ggplot2 matrixcalc mvtnorm Rcpp RcppArmadillo rgl sp spatstat USAboundaries]; }; - spray = derive2 { name="spray"; version="1.0"; sha256="12iv1sksxmac2ykrb8psfnaa9lzq6djv0a7a1x73jr3nflvrx9bh"; depends=[magic partitions Rcpp]; }; + spray = derive2 { name="spray"; version="1.0-3"; sha256="0zy2dwzk33cwch0pdhhsyiy169z39iij3zvvjg81gxa29pq0h1ab"; depends=[magic partitions Rcpp]; }; sprex = derive2 { name="sprex"; version="1.4.1"; sha256="14idml4mipd4wyza7hqf49ww4dparmwaps35hxm8jg5h0w1pgh7j"; depends=[swfscMisc]; }; sprint = derive2 { name="sprint"; version="1.0.7"; sha256="1yzx1qjpxx9yc0hbm1mmha5b7aq13iflq66af597b7yj6abm7zjp"; depends=[boot e1071 ff randomForest rlecuyer]; }; sprinter = derive2 { name="sprinter"; version="1.1.0"; sha256="12v4l4fxijh2d46yzs0w4235a8raip5rfbxskl0dw7701ryh7n8g"; depends=[CoxBoost GAMBoost LogicReg randomForestSRC survival]; }; sprm = derive2 { name="sprm"; version="1.2.2"; sha256="0iyijkjnyz4yx2cmazlnhkk0f5ls0c2q2aikwlzl13w6zbj040a8"; depends=[cvTools ggplot2 pcaPP reshape2 robustbase]; }; sprsmdl = derive2 { name="sprsmdl"; version="0.1-0"; sha256="09klwsjp5w6p7dkn5ddmqp7m9a3zcmpr9vhcf00ynwyp1w7d26gi"; depends=[]; }; - spsann = derive2 { name="spsann"; version="2.0-0"; sha256="1if86d9qm9b2798284axlkp35zxgzmzvp2816i5fqxn50j8fcqy3"; depends=[pedometrics Rcpp sp SpatialTools]; }; + spsann = derive2 { name="spsann"; version="2.1-0"; sha256="0smxkcizs38m84d1d7852hsw699blv6x0n1ma9bi071r9lngljm5"; depends=[pedometrics Rcpp sp SpatialTools]; }; spselect = derive2 { name="spselect"; version="0.0.1"; sha256="02aiml4dh40n6yl52ypramn4847ykdi4y5lhsmchnnp4nnnqycsn"; depends=[magic pracma tester]; }; spsi = derive2 { name="spsi"; version="0.1"; sha256="0q995hdp7knic6nca0kf5yzkvv8rsskisbzpkh9pijxjmp1wnjrx"; depends=[plot3D]; }; - spsmooth = derive2 { name="spsmooth"; version="1.1-3"; sha256="09b740586zyi8npq0bmy8qifs9rq0rzhs9c300fr6pjpc7134xn4"; depends=[mgcv]; }; spsurvey = derive2 { name="spsurvey"; version="3.3"; sha256="1xpjimqkrwm77amqza4713psmg86bvz08gxdi35advq4w614f2w1"; depends=[deldir foreign Hmisc MASS rgeos sp]; }; spt = derive2 { name="spt"; version="1.13-8-8"; sha256="18s74pxfmsjaj92z2a34nq90caf61s84c616yv33a0xvfvp32qr5"; depends=[]; }; sptm = derive2 { name="sptm"; version="16.7-9"; sha256="0x8824zccrwdl38jbhq8skzcvxb7a3b1zggkd7gmyjd94xvxll9k"; depends=[kyotil survey survival]; }; spuRs = derive2 { name="spuRs"; version="2.0.0"; sha256="0lbc3nny6idijdaxrxfkfrn40bxfyp9z3yl9mwb1k6cyd10v5mfj"; depends=[lattice MASS]; }; spup = derive2 { name="spup"; version="0.1-0"; sha256="1dfdxh45db91rmdws4pq1kbsbcjczz98fbfcmm4vlr0vbvisy9bj"; depends=[gstat magrittr mvtnorm purrr raster whisker]; }; - sqldf = derive2 { name="sqldf"; version="0.4-10"; sha256="0n8yvrg3gjgbc3vzq0vlf7fwhgm28kwf0jv25qy44x21n6fg11h7"; depends=[chron DBI gsubfn proto RSQLite]; }; + sqldf = derive2 { name="sqldf"; version="0.4-11"; sha256="0q12vsb53p2wchgp8wfz5bk08wfnm0jxjrakclj4jyy6x3a7ksff"; depends=[chron DBI gsubfn proto RSQLite]; }; sqliter = derive2 { name="sqliter"; version="0.1.0"; sha256="17jjljq60szz0m8p2wc5l56659aap7an5gknc848dp89ycjgj3zx"; depends=[DBI functional RSQLite stringr]; }; - sqlscore = derive2 { name="sqlscore"; version="0.1.1"; sha256="140g2kgfqcw6x3lq7bs90kvdx9kj81fr86hpcbg6dn3i8xslwrad"; depends=[dplyr]; }; + sqlscore = derive2 { name="sqlscore"; version="0.1.2"; sha256="0pl4nf59b8jy8rkqs2z684lxfqh01284h3cx97a1igpy4qqj712b"; depends=[dbplyr]; }; sqlutils = derive2 { name="sqlutils"; version="1.2"; sha256="0dq4idg8i4hv9xg8jllllizqf3s75pdfm1wgncdjj52xhxh169pf"; depends=[DBI roxygen2 stringr]; }; - squash = derive2 { name="squash"; version="1.0.7"; sha256="1wdnzagibh9fz7a3x6m4ixckh7493shvwxg7cn5kpnfzf8m1imyj"; depends=[]; }; + squash = derive2 { name="squash"; version="1.0.8"; sha256="1x1rw0ny2kas0x8y5vv9czyqmwml7s5d2c8a33vqap0x8q52r4z6"; depends=[]; }; squid = derive2 { name="squid"; version="0.1.1"; sha256="0qv9lazgiqazhq096ybmllalm2l2h794ry4p1r93c10msxg37sdp"; depends=[arm data_table ggplot2 lme4 MASS shiny]; }; sra = derive2 { name="sra"; version="0.1.1"; sha256="03nqjcydl58ld0wq1f9f5p666qnvdfxb5vhd584sdilw1b730ykd"; depends=[]; }; - srd = derive2 { name="srd"; version="1.0"; sha256="04j2gj7fn7p2rm34haayswrfhn6w5lln439d07m9g4c020kqqsr3"; depends=[animation colorspace plyr stringr survival]; }; - srvyr = derive2 { name="srvyr"; version="0.2.0"; sha256="0znhwp6111p4icrpgn22k48qlicxgripz3wslhmmkwydq00ndz9w"; depends=[dplyr lazyeval magrittr survey tibble]; }; + srvyr = derive2 { name="srvyr"; version="0.2.2"; sha256="0k8s96hldv9jya6v0l6xls3cxr7mzxk0nqjhwizsqbqb773x95j7"; depends=[dplyr lazyeval magrittr survey tibble]; }; ss3sim = derive2 { name="ss3sim"; version="0.9.5"; sha256="0rdb49bfxvyh0jrqycrv1hxvh7y4kvw81jccjg5ma734x44q0vm5"; depends=[bbmle dplyr foreach ggplot2 gtools lubridate magrittr plyr r4ss]; }; ssa = derive2 { name="ssa"; version="1.2.1"; sha256="10x58c57pa9x6svm4h4xrss72ikin9lpf3ihjwmnkgnaicvsd0bx"; depends=[iterators]; }; ssanv = derive2 { name="ssanv"; version="1.1"; sha256="17a4a5azxm5h2vxia16frcwdyd36phpfm7fi40q6mnnrwbpkzsjd"; depends=[]; }; @@ -9637,16 +10071,19 @@ in with self; { stablespec = derive2 { name="stablespec"; version="0.3.0"; sha256="0m143cq0baj2lyakhr31mqk2lg78jzpdlpv2bhwz6bzzip7mqi22"; depends=[foreach ggm graph matrixcalc nsga2R polycor Rgraphviz sem]; }; stabs = derive2 { name="stabs"; version="0.6-2"; sha256="0alzdj3lciggi9g3fj2lgdjb60dz6077nn4nb4wwd5nv7walp4sl"; depends=[]; }; stackoverflow = derive2 { name="stackoverflow"; version="0.1.2"; sha256="1psw96iscgsx11drmcnh0yjg2jjcaa4akmywh337i6gbgam8kj61"; depends=[]; }; - stacomirtools = derive2 { name="stacomirtools"; version="0.5.0"; sha256="1jq392dcv72r78iv4nd4scidn83l9wglgdzjcj8afr9d0ybdz3gk"; depends=[RODBC xtable]; }; + stacomiR = derive2 { name="stacomiR"; version="0.5.3"; sha256="0jlpg2i304xzfg418x5x9kwm2iawp2jc0q5iahmmy0kiz7283zjr"; depends=[dplyr ggplot2 gWidgets gWidgetsRGtk2 Hmisc intervals lattice lubridate magrittr mgcv RColorBrewer reshape2 RGtk2 RODBC RPostgreSQL sqldf stacomirtools stringr xtable]; }; + stacomirtools = derive2 { name="stacomirtools"; version="0.5.2"; sha256="1a33yy594699b05lb32zwx6yhmvxzwly6vvf8xzqg6lac64p26r5"; depends=[RODBC xtable]; }; stagePop = derive2 { name="stagePop"; version="1.1-1"; sha256="0949r5ibl3sb10sr5xsswxap3wd824riglrylk7fx43ynsv5hzpy"; depends=[deSolve PBSddesolve]; }; stam = derive2 { name="stam"; version="0.0-1"; sha256="1x1j45fir64kffny0nssb2hwn4rcp8gd2cjv6fw4yy0l4d0xi5iv"; depends=[np sp]; }; stampr = derive2 { name="stampr"; version="0.1"; sha256="1w7zp5n41gzahv4psdgw5a5mylcxlf12931fnjz0q2cwqj9cwql5"; depends=[deldir maptools raster rgdal rgeos sp spdep]; }; - standardize = derive2 { name="standardize"; version="0.1.1"; sha256="18wc64fr55rb27a0h3pgqqfs360532s6gb0zgmd3wybfg5kjh5zx"; depends=[lme4 MASS stringr]; }; + standardize = derive2 { name="standardize"; version="0.2.1"; sha256="0ijyqy09fl478cvqnqwv7fpdmf2yvihw18abkkmgwdnm2v3xqphp"; depends=[lme4 MASS stringr]; }; stargazer = derive2 { name="stargazer"; version="5.2"; sha256="0nikfkzjr44piv8hng5ak4f8d7q78f2znw2df0gy223kis8q2hsd"; depends=[]; }; starma = derive2 { name="starma"; version="1.3"; sha256="07r0kyabhgbm2v39fcrw0qhxcxj9a9cb45g9chzcnn9qmvramcwx"; depends=[ggplot2 Rcpp RcppArmadillo scales]; }; starmie = derive2 { name="starmie"; version="0.1.2"; sha256="06cvl8gk78c55kcf4rd27d4gfzh2lcg7ldynvx4hclvbw7ak9zdq"; depends=[combinat data_table ggdendro ggplot2 ggrepel gridExtra iterpc label_switching MCL MCMCpack proxy purrr readr stringr tidyr]; }; - startup = derive2 { name="startup"; version="0.5.0"; sha256="1zhnvg47r4dgm85lvzgcacn2vlfz4pk4r1b263x9mg2ccjwpn8ld"; depends=[]; }; - startupmsg = derive2 { name="startupmsg"; version="0.9.3"; sha256="0i7j412xhyq6pk0gb5pp53sa455fwzpjyfd331j2d5qwk8dhrbh3"; depends=[]; }; + startR = derive2 { name="startR"; version="0.0.1"; sha256="12y57n3yip5rz4rln41896a15zv5b4c67k164282fh1p6ww9gr3r"; depends=[abind bigmemory future]; }; + startup = derive2 { name="startup"; version="0.6.1"; sha256="1hxncw08sw9278vdpg8q1gmg2y3crkj9h8cbvf77pgm3jzswpbbc"; depends=[]; }; + startupmsg = derive2 { name="startupmsg"; version="0.9.4"; sha256="1r9dqrfznsrj7s11m56hkzgfnw3qcgzh07pqipl007zr2av9xwqw"; depends=[]; }; + statGraph = derive2 { name="statGraph"; version="0.1.0"; sha256="13wfylb92lzw08fn3p000v87abs7ij2rb82np1rkgsl8w2kica73"; depends=[igraph MASS]; }; statar = derive2 { name="statar"; version="0.6.4"; sha256="16jahn6skj4d1c8yg4m9iwifgl5i4bmqq7d2k9vcfnj21ih6fcvr"; depends=[data_table dplyr ggplot2 lazyeval matrixStats stringr tidyr]; }; statcheck = derive2 { name="statcheck"; version="1.2.2"; sha256="0bcv8klp75q8hlmwhax9lxx9i0kbhsz8442acbhxh5fn2pn2x9jm"; depends=[ggplot2 plyr]; }; statcomp = derive2 { name="statcomp"; version="0.0.1.1000"; sha256="0ac4s8a955ka0rs2a3k93aq2cxzrc48ai0sl9kn4yaqcw1arv2ap"; depends=[zoo]; }; @@ -9654,7 +10091,7 @@ in with self; { stationaRy = derive2 { name="stationaRy"; version="0.4.1"; sha256="1iyzg40vi1l4s68kh50in1p97pcb28z6n932cgrx5k1rv3api13g"; depends=[downloader dplyr leaflet lubridate plyr progress readr stringr]; }; statip = derive2 { name="statip"; version="0.1.4"; sha256="1vy3433rrifcix1m28lizbik3qrl2krdldbvmqfyp046xxf2inc1"; depends=[bazar dplyr]; }; statisticalModeling = derive2 { name="statisticalModeling"; version="0.3.0"; sha256="018ap1hbv4m6y0c71f807apbb9bhr64kcfrn4w8ahhb2520l4mf8"; depends=[ggplot2 lazyeval magrittr mosaic rpart]; }; - statmod = derive2 { name="statmod"; version="1.4.29"; sha256="1fgzkwriba39d7946lq892f0si2fjdy37pvxki6ix8xyj8qgnci4"; depends=[]; }; + statmod = derive2 { name="statmod"; version="1.4.30"; sha256="07v4x8af60alcw6vbiwf5fp25bhra61kvxz9kqx64lszm0i1fb4x"; depends=[]; }; statnet = derive2 { name="statnet"; version="2016.9"; sha256="1j5z7awvac3sb66ma1lrc9j23m6hmzqfnqxc0znsm36h324y3y6s"; depends=[ergm ergm_count network networkDynamic sna statnet_common tergm]; }; statnet_common = derive2 { name="statnet.common"; version="3.3.0"; sha256="190gwkbzd1qh3d7v1xi13snp83jkpvsl7x4ac9x1pxybn3kw856p"; depends=[]; }; statnetWeb = derive2 { name="statnetWeb"; version="0.4.0"; sha256="0gqvvpz9435wakpgf5jsznwgd3fix1vyabh87bnnfsm3pfs7rf2x"; depends=[ergm lattice latticeExtra network RColorBrewer shiny sna]; }; @@ -9670,13 +10107,12 @@ in with self; { stellaR = derive2 { name="stellaR"; version="0.3-3"; sha256="098sz6b8pl3fyca3g6myp97nna368xhxf8krmibadnnsr49q5zs9"; depends=[]; }; stepPenal = derive2 { name="stepPenal"; version="0.1"; sha256="09viapb4846g91jzf9364rdyd865b19v83pwcdm3p3xsjry9ffxk"; depends=[caret dfoptim glmnet mvtnorm pROC]; }; stepPlr = derive2 { name="stepPlr"; version="0.92"; sha256="16j32sk7ri4jdgss7vw5zz7s42rxk7rs376iyxzzpy1zcc9b64rv"; depends=[]; }; - stepR = derive2 { name="stepR"; version="1.0-6"; sha256="1ywczjidcw1f7318rn3y73b12c1ck0947m6npn6k41y3i47dgh4i"; depends=[]; }; + stepR = derive2 { name="stepR"; version="2.0-1"; sha256="1r45wxw9kvzyybkl4f1r9c2d7wmi0k4ji39w3nxqrf7n5kp2cnj4"; depends=[digest R_cache Rcpp]; }; stepp = derive2 { name="stepp"; version="3.0-11"; sha256="0jrwfvcgh3sjm3zag93kjyny2qqsyiw988vnx6jw7s31bv9g0d6s"; depends=[car survival]; }; stepwise = derive2 { name="stepwise"; version="0.3"; sha256="1lbx1bxwkf9dw6q46w40pp7h5nkxgghmx8rkpaymm6iybc7gyir2"; depends=[]; }; stheoreme = derive2 { name="stheoreme"; version="1.2"; sha256="14w3jcbs8y8cz44xlq8yybr2jwgk3w7s2msgjhlp1vazy8959s65"; depends=[]; }; sticky = derive2 { name="sticky"; version="0.5.2"; sha256="0yib9llvlxyzcwam3qd3wxz91mdacvh4v888ifxwjhhjihffqvbj"; depends=[]; }; stilt = derive2 { name="stilt"; version="1.0.1"; sha256="1vrbbic0vqzgy574kzcr38iqyhax4wa6zl6w74n65z15map2fyma"; depends=[fields]; }; - stima = derive2 { name="stima"; version="1.1"; sha256="1i8l7pfnqxx660h3r2jf6a9bj5ikg9hw7v8apwk98ms8l7q77p5l"; depends=[rpart]; }; stinepack = derive2 { name="stinepack"; version="1.3"; sha256="0kjpcjqkwndqs7cyc6w62z1nnkqmhkifz2w0bi341jh0ybmak4fq"; depends=[]; }; stlplus = derive2 { name="stlplus"; version="0.5.1"; sha256="14728xsm982z9sg4rbqg307pbwqlsiyzj8z3sr9wr6fi0dayf6z5"; depends=[lattice Rcpp yaImpute]; }; stm = derive2 { name="stm"; version="1.2.2"; sha256="1kv4plz9i446s8vdrh71lk49gvvl6v5dviym4qh63iwkipgz2fy1"; depends=[data_table glmnet lda Matrix matrixStats quadprog quanteda Rcpp RcppArmadillo slam stringr]; }; @@ -9684,6 +10120,7 @@ in with self; { stmCorrViz = derive2 { name="stmCorrViz"; version="1.3"; sha256="1a4pckrbzsihyf1bqvw3cl0hxrc4yq1pnkgxgf4b8jday6zkxwcv"; depends=[jsonlite SnowballC stm tm]; }; stmgp = derive2 { name="stmgp"; version="1.0"; sha256="1v6ahg4icyrz8p0lfiyi2x90allhjvcq8rycinas5mffg7xgpv7d"; depends=[MASS]; }; stmgui = derive2 { name="stmgui"; version="0.1.6"; sha256="1fn2m5l7y3p1riw39g6r3hpjxdccygih7yipp7dvc4msl9fm4h5c"; depends=[markdown shiny shinyBS shinyjs shinythemes stm tm]; }; + stoRy = derive2 { name="stoRy"; version="0.1.0"; sha256="03i8w9b817vdgs3c9nhi770027sik8f2x5cwq33n4q1lb1xdysyw"; depends=[R6]; }; stocc = derive2 { name="stocc"; version="1.30"; sha256="0xpf9101094l5l75p9lr64gwh2b8jh4saw6z6m2nbn197la3acpw"; depends=[coda fields Matrix rARPACK truncnorm]; }; stochprofML = derive2 { name="stochprofML"; version="1.2"; sha256="0gqfm2l2hq1dy3cvg9v2ksphydqdmaj8lppl5s5as2khnh6bd1l1"; depends=[MASS numDeriv]; }; stochvol = derive2 { name="stochvol"; version="1.3.2"; sha256="08vn2ifbb7yc3b7c5pgklp9wr98vx1gv60gpsqba32xr6ijn49vd"; depends=[coda Rcpp RcppArmadillo]; }; @@ -9691,18 +10128,20 @@ in with self; { stocks = derive2 { name="stocks"; version="1.1.1"; sha256="1qwd16bw40w2ns7b0n9wm8l344r4vyk27rmg0vr5512zsrcjkcfb"; depends=[rbenchmark Rcpp]; }; stoichcalc = derive2 { name="stoichcalc"; version="1.1-3"; sha256="0z9fnapibfp070jxg27k74fdxpgszl07xiqfj448dkydpg8ydkrb"; depends=[]; }; stormwindmodel = derive2 { name="stormwindmodel"; version="0.1.0"; sha256="1pxkb0ijx04c4bk6szxhj8lxq6x76m8pyhxpf8xq63h4gh57fxh3"; depends=[dplyr ggplot2 lubridate maps plyr stringr tidyr weathermetrics]; }; - storr = derive2 { name="storr"; version="1.0.1"; sha256="1yc4z151dnbhcim7gvkylss239wcc7xlpjrfdc6qv8mf2gq1bv30"; depends=[digest R6]; }; + storr = derive2 { name="storr"; version="1.1.1"; sha256="0n2shzv7hblff7wrh7ls3q5zp97pisz935laqmyg201vhlypnqfi"; depends=[digest R6]; }; stosim = derive2 { name="stosim"; version="0.0.12"; sha256="0c4sj5iirm542hx782izfdmy2m3kl5q28l10xjj0ib4xn5y6yx3c"; depends=[Rcpp tcltk2]; }; - stplanr = derive2 { name="stplanr"; version="0.1.7-3"; sha256="07ap68vfksdyh29hqqhdq5mx17sppp6yqcx94swaryd51mc7rl72"; depends=[doParallel dplyr foreach geosphere httr igraph jsonlite lubridate maptools nabor openxlsx R_utils raster Rcpp RcppArmadillo readr rgdal rgeos RgoogleMaps sp stringi stringr]; }; + stplanr = derive2 { name="stplanr"; version="0.1.8"; sha256="1y8x0ybggfx2fyizwq49q1ak989kqih9gih5h20s75mz7al7zn72"; depends=[curl doParallel dplyr foreach geosphere httr igraph jsonlite lubridate maptools nabor openxlsx R_utils raster Rcpp RcppArmadillo readr rgdal rgeos RgoogleMaps sp stringi stringr]; }; stpm = derive2 { name="stpm"; version="1.6.6"; sha256="0vzl405hc5y97n9ixy20js50q5a6s7laaj1w9avn5dl2rgwk6xva"; depends=[mice nloptr Rcpp RcppArmadillo sas7bdat survival]; }; stpp = derive2 { name="stpp"; version="1.0-5"; sha256="1444dbwm0nyb5k8xjfrm25x984a7h9ln2vddrwjszfpmscv0iwm1"; depends=[KernSmooth spatstat splancs]; }; stppResid = derive2 { name="stppResid"; version="1.1"; sha256="0hgzsyy5y0sqd4d2agdr7p2kq0w51vs8f63dvj6j49h8cvgiws2x"; depends=[cubature deldir splancs]; }; strap = derive2 { name="strap"; version="1.4"; sha256="0gdvx02w0dv1cq9bb2yvap00lsssklfnqw0mwsgblcy2j6fln7b0"; depends=[ape geoscale]; }; strat = derive2 { name="strat"; version="0.1"; sha256="1axxrp750kjzcgxjdqfscjmryv1mkv4l23zk8k23z8l4ymhd2f5w"; depends=[Hmisc Rcpp RcppArmadillo]; }; strataG = derive2 { name="strataG"; version="2.0.2"; sha256="1rf1xf07yb0dzasgig9sfm4i9ggdkjgy5iiysqgdapk3sxs26c8r"; depends=[adegenet ape apex copula data_table DT ggplot2 gridExtra Hmisc pegas phangorn RColorBrewer Rcpp shiny shinyFiles survival swfscMisc]; }; + stratbr = derive2 { name="stratbr"; version="1.2"; sha256="15vkymmc61yz9szhfhc5663hfyqvh499ahwhr9mv1lhv5bikk0kb"; depends=[Rglpk snowfall stratification]; }; strategicplayers = derive2 { name="strategicplayers"; version="1.0"; sha256="19vijrlzawd701vvk9ig7yhzbirh39dxxcwfz8ywwvxxiaky5x55"; depends=[sna]; }; stratification = derive2 { name="stratification"; version="2.2-6"; sha256="1jlks3g8wpqlpci6v0ryyv93agiabdiklmk6ij0pc5icrfiynbhw"; depends=[]; }; stratigraph = derive2 { name="stratigraph"; version="0.66"; sha256="1idn5rwar9pxp1vsra68wrlhagmc92y5rs7vn4h63p35p357qdwz"; depends=[]; }; + stratvns = derive2 { name="stratvns"; version="1.0"; sha256="1bw9l389lxiji4h7hrsshf24v135h6la9dg3xxjly53d4fi56ifh"; depends=[MultAlloc Rglpk sampling snowfall stratification]; }; straweib = derive2 { name="straweib"; version="1.0"; sha256="0bh2f4n4i7fiki52sa57v96757qw1gn1lcn7vgxmc5hk5rzp2mi8"; depends=[]; }; stream = derive2 { name="stream"; version="1.2-4"; sha256="1xk9lnvf9xld74z4sxbwpgxl7cbni88cjyxqzxr0r9pn9vcpwima"; depends=[animation clue cluster clusterGeneration dbscan fpc MASS mlbench proxy Rcpp]; }; streamMOA = derive2 { name="streamMOA"; version="1.1-2"; sha256="0mg113v8zy6kh67hm91xfd9kd1x8vvvx03svhz70nz9npw00pvlz"; depends=[rJava stream]; }; @@ -9717,7 +10156,7 @@ in with self; { stringr = derive2 { name="stringr"; version="1.2.0"; sha256="16hj2rmv8x03lp6cp2jk0k2plibvbggf444kp05przdvd03v7l31"; depends=[magrittr stringi]; }; strip = derive2 { name="strip"; version="0.1.1"; sha256="18pz6ix6d661fvg1k1yyyiiwa1gdixynmpxl725ffd9lpykmfqbw"; depends=[rlist]; }; stripless = derive2 { name="stripless"; version="1.0-3"; sha256="08mdp7kq6r5bk77j09477d1dnn7iwa346pr24b5bqsxwnbknyrsr"; depends=[lattice]; }; - striprtf = derive2 { name="striprtf"; version="0.3.1"; sha256="12cj0zfnyvi6bs41lhfplfhl84xjs9x9441q6x136arbs68lrlgm"; depends=[magrittr Rcpp stringr]; }; + striprtf = derive2 { name="striprtf"; version="0.4.5"; sha256="002whpmzhqw8bhqbdilfmlz0q4hgh9yy4ad1kly6lngx2n3p7db0"; depends=[magrittr Rcpp stringr]; }; strucchange = derive2 { name="strucchange"; version="1.5-1"; sha256="0cdgvl6kphm2i59bmnppn1y3kv65ml111bk7yzpcx7vv8wh2w3kl"; depends=[sandwich zoo]; }; structSSI = derive2 { name="structSSI"; version="1.1.1"; sha256="06rwmrgqc4qy4x0bhlshjdsjxfmp5fr9d1wjglhlb1gbp72fmkdv"; depends=[ggplot2 igraph multtest reshape2 rjson]; }; structree = derive2 { name="structree"; version="1.1.3"; sha256="1apiqbmmvqmn0nv5cfflfqlyh0108fvy8sg9gg8z6d6bfqkd4rhb"; depends=[mgcv penalized]; }; @@ -9725,14 +10164,14 @@ in with self; { strvalidator = derive2 { name="strvalidator"; version="1.9.0"; sha256="0srmld1xwvf2cki79c2mhwinal2yz6yar5k0b05a9adm70zb0swr"; depends=[data_table ggplot2 gridExtra gtable gWidgets gWidgetsRGtk2 MASS plyr RGtk2 scales]; }; stsm = derive2 { name="stsm"; version="1.9"; sha256="18ypmkd7l7m7qkahb0nqf8f1m8g4irxlw48v2ms0dq1bsnhbzx7j"; depends=[KFKSDS]; }; stsm_class = derive2 { name="stsm.class"; version="1.3"; sha256="19jrja5ff31gh5k2zqhqsyd7w2ivr4s6bkliash6x8fmd22h5zs8"; depends=[]; }; - stubthat = derive2 { name="stubthat"; version="1.1.0"; sha256="0x4sy808pq7nqnprqrcpss0v3r8sa1z8bbs759jmybqs1b0ihnqf"; depends=[testthat]; }; + stubthat = derive2 { name="stubthat"; version="1.2.0"; sha256="0ib1jvrhxahlpaqai0zg49jr2iwn04c0iimfgvhvx3hyp9qhhbll"; depends=[testthat]; }; stylo = derive2 { name="stylo"; version="0.6.4"; sha256="1z4db5p83b3fb3cfy4y8a4pi5hybda283988ri7215fk7rifg1jk"; depends=[ape class e1071 lattice pamr tcltk2 tsne]; }; suRtex = derive2 { name="suRtex"; version="0.9"; sha256="0xcy3x1079v10bn3n3y6lxignb9n3h57w4hhrvzi5y14x05jjyda"; depends=[]; }; subcopem2D = derive2 { name="subcopem2D"; version="1.2"; sha256="1yrjqg3y6i5m6k0zljq1p1pciicmc1vig3qd0wxaicz708rbp3yq"; depends=[]; }; subdetect = derive2 { name="subdetect"; version="1.1"; sha256="1bcc13avs5w9vmwyf71cnjd2kwmcavmzpwyv8gvsn61n7b4j8wlk"; depends=[]; }; subgroup = derive2 { name="subgroup"; version="1.1"; sha256="1n3qw7vih1rngmp4fwjbs050ngby840frj28i8x7d7aa52ha2syf"; depends=[]; }; sublime = derive2 { name="sublime"; version="1.3"; sha256="0455fppc68azxknxjvxci4kjpcj6c1jkp9adbxqrn3qnnywaj5v2"; depends=[AnalyzeFMRI downloader oro_nifti]; }; - subniche = derive2 { name="subniche"; version="0.9.4"; sha256="1pqw2sh20k4mw5ads2yfvdykc6hw7fwnl1mam6vq98jvvh4m5qmx"; depends=[ade4]; }; + subniche = derive2 { name="subniche"; version="0.9.6"; sha256="1xad4ai8sg5xakdrpl5kcwimh13pzi5ifkhjiqa9jgjpyjlsbbgb"; depends=[ade4]; }; subplex = derive2 { name="subplex"; version="1.2-2"; sha256="10g1hv41w9g0pzj0k071zb3wglk7jl5p99v5maqpkr2v75mfkyry"; depends=[]; }; subprocess = derive2 { name="subprocess"; version="0.8.0"; sha256="0hvja2gacr84izlsvxcbw1xmm57ycx0n9k5yn62p1v40d135wk9p"; depends=[]; }; subrank = derive2 { name="subrank"; version="0.9.7"; sha256="0f1m4zk7s49f3kg8gz8g5af8r1x00m4zybdy5fmzvgnx9cx6crkc"; depends=[]; }; @@ -9740,13 +10179,14 @@ in with self; { subselect = derive2 { name="subselect"; version="0.12-6"; sha256="157vkfxy570sl1q9nylpw0vs51h39zjx0m2yxiwdgvzvd6h4s3kr"; depends=[corpcor ISwR MASS]; }; subsemble = derive2 { name="subsemble"; version="0.0.9"; sha256="0vzjmxpdwagqb9p2r4f2xyghmrprx3nk58bd6zfskdgj0ymfgz5z"; depends=[SuperLearner]; }; subspace = derive2 { name="subspace"; version="1.0.4"; sha256="0p2j0lnwj3ym1v4xla6r97zjikb8alnibdc690xn9c0z21hmv43v"; depends=[colorspace ggvis rJava stringr]; }; - subspaceMOA = derive2 { name="subspaceMOA"; version="0.5.2"; sha256="051zlpqpxxhhryzv03bb0dz8m7ijhwahagpcwngvh0ccdpi32m7h"; depends=[fields ggplot2 gridExtra magrittr rJava shiny stream streamMOA]; }; + subspaceMOA = derive2 { name="subspaceMOA"; version="0.6.0"; sha256="1q2n4q87zaxwaak77b6rff97n9sx6nflshqf73r2q8hflfs3sxv3"; depends=[fields ggplot2 gridExtra magrittr rJava shiny stream streamMOA]; }; subtype = derive2 { name="subtype"; version="1.0"; sha256="1094q46j0njkkqv09slliclp3jf8hkg4147hmisggy433xwd19xh"; depends=[penalized ROCR]; }; sudoku = derive2 { name="sudoku"; version="2.6"; sha256="13j7m06m38s654wn75kbbrin5nqda4faiawlsharxgrljcibcbrk"; depends=[]; }; - sudokuAlt = derive2 { name="sudokuAlt"; version="0.1-10"; sha256="040ijdkjy95wd1w85g61jz7p9x2f0dm0lhcvkmy1jhmp28asb5pw"; depends=[]; }; + sudokuAlt = derive2 { name="sudokuAlt"; version="0.1-11"; sha256="1hv9d99ir1xz6p0arxr77dv5qb45sr8jhapm6wf755l7pxlqqklq"; depends=[magrittr]; }; summariser = derive2 { name="summariser"; version="0.1.0"; sha256="0a6wyb0r1i0cynld002q96ylr58jz76n5jqjz8gm6a3csjn9qss7"; depends=[dplyr ggplot2 lazyeval plotrix]; }; summarytools = derive2 { name="summarytools"; version="0.6.5"; sha256="1ddvwn0rfyrlfar1kpwggxnpp9dpswdy8v5alcv3kanp540hnmb1"; depends=[Hmisc htmltools matrixStats pander pryr rapportools rstudioapi xtable]; }; - sunburstR = derive2 { name="sunburstR"; version="0.6.5"; sha256="0sq1x8rpqazgzn1c4gg13yimdmkc9nj9qr4b5z8anynr96hfjb45"; depends=[d3r htmltools htmlwidgets]; }; + sunburstR = derive2 { name="sunburstR"; version="1.0.0"; sha256="0n6nw35n8c453nminv0kzpfxxhwhh6hdmjja0wg1m2kpai8aj2kw"; depends=[d3r dplyr htmltools htmlwidgets]; }; + suncalc = derive2 { name="suncalc"; version="0.1"; sha256="173yzrzayvc2hidy38arjnsl2344wh80nc355nip9mxd1wwddbzy"; depends=[V8]; }; supc = derive2 { name="supc"; version="0.1"; sha256="1cq0lr04m409xr3i1hphww4ldr8z3kqq2gmp7hm3yp0iz2gy3m9a"; depends=[BH Rcpp]; }; supclust = derive2 { name="supclust"; version="1.0-7"; sha256="0437pccagvqv6ikdsgzpif9yyiv6p24lhn5frk6yqby2asj09727"; depends=[class rpart]; }; supcluster = derive2 { name="supcluster"; version="1.0"; sha256="1rkd4bpzzvzbmqaj907pqv53hxcgic0jklbsf5iayf0ra768b5w6"; depends=[gtools mvtnorm]; }; @@ -9756,17 +10196,18 @@ in with self; { superheat = derive2 { name="superheat"; version="0.1.0"; sha256="01v8s6px1k5fajlm6py3ksr1i853kwwlky1yryzhy3p1cxhwgg83"; depends=[dplyr ggdendro ggplot2 gtable magrittr plyr scales]; }; superpc = derive2 { name="superpc"; version="1.09"; sha256="1p3xlg2n7p57n54g2w4frfrng5vjh97kp6ax4mrgvj3pqmd1m69z"; depends=[survival]; }; supervisedPRIM = derive2 { name="supervisedPRIM"; version="2.0.0"; sha256="1j5gsy119pvrhkkg048lyk6hjvn9x1bhmfy5g824gj3k1w5slrib"; depends=[prim]; }; - support_BWS = derive2 { name="support.BWS"; version="0.1-3"; sha256="1qlh2zgmr3b6gz3xmncjawgg08c6kgfg3d2m9x78iw95x7p3p5h8"; depends=[]; }; + support_BWS = derive2 { name="support.BWS"; version="0.1-4"; sha256="1zg0wgqhcnk3sx87k3l9z4zf3ck3gk75rn37am1rq6wbzbfm96i4"; depends=[]; }; support_BWS2 = derive2 { name="support.BWS2"; version="0.1-1"; sha256="1jay1ak8242vn9a0ippfdd48vdxqqz9j8frbgf5ncffdmzzn1n21"; depends=[]; }; support_CEs = derive2 { name="support.CEs"; version="0.4-1"; sha256="1rbyl7v6m07dsp08kkk9020bh39rhx89q7d05rc5kxb6f7y66jyz"; depends=[DoE_base MASS RCurl simex XML]; }; supportInt = derive2 { name="supportInt"; version="1.1"; sha256="14fh75sds05c06xkcfbijd8my3sa9kpnczzh96xx0gwj1193yya9"; depends=[ProfileLikelihood]; }; surface = derive2 { name="surface"; version="0.4-1"; sha256="0z7fh09hjmxfmqzi588gjwqqlpj1a475aixrnvy911lkx3zfk146"; depends=[ape geiger MASS ouch]; }; - surrosurv = derive2 { name="surrosurv"; version="1.1.10"; sha256="1sqwj90nvklrx0by185dlkjwaf9fxrlikf94irxih893vrqsihg8"; depends=[copula eha lme4 MASS msm mvmeta optextras optimx parfm SurvCorr survival]; }; - surv2sampleComp = derive2 { name="surv2sampleComp"; version="1.0-4"; sha256="1ihz71vzrkd5ksy7421myrgkbww0z5k0ywcb2bfalxx2bd2cs2wf"; depends=[flexsurv plotrix survC1 survival]; }; + surrosurv = derive2 { name="surrosurv"; version="1.1.15"; sha256="0ns189h33akzl8rs53yg9g1975133wv0csn5cg0lp26b2sh9qp1x"; depends=[copula eha lme4 MASS Matrix msm mvmeta optextras optimx parfm SurvCorr survival]; }; + surv2sampleComp = derive2 { name="surv2sampleComp"; version="1.0-5"; sha256="0pk70q33il9clz0ikzx1cypg5ygnsqp5hgk67xczzbidksjzs4dn"; depends=[flexsurv plotrix survival]; }; survAUC = derive2 { name="survAUC"; version="1.0-5"; sha256="0bcj982ib1h0sjql09zbvx3h1m96jy9q37krmk6kfzw25ms6bzzr"; depends=[survival]; }; survAWKMT2 = derive2 { name="survAWKMT2"; version="1.0.0"; sha256="1cv39rf1ia4nwrri9d9izy6lxndnfwqy2vzrb9rrxga2qplxl79k"; depends=[survival]; }; survAccuracyMeasures = derive2 { name="survAccuracyMeasures"; version="1.2"; sha256="1i41xkvqpxpq9spryh1syp57ymlzw71ygdjqn41rv8jjc9q52x9g"; depends=[Rcpp RcppArmadillo survival]; }; survC1 = derive2 { name="survC1"; version="1.0-2"; sha256="1bidjhq3k5ab7gqj1b2afngip7pp6c9c7q0m6ww7h7i2vg505l7v"; depends=[survival]; }; + survHE = derive2 { name="survHE"; version="1.0.4"; sha256="1iz2ji8scw69ajwdffwbs0c5d4j5ixv4bav2jcj17cjfdzxm2vsd"; depends=[BH flexsurv Rcpp RcppEigen rms rstan StanHeaders xlsx]; }; survIDINRI = derive2 { name="survIDINRI"; version="1.1-1"; sha256="03lsypx189zm28gv764gdq24a18jj3kpdk91ssa501qxj5jv7v29"; depends=[survC1 survival]; }; survJamda = derive2 { name="survJamda"; version="1.1.4"; sha256="14ly1g548ysm8jgsyrhj12zmd6i2lca7rsgby3jbwikyqyk1mx5q"; depends=[ecodist survcomp survival survivalROC survJamda_data]; }; survJamda_data = derive2 { name="survJamda.data"; version="1.0.2"; sha256="0a010v2ar48i5m0jiqjvdyqm93ckfgfmcmym9a02h0rclnizd75r"; depends=[]; }; @@ -9774,18 +10215,20 @@ in with self; { survPresmooth = derive2 { name="survPresmooth"; version="1.1-9"; sha256="146ni0xnqd4kfxfxm8nkrgk6v4nrf2hpbb957zh10kmvaa5f9mij"; depends=[]; }; survRM2 = derive2 { name="survRM2"; version="1.0-2"; sha256="0pvp65c1kkbkcci4l3cvq4a5krmv58jwb9abz5225ql6jyawzlsw"; depends=[survival]; }; survSNP = derive2 { name="survSNP"; version="0.24"; sha256="0mzwcp8zfqvsiapa446si9qb6wyymnw5zj6acj6f2cfjpyi76k4w"; depends=[foreach lattice Rcpp survival xtable]; }; - surveillance = derive2 { name="surveillance"; version="1.13.0"; sha256="1451lcw4hr1np0hmghvkb7q3iwm7jfn8zfi85fr5qdkwsvkivsd1"; depends=[MASS Matrix nlme polyCub Rcpp sp spatstat xtable]; }; + surveillance = derive2 { name="surveillance"; version="1.14.0"; sha256="0gx6ry2qyapn5lwk5hgl7pdijpqnpc0ccp623g79lzwx98w9rp4k"; depends=[MASS Matrix nlme polyCub Rcpp sp spatstat xtable]; }; survexp_fr = derive2 { name="survexp.fr"; version="1.0"; sha256="12rjpnih0xld4dg5gl7gwxdxmrdmyzsymm7j05v98ynldd1jkjl8"; depends=[survival]; }; - survey = derive2 { name="survey"; version="3.31-5"; sha256="1ijlxcslzpy9aqgj1hkr4axhyga6ll4ybzqdw2y07adyz1fwvkpj"; depends=[lattice Matrix survival]; }; + survey = derive2 { name="survey"; version="3.32-1"; sha256="0law5dw2kprbkclrq0xj5vy6qcbx4i0rmasmsawyl35q4y1v01ny"; depends=[lattice Matrix survival]; }; surveybootstrap = derive2 { name="surveybootstrap"; version="0.0.1"; sha256="13rp6gj1dgdzcjbi2403pldygp1dyqx8zj0r1nvyghpi06x5gpb7"; depends=[dplyr functional plyr Rcpp RcppArmadillo stringr]; }; surveydata = derive2 { name="surveydata"; version="0.1-14"; sha256="1zcp3wb7yhsa59cl4bdw7p08vpviypvfa9hggwc60w7ashpky73i"; depends=[plyr stringr]; }; surveyeditor = derive2 { name="surveyeditor"; version="1.0"; sha256="073219bcn1hlxl9ql6gncfvgn0m37pz5sb7h94nq6lf35dymq5zq"; depends=[]; }; surveyoutliers = derive2 { name="surveyoutliers"; version="0.1"; sha256="03nqw0zir3x57gg23hgsr2s99pv958kfsygqfwly96rvfdhr5p3v"; depends=[]; }; surveyplanning = derive2 { name="surveyplanning"; version="2.8"; sha256="0p4yigwypy2hl747qvm0qm0q7vp7p8af0yapqi7aadbbpwyy9z7h"; depends=[data_table laeken]; }; + survidm = derive2 { name="survidm"; version="0.1.0"; sha256="0jpbnvwx7ilb3z10xg5y8palbk05ax1ad1qlz319rrblx0fxi75r"; depends=[doParallel doRNG foreach KernSmooth np survival]; }; survival = derive2 { name="survival"; version="2.41-3"; sha256="07cnr0hnki6ybbjll54l4s5lllhk19vni5f8m0mvsfp99ls7qygk"; depends=[Matrix]; }; survivalMPL = derive2 { name="survivalMPL"; version="0.1.1"; sha256="0c4hr2q50snd5qm2drg4qzfkcz4klxr4jba6xpc8n2i8wn573cvc"; depends=[survival]; }; survivalROC = derive2 { name="survivalROC"; version="1.0.3"; sha256="0wnd65ff5w679hxa1zrpfrx9qg47q21pjxppsga6m3h4iq1yfj8l"; depends=[]; }; - survminer = derive2 { name="survminer"; version="0.3.1"; sha256="03jg7lanharv32nj09xqf418aq23pwzwmm61qir0k3p5d3xxcmny"; depends=[broom cmprsk dplyr ggplot2 ggpubr gridExtra magrittr maxstat scales survival survMisc tidyr]; }; + survivalsvm = derive2 { name="survivalsvm"; version="0.0.2"; sha256="13dwymalpfm3cli7yf0hvd1xzm915qhyvzp03va6fzkd24id1660"; depends=[Hmisc kernlab Matrix pracma survival]; }; + survminer = derive2 { name="survminer"; version="0.4.0"; sha256="0appa7difd87g1cggmkj1vwarcqvq4krryzx344gmq3d54jx8hw3"; depends=[broom cmprsk dplyr ggplot2 ggpubr gridExtra magrittr maxstat purrr scales survival survMisc tibble tidyr]; }; survrec = derive2 { name="survrec"; version="1.2-2"; sha256="0b77ncr1wg2xqqg1bv1bvb48kmd9h3ja2dysiggvprzjrj7hdlmx"; depends=[boot]; }; survsim = derive2 { name="survsim"; version="1.1.4"; sha256="16njbqlzmk34zrh485kc0a52yacdyj9z4z4a9zcq1z5psm87c58m"; depends=[eha statmod]; }; survutils = derive2 { name="survutils"; version="1.0.0"; sha256="1dha1i2k9dyc9m9awqiq2ypy617zmw9yflfzv182z5fpd491ghrv"; depends=[broom dplyr ggplot2 lazyeval magrittr purrr survC1 survival]; }; @@ -9815,6 +10258,7 @@ in with self; { svyPVpack = derive2 { name="svyPVpack"; version="0.1-1"; sha256="15k5ziy2ng853jxl66wjr27lzc90l6i5qr08q8xgcs359vn02pmp"; depends=[survey]; }; swCRTdesign = derive2 { name="swCRTdesign"; version="2.1"; sha256="0c5pya5jgpj5ncrvpzahhrbhl7b39w19f3vl06r8q0nandbn7rwq"; depends=[]; }; swamp = derive2 { name="swamp"; version="1.2.3"; sha256="1xpnq5yrmmsx3d48x411p7nx6zmwmfc9hz6m3v9avvpjkbc3glkg"; depends=[amap gplots impute MASS]; }; + swapClass = derive2 { name="swapClass"; version="1.0.1"; sha256="0wg6km261xdywakxi64dw4wwprbrkw217q4c6622z0mgm9sjgpym"; depends=[inline]; }; sweidnumbr = derive2 { name="sweidnumbr"; version="1.4.1"; sha256="014zbp6a66gv7b0f2gmzvifllz266zrc14ihawksvyp1mcxz2ipg"; depends=[lubridate stringr]; }; swfscMisc = derive2 { name="swfscMisc"; version="1.2"; sha256="08p2crsx8zi6qprs14mhdyq9x5sjlp3a46c1zzvp6741an4fy640"; depends=[ggplot2 mapdata maps reshape2 spatstat]; }; swirl = derive2 { name="swirl"; version="2.4.3"; sha256="1l7gwisk3sjslh6zh4cq3vxf5y84af2fr078cp4i86rw1w2j9d44"; depends=[digest httr RCurl stringr testthat yaml]; }; @@ -9830,47 +10274,54 @@ in with self; { sybilcycleFreeFlux = derive2 { name="sybilcycleFreeFlux"; version="2.0.0"; sha256="0p3w7ipyrqrh7nf52h8qmr4fikyinm8an7npmcb7kwjd59rcy554"; depends=[MASS Matrix sybil]; }; sylcount = derive2 { name="sylcount"; version="0.1-0"; sha256="1dxbqbjyvkg7cx234icby9fjdjz1z4l4crqd7kv8m05fv69pg224"; depends=[]; }; syllable = derive2 { name="syllable"; version="0.1.3"; sha256="1ymnczwx58h720hsm0s9zq3ddwg6gn6bgg0m8zw24i0nlivx0yjg"; depends=[data_table stringi textclean textshape]; }; + symDMatrix = derive2 { name="symDMatrix"; version="1.0.0"; sha256="0xss7f7hkrf2afchccfavymylfybnp9nxawqxd2vdjni95kbd595"; depends=[]; }; symbolicDA = derive2 { name="symbolicDA"; version="0.4-2"; sha256="1vn7r7b7yyn2kp8j3ghw50z49yzvwhm0izc6wgc7a99300xrr77s"; depends=[ade4 cluster clusterSim e1071 rgl shapes XML]; }; symbols = derive2 { name="symbols"; version="1.1"; sha256="1234rx3divhg60p0h0zn11viqn51fm6b8876m6rip2i6z8vrg319"; depends=[shape]; }; symmoments = derive2 { name="symmoments"; version="1.2"; sha256="074k0285c0yri39zags420kjls6kjlvlhymg3r7y24h42zdy82d4"; depends=[combinat cubature multipol mvtnorm]; }; synRNASeqNet = derive2 { name="synRNASeqNet"; version="1.0"; sha256="05ncwbv8kvvhqqrxa8qq7s0jc6krs5a56ph04z50iwgd91rzyi7x"; depends=[GenKern igraph KernSmooth parmigene]; }; - synbreed = derive2 { name="synbreed"; version="0.12-4"; sha256="18mqa5iaybc0psc3cbk02sirfm3a7l9ph10yvj9w4z6ss76z004v"; depends=[abind BGLR doBy doParallel foreach igraph lattice LDheatmap MASS qtl regress]; }; + synbreed = derive2 { name="synbreed"; version="0.12-6"; sha256="03h3j2g6ynnbmsc6yhbmmmrwj69jf3gjpp1wnsd02yc5kf4r1q57"; depends=[abind BGLR doBy doParallel foreach igraph lattice LDheatmap MASS qtl regress]; }; synbreedData = derive2 { name="synbreedData"; version="1.5"; sha256="16wv9r7p0n8726qv0jlizmkvnrqwjj1q4xaxvfmj9611rm47vckx"; depends=[]; }; synchronicity = derive2 { name="synchronicity"; version="1.1.9.1"; sha256="0d9skpwmsnkn4xb3f2kgyyv8bhdi0r9p1kj3cvi0s92fjjnpi00c"; depends=[BH bigmemory_sri Rcpp]; }; synchrony = derive2 { name="synchrony"; version="0.2.3"; sha256="0fi9a3j8dfslf1nqx8d53fi635y3aq8isxw0dbjbpgk7rc71nzby"; depends=[]; }; synlik = derive2 { name="synlik"; version="0.1.1"; sha256="0g4n78amydihsq4jg2i9barjm9g40zczasb31fj10yn6wir1dhv7"; depends=[Matrix Rcpp RcppArmadillo]; }; synthACS = derive2 { name="synthACS"; version="1.0.1"; sha256="0jbhiadgc8f6h7ga685cm5i8y59lf76r8sgd629xfjj4jxn8ckdm"; depends=[acs data_table Rcpp]; }; synthpop = derive2 { name="synthpop"; version="1.3-1"; sha256="0vp79jxp4hr9wrc4dlh9ckkcpwiffdixr9jh1w6w1wkii3bjcani"; depends=[foreign ggplot2 lattice MASS nnet party plyr polspline proto randomForest rpart]; }; - sys = derive2 { name="sys"; version="1.2"; sha256="01spav1mr1mbpfgxjx0xvi9m5n2s41pdad0qs3kv0hrxcfmwgy6g"; depends=[]; }; + sys = derive2 { name="sys"; version="1.4"; sha256="0x9npf3hybrh0vsr2bxax31k3x99p6klrc1gplp295mjiqxiy7sk"; depends=[]; }; sysfonts = derive2 { name="sysfonts"; version="0.5"; sha256="1vppj3jnag88351f8xfk9ds8gbbij3m55iq5rxbnrzy89c04zpzp"; depends=[]; }; sysid = derive2 { name="sysid"; version="1.0.4"; sha256="0fr9gf5yjin3zvz850z4r4pqc1r4mwx8d46sl64i4csdm9qnqagy"; depends=[bitops ggplot2 polynom reshape2 signal tframe zoo]; }; systemfit = derive2 { name="systemfit"; version="1.1-20"; sha256="1qzgx4hn6f71hnk70ccf6inajprrb6my5af8q2manz41577z0ka7"; depends=[car lmtest MASS Matrix sandwich]; }; systemicrisk = derive2 { name="systemicrisk"; version="0.4"; sha256="1qpimrfr75l6phr425m7av02l57yyn1n2if7h26cndf9ynmv6vz1"; depends=[lpSolve Rcpp]; }; syuzhet = derive2 { name="syuzhet"; version="1.0.1"; sha256="0b0w98mx0zf28c55qmv93hfcfcjplrfk68qk2691fas23q14jn56"; depends=[dtt NLP openNLP zoo]; }; + tRophicPosition = derive2 { name="tRophicPosition"; version="0.7.0"; sha256="088bh4miaskp0j15kcsi55x9iykry0wly66z78gpwanyb6zid04d"; depends=[coda dplyr ggplot2 gridExtra hdrcde MCMCglmm MCMCvis plyr rjags runjags SIBER]; }; taRifx = derive2 { name="taRifx"; version="1.0.6"; sha256="10kp06hkdx1qrzh2zs9mkrgcnn6d31cldjczmk5h9n98r34hmirx"; depends=[plyr reshape2]; }; tab = derive2 { name="tab"; version="3.1.2"; sha256="1vc5swfy9p3bsv5bqqgk4w81apzk6d0m1xz0cbhii7rpn7x6zh1h"; depends=[gee survey survival xtable]; }; taber = derive2 { name="taber"; version="0.1.0"; sha256="07a18kn65b4cxxf1z568n7adp6y3qx96nrff3a3714x241sd5p6i"; depends=[dplyr magrittr]; }; - tablaxlsx = derive2 { name="tablaxlsx"; version="1.2.0"; sha256="1wrjasa4bdcv9pcfardm3v3k5f2lm7hrbm7xpyz0gy2ibm3b15pk"; depends=[openxlsx]; }; + tablaxlsx = derive2 { name="tablaxlsx"; version="1.2.2"; sha256="1q7ap1dmymf3aj5g860794jfn9zrn3qiwwcdzl95lsbpkhgyspmz"; depends=[openxlsx]; }; table1xls = derive2 { name="table1xls"; version="0.3.2"; sha256="0b8j4gl4w3jz8hg89ja90sjvigjkqnrh4hpmky5q4a9swgwhmgf6"; depends=[XLConnect]; }; - tableHTML = derive2 { name="tableHTML"; version="0.2.12"; sha256="02a0j75d6praxp44m9idv116grzw6k9lhhgdjcxl2r9ci9cak1bn"; depends=[htmltools magrittr shiny]; }; + tableHTML = derive2 { name="tableHTML"; version="1.0.1"; sha256="08dcl4a8lz3abw6cjsrvwj344yq7fj2qdak6l3aj2axnnjxiqqmh"; depends=[htmltools magrittr shiny]; }; tableMatrix = derive2 { name="tableMatrix"; version="0.8"; sha256="00l03blrrkwdrihqnwz8afx6s3d7a19laj44584546yd3prqx5dy"; depends=[data_table]; }; - tableone = derive2 { name="tableone"; version="0.7.3"; sha256="0ffir00gzrx4fxci018vra7m8hfiqmvlib52wlxikksna2ha51qv"; depends=[e1071 gmodels MASS survey zoo]; }; + tableone = derive2 { name="tableone"; version="0.8.1"; sha256="1rzh59ij53wzhnsxib47pgqmcmk65h0s9i9ifmwcvgjmcx71mn86"; depends=[e1071 gmodels MASS nlme survey zoo]; }; tableplot = derive2 { name="tableplot"; version="0.3-5"; sha256="1jkkl2jw7lwm5zkx2yaiwnq1s3li81vidjkyl393g1aqm9jf129l"; depends=[]; }; tables = derive2 { name="tables"; version="0.8"; sha256="0a8ks6gs4n25khs51dr55z1665zbsyzv2849h7h9xwz8izv8l6za"; depends=[Hmisc]; }; tabplot = derive2 { name="tabplot"; version="1.3-1"; sha256="0yz3npn36q93gr0k9a4x5swap5fwxfc22b131kif3dfxkgklna06"; depends=[bit ff ffbase]; }; tabplotd3 = derive2 { name="tabplotd3"; version="0.3.3"; sha256="0mbj45vb17wlnndpkhvq7xaawsb814x7zxa4rqbfgidvbm1p3abv"; depends=[brew httpuv RJSONIO Rook tabplot]; }; tabuSearch = derive2 { name="tabuSearch"; version="1.1"; sha256="0bri03jksm314xy537dldbdvgyq6sywfmpmj2g2acdcli31kkpq0"; depends=[]; }; - tadaatoolbox = derive2 { name="tadaatoolbox"; version="0.10.0"; sha256="1n3fq68gk20bivkybdls3c6vdwlyxqg8rfsksskv0i4aj1vdvbdw"; depends=[broom car cowplot dplyr ggplot2 haven lazyeval nortest pixiedust pwr ryouready sjmisc vcd]; }; + tadaatoolbox = derive2 { name="tadaatoolbox"; version="0.12.0"; sha256="1hlvw011a8rbczxjk2ww39rq5pcdyr8wf27dzkqwrni5nswarrcg"; depends=[broom car cowplot dplyr ggplot2 haven lazyeval lsr magrittr nortest pixiedust pwr ryouready sjmisc vcd viridis]; }; tagcloud = derive2 { name="tagcloud"; version="0.6"; sha256="04zrh029n8pjlxlr6pdd7xhqqhavbrj3fhvhj6ygzlvi2jslxnwl"; depends=[RColorBrewer Rcpp]; }; tailDepFun = derive2 { name="tailDepFun"; version="1.0.0"; sha256="1z2jrzly1adiwi8y0pndyfggpr0li6sjv9rkrc5mi47s0qjvr5qj"; depends=[copula cubature mvtnorm SpatialExtremes]; }; tailloss = derive2 { name="tailloss"; version="1.0"; sha256="0lmjgjs6d94b70i10vx66fyvlxm5swwqbcjsnqa3lmldzz6m4jc1"; depends=[MASS]; }; + tangram = derive2 { name="tangram"; version="0.3"; sha256="053nwj15w40966i7br52zp9lfmckxhj55imx58w767ha9m73gwvc"; depends=[base64enc digest htmltools magrittr R6 stringi stringr]; }; + tatoo = derive2 { name="tatoo"; version="1.0.6"; sha256="0xf85fwcjbf0wh68cs57q3a6jvx8z49laxffhj4i2rvbrc4a5hi5"; depends=[assertthat data_table magrittr openxlsx purrr stringi]; }; tau = derive2 { name="tau"; version="0.0-19"; sha256="0z7ylw590r7jrw4rlmhahxiwqrnw3124fssnzqs36qa7pa3zqhq2"; depends=[]; }; tawny = derive2 { name="tawny"; version="2.1.6"; sha256="0s6p0nnz1rpcnn2yfj1vvl54g57d8rv5s4y09azwz1z5ls7vnnlv"; depends=[futile_logger futile_matrix lambda_r lambda_tools PerformanceAnalytics quantmod tawny_types xts zoo]; }; tawny_types = derive2 { name="tawny.types"; version="1.1.3"; sha256="1v0k6nn45rdczjn5ymsp2fqq0ijnlniyf3bc08ibd8yd1jcdyjnj"; depends=[futile_logger futile_options lambda_r lambda_tools quantmod xts zoo]; }; taxize = derive2 { name="taxize"; version="0.8.4"; sha256="03zfrkcpkbzqkm3w9m9g34nhrrp36l630l8rhpnsnkqnfxybb3yv"; depends=[ape bold data_table foreach httr jsonlite natserv plyr reshape2 ritis rotl rredlist stringr tibble worrms xml2]; }; + taxizedb = derive2 { name="taxizedb"; version="0.1.4"; sha256="15gj9i18ysd83v9fidrrvw938dah04i10ahi3wh5dgjs5fd5ch2s"; depends=[curl DBI dbplyr dplyr hoardr magrittr RMySQL RPostgreSQL RSQLite]; }; + taxlist = derive2 { name="taxlist"; version="0.1.0"; sha256="0896wh9v78kvjfkjj6qk8sqwkdl4bf2i7hp09vr1vwrahx54cwhx"; depends=[foreign taxize vegdata]; }; taxonomizr = derive2 { name="taxonomizr"; version="0.2.2"; sha256="0drzsbr23kr3da6bawjrz8rl976mai0vcz19fr5aypsliqz32b41"; depends=[data_table R_utils RSQLite]; }; tbart = derive2 { name="tbart"; version="1.0"; sha256="0m8l9ic7na70il6r9ha0pyrjwznbgjq7gk5xwa5k9px4ysws29k5"; depends=[Rcpp sp]; }; tbdiag = derive2 { name="tbdiag"; version="0.1"; sha256="1wr2whgdk84426hb2pf8iiyradh9c61gyazvcrnbkgx2injkz65q"; depends=[]; }; + tbl2xts = derive2 { name="tbl2xts"; version="0.1.0"; sha256="00psr9mxnh8hb2pczr20lrnb8qia4wna1a5cck7v8bb242v7yx7h"; depends=[dplyr lazyeval PerformanceAnalytics xts zoo]; }; tcR = derive2 { name="tcR"; version="2.2.1.11"; sha256="1wyxjwyba08m80g2c40sdg3d5brs3qmq8azb6vzwh2wmgqlb5400"; depends=[data_table dplyr ggplot2 gridExtra gtable igraph Rcpp reshape2 scales stringdist]; }; tcgsaseq = derive2 { name="tcgsaseq"; version="1.4.1"; sha256="09hswqmj7svyiqdbbg7shimhkgxmz0m8w6bknx9qd987hik9asx8"; depends=[CompQuadForm ggplot2 GSA KernSmooth]; }; tcltk2 = derive2 { name="tcltk2"; version="1.2-11"; sha256="1ibxld379600xx7kiqq3fck083s8psry12859980218rnzikl65d"; depends=[]; }; @@ -9886,12 +10337,12 @@ in with self; { tempR = derive2 { name="tempR"; version="0.9.9.10"; sha256="1lrl3q51xy598kpak97im7r0cp61zb7lygwxkib2ryskihrcfk7b"; depends=[]; }; tempcyclesdata = derive2 { name="tempcyclesdata"; version="1.0.1"; sha256="0hciachv59kjpjs119r4z24jskzgnassi1yjg3cgl2r0hyglxxc3"; depends=[]; }; tempdisagg = derive2 { name="tempdisagg"; version="0.25.0"; sha256="0zi11jqb3i5kd2z1bbkz8y7g16kmkcn3xpkwj2brv0s86wxwsny7"; depends=[]; }; - templates = derive2 { name="templates"; version="0.1.0"; sha256="133gzc7hz0dh1myv7b0rmcz14x0n1gy7pj948gci70sikvdvbvp5"; depends=[dat magrittr modules stringr]; }; + templates = derive2 { name="templates"; version="0.2.0"; sha256="1lil7z975fk83m9pgacn0ikii4kslpp0pvpc8g7ra9yqj7qpyv3h"; depends=[dat magrittr modules stringr]; }; tensor = derive2 { name="tensor"; version="1.5"; sha256="19mfsgr6vz4lgwidm80i4yw0y1dr3n8i6qz7g4n2xa0k74zc5pp1"; depends=[]; }; tensorA = derive2 { name="tensorA"; version="0.36"; sha256="1xpczn94a6vfkfibfvr71a7wccksg16pc22h0inpafna4qpygcwp"; depends=[]; }; tensorBF = derive2 { name="tensorBF"; version="1.0.1"; sha256="1rnsff1ypwhn5z0xsxyk2z7jl6igscma1a0w613i81qf37iy81ba"; depends=[tensor]; }; - tensorBSS = derive2 { name="tensorBSS"; version="0.2"; sha256="0bwqv5cxr5lf2p6xa2p03kwhanrzskz8k3xif1myfjhdw1vzyqib"; depends=[JADE Rcpp RcppArmadillo tensor tsBSS]; }; - tensorflow = derive2 { name="tensorflow"; version="0.7"; sha256="0hiz29r79snk4zcpprf6imi8lknn9n791h1svdajyicsd0zi458v"; depends=[reticulate yaml]; }; + tensorBSS = derive2 { name="tensorBSS"; version="0.3"; sha256="0nj1rizz9c5ryfbrvsvgrx31rv3kjcpyhzi8kc2bbhz1kymch6r9"; depends=[JADE Rcpp RcppArmadillo tensor tsBSS]; }; + tensorflow = derive2 { name="tensorflow"; version="0.9"; sha256="19bkh0axi08y9nwp0rmxh8n421224jgs3fhk3dmb3mq0s6i0fw52"; depends=[jsonlite processx reticulate yaml]; }; tensorr = derive2 { name="tensorr"; version="0.1.0"; sha256="00zqklz3hqjv20giwqnd1d62x5hdm620hfdkn1x75i87dv92qn8m"; depends=[assertive_base assertive_properties assertive_types Matrix purrr]; }; tensr = derive2 { name="tensr"; version="1.0.0"; sha256="05gclhljflkz98hgiq5bgbqjz8icxbdq6b84bn2995cx7v0x85ds"; depends=[]; }; tergm = derive2 { name="tergm"; version="3.4.0"; sha256="19658k5570z8yxpklbbl87a7pd8i4yygi0ky8lgzb8qymds90v4s"; depends=[coda ergm MASS network networkDynamic nlme robustbase statnet_common]; }; @@ -9901,14 +10352,14 @@ in with self; { testassay = derive2 { name="testassay"; version="0.1.0"; sha256="06gks3k04m45kn946i525261v33ymwxpvgdy84kc7sp01xxx4rfv"; depends=[]; }; tester = derive2 { name="tester"; version="0.1.7"; sha256="1x5m43abk3x3fvb2yrb1xwa7rb4jxl8wjrnkyd899ii1kh8lbimr"; depends=[]; }; testforDEP = derive2 { name="testforDEP"; version="0.2.0"; sha256="1mgzhj8b35r5cm4bl0nnyxj0h7rwd28d17qvgvaky2kvm2r83cf9"; depends=[Hmisc minerva Rcpp]; }; - testit = derive2 { name="testit"; version="0.6"; sha256="05ll0vg30gbb2x7pal6a5ms94nmxj86fzx4ahggrr96cpxyhy8lv"; depends=[]; }; + testit = derive2 { name="testit"; version="0.7"; sha256="07qsnhghdgyxdknzq7ngpkf3qw9939m3lvk9dv9nk2zypy4jhcq3"; depends=[]; }; testthat = derive2 { name="testthat"; version="1.0.2"; sha256="0pj1r01x4ny4capr83dfa19hi5i2sjjxky99schzip8zrq5dzxqf"; depends=[crayon digest magrittr praise R6]; }; texPreview = derive2 { name="texPreview"; version="1.0.0"; sha256="1i34w1804p3qwmijj2lqmfjy909axfp8icllr1nilfqbsrrmssbi"; depends=[magick magrittr rstudioapi svgPanZoom xml2 xtable]; }; texmex = derive2 { name="texmex"; version="2.3"; sha256="0hh633hlzmjrlind51kjs7s1zpx8bwcwfa93yl4swfvn501j1hy9"; depends=[ggplot2 mvtnorm]; }; texmexseq = derive2 { name="texmexseq"; version="0.3"; sha256="08zjsb541xqqs3lj7avx5147g2d0bh3v036x615srjx2pbxzhsvg"; depends=[dplyr ggplot2 testthat]; }; texreg = derive2 { name="texreg"; version="1.36.23"; sha256="0yxaqimd7cyfrfpia6fnqm15lgs0bf5zyjzmnfm1v4qmf8kj8x6v"; depends=[]; }; text2vec = derive2 { name="text2vec"; version="0.4.0"; sha256="1ipggg63s16gb72fr7kpmc4z8v6ylp4kw7kb9bk6pccg9iz54i5a"; depends=[data_table digest foreach irlba magrittr Matrix R6 Rcpp RcppParallel]; }; - textTinyR = derive2 { name="textTinyR"; version="1.0.5"; sha256="14jk28zydpqjpkvai3bvvaxgv0lrry0vb42l8mkqx97smfv5yq4j"; depends=[BH data_table Matrix R6 Rcpp RcppArmadillo]; }; + textTinyR = derive2 { name="textTinyR"; version="1.0.7"; sha256="1p5qsjs1k2n99p6vc05bqw3zfhh481ynrsnr5qjidf02iavcq00m"; depends=[BH data_table Matrix R6 Rcpp RcppArmadillo]; }; textcat = derive2 { name="textcat"; version="1.0-5"; sha256="039bzyz4jvh1hl2a2pfp328kr2mpb1a07j79yqf5cbqk3d5a197b"; depends=[slam tau]; }; textclean = derive2 { name="textclean"; version="0.3.1"; sha256="1k8wjzzh6nplrnyxq4cd7q4q0sn2fa5p5r2kaq2rd4j9sqrrypp0"; depends=[english qdapRegex stringi textshape]; }; textgRid = derive2 { name="textgRid"; version="1.0.1"; sha256="1wi5vq5f7ixhz39l5hqi2jlmjjacx4lyrs4h8xfbd47pj6g16lc6"; depends=[]; }; @@ -9916,7 +10367,7 @@ in with self; { textmineR = derive2 { name="textmineR"; version="2.0.5"; sha256="138qscgpxkkza0x6lbjrlqf1f1nvj369rw5rvjp5xj9bh7sd62xs"; depends=[lda Matrix Rcpp RcppArmadillo RcppProgress RSpectra SnowballC stringr text2vec tm topicmodels]; }; textmining = derive2 { name="textmining"; version="0.0.1"; sha256="16wiykhrjs4djwa7q2wm4g8b3mrhh6hq9d9876w1j7c2s6zx69gd"; depends=[caret dplyr koRpus mallet networkD3 NLP rJava slam SnowballC stylo tm topicmodels wordcloud]; }; textometry = derive2 { name="textometry"; version="0.1.4"; sha256="17k3v9r5d5yqgp25bz69pj6sw2j55dxdchq63wljxqkhcwxyy9lh"; depends=[]; }; - textreadr = derive2 { name="textreadr"; version="0.3.1"; sha256="0l8aiad16m7lgak61lwi7j03mkrzkjvp1fwi8b4xmgfn3mg797zq"; depends=[curl pdftools readxl textshape XML]; }; + textreadr = derive2 { name="textreadr"; version="0.5.1"; sha256="03j69xn5ligqypkkhj4w0avl4nzn5c87hz3ycz7cwlm2symkwadw"; depends=[antiword curl pdftools readxl rvest textshape xml2]; }; textreg = derive2 { name="textreg"; version="0.1.4"; sha256="0k7hpvvhacz29d3mvnygg6rqmh9f3ghkcp7kjmvv9jnr2ipw2j21"; depends=[NLP Rcpp tm]; }; textreuse = derive2 { name="textreuse"; version="0.1.4"; sha256="0qfp7ffzb5p3k3wiw8i1zjskni8f38rzkjnss97j9f3vhhb8j4r7"; depends=[assertthat BH digest dplyr NLP Rcpp RcppProgress stringr tidyr]; }; textshape = derive2 { name="textshape"; version="1.0.2"; sha256="0p9n003z98aqk272wcj02z0c5dzaw01iyfbd0fjyccgkidyaz49h"; depends=[data_table slam stringi]; }; @@ -9932,6 +10383,7 @@ in with self; { tgp = derive2 { name="tgp"; version="2.4-14"; sha256="1l3kssjkh5sbrh75qdpmynjfnidgz8vmzq1jml1qm1yfwval8ak1"; depends=[maptree]; }; tgram = derive2 { name="tgram"; version="0.2-2"; sha256="091g6j5ry1gmjff1kprk5vi2lirl8zbynqxkkywaqpifz302p39q"; depends=[zoo]; }; thankr = derive2 { name="thankr"; version="1.0.0"; sha256="089ikp85d5ia6a1qzmw8dkgcmz628cibmwfzcpk7m3ii8acxq91w"; depends=[]; }; + themetagenomics = derive2 { name="themetagenomics"; version="0.1.0"; sha256="1p8qyvll6a9yx2akny1087f73r6p5zi6cf1si7b8i786bcs9khwj"; depends=[ggplot2 lda lme4 Matrix plotly Rcpp rstan scales shiny stm]; }; thermocouple = derive2 { name="thermocouple"; version="1.0.2"; sha256="1rlvhw3i83iq1vibli84gj67d98whvgkxafwpmisva1m4s1bmij4"; depends=[]; }; thgenetics = derive2 { name="thgenetics"; version="0.3-4.1"; sha256="05g5rwdpnd1b4h1lay2l1s0ns2q6a7sav8d4zrxaqgzhaafnpxyv"; depends=[]; }; thief = derive2 { name="thief"; version="0.2"; sha256="14xl5l7iw0nwbz5zzd00c8ihfclvhfcazvysr8rapsq1j2r5dfck"; depends=[forecast forecTheta ggplot2 hts]; }; @@ -9939,27 +10391,29 @@ in with self; { threejs = derive2 { name="threejs"; version="0.2.2"; sha256="1i8ca99ys0m0njf5f9yhc5rvs9x43mwl98dh74gggq7vj2a99zj1"; depends=[base64enc htmlwidgets jsonlite Matrix]; }; threewords = derive2 { name="threewords"; version="0.1.0"; sha256="083y5i4qyl1wj017wy5ywl2yx9wvrpjl9g9k9clvnrbwzbycx2cg"; depends=[httr]; }; threg = derive2 { name="threg"; version="1.0.3"; sha256="1ja0w4hhdkw3b1cipbpw8ym27k5lh2m7gibd74mj6gij7rpixrnb"; depends=[Formula survival]; }; - thregI = derive2 { name="thregI"; version="1.0.2"; sha256="1r2p4mcj1myay5qgwvdprh3qvb2gzg2lbcci24hfx5c8dmsc39fd"; depends=[Formula survival]; }; + thregI = derive2 { name="thregI"; version="1.0.3"; sha256="1nacwpzwzb6v6gxrdrarpnrgmsgnn6nsrg53b6866lcqsg09imvj"; depends=[Formula survival]; }; thsls = derive2 { name="thsls"; version="0.1"; sha256="18z7apskydkg7iqrs2hgnzby578qsvyd73wx8v4z3aa338lssdi7"; depends=[Formula]; }; - tibble = derive2 { name="tibble"; version="1.3.0"; sha256="1q25i1cv3qms6d3lw7jd3z142w188znkcbyam460gn9si8l8g2bk"; depends=[lazyeval Rcpp]; }; + tibble = derive2 { name="tibble"; version="1.3.3"; sha256="1bhq4pm56l7l6s1k44ajrcr7hz56h37m9ck4zji9f8xfdqschbl0"; depends=[Rcpp rlang]; }; tibbrConnector = derive2 { name="tibbrConnector"; version="1.5.1"; sha256="1r58myi7x4hqqvyrphxy4ppa1lnad6x2ginfq2j52ax53zr07ajp"; depends=[RCurl rjson]; }; - tictactoe = derive2 { name="tictactoe"; version="0.2.0"; sha256="1n8lbw3g9x1i6rjj3gsyzwnb0ailw9vb6vgr0s0h21c0g1z66a74"; depends=[hash]; }; + tictactoe = derive2 { name="tictactoe"; version="0.2.2"; sha256="1fx8plj5zr04xwk5hfj3zqhcknidxlzya2q14cf0m3y33a86lx42"; depends=[hash]; }; tictoc = derive2 { name="tictoc"; version="1.0"; sha256="1zp2n8k2ax2jjw89dsri268asmm5ry3ijf32wbca5ji231y0knj7"; depends=[]; }; - tidyRSS = derive2 { name="tidyRSS"; version="1.0.1"; sha256="0nm5kbwf8i03n2si81iwf55cmc7q9x1rvg2zlq8fw00kmp0amwzs"; depends=[dplyr httr lubridate magrittr purrr RCurl XML xml2]; }; - tidyjson = derive2 { name="tidyjson"; version="0.2.1"; sha256="178lc4ii4vjzvrkxfdf5cd9ryxva9h2vv4wl6xgxgaixkab9yv9w"; depends=[assertthat dplyr jsonlite]; }; - tidyquant = derive2 { name="tidyquant"; version="0.5.0"; sha256="0zwwlybh07kr8j4qvsx6bbbh14lc89vswn8rgnv2pgbf4337bzv3"; depends=[broom curl devtools dplyr ggplot2 httr lazyeval lubridate magrittr PerformanceAnalytics purrr Quandl quantmod readr rvest scales stringr tibble tidyr tidyverse timeSeries tseries TTR xml2 xts zoo]; }; - tidyr = derive2 { name="tidyr"; version="0.6.1"; sha256="11hs3gqpbaw3w281as4m7j9n594ix5axfpwbyjsd0l62pwnzj217"; depends=[dplyr lazyeval magrittr Rcpp stringi tibble]; }; - tidytext = derive2 { name="tidytext"; version="0.1.2"; sha256="1pmr7bajlcv2s42qmiz1c6723scqmlfky1ajb7hrp8h3bf7sv0cm"; depends=[broom dplyr hunspell janeaustenr Matrix purrr stringr tokenizers]; }; + tidyRSS = derive2 { name="tidyRSS"; version="1.2.1"; sha256="0ccs7njylm9dns8vkda52plxp8is3c5ynb55wcjd50qk44sys867"; depends=[dplyr httr lubridate magrittr tibble xml2]; }; + tidycensus = derive2 { name="tidycensus"; version="0.1.2"; sha256="1p16krbkgzx6jzy5i0xmy7v4314b2sl30glzyifgva5kngk4l7sp"; depends=[dplyr httr jsonlite purrr rappdirs readr rvest sf stringr tidyr tigris units xml2]; }; + tidygenomics = derive2 { name="tidygenomics"; version="0.1.0"; sha256="0n6km2zhdmbgacn6rzamrn506d9y3sl6yp2q6fd9x7kzgz09aq4n"; depends=[dplyr fuzzyjoin IRanges purrr Rcpp tidyr]; }; + tidyjson = derive2 { name="tidyjson"; version="0.2.2"; sha256="1fim73qbd6jqjlprxv9wzhg0hr20pihdmdbx49yharfs74hf9yv7"; depends=[assertthat dplyr jsonlite]; }; + tidyquant = derive2 { name="tidyquant"; version="0.5.1"; sha256="1w21l3njza6sf3banr3mwi6q8sqsd567z5n6qfj0f9x3nd7q8h52"; depends=[broom curl devtools dplyr ggplot2 httr lazyeval lubridate magrittr PerformanceAnalytics purrr Quandl quantmod readr rvest scales stringr tibble tidyr tidyverse timeSeries tseries TTR xml2 xts zoo]; }; + tidyr = derive2 { name="tidyr"; version="0.6.3"; sha256="14s57zrjm2phiy600z9ivq4az71z0ggmp6nj0js7yrybxf0dlah6"; depends=[dplyr lazyeval magrittr Rcpp stringi tibble]; }; + tidytext = derive2 { name="tidytext"; version="0.1.3"; sha256="10vdrvadllqrblc0w4ndvgvy9gq5l4nf93g31b1a2xkz2p30zc15"; depends=[broom dplyr hunspell janeaustenr Matrix purrr stringr tokenizers]; }; tidyverse = derive2 { name="tidyverse"; version="1.1.1"; sha256="1ahxs7xzik27xdbzc1ccrkq5knzrn8xf82x3dhh94xi5c8p3ysqx"; depends=[broom dplyr forcats ggplot2 haven hms httr jsonlite lubridate magrittr modelr purrr readr readxl rvest stringr tibble tidyr xml2]; }; tidyxl = derive2 { name="tidyxl"; version="0.2.1"; sha256="10b6bl2yr11mzajkzj6xzfyfb0mgglzxm8hpsqxkmd9dp4x96035"; depends=[Rcpp]; }; tiff = derive2 { name="tiff"; version="0.1-5"; sha256="0asf2bws3x3yd3g3ixvk0f86b0mdf882pl8xrqlxrkbgjalyc54m"; depends=[]; }; tiger = derive2 { name="tiger"; version="0.2.3.1"; sha256="0xr56c46b956yiwkili6vp8rhk885pcmfyd3j0rr4h8sz085md6n"; depends=[e1071 hexbin klaR lattice qualV som]; }; tigerhitteR = derive2 { name="tigerhitteR"; version="1.1.0"; sha256="0inyi12lf8bn7nbklf2rjixk6wrgrjcp8njv7knai4dgvv7v0rfa"; depends=[Hmisc magrittr openxlsx zoo]; }; tigerstats = derive2 { name="tigerstats"; version="0.3"; sha256="12wrghipgypkhwwkmaxb6n0qx9fgxk82dc6wlh56rblsvciv2hj0"; depends=[abd ggplot2 lattice manipulate MASS mosaic mosaicData]; }; - tigger = derive2 { name="tigger"; version="0.2.8"; sha256="1qck72fnsivmc8gq8n5c18b6nzxp2kn3vs9kfziqr04hpwhz4266"; depends=[alakazam doParallel dplyr foreach ggplot2 iterators tidyr]; }; + tigger = derive2 { name="tigger"; version="0.2.9.999"; sha256="1kzvx6k3460m60v81rv8ai8fk4rjbwq8ya038d1c0g39ypvkmmjc"; depends=[alakazam doParallel dplyr foreach ggplot2 iterators tidyr]; }; tightClust = derive2 { name="tightClust"; version="1.0"; sha256="0psyzk6d33qkql8v6hzkp8mfwb678r95vfycz2gh6fky7m5k3yyz"; depends=[]; }; tigreBrowserWriter = derive2 { name="tigreBrowserWriter"; version="0.1.4"; sha256="0c733mb2fzskrfa4664w6psp80wdr5hc7f9rp516y59a8rr3xzr0"; depends=[DBI RSQLite]; }; - tigris = derive2 { name="tigris"; version="0.3.3"; sha256="11wpxzh7045n9ss5rjhiz2b6cmgj7rnfwrxwnp9kqf0dcaaqx0hv"; depends=[httr magrittr maptools rappdirs rgdal rgeos sp stringr uuid]; }; + tigris = derive2 { name="tigris"; version="0.5.3"; sha256="0ic4l91dd97gmbqm6jgwkx34gsna6asaq14prmjq8y8n4bw7dkvf"; depends=[dplyr httr magrittr maptools rappdirs rgdal rgeos sf sp stringr uuid]; }; tikzDevice = derive2 { name="tikzDevice"; version="0.10-1"; sha256="1fjxzmp9wrf9bigzb4hkp2cb64sd6x4yhrjd6gryw17cqrblhicg"; depends=[filehash png]; }; tileHMM = derive2 { name="tileHMM"; version="1.0-7"; sha256="1ks4b6h15982jh3ls9fz8hq9ac1wf5hfjsvdqcmnba8n3m5zm651"; depends=[corpcor st]; }; tilegramsR = derive2 { name="tilegramsR"; version="0.2.0"; sha256="11cnyvlghg8z7lr9ahzsjpyjrqnxqs77wdcydqvavrsqj745xvi2"; depends=[sf sp]; }; @@ -9969,13 +10423,13 @@ in with self; { timeROC = derive2 { name="timeROC"; version="0.3"; sha256="0xl6gpb5ayppzp08wwry4i051rm40lzfx43jw2yn3jy2p3nrcakb"; depends=[mvtnorm pec]; }; timeSeq = derive2 { name="timeSeq"; version="1.0.2"; sha256="05ncs12afww2apa9sm71x30kjp3ns2l6c5dzrbc2inmy2bss5fy6"; depends=[doParallel foreach gss lattice pheatmap reshape]; }; timeSeries = derive2 { name="timeSeries"; version="3022.101.2"; sha256="0yr5j8w6p0k05g76hjhkrbx3vb166p5916grigc1yag6baj6nsij"; depends=[timeDate]; }; - timedelay = derive2 { name="timedelay"; version="1.0.6"; sha256="063pn1h8lr75bdqyxb90l2w50lq8lzmggv4x0575r3l292rbqwpr"; depends=[mnormt]; }; - timeit = derive2 { name="timeit"; version="0.2.1"; sha256="0fsa67jyk4yizyd079265jg6fvjsifkb60y3fkkxsqm7ffqi6568"; depends=[microbenchmark]; }; - timekit = derive2 { name="timekit"; version="0.1.0"; sha256="0pjnckwwhh4kf804nnpw7w2s9g7s7illmnfxw3jmx8qgbqk2q53v"; depends=[devtools dplyr forcats forecast lazyeval lubridate purrr quantmod readr scales tibble tidyquant tidyr timeSeries tseries TTR xts zoo]; }; + timedelay = derive2 { name="timedelay"; version="1.0.7"; sha256="01rl3nwazxlypimaclyjr6ihwn75jfaffp43b94msvf25xd30aiy"; depends=[mnormt]; }; + timekit = derive2 { name="timekit"; version="0.3.1"; sha256="0wpjx95sy6ny2jwj8p16l778znq0anr2svdnvf8j68bc3pyynmna"; depends=[devtools dplyr forecast lazyeval lubridate padr purrr readr stringi tibble tidyr xts zoo]; }; timeline = derive2 { name="timeline"; version="0.9"; sha256="0zkanz3ac6cgsfl80sydgwnjrj9rm7pcfph7wzl3xkh4k0inyjq3"; depends=[ggplot2]; }; + timelineR = derive2 { name="timelineR"; version="0.1.0"; sha256="1a2pdy5b9nca66khydrb50yzjglr78lxrgzisw6bp2simk5cix51"; depends=[dplyr futile_logger ggplot2 gtable lubridate mtconnectR stringr]; }; timelineS = derive2 { name="timelineS"; version="0.1.1"; sha256="076w8ckzzl59bc1gnwjgdwynnz86320hyfmzb0k26hl3k13jlmxs"; depends=[dplyr ggplot2 lubridate magrittr]; }; timeordered = derive2 { name="timeordered"; version="0.9.8"; sha256="1j0x2v22ybyl3l9r3aaz5a3bxh0zq81rbga9gh63zads2xy5axmf"; depends=[igraph plyr]; }; - timereg = derive2 { name="timereg"; version="1.9.0"; sha256="1rhnbi2gs1pc2nsqcf1qs3x6v1c83l21p1yq8invzgikwdmg4dhy"; depends=[lava numDeriv survival]; }; + timereg = derive2 { name="timereg"; version="1.9.1"; sha256="1rm3b8i3vrajd50rfm39hlyz1idxxwlj73zga2q8gm0md75034rv"; depends=[lava numDeriv survival]; }; timesboot = derive2 { name="timesboot"; version="1.0"; sha256="1ixmcigi1bf42np93md8d3w464papg9hp85v0c3hg3vl4nsm2bji"; depends=[boot]; }; timeseriesdb = derive2 { name="timeseriesdb"; version="0.2.1"; sha256="0150zs8c8184jzry33aki21prmpnxp3rclp84q6igwxi4grdhlr0"; depends=[DBI reshape2 RJSONIO RPostgreSQL shiny xts zoo]; }; timetools = derive2 { name="timetools"; version="1.11.4"; sha256="0sny0kbadpgaa84xbh0d8blhc8gz2l8gp5f98zfc1jq7m6jm5km8"; depends=[]; }; @@ -10003,8 +10457,9 @@ in with self; { tm_plugin_lexisnexis = derive2 { name="tm.plugin.lexisnexis"; version="1.3"; sha256="056fvhd7m1z7pqmllq2l36v1zm2iwrmii3andhr22894qk99kck1"; depends=[ISOcodes NLP tm XML]; }; tm_plugin_mail = derive2 { name="tm.plugin.mail"; version="0.1"; sha256="0ca2w2p5zv3qr4zi0cj3lfz36g6xkgkbck8pdxq5k65kqi5ndzyp"; depends=[NLP tm]; }; tm_plugin_webmining = derive2 { name="tm.plugin.webmining"; version="1.3"; sha256="1694jidf01ilyk286q43bjchh1gg2fk33a2cwsf5jxv7jky3gl7h"; depends=[boilerpipeR NLP RCurl RJSONIO tm XML]; }; - tmap = derive2 { name="tmap"; version="1.8-1"; sha256="193mkyby2rwx917b4bh0fg1ds6hc67ml1ch6wva1dssnkasn2x5i"; depends=[classInt htmltools htmlwidgets leaflet mapview raster RColorBrewer rgdal rgeos sp spdep tmaptools]; }; - tmaptools = derive2 { name="tmaptools"; version="1.2"; sha256="1ljqrajzjl2qcxp55awy79p4d8z4phlkj2kmlqd8fk00lfbig2qp"; depends=[classInt dichromat geosphere KernSmooth magrittr osmar raster RColorBrewer rgdal rgeos rmapshaper sp spdep XML]; }; + tmap = derive2 { name="tmap"; version="1.10"; sha256="1yylbcvpby180axs0mi68y6rbqisis146lj0gaz09vlmmraz1aln"; depends=[classInt htmltools htmlwidgets leaflet mapview raster RColorBrewer rgdal rgeos sp spdep tmaptools]; }; + tmaptools = derive2 { name="tmaptools"; version="1.2-1"; sha256="0rivy6wm0k0dir864n2saa5xq9b1rli8286f1zni86kzsa9n16kn"; depends=[classInt dichromat geosphere KernSmooth magrittr osmar raster RColorBrewer rgdal rgeos rmapshaper sp spdep XML]; }; + tmcn = derive2 { name="tmcn"; version="0.2-8"; sha256="0msgjz32yizl7kfy33mzxjgfj7q3pd0wdly0xzvcmkc254q41bq7"; depends=[]; }; tmg = derive2 { name="tmg"; version="0.3"; sha256="0yqavibinzsdh85izzsx8b3bb9l36vzkp5a3bdwdbh410s62j68a"; depends=[Rcpp RcppEigen]; }; tmle = derive2 { name="tmle"; version="1.2.0-5"; sha256="06pan7kf1ffs587kayrscqcp4d613ismpzxp8fhfzga02vzvc3a2"; depends=[SuperLearner]; }; tmle_npvi = derive2 { name="tmle.npvi"; version="0.10.0"; sha256="00jav1ql3lv18wh9msxnjvz36z2ds44fdi6lrp1pfphh1in4vdcl"; depends=[geometry MASS Matrix R_methodsS3 R_oo R_utils]; }; @@ -10036,8 +10491,9 @@ in with self; { tracer = derive2 { name="tracer"; version="1.0.0"; sha256="1jdh4ljcz7d0w2y5miggqkvv397jdx7fn108hbjw93af2gnh698q"; depends=[clisymbols crayon prettycode]; }; tracheideR = derive2 { name="tracheideR"; version="0.1.1"; sha256="1x1jwzgs2aqb3k17mm9mhfhnbwcmilhkjaz9rl40rcg84xjqdrpl"; depends=[tgram]; }; track = derive2 { name="track"; version="1.1.9"; sha256="1d0hab7xyayyhyyrbv8nvpka1kzry4yx10fg8aqwkca3nm7n2q3c"; depends=[]; }; + trackdem = derive2 { name="trackdem"; version="0.2"; sha256="0gvra57bilx504lijp7gr7z6alkivsnpqi2lbbvcp1dchzaf4gwi"; depends=[MASS neuralnet png raster Rcpp RcppArmadillo SDMTools]; }; trackeR = derive2 { name="trackeR"; version="0.0.5"; sha256="0c1wfc41a0n9ldz7mmcss3m2c7lz5wjmv5ifwn9h6ih7wng9d707"; depends=[colorspace fda ggmap ggplot2 gridExtra gtable jsonlite leaflet raster RSQLite scam XML zoo]; }; - tractor_base = derive2 { name="tractor.base"; version="3.0.7"; sha256="19rnsk0v34zlic12839zfp1rrmv7dq4pl1wq5c6hcnsjrbw731wn"; depends=[ore reportr]; }; + tractor_base = derive2 { name="tractor.base"; version="3.1.0"; sha256="0d3hkxqygyh02v63wny32zdxpsn6m6q8i1630zl1mhrbvq3kmqr5"; depends=[ore reportr]; }; traitr = derive2 { name="traitr"; version="0.14"; sha256="1pkc8wcq55229wkwb54hg9ndbhlxziv51n8880z6yq73zac1hbmf"; depends=[digest gWidgets proto]; }; traits = derive2 { name="traits"; version="0.2.0"; sha256="0qsnlp96ilwmaimph0bvkjw4kaqd3wpfy6knd7k5s321b68hqaam"; depends=[data_table dplyr httr jsonlite readr rvest taxize xml2]; }; traj = derive2 { name="traj"; version="1.2"; sha256="0mq6xdbxjqjivxyy7cwaghwmnmb5pccrah44nmalssc6qfrgys4n"; depends=[cluster GPArotation NbClust pastecs psych]; }; @@ -10050,7 +10506,7 @@ in with self; { translation_ko = derive2 { name="translation.ko"; version="0.0.1.5.2"; sha256="1w5xibg4znhd39f3i0vsqckp6iia43nblqxnzgj0ny6s7zmdq1wd"; depends=[]; }; transport = derive2 { name="transport"; version="0.8-2"; sha256="0l6scyfw8ygzjg2b0q04k3mkrmhv8gj4hmjkkcqvpa7q1cnma10h"; depends=[]; }; trapezoid = derive2 { name="trapezoid"; version="2.0-0"; sha256="0f6rwmnn61bj97xxdgbydi94jizv1dbq0qycl60jb4dsxvif8l3n"; depends=[]; }; - treatSens = derive2 { name="treatSens"; version="2.1"; sha256="1d0nhyrnfcl0llrpslfqhgpyf9h4fp2a178v5vjy4m9rmqymmrql"; depends=[BH dbarts mvtnorm Rcpp RcppEigen rstan StanHeaders]; }; + treatSens = derive2 { name="treatSens"; version="2.1.2"; sha256="0zqpx0lwx3vzbwi55n0517zs5vn4zlaf66js506vxnzf1dzx2h0a"; depends=[BH dbarts mvtnorm Rcpp RcppEigen rstan StanHeaders]; }; tree = derive2 { name="tree"; version="1.0-37"; sha256="091297qhvqhgjmnyr96jkwaghz8dkbf03rnhwfhks8bsgax6jl13"; depends=[]; }; treeClust = derive2 { name="treeClust"; version="1.1-6"; sha256="07cw8mnfrkw733ga3aq4am1pj50g8vk0rw6b3lflnb4wdhm2fgbi"; depends=[cluster rpart]; }; treeHFM = derive2 { name="treeHFM"; version="1.0.3"; sha256="10pyvyyz9ia4dpj8zkil56ipbvbks5xh0n9hkdy0hcinsyq0ba29"; depends=[mclust]; }; @@ -10058,13 +10514,12 @@ in with self; { treeclim = derive2 { name="treeclim"; version="2.0.0"; sha256="0hiba5xc6rp5zzka31k5klmlllpgbnla4pm920zk12jxn796953l"; depends=[abind boot ggplot2 lmodel2 lmtest np plyr Rcpp RcppArmadillo]; }; treecm = derive2 { name="treecm"; version="1.2.2"; sha256="0vrawg4vvy270dn20gb2k99xi4q89l4mjz0mm7ikpz8wxqypzq2l"; depends=[plyr]; }; treelet = derive2 { name="treelet"; version="1.1"; sha256="0k3qhxjg7ws6jfhcvvv9jmy26v2wzi4ghnxnwpjm8nh7b90lbysd"; depends=[]; }; - treeman = derive2 { name="treeman"; version="1.0"; sha256="0nbcvyqqd75vvms1bvalm7bq59wfg4fdcql7ydhkrjdv0mf0753m"; depends=[plyr]; }; + treeman = derive2 { name="treeman"; version="1.1.1"; sha256="0j76crs31qniibsdj7dpbbr2jdbhvclfvcscd5dgklvpcspbarch"; depends=[ape bigmemory plyr RJSONIO stringr]; }; treemap = derive2 { name="treemap"; version="2.4-2"; sha256="15bdgkdwryb55v82b3hpcx4ykfg5z7zf10h0wwknf6kl1kn34v90"; depends=[colorspace data_table ggplot2 gridBase igraph RColorBrewer shiny]; }; treeperm = derive2 { name="treeperm"; version="1.6"; sha256="0mz7p9khrsq4dbkijymfvlwr01y4fvs0x6si4x5xid16s2zsnmm4"; depends=[]; }; treeplyr = derive2 { name="treeplyr"; version="0.1.2"; sha256="03bfl7pqhw2isffnfli82bw6la41rfqcshh9dhlbnlwr7yj69m4x"; depends=[ape dplyr geiger lazyeval phytools Rcpp]; }; - treescape = derive2 { name="treescape"; version="1.10.18"; sha256="1vfyqap1696pz212x7jqrga94a8vs61r6fr7vh86nxiayf6fz7b3"; depends=[ade4 adegenet adegraphics adephylo ape combinat distory fields htmlwidgets MASS phangorn Rcpp rgl RLumShiny scatterD3 shiny shinyBS]; }; treespace = derive2 { name="treespace"; version="1.0.0"; sha256="1dc98p5jf9qyr31xa7h7v2zrjmhd3jlzrh2cpmnmhbpfm1cviskj"; depends=[ade4 adegenet adegraphics adephylo ape combinat distory fields htmlwidgets MASS phangorn Rcpp RLumShiny scatterD3 shiny shinyBS]; }; - treethresh = derive2 { name="treethresh"; version="0.1-9"; sha256="1fmnmfgaysbnqn002zgcm1d2kpzc7is2k2z859hj0h0ll3yjp592"; depends=[EbayesThresh wavethresh]; }; + treethresh = derive2 { name="treethresh"; version="0.1-11"; sha256="1fksyn9mycr6dpw1yh5b3fa7fk7ndz7q39174daplm55jbrz1dr5"; depends=[EbayesThresh wavethresh]; }; trelliscope = derive2 { name="trelliscope"; version="0.9.7"; sha256="1hczmi3hjlk1nqd4p2m2hs89a86jrg59rraxw5z5fm0pa92xnzqy"; depends=[base64enc curl data_table datadr digest DistributionUtils ggplot2 hexbin htmltools htmlwidgets jpeg jsonlite lattice png rsconnect shiny]; }; trelloR = derive2 { name="trelloR"; version="0.1.0"; sha256="0d549yw9pfxs8a3q716z08fzg68bkm5l09cv5iqqkm4gyasrxsf4"; depends=[dplyr httr jsonlite]; }; trend = derive2 { name="trend"; version="0.2.0"; sha256="0kq2j9rky8kad3rfkwqys2s9hivrqy4yb03q80dvgz856bsh5fiw"; depends=[]; }; @@ -10080,6 +10535,7 @@ in with self; { trip = derive2 { name="trip"; version="1.5.0"; sha256="1qdq3hbqqaa0cmb47ssg3pr3jksni7g4xsc7bsj6wwdw62d9wzf6"; depends=[maptools MASS raster sp spatstat]; }; tripEstimation = derive2 { name="tripEstimation"; version="0.0-44"; sha256="1ylpyzlqr6l5haxq4icnlxw6vgvc2lsfz5sm2wqqm4m6h3p0i6s6"; depends=[lattice mgcv rgdal sp zoo]; }; tripack = derive2 { name="tripack"; version="1.3-8"; sha256="0pf707z6xysxvcs508nadga3mglpvmfk6r061qda8acn58ll1cvb"; depends=[]; }; + tropr = derive2 { name="tropr"; version="0.1.2"; sha256="1nm97sqmj4nfy7h8z58gmd9ipyrkw6skh2wx2g3ivm9pn3m50bwl"; depends=[digest httr magrittr rvest stringr xml2]; }; trotter = derive2 { name="trotter"; version="0.6"; sha256="0i8r2f2klkkfnjm7jhvga3gx6m7r97pd73d88004jzlm9ficspgy"; depends=[]; }; trueskill = derive2 { name="trueskill"; version="0.1"; sha256="0mqvm64fcsxjlh789lqdk6l28q31yhh6jjirwjlgbpxxb90c5107"; depends=[]; }; truncSP = derive2 { name="truncSP"; version="1.2.2"; sha256="1hdi518j3sg9273g01l1jqlmqya3ppim82ma7zakwqpmsjmzw18q"; depends=[boot truncreg]; }; @@ -10088,7 +10544,7 @@ in with self; { truncnorm = derive2 { name="truncnorm"; version="1.0-7"; sha256="1qac05z50618y4bw1d7yznsli1bv82s0g8h37iacrjrdkv87bmy7"; depends=[]; }; truncreg = derive2 { name="truncreg"; version="0.2-4"; sha256="1rmf1v2khsx82yzyyk51k7fbnbchf21lj9yqrays1z2mx3p1l1fc"; depends=[maxLik]; }; trust = derive2 { name="trust"; version="0.1-7"; sha256="013gmiqb6frzsl6fsb5pqfdapwdxas0llg954hlcvgki9al5mlg3"; depends=[]; }; - trustOptim = derive2 { name="trustOptim"; version="0.8.5"; sha256="1y9krw2z5skkwgfdjagl8l04l9sbiqbk1fbxp30wrf4qj3pba5w6"; depends=[Matrix Rcpp RcppEigen]; }; + trustOptim = derive2 { name="trustOptim"; version="0.8.6"; sha256="14vxcpdmp3avkjdwqyh3hj3v315zwdp7cl5f67pwzj3l69gm1yh5"; depends=[Matrix Rcpp RcppEigen]; }; tsBSS = derive2 { name="tsBSS"; version="0.2"; sha256="1rnfkrmfmha6pjcsl5zicafj5s2agr048j1rmqficyh3km0kz3i7"; depends=[JADE Rcpp RcppArmadillo]; }; tsDyn = derive2 { name="tsDyn"; version="0.9-44"; sha256="09vxp2zir0vidzfm57j4cgkigsiyqwvr6ssy15ydfjxha30523a7"; depends=[foreach forecast MASS Matrix mgcv mnormt nnet tseries tseriesChaos urca vars]; }; tsModel = derive2 { name="tsModel"; version="0.6"; sha256="0mkmhzj4g38ngzfcfx0zsiqpxs2qpw82kgmm1b8gl671s4rz00zs"; depends=[]; }; @@ -10098,18 +10554,17 @@ in with self; { tsbridge = derive2 { name="tsbridge"; version="1.1"; sha256="0mry3ia54cdfydpzm8asrq1ldj70gnpb5dqzj51w0jiyps2zlw6f"; depends=[mvtnorm tsbugs]; }; tsbugs = derive2 { name="tsbugs"; version="1.2"; sha256="130v4x6cfy7ddvhijsnvipm4ycrispkj1j0z5f326yb4v5lrk91x"; depends=[]; }; tsc = derive2 { name="tsc"; version="1.0-3"; sha256="1acsdkxizlkix1sskwqv2a80rshw6f14zvcsjhrmmdfd4bmwh36y"; depends=[]; }; - tscount = derive2 { name="tscount"; version="1.3.0"; sha256="0zbm096z8nlbk9rd5qkvw5285wpz7qx8avi1md3zv64zmqmny7qa"; depends=[ltsa]; }; tsdecomp = derive2 { name="tsdecomp"; version="0.2"; sha256="1wy37gjp49dr60s4zhwv19iv3mzr1fjz5yilqmqgy78j5d45ns15"; depends=[]; }; tsdisagg2 = derive2 { name="tsdisagg2"; version="0.1.0"; sha256="1vjypf9d4rdprpgxfsgpccn412kvar59v341ridq2hcdp7hfb70s"; depends=[]; }; - tseries = derive2 { name="tseries"; version="0.10-40"; sha256="1mbb44k428m0l7dqdw4fq63div4kic02fdlwb8vx7zl2s1614a34"; depends=[quadprog zoo]; }; + tseries = derive2 { name="tseries"; version="0.10-42"; sha256="1i26ankmbc96w6abqhxhbvhd12m87f2jfb5xrbl01iqmhy2pjzw2"; depends=[quadprog quantmod zoo]; }; tseriesChaos = derive2 { name="tseriesChaos"; version="0.1-13"; sha256="0f2hycxyvcaj3s1lmva1qy46xr6qi43k8fvnm4md5qj8jp2zkazg"; depends=[deSolve]; }; tseriesEntropy = derive2 { name="tseriesEntropy"; version="0.6-0"; sha256="04clfkpkiy5p5nxcq59c7f4v1llj1d95lvck23h1px50lvb993fv"; depends=[cubature ks]; }; tsfa = derive2 { name="tsfa"; version="2014.10-1"; sha256="0gkgl55v08dr288nf8r769f96qri7qbi5src7y6azrykb37nz6iz"; depends=[dse EvalEst GPArotation setRNG tfplot tframe]; }; - tsiR = derive2 { name="tsiR"; version="0.1.0"; sha256="1h14qpg542zr41dr5vrd34aj6ss3z7c4lzvb5bfaha72zbca1l6s"; depends=[ggplot2 kernlab reshape2]; }; + tsiR = derive2 { name="tsiR"; version="0.2.0"; sha256="15n40xj2pcdzlrd8qr1igkp27dkni3i4761ilix2mdnaml8gng5x"; depends=[ggplot2 kernlab reshape2]; }; tsintermittent = derive2 { name="tsintermittent"; version="1.9"; sha256="1mrb6yrsjwj6j40n97sgg42ddvwhjnaiq9k7ka249bbq01gf2975"; depends=[MAPA]; }; tsna = derive2 { name="tsna"; version="0.2.0"; sha256="09q01jzj1rnv2f2jf7djnq5xrkp7lvykdbf4bfswsy0f95j0asx2"; depends=[network networkDynamic statnet_common]; }; tsne = derive2 { name="tsne"; version="0.1-3"; sha256="0s8cv2pndkddq62rzlgzgfdjp1vjv5hz5i5957sllnb97vbzbzb6"; depends=[]; }; - tsoutliers = derive2 { name="tsoutliers"; version="0.6-5"; sha256="1d2m51mlqw4npm7vmbaayj4s3rvsrf33abld947ryqvzi5zrwpim"; depends=[forecast KFKSDS stsm]; }; + tsoutliers = derive2 { name="tsoutliers"; version="0.6-6"; sha256="0q4lkqasnsps8lzpiyk074nfhv29sbma080729c8l3ba1sa9pmyn"; depends=[forecast KFKSDS stsm]; }; tspmeta = derive2 { name="tspmeta"; version="1.2"; sha256="028jbbd0pwpbjq4r6jcc1h0p7c4djcb9d2mvgzw1rmpphaxjvrkd"; depends=[BBmisc checkmate fpc ggplot2 MASS splancs stringr TSP vegan]; }; tsqn = derive2 { name="tsqn"; version="1.0.0"; sha256="1iv1wwa6a9824dbgfk5a609szppc3a8j250z74hb8csjvwwx9qq9"; depends=[fracdiff MASS robustbase]; }; tswge = derive2 { name="tswge"; version="1.0.0"; sha256="0wj0kyb1dcwfn8wjp7skgcflc48cr4va0i0jg8x970658if7z6fz"; depends=[astsa MASS PolynomF signal waveslim]; }; @@ -10120,11 +10575,12 @@ in with self; { tttplot = derive2 { name="tttplot"; version="1.1.1"; sha256="0rmgp1888y07w0h8kwq1azpr6bysjq4pyjf6ygpra75jj4563wx9"; depends=[]; }; ttutils = derive2 { name="ttutils"; version="1.0-1"; sha256="18mk30070mcplybg320vjbk9v5flxnbqi5gx0yyr1z6ymjmnrxbc"; depends=[]; }; ttwa = derive2 { name="ttwa"; version="0.8.5.1"; sha256="1lhypcwssq0dspizvln3w4dg16ad6mz8cj4w34c5vsrayqid7fyn"; depends=[data_table]; }; - tuber = derive2 { name="tuber"; version="0.8.0"; sha256="1sqj8mrpsgc553qcnafg07i7issmjfrxgdw2ppin88d7s2axf5cn"; depends=[httr plyr]; }; + tuber = derive2 { name="tuber"; version="0.9.0"; sha256="0s90mkv14mx1np0aa8chh5fdzx8978i2qn7v6w2aaxqff8q9why6"; depends=[httr plyr]; }; tubern = derive2 { name="tubern"; version="0.1.0"; sha256="0wpn4aig6r1kpncrgrqra4kr0f07rdq7z4p2k0h28f7kww6l52vv"; depends=[httr jsonlite]; }; tuckerR_mmgg = derive2 { name="tuckerR.mmgg"; version="1.5.0"; sha256="0pxsnvzh5gy5dsdsqsmq8hkr597dnnv60b5dw7bqw493lavk2ccm"; depends=[]; }; tufte = derive2 { name="tufte"; version="0.2"; sha256="0yh5xdxapqpf5hgdn8c2jkk63817l2w6bxavw8457r89rnj1022p"; depends=[htmltools knitr rmarkdown]; }; tufterhandout = derive2 { name="tufterhandout"; version="1.2.1"; sha256="04fvvbx69a28nk7i4wz5ynamz1yvsa2ibz542r1xaq1ikk0ywqbw"; depends=[knitr rmarkdown]; }; + tukeytrend = derive2 { name="tukeytrend"; version="0.4"; sha256="14jyv8xb7ghbprn9gm5dlkry868i14ga63pfi78dhmq67i43s70x"; depends=[lme4 Matrix mgcv multcomp nlme pbkrtest]; }; tumblR = derive2 { name="tumblR"; version="1.1"; sha256="0gl6q6rff9bp21gvi3bz8kmwbhimxqrv1mmzwshl1ys9r7d4dvps"; depends=[httr RCurl RJSONIO stringr]; }; tumgr = derive2 { name="tumgr"; version="0.0.4"; sha256="1ylfmrsg177g75l2scjpgw6v4dpz62r7cy89pql9zd5zqy167xqj"; depends=[minpack_lm]; }; tuneR = derive2 { name="tuneR"; version="1.3.2"; sha256="1xk66rrahfvvbjzpx2mkbmlmyj0l3vidd8kz24f72wh56gbdgbsa"; depends=[signal]; }; @@ -10139,6 +10595,7 @@ in with self; { tweedie = derive2 { name="tweedie"; version="2.2.5"; sha256="1n08xdkqklh020zwgkkj6wbf7gyjghjl5wbs0xj83zi9jcmn08sn"; depends=[]; }; tweenr = derive2 { name="tweenr"; version="0.1.5"; sha256="06h0vhxlljmvxg4a62sqrq53lpbvl5w19dqcpyw1jqvrb5agidnq"; depends=[Rcpp]; }; tweet2r = derive2 { name="tweet2r"; version="1.0"; sha256="0v7xshk389k3aws72ww9kqc2ycw6l6q9xmhps47g3bdl64jy8bay"; depends=[ggmap ggplot2 maptools plyr rgdal ROAuth RPostgreSQL RSQLite sp spacetime spatstat splancs streamR]; }; + twfy = derive2 { name="twfy"; version="0.1.0"; sha256="14xxl9y8iagnn5jd06k6jyy4wk7crm64svz8h0zmzcvg47k8bwc7"; depends=[httr jsonlite]; }; twiddler = derive2 { name="twiddler"; version="0.5-0"; sha256="0r16nfk2afcw7w0j0n3g0sjs07dnafrp88abwcqg3jyvldp3kxnx"; depends=[]; }; twilio = derive2 { name="twilio"; version="0.1.0"; sha256="0b70vcc2bd5jpd2d82i2k828q90viah0b9abz2r627bbyxivpcnd"; depends=[httr jsonlite lubridate magrittr purrr]; }; twitteR = derive2 { name="twitteR"; version="1.1.9"; sha256="1hh055aqb8iddk9bdqw82r3df9rwjqsg5a0d2i0rs1bry8z4kzbr"; depends=[bit64 DBI httr rjson]; }; @@ -10154,12 +10611,14 @@ in with self; { udapi = derive2 { name="udapi"; version="0.1.0"; sha256="0hwnrx9qkazja288m6irmwwybiys9npk6sk60acjdczsfrn1hvl0"; depends=[curl httr]; }; udunits2 = derive2 { name="udunits2"; version="0.13"; sha256="0yav7rm2afcx67xqrknybxgz7x63w78zyxa0xifvc0k2gz0d6mfi"; depends=[]; }; uiucthemes = derive2 { name="uiucthemes"; version="0.1.1"; sha256="0d1agg94z0qy6k4pbv01p1xb0zh42gkjl5i9kbqblplnk2swkzyi"; depends=[rmarkdown]; }; + ukbabynames = derive2 { name="ukbabynames"; version="0.1.1"; sha256="0vrwcf3hixd40ag6kb289anq2ys2k6vdhhsrjbizvndkyn8sr0r0"; depends=[]; }; ukds = derive2 { name="ukds"; version="0.1.0"; sha256="00lgr9jy57bwa8p38mqcf4fk29g2w2wqk3pwf9av6f5lapzzgc94"; depends=[magrittr rio RSelenium stringr]; }; ukgasapi = derive2 { name="ukgasapi"; version="0.13"; sha256="0bnblha96ldbxj0nqhcj26d1dk2xm6nkjqqval1jlc2pki20mr9n"; depends=[RCurl XML]; }; ump = derive2 { name="ump"; version="0.5-8"; sha256="1sg226caq9y41cwl7wr5s9z3bpq2j5p6rj6fy2pasbzimgzw0byx"; depends=[]; }; umx = derive2 { name="umx"; version="1.7.5"; sha256="1pzxf2ghds4wdqky670da4ig17g9knwmckx3c3sb7pmin75k79vz"; depends=[DiagrammeR knitr MASS Matrix mvtnorm numDeriv OpenMx polycor R2HTML RCurl sfsmisc]; }; unbalanced = derive2 { name="unbalanced"; version="2.0"; sha256="18hy9nnq42s1viij0a5i9wzrrfmmbf7y3yzjzymz2wnrx4f2pqwv"; depends=[doParallel FNN foreach mlr RANN]; }; unbalhaar = derive2 { name="unbalhaar"; version="2.0"; sha256="0v6bkin1cakwl9lmv49s0jnccl9d6vdslbi1a7kfvmr5dgy760hs"; depends=[]; }; + uncmbb = derive2 { name="uncmbb"; version="0.1.0"; sha256="0gkd475k4qbnfn3cgh8w4fq4g3i2fn3dlb8n89ih3xdk5ac4ns73"; depends=[]; }; unfoldr = derive2 { name="unfoldr"; version="0.6"; sha256="1chxd6b353s56rl78wxr8zzh2vvnj7wbjl6xnakhcchcfqr4zjqd"; depends=[]; }; ungeneanno = derive2 { name="ungeneanno"; version="0.1.6"; sha256="0fm47vmzn4z73pn37p94r84lbkg5amk0sl78304ibwz0rhlda0y5"; depends=[httr XML]; }; uniCox = derive2 { name="uniCox"; version="1.0"; sha256="1glgk6k8gwxk3haqaswd2gmr7a2hgwjkwk2i1qc5ya7gg8svyavv"; depends=[survival]; }; @@ -10169,15 +10628,17 @@ in with self; { uniqtag = derive2 { name="uniqtag"; version="1.0"; sha256="025q71mzdv3n1jw1fa37bbw8116msnfzcia01p1864si04ch5358"; depends=[]; }; uniqueAtomMat = derive2 { name="uniqueAtomMat"; version="0.1-2"; sha256="15d6s44n1cvhpjsmwjly3nqq7q2zpi2ws6cw5jrxb97gacma896n"; depends=[]; }; unitedR = derive2 { name="unitedR"; version="0.2"; sha256="0glcyji0cypb2687cvyra0zzlzbq0md7qb60abgi0199hf51q3dj"; depends=[plyr]; }; - unitizer = derive2 { name="unitizer"; version="1.4.2"; sha256="19vxxzxwcmrjzg8hacqqscrljx2srznyskbdsdbq7f7xa16z7v5z"; depends=[crayon diffobj]; }; - units = derive2 { name="units"; version="0.4-3"; sha256="0gh324k2wgwdgasvam0mzvcywl0y5s7aqxapqqzgjh4qkl341cgc"; depends=[udunits2]; }; + unitizer = derive2 { name="unitizer"; version="1.4.3"; sha256="0wcr58w1pf91hb3g8sgq7l6cw3idxn550i2aih8ixp1s3r1r757d"; depends=[crayon diffobj]; }; + units = derive2 { name="units"; version="0.4-5"; sha256="0sal0h1px9nbaqmd0d3s1x70lqs34qbj43b3pdrp7hvb4v48q82w"; depends=[udunits2]; }; unittest = derive2 { name="unittest"; version="1.2-0"; sha256="1g3f36kikxrzsiyhwpl73q2si5k28drcwvvrqzsqmfyhbjb14555"; depends=[]; }; - unix = derive2 { name="unix"; version="1.0"; sha256="17mnlclphpvk6rbd23jda8ksaqcmr2nqbk5ndhh44y3f7f1y2g64"; depends=[]; }; - unmarked = derive2 { name="unmarked"; version="0.12-0"; sha256="0s4m29ynrgw10hylbhq2z1zqzm44j4yy2g5inxwz3hs0blxrap6l"; depends=[lattice plyr raster Rcpp RcppArmadillo reshape]; }; - unpivotr = derive2 { name="unpivotr"; version="0.1.0"; sha256="01pbmfm94i4z0xx7lj9pipw88d5szqgqa6j23m4i8cv8kx48r3p7"; depends=[data_table dplyr dtplyr lazyeval magrittr purrr tibble tidyr]; }; + univOutl = derive2 { name="univOutl"; version="0.1-3"; sha256="0p6x38szag3ngk48rz3vlsph5y6yd2vckpkqfd9h7yz2ziyyy5m6"; depends=[Hmisc robustbase]; }; + unix = derive2 { name="unix"; version="1.3"; sha256="1l5w22j0h3qzya13wx7y8lx2baw496vcmn39l2y8r1v38as9dybc"; depends=[]; }; + unmarked = derive2 { name="unmarked"; version="0.12-2"; sha256="1ql8l7kc8py7zand164w3yszqbmwyxvrkjvr10l4hx2mkcnvxzx0"; depends=[lattice plyr raster Rcpp RcppArmadillo reshape]; }; + unpivotr = derive2 { name="unpivotr"; version="0.1.1"; sha256="0k7ddbkfcdgzfbd6lzgw8dax3f879ccc04yi9wkjvw1dzx4q69kk"; depends=[data_table dplyr dtplyr lazyeval magrittr purrr tibble tidyr]; }; + unrtf = derive2 { name="unrtf"; version="1.0"; sha256="16z2i5194hawbyfrc5xyr54vwcfnylhr6jdz1flnw8pylbjm4z1j"; depends=[sys]; }; unsystation = derive2 { name="unsystation"; version="0.1.1"; sha256="0w5llr2kyv7g5fx5yvlyqwj4da5k5fq1f2y70c9pjdzrny9lpz4q"; depends=[doParallel foreach iterators Rcpp RcppArmadillo]; }; untb = derive2 { name="untb"; version="1.7-2"; sha256="1ha0xj94sz1r325qb4sb5hla9hw1gbqr76703vk792x9696skhji"; depends=[Brobdingnag partitions polynom]; }; - unvotes = derive2 { name="unvotes"; version="0.1.0"; sha256="128jp2iin0xb7xr21s4sd6yprgzc0qssjbhz3vcslbwfl3jp2ch0"; depends=[]; }; + unvotes = derive2 { name="unvotes"; version="0.2.0"; sha256="0wanvivwm1nmqadq2vapg27kasnjnr0a4np2kw54wj9pg21izqic"; depends=[]; }; upclass = derive2 { name="upclass"; version="2.0"; sha256="0jkxn6jgglw6pzzbcvi1pnq4hwfach3xbi13zwml4i83s3n5b0vg"; depends=[mclust]; }; uplift = derive2 { name="uplift"; version="0.3.5"; sha256="11xikfmg6dg8mhwqq6wq9j9aw4ljh84vywpm9v0fk8r5a1wyy2f6"; depends=[coin MASS penalized RItools tables]; }; upmfit = derive2 { name="upmfit"; version="0.1.0"; sha256="0f0rk606v17abgw3mwlwihl6fsxprp44h2xbhv1675i18i36vbgx"; depends=[mcmcplots R2jags]; }; @@ -10187,29 +10648,29 @@ in with self; { urlshorteneR = derive2 { name="urlshorteneR"; version="0.9.2"; sha256="1y5n1rn2c7yj5ncxfnsrj9lvaam2j3vvx8ld1vqyjay1r8flzifd"; depends=[httr jsonlite stringr]; }; urltools = derive2 { name="urltools"; version="1.6.0"; sha256="1vyv88x5l0hr4jhn7sics11g8j6817gn4yjpk58b40ynija42kkb"; depends=[Rcpp triebeard]; }; uroot = derive2 { name="uroot"; version="2.0-9"; sha256="0nxc8d4v9v5z3wbnj325iq2yrh0mipqgg2rn8pp2jyyq9vb1cxlv"; depends=[]; }; - usdm = derive2 { name="usdm"; version="1.1-15"; sha256="1638fv8if7pcnm6y44w3vbmivgcg4a577zd2jwhmp00vrwml2a9m"; depends=[raster sp]; }; - useful = derive2 { name="useful"; version="1.2.1"; sha256="08ihyvyjrdrfba7zasqkg4204nmql4xgwigzs80dks51bpqcq2mv"; depends=[dplyr ggplot2 magrittr plyr scales]; }; - userfriendlyscience = derive2 { name="userfriendlyscience"; version="0.6-0"; sha256="167gvg6f55h99iywm463m0vx0sn7c29iyxappi24g7391y9s4aji"; depends=[car data_tree DiagrammeR diptest fBasics GGally ggplot2 ggrepel GPArotation gridExtra gtable knitr lavaan MASS MBESS mosaic pander plyr psych pwr RColorBrewer rio scales SCRT SuppDists XML xtable]; }; + usdm = derive2 { name="usdm"; version="1.1-18"; sha256="1sis47fri2lrbx2ll5ps7bvycjqhncnia800izf11szgayim5lrv"; depends=[raster sp]; }; + usedist = derive2 { name="usedist"; version="0.1.0"; sha256="17mldp0888ig2xc8cp1nhldj5g3srwmbx3mfcnzz21n1fz31jkmg"; depends=[]; }; + useful = derive2 { name="useful"; version="1.2.3"; sha256="016fwnjrnq44m71jmiy8cpzncja77pii2ag2ir85jdk4fzgckn7l"; depends=[dplyr ggplot2 magrittr Matrix plyr purrr scales]; }; + userfriendlyscience = derive2 { name="userfriendlyscience"; version="0.6-1"; sha256="07dy0xackm90nwwcwi0c2dabwjy1znf476vp0aimyfwiq0d8wqs7"; depends=[car data_tree DiagrammeR diptest fBasics GGally ggplot2 ggrepel GPArotation gridExtra gtable knitr lavaan MASS MBESS mosaic pander plyr psych pwr RColorBrewer rio scales SCRT SuppDists XML xtable]; }; uskewFactors = derive2 { name="uskewFactors"; version="2.0"; sha256="0ndi5987ak8sa7krgiglsibfg0k7z9j8fg47hg1m8ar0sq4r1yj6"; depends=[MASS MCMCpack mvtnorm tmvtnorm]; }; usl = derive2 { name="usl"; version="1.7.0"; sha256="116h8yfij7fkzd8va5w8v977fj2is86vlwzfnv28g3h0avdwysls"; depends=[nlmrt]; }; - usmap = derive2 { name="usmap"; version="0.1.0"; sha256="1v255hl31rhzzggilnxsy30hwwbhsmsl6wyj3qnhxkygbnax7ncd"; depends=[]; }; + usmap = derive2 { name="usmap"; version="0.2.0"; sha256="1h7jv5bpgxiwdncibcsp2p4sfczx02qkfydla669r1rb4lh30h01"; depends=[]; }; ustyc = derive2 { name="ustyc"; version="1.0.0"; sha256="1267bng2dz3229cbbq47w22i2yq2ydpw26ngqa1nbi3ma6hwqsv4"; depends=[plyr XML]; }; utf8latex = derive2 { name="utf8latex"; version="1.0.4"; sha256="12isrl056h7y7nr7wk52dnvf3frcp66qqy7si869ark2aj81f959"; depends=[]; }; - utility = derive2 { name="utility"; version="1.4"; sha256="088dgi0ybpcrk6g11fs500ymzwshbypikgjy6hxnx79byiwhrscp"; depends=[]; }; + utility = derive2 { name="utility"; version="1.4.1"; sha256="1q94ax5vp0js4rskklkq91mvz07m4ryn5z1333cxkjmgilv9975j"; depends=[]; }; utiml = derive2 { name="utiml"; version="0.1.2"; sha256="0x30pgsq4j8vm6d95j7g1zc5hmbibjm9q1gphrf2bday2czmzakk"; depends=[mldr]; }; uuid = derive2 { name="uuid"; version="0.1-2"; sha256="1gmisd630fc8ybg845hbg13wmm3pk3npaamrh5wqbc1nqd6p0wfx"; depends=[]; }; uwIntroStats = derive2 { name="uwIntroStats"; version="0.0.3"; sha256="1m8n6bans7kkwriqky92vvv2sbdacyq2pvbv2m5p37q7qk5215c2"; depends=[Exact geepack plyr sandwich survival]; }; - vacem = derive2 { name="vacem"; version="0.1-1"; sha256="0lh32hj4g1hsa45v6pmfyj1hw0klk8gr1k451lvs4hzpkkcwkqbn"; depends=[foreach]; }; vaersNDvax = derive2 { name="vaersNDvax"; version="1.0.4"; sha256="0hvw7vbxs87c9xkdv3617fkjwz2dbawscbd7dgaixhdhcr3k823a"; depends=[]; }; vaersvax = derive2 { name="vaersvax"; version="1.0.4"; sha256="15znkwbhr624qgwlcrdhaxpdfl85ym845mr2sy8b016d3ngz7n94"; depends=[]; }; valaddin = derive2 { name="valaddin"; version="0.1.0"; sha256="19j3vwg8nrsnqhdvn6865k7pf79cchlf1vkdrlz7w26lnfyzzv7p"; depends=[dplyr lazyeval purrr]; }; - validann = derive2 { name="validann"; version="1.2.0"; sha256="1g8svbxyy56kmzm8yxwk9jqwnwsmlvxm87ss7l88arjl5kqgvasq"; depends=[moments]; }; + validann = derive2 { name="validann"; version="1.2.1"; sha256="00c0hkjiv8n7mksx6sknb4xkkivxr1ml31k697csv4imwrk09dy5"; depends=[moments]; }; validate = derive2 { name="validate"; version="0.1.7"; sha256="1z29q7v5dwaa334dp8qg6h2gyiv9a3fggrxzvx4jqjjjmip303db"; depends=[settings yaml]; }; validateRS = derive2 { name="validateRS"; version="1.0.0"; sha256="1ivw9ddr6z2wrsqvhbn87p5pikhkxlz8p45pb5nq13dvs359vkww"; depends=[data_table reshape2 triangle truncnorm]; }; validatejsonr = derive2 { name="validatejsonr"; version="1.0.4"; sha256="1n8jf7j3hvz47z1x3gqz5yj5wxfjzz0zgzkgckdvy1nbsqf7w3cr"; depends=[Rcpp]; }; valorate = derive2 { name="valorate"; version="1.0-1"; sha256="06vczszpkipsxfs7h6ld33vvxb5ci62rwg3cglwy3lcfifhbnsfi"; depends=[survival]; }; valottery = derive2 { name="valottery"; version="0.0.1"; sha256="0rlv8agm9ng4jcb9ixqifh7kjczvkx7047brq8yf9kg7rb8mzgpz"; depends=[]; }; - valr = derive2 { name="valr"; version="0.1.2"; sha256="0n5a70j7hqbvlfv4886cvcdp4a83i86hw0kk5dgxisl9xrsmsrg9"; depends=[BH broom dplyr ggplot2 lazyeval Rcpp readr stringr tibble tidyr]; }; + valr = derive2 { name="valr"; version="0.3.0"; sha256="1gzai8kg5gh0l2aazrr13c8z0l4db4r4lqsr7qv7sv3rx3fcplws"; depends=[BH broom dplyr ggplot2 Rcpp readr rlang stringr tibble]; }; valuer = derive2 { name="valuer"; version="1.1.1"; sha256="1pvzhx5irxww6vb8j4nsanlzgwaa4z96vw4l97h6l27h1403gdkb"; depends=[ggplot2 orthopolynom R6 Rcpp RcppEigen timeDate yuima]; }; varComp = derive2 { name="varComp"; version="0.1-360"; sha256="18xazjx102j6v1jgswxjdqjb0hq6hd646yhwb7bcplqyls9hzha0"; depends=[CompQuadForm MASS Matrix mvtnorm nlme quadprog RLRsim SPA3G]; }; varSel = derive2 { name="varSel"; version="0.1"; sha256="0ddj3swfxzchs75kfi6h25h3c33hpapnd5kcwcijnqhlh902b1r0"; depends=[]; }; @@ -10217,8 +10678,8 @@ in with self; { varband = derive2 { name="varband"; version="0.9.0"; sha256="16z66rx7xq5zan8pnw100c9r5syw1ml4hgzi9mch52aia23v21p9"; depends=[Rcpp RcppArmadillo]; }; varbvs = derive2 { name="varbvs"; version="2.0-8"; sha256="1bjw90lz1499ykx1q6yj7qd9bks1794s4yf4lz4c7sm0vbdx31x6"; depends=[lattice latticeExtra Rcpp]; }; vardiag = derive2 { name="vardiag"; version="0.2-1"; sha256="07i0wv84sw035bpjil3cfw69fdgbcf2j8wq4k22narkrz83iyi2z"; depends=[]; }; - vardpoor = derive2 { name="vardpoor"; version="0.9.0"; sha256="139msbslzav7grjwvci97x0rmlfqgb83dj2jm9pzf3anrwg230d6"; depends=[data_table foreach gdata laeken MASS plyr stringr surveyplanning]; }; - varhandle = derive2 { name="varhandle"; version="2.0.1"; sha256="06n13dyq41dr0gsq2bzkqqraqqkab93n7gimln4ckkdnrv0a1crx"; depends=[]; }; + vardpoor = derive2 { name="vardpoor"; version="0.9.4"; sha256="1k76jiaiyj577pz33v2piqzk6l7w1cn0js20i3rp1j73kgl2hjgl"; depends=[data_table foreach gdata laeken MASS plyr stringr surveyplanning]; }; + varhandle = derive2 { name="varhandle"; version="2.0.2"; sha256="1lbhwkkp9dyfhby6s4q3b6wy13wfqdjw3q21kq6k08rz7lsi0wny"; depends=[]; }; variables = derive2 { name="variables"; version="0.0-30"; sha256="182c8c7cwkmrpk01bki94y6f3wgf2zdjvvcfa4paa6bfq8w9ckh3"; depends=[]; }; varian = derive2 { name="varian"; version="0.2.2"; sha256="0jyw46qx2w19h02mrwv3w3n8qc1n4b3ckm38qly1y4a4w9ib6c2i"; depends=[Formula ggplot2 gridExtra MASS rstan]; }; vars = derive2 { name="vars"; version="1.5-2"; sha256="1q45z5b07ww4nafrvjl48z0w1zpck3cd8fssgwgh4pw84id3dyjh"; depends=[lmtest MASS sandwich strucchange urca]; }; @@ -10226,30 +10687,32 @@ in with self; { vbsr = derive2 { name="vbsr"; version="0.0.5"; sha256="1avskbxxyinjjdga4rnghcfvd4sypv4m39ysfaij5avvmi89bx3b"; depends=[]; }; vcd = derive2 { name="vcd"; version="1.4-3"; sha256="05azric2w8mrsdk7y0484cjygcgcmbp96q2v500wvn91fj98kkhp"; depends=[colorspace lmtest MASS]; }; vcdExtra = derive2 { name="vcdExtra"; version="0.7-0"; sha256="0ggkv0khn9h6b787dnmkk38fkxgp84k4nn1c3gm12i7n47r58ygr"; depends=[ca gnm MASS vcd]; }; - vcfR = derive2 { name="vcfR"; version="1.4.0"; sha256="18mgkk8msysb1xahcyp9slj7lvr3xaiwchr8y6sxrvmn1a940wvf"; depends=[ape dplyr magrittr memuse pinfsc50 Rcpp stringr tidyr vegan viridisLite]; }; + vcfR = derive2 { name="vcfR"; version="1.5.0"; sha256="08hsfk69j2xafmf98izhnimxcda12fsqdvy94xhwy811sx9d7mvw"; depends=[ape dplyr magrittr memuse pinfsc50 Rcpp stringr tidyr vegan viridisLite]; }; vcrpart = derive2 { name="vcrpart"; version="0.4-2"; sha256="16ai6x9x068s91013k980svarpkr310a4mihmcl00mx7bf5lsww3"; depends=[nlme numDeriv partykit rpart sandwich strucchange ucminf zoo]; }; vdg = derive2 { name="vdg"; version="1.2.0"; sha256="1hi5d14nh9q784sbdk018awrawh9f1aix0wl26x7n0xb4707rcmy"; depends=[ggplot2 gridExtra proxy quantreg]; }; vdiffr = derive2 { name="vdiffr"; version="0.1.1"; sha256="1aqmawwhz67j7rzrd6cabxvma532mndk3iy3wq2xdm9liwpn9yq4"; depends=[devtools fontquiver gdtools htmlwidgets purrr R6 Rcpp shiny svglite testthat xml2]; }; - vdmR = derive2 { name="vdmR"; version="0.2.3"; sha256="1bvll48lc609zdq0y1d2s95ihzj9a14wkg67i4h87d4akd280k6z"; depends=[broom dplyr GGally ggplot2 gridSVG maptools plyr rjson Rook sp]; }; + vdmR = derive2 { name="vdmR"; version="0.2.4"; sha256="05y2zaj37ydqrb3lw16mr8brwsdcdyl5bq1kb84shfmmi0qarsqa"; depends=[broom dplyr GGally ggplot2 gridSVG maptools plyr rgdal rgeos rjson Rook sp]; }; vec2dtransf = derive2 { name="vec2dtransf"; version="1.1"; sha256="029xynay9f9rn0syphh2rhd3szv50ib4r0h0xfhhvbbb37h5dc9s"; depends=[sp]; }; vecsets = derive2 { name="vecsets"; version="1.1"; sha256="0k27g3frc9y9z2qlm19kfpls6wl0422dilhdlk6096f1fp3mc6ij"; depends=[]; }; vegalite = derive2 { name="vegalite"; version="0.6.1"; sha256="0dlzhvrg3nj6knyycdgg3d1vzq3dn9vxb34fjin9hzilszqmarbk"; depends=[base64 clipr digest htmltools htmlwidgets jsonlite magrittr webshot]; }; vegan = derive2 { name="vegan"; version="2.4-3"; sha256="15zcxfix2d854897k1lr0sfmj2n00339nlsppcr3zrb238lb2mi5"; depends=[cluster lattice MASS mgcv permute]; }; - vegan3d = derive2 { name="vegan3d"; version="1.0-1"; sha256="19xwbmnmhdvm8vsfjv17bhbjrlsr2wwgjj0nflw8kgmlz0d2f70k"; depends=[cluster rgl scatterplot3d vegan]; }; + vegan3d = derive2 { name="vegan3d"; version="1.1-0"; sha256="1rhqk9sj71mrb53r2pgdy87bdq3drx5j4a9ilwvw23dlvjry889l"; depends=[cluster rgl scatterplot3d vegan]; }; vegclust = derive2 { name="vegclust"; version="1.6.5"; sha256="0y1lh4d2i3nxgc30wp6f14v2p14bx399y4cr5r7gv2gi76c5bhj4"; depends=[sp vegan]; }; vegdata = derive2 { name="vegdata"; version="0.9"; sha256="0hk56nbzg1c1q6shz9b04d60w9gd71f4fhyy89l98mcr41g8hjbc"; depends=[foreign httr jsonlite XML]; }; vegetarian = derive2 { name="vegetarian"; version="1.2"; sha256="15ys1m8p3067dfsjwz6ds837n6rqd19my23yj8vw78xli3qmn445"; depends=[]; }; + vein = derive2 { name="vein"; version="0.2.1-8"; sha256="1pyn4zcsk77mnd8y865sbd2prvpmbarpzmx0hbk5vf062vqwx2i7"; depends=[raster rgeos sp units]; }; velociraptr = derive2 { name="velociraptr"; version="1.0"; sha256="1n7q08i37qbbh5cjq6jb4gmpzzip3wx2wx8xx5wpkln8n3nyiqki"; depends=[RCurl rgdal]; }; velox = derive2 { name="velox"; version="0.1.0"; sha256="0jiza6myx4fj26agzbqjllr34f5kpmgcidrrv1r8jasljsbqf0n1"; depends=[raster Rcpp rgdal rgeos sp]; }; vembedr = derive2 { name="vembedr"; version="0.1.2"; sha256="0pqjf55rgylszgmzdhzr7m0lcqw3dw6c49i45r39yiq3wprc55qa"; depends=[htmltools httr magrittr stringr]; }; venn = derive2 { name="venn"; version="1.2"; sha256="18il18i13p92dm167c6mwppzjldp2blq482l5206lp1gqvxyc7f0"; depends=[]; }; venneuler = derive2 { name="venneuler"; version="1.1-0"; sha256="10fviqv9vr7zkmqm6iy2l9bjxglf2ljb7sx423vi4s9vffcxjp17"; depends=[rJava]; }; - vennplot = derive2 { name="vennplot"; version="0.9.01"; sha256="1p55sjhgi7wry2avf38i222yb52iam7nwq5g0w615hiajz3y7s2z"; depends=[Rcpp rgl stringr]; }; + vennplot = derive2 { name="vennplot"; version="0.9.02"; sha256="1q2hkp0kjz0wp7cdr3wnzlq9qasj8098cf048lx2sbav2b0bkrvz"; depends=[Rcpp rgl stringr]; }; verification = derive2 { name="verification"; version="1.42"; sha256="0pdqvg7cm9gam49lhc2xy42w788hh2zd06apydc95q2gj95xnaiw"; depends=[boot CircStats dtw fields MASS]; }; versions = derive2 { name="versions"; version="0.3"; sha256="0zm49j785dgv7fyr1yl9q5f0dsk8hhpim5q5bpkgrkzv7pwjribd"; depends=[]; }; vertexenum = derive2 { name="vertexenum"; version="1.0.1"; sha256="060sfa22m35d1hqxqngxhy7bwjihf6b4sqa1kg5r0cqvdw9zg51d"; depends=[numbers]; }; vesselr = derive2 { name="vesselr"; version="0.2.1"; sha256="1wzprnpiv04gxhqgki36gp1a0xj9l3mchllphwkfsdja4axq3prk"; depends=[oro_nifti pbapply pbmcapply]; }; vetools = derive2 { name="vetools"; version="1.3-28"; sha256="1470xgqdq9n5kj86gdfds15k3vqidk3h99zi3g76hhyfl8gyl1c0"; depends=[lubridate maptools plyr scales sp stringr tis xts]; }; + vfcp = derive2 { name="vfcp"; version="1.1.0"; sha256="0y4gql3vps3m029k4nj6bvsni8fn5qibbnxcz8sz5dxcp13c1in0"; depends=[]; }; vhica = derive2 { name="vhica"; version="0.2.4"; sha256="0km49lrzn9rm3wxadwxc290dvx3bsblbmna7f9lnkq6g1z5jdqwg"; depends=[]; }; vietnamcode = derive2 { name="vietnamcode"; version="0.1.1"; sha256="0vc0c1fg30afar2dkch5h27b8jbglcd9ja6d5hcypnibqz4c68vz"; depends=[]; }; vines = derive2 { name="vines"; version="1.1.5"; sha256="057d2fdh03cq9kh4vz94arqscahmz14xbr2g59l0vn205lnyilf1"; depends=[ADGofTest copula cubature TSP]; }; @@ -10260,49 +10723,53 @@ in with self; { viridis = derive2 { name="viridis"; version="0.4.0"; sha256="03mha2935k1mw7mjjkq7mrx185hl0m3vq3967iiwbknpivbdxllk"; depends=[ggplot2 gridExtra viridisLite]; }; viridisLite = derive2 { name="viridisLite"; version="0.2.0"; sha256="1546h44ng4dxs130jkh6lkh990hmp90m1w45sq5p47n546gr0k9d"; depends=[]; }; virtualspecies = derive2 { name="virtualspecies"; version="1.4-1"; sha256="02n83j10z7m8bjlavm2c6v58z1flhxn36j0h00c5xm085brzww3y"; depends=[ade4 dismo raster rworldmap]; }; - virustotal = derive2 { name="virustotal"; version="0.2.0"; sha256="0c2ig1wki08cq41ma1bawxgyzlkqv2j6kjlsapdry12vm42rz1yc"; depends=[httr plyr]; }; - visNetwork = derive2 { name="visNetwork"; version="1.0.3"; sha256="0wq37srnra6vzzw3d3c5lfvdqpd5329s73zrr9cd2saa6ski23i1"; depends=[htmltools htmlwidgets jsonlite magrittr]; }; - visreg = derive2 { name="visreg"; version="2.3-0"; sha256="05vs3zs8dpdqgk004lc2dnhqjgbfjh1ak17y5c8gni6wkp27hl7y"; depends=[lattice]; }; - vistime = derive2 { name="vistime"; version="0.3.0"; sha256="07vri3n3wkcng793hcy414x0n2hhjwak98ra9sxh36p969m26h1q"; depends=[plotly RColorBrewer]; }; + virustotal = derive2 { name="virustotal"; version="0.2.1"; sha256="0lky75al8zcvmfgx7a2s3bij8ya4avdsnv046lk7564zfd8rbymw"; depends=[httr plyr]; }; + visNetwork = derive2 { name="visNetwork"; version="2.0.0"; sha256="0nb5436kz1md72fyaq1fkari2933frhalpg19lmx2mj8875k2ikp"; depends=[htmltools htmlwidgets jsonlite magrittr]; }; + visreg = derive2 { name="visreg"; version="2.4-1"; sha256="1lkp668ni5p7k0vzcr75p1bsc1pyg0j0sghagdjb11abinmfzsm1"; depends=[lattice]; }; + vistime = derive2 { name="vistime"; version="0.4.0"; sha256="0fahih28q7lyywnm4mri9macdx4c5b3c5djmg557f7dxlyhhjw0l"; depends=[plotly RColorBrewer]; }; visualFields = derive2 { name="visualFields"; version="0.4.3"; sha256="0ws3cz71hhhrf4xkdb644li04d31wf51xb2sq789bl2lf50q6a1a"; depends=[flip gridBase Hmisc matrixStats]; }; - visualize = derive2 { name="visualize"; version="4.2"; sha256="1jgk7j0f3p72wbqnmplrgpy7hlh7k2cmvx83gr2zfnbhygdi22mk"; depends=[]; }; + visualize = derive2 { name="visualize"; version="4.3.0"; sha256="1s49sx828f25d4n93mn28xdbc81zflk2sr3h8ffs2mkjr888qd8y"; depends=[]; }; vita = derive2 { name="vita"; version="1.0.0"; sha256="114p2lzcr8rn68f0z4kmjdnragqlmi18axda9ma4sbqh8mrmjs9v"; depends=[randomForest Rcpp]; }; vitality = derive2 { name="vitality"; version="1.2"; sha256="0vjbf39i7qm3857gyidg2j5hfimpydav1sx2d07n12b8q1cs8k4p"; depends=[]; }; vkR = derive2 { name="vkR"; version="0.1"; sha256="0rb66am3y009wli8ykl58i02kzm6cdqz5v5d4vvzlbngz8crdkyy"; depends=[httr jsonlite XML]; }; vmsbase = derive2 { name="vmsbase"; version="2.1.3"; sha256="1y4r1f6miwxx3q8pajyh202wvjz08w6291jvpv723qyxa6z1r69a"; depends=[AMORE cairoDevice chron cluster DBI ecodist fields foreign ggmap ggplot2 gmt gsubfn gWidgets gWidgetsRGtk2 intervals mapdata maps maptools marmap outliers PBSmapping plotrix R6 RSQLite sp sqldf VennDiagram]; }; vocaldia = derive2 { name="vocaldia"; version="0.8.1"; sha256="14rh8f936p8fadlinn0n9d3l7q60bp3a1mgqag9m4q310477lf36"; depends=[]; }; - vortexR = derive2 { name="vortexR"; version="1.0.3"; sha256="1lwl61jfsf2kwmi30zwy9anc755jarji1q7qzzj4nb5jmdc395dy"; depends=[betareg data_table GGally ggplot2 glmulti gtools irr plyr R_utils stringr vortexRdata]; }; + vortexR = derive2 { name="vortexR"; version="1.1.4"; sha256="1zjrywjh8nrzaqmrl2yym481j0y40126xz8lh52vc8pk041p3xdb"; depends=[betareg data_table GGally ggplot2 glmulti gtools irr plyr R_utils stringr vortexRdata]; }; vortexRdata = derive2 { name="vortexRdata"; version="1.0.3"; sha256="1pq910xaqk6d5amg8hj7xagb5wn2ahfrmqairf3vhwqx55lhjbg1"; depends=[]; }; vote = derive2 { name="vote"; version="1.0-0"; sha256="1fx5x5248s48n86gdclv8pjnllly89rw0l6d2is263qqndn9fsk9"; depends=[formattable knitr]; }; vottrans = derive2 { name="vottrans"; version="1.0"; sha256="1fp7jrw072ws39bqsg88bm2qndcv68aa2vdqwgnza58p1dfq3x9f"; depends=[quadprog]; }; vowels = derive2 { name="vowels"; version="1.2-1"; sha256="0177xysb5y8jzpxn9wdygq2f74gys67g29cd12zw77vlq3c3kkbr"; depends=[]; }; vows = derive2 { name="vows"; version="0.5"; sha256="06akjdbab9v7r47di7syvcm7gf4k81djizg8maszs5l1ksyhmv6b"; depends=[fda gamm4 mgcv oro_nifti RLRsim shape stringr]; }; - voxel = derive2 { name="voxel"; version="1.2.1"; sha256="00r8diza4frwhizsjg5hfmdkikrbcg598sp09m81vg92nmjni41g"; depends=[gamm4 ggplot2 lmerTest mgcv oro_nifti]; }; - vqtl = derive2 { name="vqtl"; version="1.0"; sha256="0zlli79rhcbbjkkf4kjjkscx7vk6kspma5qgywxdiyhkxiq8j2x5"; depends=[dglm dplyr evd gtools plyr qtl RColorBrewer scales stringr]; }; + voxel = derive2 { name="voxel"; version="1.3.2"; sha256="0sixcan3v5nczmrrxn56rw5dqjq8xx7z3cp18j23jq26mvq4nm34"; depends=[gamm4 ggplot2 lmerTest mgcv oro_nifti]; }; + vqtl = derive2 { name="vqtl"; version="1.2.0"; sha256="1l5b1bchl08z3bx5y6dbvbw4hnxzb6i5i6h7vv5kd8mbffkdspyb"; depends=[dglm doParallel dplyr evd foreach ggplot2 gtools iterators knitr lazyeval qtl stringr testthat tidyr]; }; vrcp = derive2 { name="vrcp"; version="0.1.1"; sha256="1wrch1dqy752gkj24h1dgi2x3kf1797xj4pf1s9mszf3x3ic905d"; depends=[ggplot2]; }; vrmlgen = derive2 { name="vrmlgen"; version="1.4.9"; sha256="0lifhhf41yml4k83wpkssl14jgn8jaw1lcknwbci1sd8s1c4478l"; depends=[]; }; vrtest = derive2 { name="vrtest"; version="0.97"; sha256="00hdgb0r18nwv3qay97b09kqqw9xqsbya06rrjyddqh9r6ggx1y0"; depends=[]; }; vscc = derive2 { name="vscc"; version="0.2"; sha256="1p14v8vd8kckd44g4dvzh51gdkd8jvsc4bkd2i4csx8vjiwrni5w"; depends=[mclust teigen]; }; - vtreat = derive2 { name="vtreat"; version="0.5.31"; sha256="08mpgcd8w2znxx86bzafh6abw7rnklkhaw9cgjch7s35ij42665i"; depends=[]; }; + vtreat = derive2 { name="vtreat"; version="0.5.32"; sha256="03hhag3syg9yp6xxf20wxrqbaa1pzjjzdc9bc030gfmmlsgwza3s"; depends=[]; }; vudc = derive2 { name="vudc"; version="1.1"; sha256="0zxz6n3ixa3xjzcinky8ymqjx9w8y8z65mz8d84dl00mxzkmkz4h"; depends=[]; }; vwr = derive2 { name="vwr"; version="0.3.0"; sha256="1h790vjcdfngs1siwldvqz8jrxpkajl3266lzadfnmchfan1x7xv"; depends=[lattice latticeExtra stringdist]; }; wBoot = derive2 { name="wBoot"; version="1.0.3"; sha256="08qgkkv6jvqmxq5gvfp7jbrc3k8mxajfww7k8a3p8888aq411p7q"; depends=[boot simpleboot]; }; - wCorr = derive2 { name="wCorr"; version="1.8.0"; sha256="0s4nlkjqn85mhxynyk5k1l8yb80af728drq2v4yk0dn7v36a5mzx"; depends=[doBy minqa mnormt Rcpp RcppArmadillo]; }; + wCorr = derive2 { name="wCorr"; version="1.9.1"; sha256="1n4qd11bh0aq80fsw68vfky7nnvgkk6irsfjrknkf9bjvwvihlak"; depends=[minqa mnormt Rcpp RcppArmadillo]; }; wPerm = derive2 { name="wPerm"; version="1.0.1"; sha256="0f3v0kba87wkwyii0pzvs6a8ja897aifpvwkvryl2hzxxxaml7z4"; depends=[]; }; wSVM = derive2 { name="wSVM"; version="0.1-7"; sha256="0c7rblzgagwfb8mmddkc0nd0f9rv6kapw8znpwapv3fv0j2qzq7h"; depends=[MASS quadprog]; }; + wTO = derive2 { name="wTO"; version="1.2.0"; sha256="0hn78jndq45grc459y5ylpqlcy0p2cij7jgyzk2m4xiz7mm84s9h"; depends=[data_table igraph magrittr plyr som visNetwork]; }; waffect = derive2 { name="waffect"; version="1.2"; sha256="0r5dvm0ggyxyv81hxdr1an658wkqkhqq2xaqzqpnh4sh4wbak35a"; depends=[Rcpp]; }; waffle = derive2 { name="waffle"; version="0.7.0"; sha256="1qjmai33p96cyavi9lgi6k30h6fj7db5sr569v9jf4kwx92c61df"; depends=[extrafont ggplot2 gridExtra gtable RColorBrewer]; }; wahc = derive2 { name="wahc"; version="1.0"; sha256="1324xhajgmxq6dxzpnkcvxdpm2m3g47drhyb2b3h227cn3aakxyg"; depends=[]; }; wakefield = derive2 { name="wakefield"; version="0.3.0"; sha256="1f74503ar4hw48j13npgzybvwc631xndldidqnyfk72wb11fzi4z"; depends=[chron dplyr ggplot2 stringi]; }; + walker = derive2 { name="walker"; version="0.1.0"; sha256="19bmilx6iyv5d9gcfllrm2v3p4k2sg3yj5s57367lyjla38rw5dz"; depends=[BH Rcpp RcppEigen rstan StanHeaders]; }; walkr = derive2 { name="walkr"; version="0.3.4"; sha256="01278hfa9mppwqmr54826gb65pswhqbh7ai8ij6m4ncc0fk6pvvd"; depends=[ggplot2 hitandrun limSolve MASS Rcpp RcppEigen shinystan]; }; walkscoreAPI = derive2 { name="walkscoreAPI"; version="1.2"; sha256="1c2gfkl5yl3mkviah8s8zjnqk6lnzma1yilxgfxckdh5wywi39fx"; depends=[]; }; - wallace = derive2 { name="wallace"; version="0.6.3"; sha256="1kv1svckdgb8rl51qdrn3cc367gklr89fy2lw92992vmsimafxhd"; depends=[devtools dismo dplyr DT ENMeval leaflet magrittr maptools raster RColorBrewer rgdal rgeos rmarkdown shiny shinyBS shinyjs shinythemes spocc spThin]; }; + wallace = derive2 { name="wallace"; version="0.6.4"; sha256="0ydhzklhpn9hqm6np9g0kjlry4z3w91ix89s587w0j8v5lxjivwd"; depends=[devtools dismo dplyr DT ENMeval leaflet magrittr maptools raster RColorBrewer rgdal rgeos rmarkdown shiny shinyBS shinyjs shinythemes spocc spThin]; }; + wally = derive2 { name="wally"; version="1.0.9"; sha256="1g6dywny8s8fpdnfvrlbzsp9d9dhxdxrm1j4dd3b9r6rpiajf964"; depends=[data_table prodlim riskRegression]; }; + walrus = derive2 { name="walrus"; version="1.0.0"; sha256="1y68nvr1fscvd24mkyapp1g7xrbbi1v22p971ipj63ygb7jh2k24"; depends=[ggplot2 jmvcore R6 WRS2]; }; wand = derive2 { name="wand"; version="0.2.0"; sha256="1p2r96nyr36jv418xi4j2ldarymb4xmpis6d2iz7mq9755kb4fnh"; depends=[dplyr purrr rappdirs Rcpp stringi tibble tidyr]; }; - warbleR = derive2 { name="warbleR"; version="1.1.6"; sha256="0wld9jshr4qj0m3l75yjy5gz725jnxwzvwwamqmdjkby6wyz823i"; depends=[doParallel dtw fftw foreach jpeg maps monitoR pbapply pbmcapply RCurl rjson seewave tuneR]; }; + warbleR = derive2 { name="warbleR"; version="1.1.8"; sha256="0igh1vk4j39bbrzbgfjllzp5kzj2znqdcbl433m1qd476ajfa54k"; depends=[bitops doParallel dtw fftw foreach iterators jpeg maps monitoR pbapply proxy RCurl rjson seewave signal tuneR]; }; warpMix = derive2 { name="warpMix"; version="0.1.0"; sha256="13zbl4aifhg7j5b3vpwgzgs09hr7yblz0rckmj5qh40s78j8cpfn"; depends=[fda fields lme4 MASS nlme reshape2]; }; wasim = derive2 { name="wasim"; version="1.1.2"; sha256="1zydzw7cihhdwv0474fnc4lgaq5fwrv8jinz79vkbidbgcy7i2fd"; depends=[fast MASS qualV tiger]; }; water = derive2 { name="water"; version="0.6"; sha256="0f569lcr68dk383cacgagyhkbyfh9aqgnn9w4c2y5x9bj3awjvq9"; depends=[raster rgdal sp]; }; - waterData = derive2 { name="waterData"; version="1.0.6"; sha256="1k1paifhngy97ik399dndm7m5hm6r935yipiapgpchzsvl5nwwva"; depends=[dataRetrieval lattice latticeExtra lubridate xml2]; }; + waterData = derive2 { name="waterData"; version="1.0.8"; sha256="0884agh876wf3qlbc75fbaa47x2iwvncz7r2l25qw34n8lxq1yr6"; depends=[dataRetrieval lattice latticeExtra lubridate xml2]; }; waterfall = derive2 { name="waterfall"; version="1.0.2"; sha256="0jy6l9mx0dixwnkychdl18sf4xh73pm0qd1jyxp9rlnv1vcragjp"; depends=[lattice]; }; waterfalls = derive2 { name="waterfalls"; version="0.1.1"; sha256="0x3f6phlrismivbaf37vqnz30wvz8xzj33qwl2wyg6lijxbmg551"; depends=[ggplot2]; }; waveband = derive2 { name="waveband"; version="4.6"; sha256="1y2qi2zb8l2ap6f8ihnpq2yavic464bl5mp5yv1dscbk0nmfn966"; depends=[wavethresh]; }; @@ -10317,15 +10784,17 @@ in with self; { wbsts = derive2 { name="wbsts"; version="0.3"; sha256="1h749j20q30lrn3b4ffcap3mvxjpih1gchvv8yag0gbzcs0wc1fm"; depends=[mvtnorm wmtsa]; }; wccsom = derive2 { name="wccsom"; version="1.2.11"; sha256="0f2p7sllp3916lcf02k179pnl17fdmk8s7bjnkwb93kh513rs1yj"; depends=[class kohonen MASS]; }; wdman = derive2 { name="wdman"; version="0.2.2"; sha256="1a6zav82w0krk0ncm5b79ahy2hc0xakg9i1m2143ih5p6zvcm5m0"; depends=[assertthat binman semver subprocess yaml]; }; - weatherData = derive2 { name="weatherData"; version="0.4.1"; sha256="19ynb9w52ay15awaf4bqm9lj2w6pk70lyaipn46jrspwxqsvfhlc"; depends=[plyr]; }; + weatherData = derive2 { name="weatherData"; version="0.5.0"; sha256="1l207m506wj0jk3skpwhwq66ci4v2jjaz7sbw30ywgpicw9mizs9"; depends=[curl plyr]; }; weathermetrics = derive2 { name="weathermetrics"; version="1.2.2"; sha256="1hjhgsy3v8328hv4czxxz7kp68sxc10sy10f3dv5j8f6pka6qlsp"; depends=[]; }; weatherr = derive2 { name="weatherr"; version="0.1.2"; sha256="11sb5bmqccqkvlabsw4siy9n6ivsrvxavywvaffgrs3blmnygql9"; depends=[ggmap lubridate RJSONIO XML]; }; webchem = derive2 { name="webchem"; version="0.2"; sha256="0mxikd2ls0jcal9z0byan1l78965qq8jdyym9ydb4c56g1p2iyl8"; depends=[httr jsonlite RCurl rvest stringr xml2]; }; + webglobe = derive2 { name="webglobe"; version="1.0.2"; sha256="1277d6fkgrgixlhikfwf0r6z8g5b7mah905xi219qsfycxmifgn9"; depends=[geojsonio httpuv jsonlite]; }; + webmockr = derive2 { name="webmockr"; version="0.1.0"; sha256="0jfjn0y62rrwx88vhx4xfgsf36f147b3yzwvpyshxwvxn9khza5i"; depends=[curl jsonlite lazyeval magrittr R6 urltools]; }; webp = derive2 { name="webp"; version="0.4"; sha256="0jsyjynrsrqpbg93rn48xrjclkvwmz2c2lhcfli5djny122ymh6r"; depends=[]; }; webreadr = derive2 { name="webreadr"; version="0.4.0"; sha256="0l3l5g4zj5faxqi1kqwx9lq91gbj40z2q3csrsmpal08qnwkxs90"; depends=[Rcpp readr]; }; - webshot = derive2 { name="webshot"; version="0.4.0"; sha256="0qh1669lkxvr98l8sj03pfn41k4kfsy9787df4rxgigfsx3vnj1h"; depends=[jsonlite magrittr]; }; + webshot = derive2 { name="webshot"; version="0.4.1"; sha256="1ydq3i4rs3dsv6rzzf020ffb7gyjszavw0aqmw34kqcj9yaj4ffs"; depends=[jsonlite magrittr]; }; webuse = derive2 { name="webuse"; version="0.1.2"; sha256="0ks3pb9ir778j9x4l0s4ly2xa1jc9syddqm65wkck52q3lrarg3l"; depends=[haven]; }; - webutils = derive2 { name="webutils"; version="0.4"; sha256="1y8xs2kyf8g4mqpxp0kwb47cidmaqs4n3ysiy7p4s35imhzi16dc"; depends=[jsonlite]; }; + webutils = derive2 { name="webutils"; version="0.6"; sha256="1basl7q2m8y9nw5ksi1kdz6an9pybvsmdd4snrm7a37041xymnps"; depends=[curl jsonlite]; }; webvis = derive2 { name="webvis"; version="0.0.2"; sha256="1cdn9jrpg2sbx4dsj0xf7m0daqr7fqiw3xy1lg0i0qn9cpvi348f"; depends=[]; }; wec = derive2 { name="wec"; version="0.4"; sha256="05mqz7784x0vl6yj79a0ii9l7jzn2s321dk0mrzq766an1s7w7hc"; depends=[dplyr]; }; weco = derive2 { name="weco"; version="1.0"; sha256="1akn85igd6k5cfj9hzn3g8a77qzhlzwyc2p4l6y8wigyncg7wyqi"; depends=[]; }; @@ -10334,12 +10803,14 @@ in with self; { weightr = derive2 { name="weightr"; version="1.1.2"; sha256="13wy7ygx7khbmymg2r0rr6mrl4lbapf5bnnq1rq8izl38sjk7csx"; depends=[]; }; weights = derive2 { name="weights"; version="0.85"; sha256="0nsvgx2yn2ynrkqvvy3fxjsi6aw8w3zknm80fyjrih2zmxc7v61f"; depends=[gdata Hmisc mice]; }; weirs = derive2 { name="weirs"; version="0.25"; sha256="17a0ppi7ghikrwn39zvhg2cvhmnr3w0qi7r9lj22x65ii9nzadd7"; depends=[]; }; + welchADF = derive2 { name="welchADF"; version="0.1"; sha256="0266iswgy2fbsc001jz5mvb0mx8rg1ys1dsy5956gxqg9hiibp1n"; depends=[]; }; wellknown = derive2 { name="wellknown"; version="0.1.0"; sha256="0cin4xi1780hglmcfyjiynvh1lm90yryl1m6z1snpprfzsxx3mmg"; depends=[jsonlite magrittr]; }; wesanderson = derive2 { name="wesanderson"; version="0.3.2"; sha256="17acf9ydi2sw7q887ni9ly12mdmip66ix6gdkh68rncj8sx3csrd"; depends=[]; }; wfe = derive2 { name="wfe"; version="1.3"; sha256="16b39i60x10kw6yz44ff19h638s9lsgnz8azc76zl9b8s64jliya"; depends=[arm MASS Matrix]; }; wfg = derive2 { name="wfg"; version="0.1"; sha256="1r6wb8v42mpapjfhmkmghm9fq21c3s4zmdxy8nlh31nsja71c37d"; depends=[igraph]; }; wfindr = derive2 { name="wfindr"; version="0.1.0"; sha256="0m5xj50hqdjj4lpbgx1kp3my4njr0nz09hd63rf4qf1ls8r7zil9"; depends=[dplyr magrittr]; }; wgaim = derive2 { name="wgaim"; version="1.4-11"; sha256="1jjyp100dcjjczp61xlvhmy48ynniqcys535vzbgswhr7fvijymg"; depends=[lattice qtl]; }; + wgeesel = derive2 { name="wgeesel"; version="1.3"; sha256="1qy55819rm20dpfyi9gcmv16w3aakj8k8w7zhfcwbbyacvrz1zrp"; depends=[bindata geepack MASS PoisNor]; }; wgsea = derive2 { name="wgsea"; version="1.8"; sha256="1114wik011sm2n12bwm2bhqvdxagbhbscif45k4pgxdkahy2abpi"; depends=[snpStats]; }; whisker = derive2 { name="whisker"; version="0.3-2"; sha256="0z4cn115gxcl086d6bnqr8afi67b6a7xqg6ivmk3l4ng1x8kcj28"; depends=[]; }; whoami = derive2 { name="whoami"; version="1.1.1"; sha256="1njyjzp9jl5k0vys0ymnvx9vbfckscg4r8hgl1nq7a2q9b9cg06f"; depends=[httr jsonlite]; }; @@ -10347,25 +10818,29 @@ in with self; { wicket = derive2 { name="wicket"; version="0.3.0"; sha256="1n6ji4zx48japlfbqyz4hbk40vr58l8d3wjdagjvc2jqx36cn19k"; depends=[BH Rcpp]; }; widals = derive2 { name="widals"; version="0.5.4"; sha256="1bl59s1r4gkvq4nkf94fk7m0zvhbrszkgmig66lfxhyvk9r84fvb"; depends=[snowfall]; }; widenet = derive2 { name="widenet"; version="0.1-2"; sha256="1nimm8szbg82vg00f5c7b3f3sk0gplssbl4ggasjnh7dl621vfny"; depends=[glmnet relaxnet]; }; - widgetframe = derive2 { name="widgetframe"; version="0.1.0"; sha256="0v7mi7m97200dyq8n173gsyw16g75bdas12s38lvg0a09gcyn8z0"; depends=[htmltools htmlwidgets magrittr purrr]; }; + widgetframe = derive2 { name="widgetframe"; version="0.2.0"; sha256="17kb0x5kgyq01b1y8d7gq1wp5rgi9f14ih11i48lsackks6cywq2"; depends=[htmltools htmlwidgets magrittr purrr]; }; wikibooks = derive2 { name="wikibooks"; version="0.2"; sha256="178lhri1b8if2j7y7l9kqgyvmkn4z0bxp5l4dmm97x3pav98c7ks"; depends=[]; }; wikilake = derive2 { name="wikilake"; version="0.2"; sha256="0z03bn4d1pllhxbyaf4knn2p8in3a3b0m32g5lxhi2lhh4sasc5h"; depends=[maps rvest selectr sp stringi stringr WikipediR xml2]; }; wikipediatrend = derive2 { name="wikipediatrend"; version="1.1.10"; sha256="10av87jlfn2lfx37bnhlpdnhg657md9jx3c3frc9a4mm4lhl7rbv"; depends=[hellno httr jsonlite rvest stringr xml2]; }; - wikitaxa = derive2 { name="wikitaxa"; version="0.1.0"; sha256="1m97bq80k8iy8vhrfjcgn5a50ihk72n936k282j3gn3pb6y0kn26"; depends=[crul curl data_table jsonlite tibble WikidataR xml2]; }; + wikitaxa = derive2 { name="wikitaxa"; version="0.1.4"; sha256="0d6ycn8j40lcc4plv7z34h14icaljywbl7b91gd803wxln4nhr6f"; depends=[crul curl data_table jsonlite tibble WikidataR xml2]; }; + wildcard = derive2 { name="wildcard"; version="1.0.1"; sha256="1qdzbpaymlifp2fhrv84z1gp3sqjlav1wsmcn2990z3d7mr3s5mc"; depends=[magrittr stringi]; }; wildlifeDI = derive2 { name="wildlifeDI"; version="0.2"; sha256="0z8zyrl3d73x2j32l6xqz5nwhygzy7c9sjfp6bql5acyfvn7ngjv"; depends=[adehabitatLT rgeos sp]; }; wildpoker = derive2 { name="wildpoker"; version="1.1"; sha256="1302ain55spz34irmq49sp9b1pvrn2nxmzmqs8m9wdk6g82h3s27"; depends=[]; }; windex = derive2 { name="windex"; version="1.0"; sha256="0ci10x6mm5i03j05fyadxa0ic0ngpyp5nsn05p9m7v1is5jhxci0"; depends=[ape geiger scatterplot3d]; }; + windfarmGA = derive2 { name="windfarmGA"; version="1.0"; sha256="1zfgfi762wrnmpws9g7kcp4smc6a45kgm04il25igbvza2l37p1m"; depends=[calibrate data_table dplyr geoR ggplot2 googleVis gstat gtools maptools raster RColorBrewer rgdal rgeos rgl RgoogleMaps sp]; }; wingui = derive2 { name="wingui"; version="0.2"; sha256="0yf6k33qpcjzyb7ckwsxpdw3pcsja2wsf08vaca7qw27yxrbmaa3"; depends=[Rcpp]; }; wiod = derive2 { name="wiod"; version="0.3.0"; sha256="1f151xmc6bm5d28w5123nm0hv7j1v8hay4jk5fk8pwn6yljl1pah"; depends=[decompr gvc]; }; - wiqid = derive2 { name="wiqid"; version="0.1.0"; sha256="0vnwalknb2w6fhgbm3iqvniajy31if0rilzd16sms0qr3i1wk7xj"; depends=[coda HDInterval MASS truncnorm]; }; + wiqid = derive2 { name="wiqid"; version="0.1.1"; sha256="0nibk10hmx4w17cn7x6m6nhybhv2s6vrrgqzn8s4jpffsbdc4cpv"; depends=[coda HDInterval MASS truncnorm]; }; withr = derive2 { name="withr"; version="1.0.2"; sha256="042z8nmqqilgrvhmbqrjc05qys3gzwq1rqy2wxp2bi5d41859493"; depends=[]; }; wkb = derive2 { name="wkb"; version="0.3-0"; sha256="0s7libkg27jdmcw5qmk5j0cmz3nqq7ny4q8gy4vhbgsgj4gbbdn9"; depends=[sp]; }; + wktmo = derive2 { name="wktmo"; version="1.0.3"; sha256="037hjc7kn171iji8yv2xl6wngxp2dsjw1zrsgpnqnmr9m530a5qf"; depends=[]; }; wle = derive2 { name="wle"; version="0.9-91"; sha256="18gqwrrw618f1xx93n0lk95gpi3lxvfkr6fmlb82v2wiibb7k7ak"; depends=[circular]; }; wmlf = derive2 { name="wmlf"; version="0.1.2"; sha256="0zxw84l5v12r15hpyd1kbajjz3cbkn5g884kmj72y7yi0yi1b6d6"; depends=[waveslim]; }; wmtsa = derive2 { name="wmtsa"; version="2.0-2"; sha256="14znrylyazsj3d8nxgh3nvr94ifckan6gwy12b43zsyskzqp9zbg"; depends=[ifultools MASS splus2R]; }; wnominate = derive2 { name="wnominate"; version="1.2"; sha256="0kkdlhliihv45hc0fd25kairxd9r71hcx04ri9l0iy8cyhjs2n12"; depends=[pscl]; }; woe = derive2 { name="woe"; version="0.2"; sha256="15mvcmwnrqxpzn054lq85vyzq5rgxkiwbd40gnn4s3ny1xdrwgsm"; depends=[]; }; - woeBinning = derive2 { name="woeBinning"; version="0.1.3"; sha256="1hkcnv5kzjw9fjmyg5nkaww7q5snkncipsyxmrb6m9ah3pgsl1a2"; depends=[]; }; + woeBinning = derive2 { name="woeBinning"; version="0.1.4"; sha256="0fjflnhyya93xns2mcklq8vw5zwwivw1ahz4smdmlcpxf35f9cz9"; depends=[]; }; + womblR = derive2 { name="womblR"; version="1.0.0"; sha256="04qifd1s6xyhl559a8pw42ixj6i5x22hg26chalw2yxzclmgqdcm"; depends=[mvtnorm Rcpp RcppArmadillo]; }; word_alignment = derive2 { name="word.alignment"; version="1.0.6"; sha256="02hhl8357ykbf04gr8gjb9vkhimmb3fbi5jxrwy8dr0qysnz1kzg"; depends=[data_table openxlsx quanteda]; }; wordbankr = derive2 { name="wordbankr"; version="0.2.0"; sha256="041d5v3gm7bihx85k7kxwlqgg6vs24wzs2h59zf3l3cs39mhrhs5"; depends=[assertthat dplyr magrittr RMySQL stringr tidyr]; }; wordcloud = derive2 { name="wordcloud"; version="2.5"; sha256="1ajqdkm8h1wid3d41zd8v7xzf2swid998w31zrghd45a5lcp7qcm"; depends=[RColorBrewer Rcpp slam]; }; @@ -10374,37 +10849,40 @@ in with self; { wordnet = derive2 { name="wordnet"; version="0.1-11"; sha256="0c04wda7im5jzvsb3bhql2krlpvbsv7cc5gdw3dshfqz33knyy9i"; depends=[rJava]; }; wordspace = derive2 { name="wordspace"; version="0.2-0"; sha256="0rrnbimf68ax1qxsyn7g0kd76abijzxg5i11h93l0fnzi2g2a9xn"; depends=[cluster iotools MASS Matrix Rcpp sparsesvd]; }; worldmet = derive2 { name="worldmet"; version="0.7.5"; sha256="08mj3m0r9rnljlsk3x25cp4da3bdv9qc1jgy1wrd1zg5908j6dis"; depends=[dplyr leaflet openair plyr RCurl readr zoo]; }; + worms = derive2 { name="worms"; version="0.2.1"; sha256="0qxij56wvhlz9pgc1wp5nr3yi2r0h0r7xvlhhvsflch60gprpi1s"; depends=[httr plyr]; }; worrms = derive2 { name="worrms"; version="0.1.0"; sha256="0wxdn960gqqbilg2xs9jjks8z1j6rslb8qwj1s9678hw3h8ymfgx"; depends=[crul jsonlite tibble]; }; wpp2008 = derive2 { name="wpp2008"; version="1.0-1"; sha256="0gd3vjw1fpzhp3qlf1jpc24f76i0pxsjs5pb1v3k2si6df7q4msd"; depends=[]; }; wpp2010 = derive2 { name="wpp2010"; version="1.2-0"; sha256="1h87r1cn4lnx80dprvawsyzfkriscqjgr27gvv7n19wvsx8qd57k"; depends=[]; }; wpp2012 = derive2 { name="wpp2012"; version="2.2-1"; sha256="00283s4r36zzwn67fydrl7ldg6jhn14qkf47h0ifmsky95bd1n5k"; depends=[]; }; wpp2015 = derive2 { name="wpp2015"; version="1.1-0"; sha256="01vsdma2fgh0vd96ly4f704hl200v0w8ksz60gjxhm44ih3qszh3"; depends=[]; }; - wppExplorer = derive2 { name="wppExplorer"; version="2.0-2"; sha256="0mja5bgw6b0dsxi3dpm87y9qbv5b9cgp81yfjkywqc5wdjpirxk7"; depends=[DT ggplot2 googleVis Hmisc plyr reshape2 shiny shinyjs shinythemes wpp2015]; }; + wpp2017 = derive2 { name="wpp2017"; version="1.0-1"; sha256="0vl8sj2zxar4di0dfmls1m5m43xq6hzdrva6rzsazg2ir0wz15wn"; depends=[]; }; + wppExplorer = derive2 { name="wppExplorer"; version="2.1-0"; sha256="1qw3az6aaqcn62m57gccr2kaw1d3s0zj0gxjdjvnjvk4n1sjkkmv"; depends=[DT ggplot2 googleVis Hmisc plyr reshape2 shiny shinyjs shinythemes wpp2017]; }; wqs = derive2 { name="wqs"; version="0.0.1"; sha256="14qaa9g9v4nqrv897laflib3wwhflyfaf9wpllmbi5xfv9223rcg"; depends=[glm2 Rsolnp]; }; wrangle = derive2 { name="wrangle"; version="0.4"; sha256="0d1xdcvgcv8bn20s90sn1dmzhcdz39yr1m2bkcjbvavm132p96bl"; depends=[dplyr lazyeval magrittr tidyr]; }; - wrapr = derive2 { name="wrapr"; version="0.1.2"; sha256="1zlllcjrygzpr0k3ibmli98hhqr96sn89h72g2cwb5pbvgb7pzgk"; depends=[]; }; + wrapr = derive2 { name="wrapr"; version="0.1.3"; sha256="1crsq3dcd3xdd91h129mix6av6pvl26w8xxa181g98553rsmd01l"; depends=[]; }; wrassp = derive2 { name="wrassp"; version="0.1.4"; sha256="0w1hzxwk00lk1hkdxxz6vqa6xzw5sf60y54xzfr510yd02x3r1gn"; depends=[]; }; write_snns = derive2 { name="write.snns"; version="0.0-4.2"; sha256="0sxg7z8rnh4lssbivkrfxldv4ivy37wkndzzndpbvq2gbvbjnp4l"; depends=[]; }; wrspathrow = derive2 { name="wrspathrow"; version="0.1"; sha256="1xkh12aal85qhk8d0pdj2qbi6pp4jnr6zbxkhdw2zwav57ly3f4i"; depends=[raster rgdal rgeos sp wrspathrowData]; }; wrspathrowData = derive2 { name="wrspathrowData"; version="1.0"; sha256="0a1aggcll0fmkwfg4h7rs4j5h3v1bh95dkbriwrb0bx0cikg63x3"; depends=[]; }; wrswoR = derive2 { name="wrswoR"; version="1.0-1"; sha256="1czw3g2j6as024wwvxiizvvxjmsxmxhz86jbw2lh95nh61znb7l8"; depends=[logging Rcpp]; }; wrswoR_benchmark = derive2 { name="wrswoR.benchmark"; version="0.1-1"; sha256="1a2ymyf1yww43i79hc912jpyqvbx44qn5bfnjwf4hq3mp707731j"; depends=[curl lazyeval]; }; - wru = derive2 { name="wru"; version="0.1-3"; sha256="02l2dfz9v0ixr7x8rjrvdrcy4x3mxicchqr1jc298jc443dnsrsf"; depends=[devtools]; }; + wru = derive2 { name="wru"; version="0.1-5"; sha256="1qc3x6wxai2qwshafx56gx9bjx75ihw1xqzq4p25av8w6xp6b79a"; depends=[devtools]; }; wskm = derive2 { name="wskm"; version="1.4.28"; sha256="0d9hcriakg6fxzc8wjsahc4zkyjza31mb9dv2h4xcf8298xa96i4"; depends=[clv lattice latticeExtra]; }; wsrf = derive2 { name="wsrf"; version="1.7.13"; sha256="07dmimn58byr5dyszckazxjs2gjjk6g3si9wa5f10gbgzpc0713p"; depends=[Rcpp]; }; wtest = derive2 { name="wtest"; version="1.0"; sha256="0rn2wp4xqd1b95asc1ppscfm21p3r85za778f88kgqax2lx7kq96"; depends=[]; }; wux = derive2 { name="wux"; version="2.2-1"; sha256="0iw0kf0wfspnpc83v7gxhcakmp0z34cccnm0jn9c2za9ay9l2swv"; depends=[abind class corpcor fields gdata Hmisc ncdf4 reshape rgdal rgeos rworldmap sp stringr]; }; wvtool = derive2 { name="wvtool"; version="1.0"; sha256="0x9awj6g5lzqp2lhwgh9ib7jmfdzyhwazrjvw1vwacqqfhbz8qxv"; depends=[]; }; - x_ent = derive2 { name="x.ent"; version="1.1.6"; sha256="1b4skjai9rivkb86md4k8qmwqbqy8adq9c31d1jq8x04dsm3z0j7"; depends=[ggplot2 jsonlite opencpu rJava statmod stringr venneuler xtable]; }; - x12 = derive2 { name="x12"; version="1.6.0"; sha256="0bl50nva4ai8p24f9hr622m0fc5nmbjakn3rsvl79g050gjsd4i3"; depends=[stringr]; }; + x_ent = derive2 { name="x.ent"; version="1.1.7"; sha256="15qra77dqhj27g3qx92gram4mq4n9fdidygdpvxfmcx7ww3vc6yh"; depends=[ggplot2 jsonlite statmod stringr xtable]; }; + x12 = derive2 { name="x12"; version="1.8.0"; sha256="1pw1dp9prdik6ffh89p3dfq4iciwyfha7sxpyildi726dr8gmkhm"; depends=[stringr x13binary]; }; x12GUI = derive2 { name="x12GUI"; version="0.13.0"; sha256="1mga7g9gwb3nv2qs27lz4n9rp6j3svads28hql88sxaif6is3nk1"; depends=[cairoDevice Hmisc lattice RGtk2 stringr x12]; }; - x13binary = derive2 { name="x13binary"; version="0.1.2"; sha256="1cvbqbg9bck9dlsj929wysg8frkc70p0hwpwy1rj4qwyw8czi4bs"; depends=[]; }; - xLLiM = derive2 { name="xLLiM"; version="1.0"; sha256="005y3xgfac047lga3dbckkz4ba781vd7dab867515yj18q5rllp7"; depends=[abind corpcor MASS Matrix]; }; + x13binary = derive2 { name="x13binary"; version="1.1.39-1"; sha256="1v6slh5136av3l7bk99a57gj6i6khx2j55qv4pyz1zmrzzgaayyc"; depends=[]; }; + xLLiM = derive2 { name="xLLiM"; version="2.1"; sha256="1q6ryw9z5wi0amv5f4drz14p36zy8gc2a0s59q10jixhhyas7ycl"; depends=[abind capushe corpcor igraph MASS Matrix]; }; xVA = derive2 { name="xVA"; version="0.8.1"; sha256="0wr4i37sya5gg6v63ka16g9077gxbhvjqyqfaahhban8skzl2adf"; depends=[SACCR Trading]; }; - xaringan = derive2 { name="xaringan"; version="0.2"; sha256="0nlys4gakgj73826yvzk5yy38kj7h33a3970vwls8n06fc68xksn"; depends=[htmltools knitr rmarkdown servr]; }; + xaringan = derive2 { name="xaringan"; version="0.3"; sha256="07b5gw5dn7qhvximi0f2zca78ld00hdl2n9lr7wyf1bpkxzp625b"; depends=[htmltools knitr rmarkdown servr]; }; xbreed = derive2 { name="xbreed"; version="1.0.1"; sha256="0grrfra9j0k3mqikmrif5qawh4260ayr40irskzpp9ywsixim63h"; depends=[BGLR]; }; xergm = derive2 { name="xergm"; version="1.8.2"; sha256="0rg8b0r27nzjnf0zkwfbkw96439h0b40k1l5lqi5igyr0bm7w0cc"; depends=[btergm GERGM rem tnam xergm_common]; }; xergm_common = derive2 { name="xergm.common"; version="1.7.7"; sha256="0nfls8a1knmnjjrrw0q93qsfrrb9p3yqsm5dxp13z0780vrzxvcj"; depends=[ergm network]; }; + xesreadR = derive2 { name="xesreadR"; version="0.1.0"; sha256="1np1x92vj3s70y9kqfxicd58ip6a611ykl6by5b5lhh0nrhcb783"; depends=[bupaR data_table dplyr tidyr XML xml2]; }; xgboost = derive2 { name="xgboost"; version="0.6-4"; sha256="1vfiz44prcjx2y442zc4x1b50k57qwd7sqbz6lq0kiqhp78ivicz"; depends=[data_table magrittr Matrix stringi]; }; xgobi = derive2 { name="xgobi"; version="1.2-15"; sha256="03ym5mm16rb1bdwrymr393r3xgprp0ign45ryym3g0x2zi8dy557"; depends=[]; }; xhmmScripts = derive2 { name="xhmmScripts"; version="1.1"; sha256="1qryyb34jx9c64l8bnwp40b08y81agdj5w0icj8dk052x50ip1hl"; depends=[gplots plotrix]; }; @@ -10418,13 +10896,14 @@ in with self; { xml2 = derive2 { name="xml2"; version="1.1.1"; sha256="05iifrcgzx53w5ciw8bbm4vdwc3giv4xsvazv8chqxkndfvf7wq0"; depends=[BH Rcpp]; }; xmlparsedata = derive2 { name="xmlparsedata"; version="1.0.1"; sha256="0q9d4l3p4ypc0qswnjwrd3as9bx9f1niixsc19y1msva51sg5h39"; depends=[]; }; xoi = derive2 { name="xoi"; version="0.66-9"; sha256="1kd9s9afq5shsaqhrxai9yz60a9imyy5np76fjpkjgyz56kbk6nr"; depends=[qtl]; }; - xpose4 = derive2 { name="xpose4"; version="4.5.3"; sha256="02m3ad4287ljsi4qrzwd84lfj1y6rz9nias2zk4cbqm14gf19pdf"; depends=[gam Hmisc lattice survival]; }; + xpose4 = derive2 { name="xpose4"; version="4.6.0"; sha256="1pyzpb6ddvpm3nx49brkam6afzhvf7jg8xnijg9jwd2qfijp8lav"; depends=[dplyr gam Hmisc lattice lazyeval readr survival]; }; xseq = derive2 { name="xseq"; version="0.2.1"; sha256="0bsakbfvkfv39q2ch2g21b17g84470sq4v73355cljlshsi6404i"; depends=[e1071 gptk impute preprocessCore RColorBrewer sfsmisc]; }; - xslt = derive2 { name="xslt"; version="1.0"; sha256="0qsllagbib1a5ahxsk4s1fib4lyw45axi2c2d187mnpzpsy3pzfn"; depends=[Rcpp xml2]; }; + xslt = derive2 { name="xslt"; version="1.1"; sha256="1mg0kjkc8hwj35ys6ih3ijl6sv1c6hlsmm03i1jm3ifqy27sad7b"; depends=[Rcpp xml2]; }; + xsp = derive2 { name="xsp"; version="0.1.2"; sha256="1jbmxa234v52qji8sz4bkg24c2n65b0zh9py1wyyfzw9n1wx5w0r"; depends=[ggplot2 reshape2]; }; xtable = derive2 { name="xtable"; version="1.8-2"; sha256="0398qkpvlw3dv0myz4mjcyqwpwc2m31l127r8vdzwc71wb6s28qn"; depends=[]; }; xtal = derive2 { name="xtal"; version="1.15"; sha256="1zq3vd5x3vw6acn47yd2x7kflr9sm3znmdkm68cs64ha54jbl3vs"; depends=[]; }; xtermStyle = derive2 { name="xtermStyle"; version="3.0.5"; sha256="1q4qq8w4sgxbbb1x0i4k5xndvwisvjszg830wspwb37wigxz8xvz"; depends=[]; }; - xtractomatic = derive2 { name="xtractomatic"; version="3.2.0"; sha256="04gng8y7606fvyj767f9vja33fh0xcwj2v2jy3nacybjwwr9yrx0"; depends=[httr ncdf4 sp]; }; + xtractomatic = derive2 { name="xtractomatic"; version="3.3.2"; sha256="10a1apsjqg0cpr267g5336cl6qr3ax03jcl234l9a8b2nh8sbwi5"; depends=[httr ncdf4 sp]; }; xts = derive2 { name="xts"; version="0.9-7"; sha256="163hzcnxrdb4lbsnwwv7qa00h4qlg4jm289acgvbg4jbiywpq7zi"; depends=[zoo]; }; xxIRT = derive2 { name="xxIRT"; version="2.0.1"; sha256="1a31jyzc37bq3068vq18rdj0fn66jihk7d1qmqk8lq76gg72dwk6"; depends=[ggplot2 glpkAPI lpSolveAPI reshape2]; }; xyloplot = derive2 { name="xyloplot"; version="1.5"; sha256="0h90070m3xgcfky5q6vx6l2lfz0ihwbp2xg25mgmbijz4kg3n9d3"; depends=[]; }; @@ -10436,34 +10915,40 @@ in with self; { yaml = derive2 { name="yaml"; version="2.1.14"; sha256="0x88xicrf7vwp77xgan27mnpdljhpkn0pz5kphnwqi3ddy25k9a1"; depends=[]; }; yarrr = derive2 { name="yarrr"; version="0.1.5"; sha256="1258bj7x4icaxfabnnd3fgwydnqbzxkih7zw0sdlwdax3q8fw5c5"; depends=[BayesFactor circlize jpeg]; }; ycinterextra = derive2 { name="ycinterextra"; version="0.1"; sha256="0hr37izbbmxqkjy6a7q8vcn0vs8an1ck9y8xfjpl5z0rygi8xc1v"; depends=[mcGlobaloptim]; }; + yearn = derive2 { name="yearn"; version="0.1.1"; sha256="12dnf856sbsksmb83975nfpgkyv0yw8fny2c89pfgg6ivm0sxy6a"; depends=[BiocInstaller devtools githubinstall]; }; yesno = derive2 { name="yesno"; version="0.0.2"; sha256="0aa8kqcqlix9a9a2l4fnl2qv25dgdn4m7cfsh7m0kk76y8q5gbc9"; depends=[]; }; yhat = derive2 { name="yhat"; version="2.0-0"; sha256="0vdhkknmms7zy7iha894jn1hr1h5w67pr53r0q67m7p404w21iza"; depends=[boot miscTools plotrix yacca]; }; - yhatr = derive2 { name="yhatr"; version="0.15.0"; sha256="0irgc26ds8fs8lwgghkhzrvx9drx338vxsphwia4wspd2i0yyzsk"; depends=[httr jsonlite stringr]; }; + yhatr = derive2 { name="yhatr"; version="0.15.1"; sha256="18g2cr1kjxnfw6cwzl62ynppfv1zz732kbx18zq8918l85kx6wbw"; depends=[httr jsonlite stringr]; }; ykmeans = derive2 { name="ykmeans"; version="1.0"; sha256="0xfji2fmslvc059kk3rwkv575ffzl787sa9d4vw5hxnsmkn8lq50"; depends=[foreach plyr]; }; yorkr = derive2 { name="yorkr"; version="0.0.7"; sha256="035pmvignq4lip3y5670kxj1n70ff04yy2jwi4837pimr9d0qjhv"; depends=[dplyr ggplot2 gridExtra reshape2 rpart_plot yaml]; }; - yuima = derive2 { name="yuima"; version="1.5.9"; sha256="04s96zkyccb2nkgzh07jxa8lpyrvzigyiynis2ifiql12yw5c960"; depends=[cubature expm mvtnorm Rcpp zoo]; }; - yuimaGUI = derive2 { name="yuimaGUI"; version="1.0.1"; sha256="14iyx7rp538l41s135qq5rcq2hbl7rpnhpigz0lzyzdyg6a2mn2n"; depends=[DT ggplot2 quantmod sde shiny shinyBS shinydashboard shinyjs yuima]; }; + yuima = derive2 { name="yuima"; version="1.6.4"; sha256="1fqvpas04k37h06nspjfnqk74ydfgihascjz5j939nprcax0fx9x"; depends=[cubature expm mvtnorm Rcpp RcppArmadillo zoo]; }; + yuimaGUI = derive2 { name="yuimaGUI"; version="1.1.0"; sha256="1q2v9hpj9j74f7ram92npglrqwyysnvv1bvk64qb7s9lpyv852zk"; depends=[DT ggplot2 quantmod sde shiny shinyBS shinydashboard shinyjs yuima]; }; yummlyr = derive2 { name="yummlyr"; version="0.1.1"; sha256="0xrk6g58laksz92d8mxck923sk4j92g55szrkxk123wjp5kg9vx6"; depends=[httr jsonlite]; }; zCompositions = derive2 { name="zCompositions"; version="1.0.3-1"; sha256="1408bb5nfipsxskgpjzixnxndg7hf48nq27k0pwrcxx16wykmlcy"; depends=[MASS NADA truncnorm]; }; + zFactor = derive2 { name="zFactor"; version="0.1.4"; sha256="1iay7w19fqimnj6hly0hq9d6q100frncpy07rn8b9hirfyywqsz9"; depends=[data_table dplyr ggplot2 rootSolve tibble tidyr]; }; zTree = derive2 { name="zTree"; version="1.0.4"; sha256="058vjvxn1lw07nxw8rs1b8vnw6ccxh3swrmvjicvr35xmakj8qa0"; depends=[plyr]; }; zeallot = derive2 { name="zeallot"; version="0.0.3"; sha256="0cxrq9lf184szysccx7zhhgsimixhkpdybgj05asi5kbrlf03pn6"; depends=[]; }; - zebu = derive2 { name="zebu"; version="0.1.0"; sha256="1s9lm90yhyhflikvrwpbx94gysc7wazpi4v3vh3fibiyna0a9sgj"; depends=[ggplot2 pbapply plyr reshape2]; }; + zebu = derive2 { name="zebu"; version="0.1.1"; sha256="1d1s455vckd7148dycsqcfsdql0l4pzanipqn5k60kla03bic5i5"; depends=[doParallel foreach ggplot2 iterators plyr reshape2]; }; + zeligverse = derive2 { name="zeligverse"; version="0.1.1"; sha256="1hf3hbgzdlhhyy2gvg984dwp8d0qm0ziyn8i9h5x00gwf74vn9dr"; depends=[Amelia dplyr MatchIt purrr rstudioapi tibble WhatIf Zelig ZeligChoice ZeligEI]; }; zendeskR = derive2 { name="zendeskR"; version="0.4"; sha256="06cjwk08w3x6dx717123psinid5bx6c563jnfn890373jw6xnfrk"; depends=[RCurl rjson]; }; zenplots = derive2 { name="zenplots"; version="0.0-1"; sha256="0agm81rrn4ip6sljrwm1a9i2q9rwdwamnxm0smz757kypgyll8c2"; depends=[graph MASS PairViz]; }; - zetadiv = derive2 { name="zetadiv"; version="1.0"; sha256="1r33v97viqq6r3afszclq45rcm4sfxy86lk13ljr6bxns47xpfii"; depends=[car glm2 Imap mgcv nnls scam vegan]; }; + zetadiv = derive2 { name="zetadiv"; version="1.0.1"; sha256="0a50xj7bgb2w3yx2ghpwq2y2hkilxx0dchhscspzjalyw77jhxvp"; depends=[car glm2 Imap mgcv nnls scam vegan]; }; zfa = derive2 { name="zfa"; version="1.0"; sha256="0lddwpifkzggzvy56ans5pfknfr8laxcg264f3ph2z150gw1plsh"; depends=[SKAT]; }; zic = derive2 { name="zic"; version="0.9"; sha256="0i39983blc46vjbb4y36rypg9q3zammxahk63p089m43gi22ycxh"; depends=[coda Rcpp RcppArmadillo]; }; + zip = derive2 { name="zip"; version="1.0.0"; sha256="0rgr9pcdhdq3k8n29h2ircp3ri1ibhrx81gja1y7331v15xyrabg"; depends=[]; }; zipcode = derive2 { name="zipcode"; version="1.0"; sha256="1lvlf1h5fv412idpdssjfh4fki933dm5nhr41ppl1mf45b9j7azn"; depends=[]; }; zipfR = derive2 { name="zipfR"; version="0.6-6"; sha256="1y3nqfjg5m89mdvcmqwjmwlc8p3hpcqnwv4ji1a7ggg4n63lwl3j"; depends=[]; }; - ziphsmm = derive2 { name="ziphsmm"; version="1.0.4"; sha256="119myqb9gzwg88k7csmsaqasn5zqjjp6x1x0wy2jra656l76g4kd"; depends=[Rcpp RcppArmadillo]; }; + ziphsmm = derive2 { name="ziphsmm"; version="1.0.6"; sha256="1d1agp57hyxsj0bf6vhj5g5v7f7vnv338kiy7wzji07sc2illw8y"; depends=[Rcpp RcppArmadillo]; }; zoeppritz = derive2 { name="zoeppritz"; version="1.0-6"; sha256="0b16w8s26pi5h911jizwqapgwhdh60gcx0khn3kayf9fi40kyzp0"; depends=[]; }; zoib = derive2 { name="zoib"; version="1.4.2"; sha256="0gdbcnxlm9m88c2av4zy0k3yvm2cvg24804xnsi0mwfgwmnngdh5"; depends=[abind coda Formula matrixcalc rjags]; }; zoo = derive2 { name="zoo"; version="1.8-0"; sha256="0mqklbx92ifwa0awm7gpm4r9dvwa09p55zjxjnypiqsxy532r4h9"; depends=[lattice]; }; zooaRch = derive2 { name="zooaRch"; version="1.2"; sha256="0grc378xppv0303sf4flfqz5002vq5a23nzbq4bsff41rww7dihc"; depends=[ggplot2]; }; + zooaRchGUI = derive2 { name="zooaRchGUI"; version="1.0.2"; sha256="0snggx0d69ajz6xxwnv03l12jpjrjkpy2dgf4lrpm2l8rspd27i4"; depends=[car coda foreign geomorph ggplot2 MASS pgirmess raster readxl rjags sp spdep splancs tcltk2 tkrplot vegan]; }; zoocat = derive2 { name="zoocat"; version="0.2.0"; sha256="1xqi90jnpqjdf3zr4pldh1a2gjppjwjrgkq71rvdhmcrf5s8jav0"; depends=[plyr reshape2 scales zoo]; }; zooimage = derive2 { name="zooimage"; version="3.0-5"; sha256="1r3slmyw0dyqfa40dr5xga814z09ibhmmby8p1cii5lh61xm4c39"; depends=[filehash jpeg mlearning png svDialogs svMisc]; }; zoom = derive2 { name="zoom"; version="2.0.4"; sha256="03f5rxfr6ncf1j6vpn7pip21q7ylj4bx0a5xphqb6x6i33lxf1g5"; depends=[]; }; zoon = derive2 { name="zoon"; version="0.6"; sha256="0dyl8fnzjncxb9q322xsdmvbm0wwzl1w9750vmvndpd8c05qi1n0"; depends=[dismo plyr randomForest raster RCurl rfigshare rgdal roxygen2 SDMTools sp testthat]; }; + zstdr = derive2 { name="zstdr"; version="0.1.1"; sha256="1rigsdh0f68l6vvvxp277cp8hbxj10x4588s6az1njxfpxrc8ajj"; depends=[Rcpp]; }; ztable = derive2 { name="ztable"; version="0.1.5"; sha256="1jfqnqy9544gfvz3bsb48v4177nwp4b4n9l2743asq8sbq305b5r"; depends=[]; }; ztype = derive2 { name="ztype"; version="0.1.0"; sha256="0brbq2rgkl4mhjbb70kkfv47lzs66k9ppfs2klavcbripirxn5fx"; depends=[assertthat dplyr ggplot2 lubridate magrittr rvest stringr]; }; zyp = derive2 { name="zyp"; version="0.10-1"; sha256="0f1fqqxysf3psnvn08s5qly2c958h1hhznjjj8mvpjr5g6hqlr1k"; depends=[Kendall]; }; diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 5c0ed284e4a..3de25dd1478 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -281,6 +281,7 @@ let pbdMPI = [ pkgs.openmpi ]; pbdNCDF4 = [ pkgs.netcdf ]; pbdPROF = [ pkgs.openmpi ]; + pbdZMQ = [ pkgs.which ]; PKI = [ pkgs.openssl.dev ]; png = [ pkgs.libpng.dev ]; PopGenome = [ pkgs.zlib.dev ]; @@ -495,7 +496,6 @@ let "fscaret" "fSRM" "gcmr" - "Geneland" "GeoGenetix" "geomorph" "geoR" @@ -566,7 +566,6 @@ let "plotSEMM" "plsRbeta" "plsRglm" - "pmg" "PopGenReport" "poppr" "powerpkg" @@ -682,560 +681,17 @@ let ]; packagesToSkipCheck = [ - "Rmpi" # tries to run MPI processes - "gmatrix" # requires CUDA runtime + "Rmpi" # tries to run MPI processes + "gmatrix" # requires CUDA runtime "gputools" # requires CUDA runtime - "sprint" # tries to run MPI processes - "pbdMPI" # tries to run MPI processes + "sprint" # tries to run MPI processes + "pbdMPI" # tries to run MPI processes ]; # Packages which cannot be installed due to lack of dependencies or other reasons. brokenPackages = [ - "acs" # build is broken - "agRee" # depends on broken package BRugs-0.8-6 - "aLFQ" # depends on broken package bio3d-2.3-1 - "anamiR" # depends on broken package RMySQL-0.10.11 - "AneuFinder" # depends on broken package Rhtslib-1.6.0 - "animation" # build is broken - "anim_plots" # depends on broken package animation-2.4 - "annmap" # depends on broken package RMySQL-0.10.9 - "apaStyle" # depends on broken package gdtools-0.1.3 - "apaTables" # depends on broken package OpenMx-2.7.4 - "aptg" # depends on broken package brranching-0.2.0 - "ArrayExpressHTS" # build is broken - "arrayQualityMetrics" # build is broken - "auRoc" # depends on broken package OpenMx-2.7.4 - "bamsignals" # depends on broken package Rhtslib-1.6.0 - "BatchQC" # build is broken - "bayesCL" # build is broken - "bayou" # depends on broken package animation-2.4 - "bedr" # build is broken - "BETS" # build is broken - "BiGGR" # depends on broken package rsbml-2.30.0 - "bio3d" # build is broken - "bioassayR" # depends on broken package ChemmineR-2.24.2 - "bioCancer" # depends on broken package covr-2.2.2 - "biomformat" # depends on broken package r-rhdf5-2.16.0 - "biotools" # depends on broken package rpanel-1.1-3 - "birte" # build is broken - "BiSEp" # build is broken - "BLCOP" # depends on broken package Rsymphony-0.1-26 - "BMhyd" # depends on broken package animation-2.4 - "BNSP" # build is broken - "BPEC" # depends on broken package animation-2.4 - "BrailleR" # depends on broken package gridGraphics-0.1-5 - "brainGraph" # build is broken - "brranching" # depends on broken package animation-2.4 - "brr" # build is broken - "BRugs" # build is broken - "CADStat" # build is broken - "CampaR1" # depends on broken package r-bio3d-2.3-1 - "canceR" # build is broken - "CardinalWorkflows" # build is broken - "CARrampsOcl" # depends on broken package OpenCL-0.1-3 - "categoryCompare" # depends on broken package RCytoscape-1.21.1 - "Causata" # depends on broken package RMySQL-0.10.9 - "cdcfluview" # depends on broken package V8-1.2 - "CexoR" # depends on broken package Rhtslib-1.6.0 - "ChAMP" # depends on broken package goseq-1.26.0 - "ChemmineDrugs" # depends on broken package ChemmineR-2.24.2 - "ChemmineR" # build is broken - "chinese_misc" # build is broken - "ChIPQC" # depends on broken package r-DiffBind-2.0.9 - "ChIPXpress" # build is broken - "ChIPXpressData" # build is broken - "choroplethr" # depends on broken package acs-2.0 - "CHRONOS" # build is broken - "cleanEHR" # build is broken - "clickR" # depends on broken package gdtools-0.1.3 - "clpAPI" # build is broken - "CNEr" # build is broken - "colormap" # depends on broken package V8-1.2 - "colorscience" # build is broken - "compendiumdb" # depends on broken package RMySQL-0.10.9 - "CONFESS" # depends on broken package r-flowCore-1.38.2 - "CONS" # build is broken - "convevol" # depends on broken package animation-2.4 - "CountClust" # build is broken - "CountsEPPM" # build is broken - "COUSCOus" # depends on broken package r-bio3d-2.3-1 - "covr" # build is broken - "cplexAPI" # build is broken - "Crossover" # build is broken - "CrypticIBDcheck" # build is broken - "csaw" # build is broken - "ctsem" # depends on broken package OpenMx-2.7.4 - "cudaBayesreg" # build is broken - "cytofkit" # depends on broken package flowCore-1.38.2 - "CytoML" # depends on broken package flowCore-1.40.6 - "daff" # depends on broken package V8-1.2 - "dagbag" # build is broken - "dagitty" # depends on broken package V8-1.2 - "dagLogo" # depends on broken package MotIV-1.28.0 - "DAISIE" # depends on broken package animation-2.4 - "DataEntry" # build is broken - "dataMaid" # build is broken - "dataone" # build is broken - "datapack" # build is broken - "dbConnect" # depends on broken package RMySQL-0.10.9 - "DBKGrad" # depends on broken package rpanel-1.1-3 - "DCM" # build is broken - "DDD" # depends on broken package animation-2.4 - "deBInfer" # depends on broken package PBSddesolve-1.12.2 - "debrowser" # depends on broken package V8-1.4 - "DecisionCurve" # build is broken - "DeepBlueR" # build is broken - "deepSNV" # build is broken - "DEGraph" # depends on broken package RCytoscape-1.21.1 - "DEploid" # build is broken - "DiagrammeRsvg" # depends on broken package V8-1.2 - "DiffBind" # build is broken - "diffHic" # depends on broken package r-csaw-1.6.1 - "DirichletMultinomial" # build is broken - "diveRsity" # build is broken - "DmelSGI" # depends on broken package r-rhdf5-2.16.0 - "docxtools" # build is broken - "DOQTL" # depends on broken package r-rhdf5-2.16.0 - "DOT" # depends on broken package V8-1.2 - "dynr" # build is broken - "ecospat" # depends on broken package MigClim-1.6 - "EGAD" # depends on broken package arrayQualityMetrics-3.28.2 - "eiR" # depends on broken package ChemmineR-2.24.2 - "emg" # build is broken - "envlpaster" # build is broken - "erpR" # depends on broken package rpanel-1.1-3 - "euroMix" # build is broken - "evobiR" # depends on broken package animation-2.4 - "exifr" # build is broken - "ExperimentHubData" # build is broken - "exprso" # build is broken - "fastR" # build is broken - "fCCAC" # depends on broken package Rhtslib-1.6.0 - "fdq" # depends on broken package gdtools-0.1.3 - "Fgmutils" # depends on broken package gdtools-0.1.3 - "flan" # build is broken - "flextable" # depends on broken package gdtools-0.1.4 - "flowAI" # depends on broken package r-flowCore-1.38.2 - "flowBeads" # depends on broken package r-flowCore-1.38.2 - "flowBin" # depends on broken package r-flowCore-1.38.2 - "flowCHIC" # depends on broken package r-flowCore-1.38.2 - "flowClean" # depends on broken package r-flowCore-1.38.2 - "flowClust" # depends on broken package r-flowCore-1.38.2 - "flowCore" # build is broken - "flowDensity" # depends on broken package flowCore-1.38.2 - "flowDiv" # depends on broken package r-flowCore-1.38.2 - "flowFit" # depends on broken package r-flowCore-1.38.2 - "flowFitExampleData" # depends on broken package r-flowCore-1.38.2 - "flowFP" # depends on broken package r-flowCore-1.38.2 - "flowMatch" # depends on broken package r-flowCore-1.38.2 - "flowMeans" # depends on broken package r-flowCore-1.38.2 - "flowMerge" # depends on broken package r-flowCore-1.38.2 - "flowPeaks" # build is broken - "flowPloidy" # depends on broken package flowCore-1.40.6 - "flowQB" # depends on broken package r-flowCore-1.38.2 - "flowQ" # depends on broken package flowCore-1.38.2 - "FlowSOM" # depends on broken package r-flowCore-1.38.2 - "flowStats" # depends on broken package r-flowCore-1.38.2 - "flowTrans" # depends on broken package r-flowCore-1.38.2 - "flowType" # depends on broken package r-flowCore-1.38.2 - "flowUtils" # depends on broken package r-flowCore-1.38.2 - "flowViz" # depends on broken package r-flowCore-1.38.2 - "flowVS" # depends on broken package r-flowCore-1.38.2 - "flowWorkspace" # depends on broken package r-flowCore-1.38.2 - "fmcsR" # depends on broken package ChemmineR-2.24.2 - "fPortfolio" # depends on broken package Rsymphony-0.1-26 - "fracprolif" # build is broken - "funModeling" # build is broken - "gahgu133acdf" # build is broken - "gahgu133bcdf" # build is broken - "gahgu133plus2cdf" # build is broken - "gahgu95av2cdf" # build is broken - "gahgu95bcdf" # build is broken - "gahgu95ccdf" # build is broken - "gahgu95dcdf" # build is broken - "gahgu95ecdf" # build is broken - "gamlss_demo" # depends on broken package rpanel-1.1-3 - "gazepath" # build is broken - "gdtools" # build is broken - "GENE_E" # depends on broken package r-rhdf5-2.16.0 - "GenoGAM" # build is broken - "genomation" # depends on broken package Rhtslib-1.6.0 - "geojson" # depends on broken package r-protolite-1.5 - "geojsonio" # depends on broken package V8-1.2 - "geojsonlint" # depends on broken package V8-1.2 - "gfcanalysis" # depends on broken package animation-2.4 - "gfer" # depends on broken package V8-1.2 - "ggcyto" # depends on broken package r-flowCore-1.38.2 - "ggghost" # depends on broken package animation-2.4 - "ggimage" # depends on broken package gridGraphics-0.1-5 - "ggiraph" # depends on broken package gdtools-0.1.3 - "ggiraphExtra" # depends on broken package gdtools-0.1.3 - "ggseas" # build is broken - "gmapR" # build is broken - "gmatrix" # depends on broken package cudatoolkit-8.0.61 - "gMCP" # build is broken - "gmDatabase" # depends on broken package RMySQL-0.10.9 - "gmum_r" # build is broken - "googleformr" # build is broken - "goseq" # build is broken - "gpg" # build is broken - "gpuR" # build is broken - "gputools" # depends on broken package cudatoolkit-8.0.61 - "GraphPAC" # build is broken - "greengenes13_5MgDb" # build is broken - "gridGraphics" # build is broken - "GSCA" # depends on broken package r-rhdf5-2.16.0 - "GUIDE" # depends on broken package rpanel-1.1-3 - "gunsales" # build is broken - "h2o" # build is broken - "h5vc" # depends on broken package r-rhdf5-2.16.0 - "harrietr" # build is broken - "HDF5Array" # depends on broken package r-rhdf5-2.16.0 - "healthyFlowData" # depends on broken package r-flowCore-1.38.2 - "hexSticker" # depends on broken package gridGraphics-0.1-5 - "HierO" # build is broken - "HilbertVisGUI" # build is broken - "HiPLARM" # build is broken - "hisse" # depends on broken package animation-2.4 - "hoardeR" # depends on broken package Rhtslib-1.6.0 - "homomorpheR" # depends on broken package sodium-0.4 - "HTSeqGenie" # depends on broken package gmapR-1.16.0 - "HTSSIP" # depends on broken package r-rhdf5-2.16.0 - "idm" # depends on broken package animation-2.4 - "ifaTools" # depends on broken package OpenMx-2.7.4 - "IHW" # depends on broken package r-lpsymphony-1.0.2 - "IHWpaper" # depends on broken package r-lpsymphony-1.0.2 - "IlluminaHumanMethylation450k_db" # build is broken - "immunoClust" # depends on broken package r-flowCore-1.38.2 - "imputeR" # depends on broken package ridge-2.2 - "intansv" # build is broken - "interactiveDisplay" # build is broken - "ionicons" # depends on broken package rsvg-1.0 - "IONiseR" # depends on broken package r-rhdf5-2.16.0 - "ITGM" # depends on broken package gdtools-0.1.3 - "jpmesh" # depends on broken package V8-1.2 - "js" # depends on broken package V8-1.2 - "jsonld" # depends on broken package V8-1.2 - "jsonvalidate" # depends on broken package V8-1.2 - "KoNLP" # build is broken - "largeList" # build is broken - "largeVis" # build is broken - "lavaan_shiny" # depends on broken package OpenMx-2.7.10 - "lawn" # depends on broken package V8-1.2 - "LCMCR" # build is broken - "LeArEst" # depends on broken package opencpu-1.6.1 - "lefse" # build is broken - "lfe" # build is broken - "lgcp" # depends on broken package rpanel-1.1-3 - "Libra" # build is broken - "libsoc" # build is broken - "link2GI" # depends on broken package r-sf-0.3-4 - "LinRegInteractive" # depends on broken package rpanel-1.1-3 - "liquidSVM" # build is broken - "littler" # build is broken - "LowMACA" # depends on broken package MotIV-1.28.0 - "lpsymphony" # build is broken - "lvnet" # depends on broken package OpenMx-2.7.4 - "MafDb_1Kgenomes_phase3_hs37d5" # build is broken - "mafs" # build is broken - "magick" # build is broken - "maGUI" # build is broken - "mapr" # depends on broken package V8-1.2 - "mar1s" # build is broken - "MatrixRider" # depends on broken package CNEr-1.8.3 - "MBESS" # depends on broken package OpenMx-2.7.4 - "mBvs" # build is broken - "mcaGUI" # build is broken - "mcPAFit" # build is broken - "mdsr" # depends on broken package RMySQL-0.10.9 - "Mediana" # depends on broken package gdtools-0.1.3 - "melviewr" # build is broken - "MeSH_Hsa_eg_db" # build is broken - "MeSH_Mmu_eg_db" # build is broken - "meshr" # depends on broken package r-MeSH.Hsa.eg.db-1.6.0 - "Metab" # build is broken - "metagear" # build is broken - "MetaIntegrator" # depends on broken package RMySQL-0.10.9 - "metaSEM" # depends on broken package OpenMx-2.7.4 - "methylKit" # depends on broken package Rhtslib-1.6.0 - "MigClim" # build is broken - "minimist" # depends on broken package V8-1.2 - "miscF" # depends on broken package BRugs-0.8-6 - "mixlink" # build is broken - "MLSeq" # build is broken - "mmnet" # build is broken - "MODIStsp" # build is broken - "MonetDBLite" # build is broken - "mongolite" # build is broken - "monogeneaGM" # depends on broken package animation-2.4 - "MonoPhy" # depends on broken package animation-2.4 - "motifbreakR" # depends on broken package MotIV-1.28.0 - "motifStack" # depends on broken package MotIV-1.28.0 - "MotIV" # build is broken - "mptools" # depends on broken package animation-2.4 - "mrMLM" # build is broken - "mRMRe" # build is broken - "mscstexta4r" # build is broken - "mscsweblm4r" # build is broken - "MSeasyTkGUI" # build is broken - "MSGFgui" # depends on broken package MSGFplus-1.6.2 - "MSGFplus" # build is broken - "multiDimBio" # depends on broken package gridGraphics-0.1-5 - "multipanelfigure" # depends on broken package gridGraphics-0.1-5 - "munsellinterpol" # build is broken - "mutossGUI" # build is broken - "mvMORPH" # depends on broken package animation-2.4 - "mvst" # build is broken - "ncdfFlow" # depends on broken package r-flowCore-1.38.2 - "NCIgraph" # depends on broken package RCytoscape-1.21.1 - "ndjson" # build is broken - "ndtv" # depends on broken package animation-2.4 - "NetRep" # depends on broken package r-RhpcBLASctl-0.15-148 - "networkBMA" # build is broken - "nlts" # build is broken - "normr" # depends on broken package Rhtslib-1.6.0 - "NORRRM" # build is broken - "odbc" # build is broken - "officer" # depends on broken package gdtools-0.1.3 - "OpenCL" # build is broken - "opencpu" # depends on broken package r-protolite-1.5 - "openCyto" # depends on broken package r-flowCore-1.38.2 - "OpenMx" # build is broken - "optbdmaeAT" # build is broken - "optBiomarker" # depends on broken package rpanel-1.1-3 - "optrcdmaeAT" # build is broken - "ora" # depends on broken package ROracle-1.3-1 - "OUwie" # depends on broken package animation-2.4 - "PAA" # build is broken - "paleotree" # depends on broken package animation-2.4 - "PathoStat" # depends on broken package BatchQC-1.2.1 - "PathSelectMP" # build is broken - "PatternClass" # build is broken - "PBD" # depends on broken package animation-2.4 - "PBSddesolve" # build is broken - "PBSmapping" # build is broken - "pcadapt" # depends on broken package vcfR-1.4.0 - "pcaL1" # build is broken - "pcaPA" # build is broken - "pcrsim" # build is broken - "pdfsearch" # build is broken - "pdftools" # build is broken - "pd_genomewidesnp_6" # build is broken - "permGPU" # build is broken - "PGA" # build is broken - "PGPC" # depends on broken package ChemmineR-2.24.2 - "ph2bye" # depends on broken package animation-2.4 - "PharmacoGx" # build is broken - "PhyInformR" # depends on broken package animation-2.4 - "phylocurve" # depends on broken package animation-2.4 - "phyloseq" # depends on broken package r-rhdf5-2.16.0 - "PhySortR" # depends on broken package animation-2.4 - "phytools" # depends on broken package animation-2.4 - "PICS" # build is broken - "PING" # depends on broken package PICS-2.16.0 - "plateCore" # depends on broken package r-flowCore-1.38.2 - "plfMA" # build is broken - "plink" # build is broken - "podkat" # build is broken - "PottsUtils" # depends on broken package BRugs-0.8-6 - "powell" # build is broken - "pqsfinder" # depends on broken package r-flowCore-1.38.2 - "prebs" # depends on broken package r-rhdf5-2.16.0 - "PREDAsampledata" # depends on broken package gahgu133plus2cdf-2.2.1 - "predictionInterval" # depends on broken package OpenMx-2.7.4 - "pRoloc" # build is broken - "pRolocGUI" # build is broken - "proteoQC" # build is broken - "protolite" # build is broken - "prototest" # build is broken - "PSAboot" # build is broken - "psbcGroup" # build is broken - "PythonInR" # build is broken - "qcmetrics" # build is broken - "QFRM" # build is broken - "qrqc" # build is broken - "qtbase" # build is broken - "qtpaint" # build is broken - "qtutils" # build is broken - "QUALIFIER" # depends on broken package r-flowCore-1.38.2 - "QuartPAC" # build is broken - "QuasR" # build is broken - "QUBIC" # build is broken - "QVM" # build is broken - "raincpc" # build is broken - "rainfreq" # build is broken - "RAM" # depends on broken package animation-2.4 - "RamiGO" # depends on broken package RCytoscape-1.21.1 - "randomcoloR" # depends on broken package V8-1.2 - "randstr" # build is broken - "RapidPolygonLookup" # depends on broken package PBSmapping-2.69.76 - "RAppArmor" # build is broken - "raptr" # depends on broken package PBSmapping-2.69.76 - "RbioRXN" # depends on broken package ChemmineR-2.24.2 - "Rblpapi" # build is broken - "RCAS" # depends on broken package Rhtslib-1.6.0 - "Rchemcpp" # depends on broken package ChemmineR-2.24.2 - "rchess" # depends on broken package V8-1.2 - "RchivalTag" # depends on broken package PBSmapping-2.69.76 - "RchyOptimyx" # depends on broken package r-flowCore-1.38.2 - "RcmdrPlugin_FuzzyClust" # build is broken - "RcmdrPlugin_PcaRobust" # build is broken - "Rcpi" # depends on broken package ChemmineR-2.24.2 - "Rcplex" # build is broken - "RcppAPT" # build is broken - "RcppGetconf" # build is broken - "RcppOctave" # build is broken - "RcppRedis" # build is broken - "rcqp" # build is broken - "rcrypt" # build is broken - "RCytoscape" # build is broken - "rdataretriever" # build is broken - "rDEA" # build is broken - "RDieHarder" # build is broken - "REBayes" # depends on broken package Rmosek-1.2.5.1 - "recluster" # depends on broken package animation-2.4 - "redland" # build is broken - "remoter" # build is broken - "repijson" # depends on broken package V8-1.2 - "replicationInterval" # depends on broken package OpenMx-2.7.4 - "ReporteRs" # depends on broken package gdtools-0.1.3 - "ReQON" # depends on broken package seqbias-1.20.0 - "RforProteomics" # depends on broken package interactiveDisplay-1.10.2 - "rgbif" # depends on broken package V8-1.2 - "Rgnuplot" # build is broken - "rgp" # build is broken - "rgpui" # depends on broken package rgp-0.4-1 - "rgsepd" # depends on broken package goseq-1.26.0 - "rhdf5" # build is broken - "RhpcBLASctl" # build is broken - "Rhtslib" # build is broken - "ridge" # build is broken - "rjade" # depends on broken package V8-1.2 - "rJPSGCS" # build is broken - "RKEEL" # depends on broken package RKEELjars-1.0.15 - "RKEELjars" # build is broken - "Rknots" # depends on broken package r-bio3d-2.3-1 - "rLindo" # build is broken - "rlo" # depends on broken package PythonInR-0.1-3 - "RMallow" # build is broken - "rmapshaper" # depends on broken package V8-1.2 - "rMAT" # build is broken - "Rmosek" # build is broken - "rmumps" # build is broken - "RMySQL" # build is broken - "rnaturalearth" # depends on broken package sf-0.4-1 - "RnavGraph" # build is broken - "rnetcarto" # build is broken - "ROI_plugin_clp" # depends on broken package clpAPI-1.2.7 - "ROI_plugin_cplex" # depends on broken package Rcplex-0.3-3 - "ROI_plugin_symphony" # depends on broken package Rsymphony-0.1-26 - "ROracle" # build is broken - "RPA" # depends on broken package r-rhdf5-2.16.0 - "RPANDA" # depends on broken package animation-2.4 - "rpanel" # build is broken - "rpg" # build is broken - "Rphylopars" # depends on broken package animation-2.4 - "Rpoppler" # build is broken - "RQuantLib" # build is broken - "Rsampletrees" # build is broken - "RSAP" # build is broken - "rsbml" # build is broken - "RSCABS" # build is broken - "rscala" # build is broken - "Rsomoclu" # build is broken - "rsparkling" # depends on broken package h2o-3.10.3.6 - "rsvg" # build is broken - "Rsymphony" # build is broken - "rtable" # depends on broken package gdtools-0.1.3 - "rTANDEM" # build is broken - "Rtextrankr" # build is broken - "rUnemploymentData" # depends on broken package acs-2.0 - "rvg" # depends on broken package gdtools-0.1.3 - "RVideoPoker" # depends on broken package rpanel-1.1-3 - "rzmq" # build is broken - "s2" # build is broken - "sapFinder" # build is broken - "sbrl" # build is broken - "SC3" # depends on broken package scater-1.2.0 - "scater" # depends on broken package r-rhdf5-2.16.0 - "scran" # depends on broken package r-rhdf5-2.16.0 - "SDD" # depends on broken package rpanel-1.1-3 - "seasonal" # build is broken - "seasonalview" # build is broken - "Sejong" # build is broken - "SemiCompRisks" # build is broken - "semPlot" # depends on broken package OpenMx-2.7.10 - "semtree" # depends on broken package OpenMx-2.7.4 - "seqbias" # build is broken - "SeqGrapheR" # build is broken - "seqTools" # build is broken - "sf" # build is broken - "shazam" # build is broken - "shinyTANDEM" # build is broken - "SICtools" # build is broken - "SigTree" # depends on broken package r-rhdf5-2.16.0 - "SimInf" # build is broken - "simsalapar" # build is broken - "smapr" # depends on broken package r-rhdf5-2.16.0 - "SMITE" # depends on broken package goseq-1.26.0 - "SnakeCharmR" # build is broken - "sodium" # build is broken - "soilphysics" # depends on broken package rpanel-1.1-3 - "sortinghat" # build is broken - "spdynmod" # depends on broken package animation-2.4 - "spocc" # depends on broken package V8-1.2 - "spongecake" # build is broken - "srd" # depends on broken package animation-2.4 - "SSDM" # build is broken - "stagePop" # depends on broken package PBSddesolve-1.12.2 - "Starr" # build is broken - "stream" # depends on broken package animation-2.4 - "streamMOA" # depends on broken package animation-2.4 - "stremr" # build is broken - "subspaceMOA" # depends on broken package animation-2.4 - "svglite" # depends on broken package gdtools-0.1.3 - "sybilSBML" # build is broken - "SymTS" # build is broken - "synthACS" # depends on broken package acs-2.0 - "tcpl" # depends on broken package RMySQL-0.10.9 - "TDA" # build is broken - "TED" # depends on broken package animation-2.4 - "tesseract" # build is broken - "texPreview" # depends on broken package magick-0.4 - "textreadr" # build is broken - "textTinyR" # build is broken - "TFBSTools" # depends on broken package CNEr-1.8.3 - "tilegramsR" # depends on broken package sf-0.4-1 - "TKF" # depends on broken package animation-2.4 - "tmap" # depends on broken package V8-1.2 - "tmaptools" # depends on broken package V8-1.2 - "tofsims" # build is broken - "toxboot" # depends on broken package RMySQL-0.10.9 - "TransView" # build is broken - "treatSens" # build is broken - "treeplyr" # depends on broken package animation-2.4 - "TSMySQL" # depends on broken package RMySQL-0.10.9 - "uaparserjs" # depends on broken package V8-1.2 - "UBCRM" # build is broken - "uHMM" # build is broken - "umx" # depends on broken package OpenMx-2.7.4 - "userfriendlyscience" # depends on broken package OpenMx-2.7.4 - "V8" # build is broken - "VariantTools" # depends on broken package gmapR-1.16.0 - "VBmix" # build is broken - "vcfR" # build is broken - "vdiffr" # depends on broken package gdtools-0.1.3 - "vmsbase" # depends on broken package PBSmapping-2.69.76 - "wallace" # depends on broken package V8-1.2 - "wand" # build is broken - "WebGestaltR" # depends on broken package PythonInR-0.1-3 - "webp" # build is broken - "wordbankr" # depends on broken package RMySQL-0.10.9 - "x13binary" # build is broken - "x_ent" # depends on broken package r-protolite-1.5 - "xps" # build is broken - "xslt" # build is broken - "zoon" # build is broken + "gputools" # depends on non-free cudatoolkit-8.0.61 + "gmatrix" # depends on non-free cudatoolkit-8.0.61 ]; otherOverrides = old: new: { diff --git a/pkgs/development/ruby-modules/bundix/default.nix b/pkgs/development/ruby-modules/bundix/default.nix index 919b4b00319..17f09724d18 100644 --- a/pkgs/development/ruby-modules/bundix/default.nix +++ b/pkgs/development/ruby-modules/bundix/default.nix @@ -1,35 +1,30 @@ -{ buildRubyGem, fetchFromGitHub, lib, bundler, ruby, nix, nix-prefetch-git }: +{ buildRubyGem, fetchFromGitHub, makeWrapper, lib, bundler, nix, + nix-prefetch-git }: buildRubyGem rec { - inherit ruby; + inherit (bundler) ruby; name = "${gemName}-${version}"; gemName = "bundix"; - version = "2.2.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "manveru"; repo = "bundix"; rev = version; - sha256 = "0lnzkwxprdz73axk54y5p5xkw56n3lra9v2dsvqjfw0ab66ld0iy"; + sha256 = "0ap23abv6chiv7v97ic6b1qf5by6b26as5yrpxg5q7p2giyiv33v"; }; - buildInputs = [bundler]; + buildInputs = [ ruby bundler ]; + nativeBuildInputs = [ makeWrapper ]; - postInstall = '' - substituteInPlace $GEM_HOME/gems/${gemName}-${version}/lib/bundix.rb \ - --replace \ - "'nix-instantiate'" \ - "'${nix.out}/bin/nix-instantiate'" \ - --replace \ - "'nix-hash'" \ - "'${nix.out}/bin/nix-hash'" \ - --replace \ - "'nix-prefetch-url'" \ - "'${nix.out}/bin/nix-prefetch-url'" \ - --replace \ - "'nix-prefetch-git'" \ - "'${nix-prefetch-git}/bin/nix-prefetch-git'" + preFixup = '' + wrapProgram $out/bin/bundix \ + --prefix PATH : "${nix.out}/bin" \ + --prefix PATH : "${nix-prefetch-git.out}/bin" \ + --prefix PATH : "${bundler.out}/bin" \ + --set GEM_HOME "${bundler}/${bundler.ruby.gemPath}" \ + --set GEM_PATH "${bundler}/${bundler.ruby.gemPath}" ''; meta = { diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index fc6a4bab75c..53e47630fbb 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "1.15.0"; - sha256 = "1k84zjr49ri7dj0mbjm7wkqdmknwdid817y2kyhn42mh4vxa68id"; + version = "1.15.1"; + sha256 = "1mq0n8g08vf2rnd7fvylx3f4sspx15abid49gycf9zzsjj7w8vps"; dontPatchShebangs = true; postFixup = '' diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index 0843c37df06..feb6865566f 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -1,13 +1,16 @@ -{ stdenv, lib, fetchurl, makeWrapper, jre }: +{ stdenv, lib, fetchurl, makeWrapper, jre +, disableRemoteLogging ? true +}: +with stdenv.lib; stdenv.mkDerivation rec { name = "ammonite-${version}"; - version = "0.9.9"; + version = "1.0.0"; scalaVersion = "2.12"; src = fetchurl { url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}"; - sha256 = "0qiqy681y1w21gjxw30kn44vxh9615j3825v06aq690p56w3rc63"; + sha256 = "0d74b3aasgg4ap5ishzzm4jbf1k4dxv7gzd88d69miyapsaa4p0c"; }; propagatedBuildInputs = [ jre ] ; @@ -19,7 +22,9 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp ${src} $out/bin/amm chmod +x $out/bin/amm - wrapProgram $out/bin/amm --prefix PATH ":" ${jre}/bin ; + wrapProgram $out/bin/amm \ + ${optionalString disableRemoteLogging "--add-flags --no-remote-logging"} \ + --prefix PATH ":" ${jre}/bin ; ''; meta = { diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 9987996c95d..e5f9fa26938 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -3,14 +3,14 @@ with lib; stdenv.mkDerivation rec { - version = "0.48.0"; + version = "0.49.1"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "13f9z4jg1v34jpaswa8kvbxkfp7flabv616vyqfvy9hafgfyisff"; + sha256 = "1fjqdyl72srla7ysjg0694ym5d3f2rdl5gfq8r9ay4v15jcb5dg6"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index ee36a9be43b..1ce0ca16153 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, makeWrapper, ncurses, ocamlPackages, graphviz -, ltl2ba, coq, alt-ergo, why3 }: +, ltl2ba, coq, alt-ergo, why3, autoconf +}: let mkocamlpath = p: "${p}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib"; @@ -8,12 +9,12 @@ in stdenv.mkDerivation rec { name = "frama-c-${version}"; - version = "20161101"; - slang = "Silicon"; + version = "20170501"; + slang = "Phosphorus"; src = fetchurl { url = "http://frama-c.com/download/frama-c-${slang}-${version}.tar.gz"; - sha256 = "1qq045ymz1mx4m9dsypigrcagqyb2k78wk13nqlbykcs5xbihfdh"; + sha256 = "16bccacms3n4rfpsxdxpdf24bk0hwrnzdpa2pbr6s847li73hkv1"; }; why2 = fetchurl { @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "00xr8aq6zwln0ccfs1ng610j70r6ia6wqdyaqs9iqibqfa1scr3m"; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ autoconf makeWrapper ]; buildInputs = with ocamlPackages; [ ncurses ocaml findlib alt-ergo ltl2ba ocamlgraph diff --git a/pkgs/development/tools/analysis/frama-c/dynamic.diff b/pkgs/development/tools/analysis/frama-c/dynamic.diff index 7ab2b32de1e..737cad0cda4 100644 --- a/pkgs/development/tools/analysis/frama-c/dynamic.diff +++ b/pkgs/development/tools/analysis/frama-c/dynamic.diff @@ -1,12 +1,12 @@ --- a/src/kernel_services/plugin_entry_points/dynamic.ml 2016-05-30 16:15:22.000000000 +0200 +++ b/src/kernel_services/plugin_entry_points/dynamic.ml 2016-10-13 18:25:31.000000000 +0200 -@@ -287,7 +287,8 @@ - (List.fold_right (add_dir ~user:false) Config.plugin_dir []) ; - let pkgs = ref [] in - List.iter (scan_directory pkgs) !load_path ; -- let findlib_path = String.concat ":" !load_path in -+ let findlib_path = String.concat ":" (!load_path @ -+ try [Sys.getenv "OCAMLPATH"] with Not_found -> []) in - Klog.debug ~dkey "setting findlib path to %s" findlib_path; - Findlib.init ~env_ocamlpath:findlib_path (); - load_packages (List.rev !pkgs) ; +@@ -270,7 +270,8 @@ + load_path := + List.fold_right (add_dir ~user:true) path + (List.fold_right (add_dir ~user:false) Config.plugin_dir []); +- let findlib_path = String.concat ":" !load_path in ++ let findlib_path = String.concat ":" (!load_path @ ++ try [Sys.getenv "OCAMLPATH"] with Not_found -> []) in + Klog.debug ~dkey "setting findlib path to %s" findlib_path; + Findlib.init ~env_ocamlpath:findlib_path () + diff --git a/pkgs/development/tools/analysis/hotspot/default.nix b/pkgs/development/tools/analysis/hotspot/default.nix new file mode 100644 index 00000000000..ee9fbb11196 --- /dev/null +++ b/pkgs/development/tools/analysis/hotspot/default.nix @@ -0,0 +1,64 @@ +{ stdenv, + cmake, + elfutils, + extra-cmake-modules, + fetchFromGitHub, + kconfigwidgets, + ki18n, + kitemmodels, + kitemviews, + libelf, + qtbase, + threadweaver, +}: + +stdenv.mkDerivation rec { + name = "hotspot-${version}"; + version = "1.0.0"; # don't forget to bump `rev` below when you change this + + src = fetchFromGitHub { + owner = "KDAB"; + repo = "hotspot"; + # TODO: For some reason, `fetchSubmodules` doesn't work when using `rev = "v${version}";`, + # so using an explicit commit instead. See #15559 + rev = "352687bf620529e9887616651f123f922cb421a4"; + sha256 = "09ly15yafpk31p3w7h2xixf1xdmx803w9fyb2aq7mhmc7pcxqjsx"; + fetchSubmodules = true; + }; + + buildInputs = [ + cmake + elfutils + extra-cmake-modules + kconfigwidgets + ki18n + kitemmodels + kitemviews + libelf + qtbase + threadweaver + ]; + + # hotspot checks for the presence of third party libraries' + # git directory to give a nice warning when you forgot to clone + # submodules; but Nix clones them and removes .git (for reproducibility). + # So we need to fake their existence here. + postPatch = '' + mkdir -p 3rdparty/perfparser/.git + ''; + + enableParallelBuilding = true; + + meta = { + description = "A GUI for Linux perf"; + longDescription = '' + hotspot is a GUI replacement for `perf report`. + It takes a perf.data file, parses and evaluates its contents and + then displays the result in a graphical way. + ''; + homepage = "https://github.com/KDAB/hotspot"; + license = with stdenv.lib.licenses; [ gpl2 gpl3 ]; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ nh2 ]; + }; +} diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix index 6da6bd4b4f9..48ba6379a0c 100644 --- a/pkgs/development/tools/analysis/spin/default.nix +++ b/pkgs/development/tools/analysis/spin/default.nix @@ -7,15 +7,15 @@ let in stdenv.mkDerivation rec { name = "spin-${version}"; - version = "6.4.5"; + version = "6.4.6"; url-version = stdenv.lib.replaceChars ["."] [""] version; src = fetchurl { # The homepage is behind CloudFlare anti-DDoS protection, which blocks cURL. # Dropbox mirror from developers: # https://www.dropbox.com/sh/fgzipzp4wpo3qc1/AADZPqS4aoR-pjNF6OQXRLQHa - url = "https://www.dropbox.com/sh/fgzipzp4wpo3qc1/AAANRpxsSyWC7iHZB-XgBwJFa/spin645.tar.gz?raw=1"; - sha256 = "0x8qnwm2xa8f176c52mzpvnfzglxs6xgig7bcgvrvkb3xf114224"; + url = "https://www.dropbox.com/sh/fgzipzp4wpo3qc1/AAA-vBeJ7xty-CDZgk7OB58Ta/spin646.tar.gz?raw=1"; + sha256 = "1n33qzlb7g30vhr5yxssw210b2m0242y9j21c7fqpn9z6b0rbhjp"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/boost-build/default.nix b/pkgs/development/tools/boost-build/default.nix index 240d24961e0..89c1b560eac 100644 --- a/pkgs/development/tools/boost-build/default.nix +++ b/pkgs/development/tools/boost-build/default.nix @@ -1,11 +1,14 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "boost-build-2.0-m12"; + name = "boost-build-${version}"; + version = "2016.03"; - src = fetchurl { - url = "mirror://sourceforge/boost/${name}.tar.bz2"; - sha256 = "10sbbkx2752r4i1yshyp47nw29lyi1p34sy6hj7ivvnddiliayca"; + src = fetchFromGitHub { + owner = "boostorg"; + repo = "build"; + rev = version; + sha256 = "1qw5marmp7z09nwcjlqrmqdg9b6myfqj3zvfz888x9mbidrmhn6p"; }; hardeningDisable = [ "format" ]; @@ -17,30 +20,17 @@ stdenv.mkDerivation rec { ''; buildPhase = '' - cd jam_src - ./build.sh + ./bootstrap.sh ''; installPhase = '' - # Install Bjam - mkdir -p $out/bin - cd "$(ls | grep bin)" - cp -a bjam $out/bin - - # Bjam is B2 - ln -s bjam $out/bin/b2 - - # Install the shared files (don't include jam_src) - cd ../.. - rm -rf jam_src - mkdir -p $out/share - cp -a . $out/share/boost-build + ./b2 install --prefix=$out ''; meta = with stdenv.lib; { homepage = http://www.boost.org/boost-build2/; license = stdenv.lib.licenses.boost; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; + maintainers = with maintainers; [ ivan-tkatchev ]; }; } diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index 64ab960c88b..2ed436981e0 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -13,11 +13,11 @@ let package = pythonPackages.buildPythonApplication (rec { name = "${pname}-${version}"; pname = "buildbot"; - version = "0.9.7"; + version = "0.9.9.post2"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0cwy39ap2v9kni3zm92633cnqf7qsnb4zlargx060pbfagkg1jwg"; + sha256 = "0g932pvkxqq3ijwkwwa29jd9sp5895gv40c3k7m2acc5dp8ygb9w"; }; buildInputs = with pythonPackages; [ @@ -83,7 +83,7 @@ let meta = with stdenv.lib; { homepage = http://buildbot.net/; - description = "Continuous integration system that automates the build/test cycle"; + description = "Buildbot is an open-source continuous integration framework for automating software build, test, and release processes"; maintainers = with maintainers; [ nand0p ryansydnor ]; license = licenses.gpl2; }; diff --git a/pkgs/development/tools/build-managers/buildbot/plugins.nix b/pkgs/development/tools/build-managers/buildbot/plugins.nix index 3c15e256a3f..63fc61cd1b8 100644 --- a/pkgs/development/tools/build-managers/buildbot/plugins.nix +++ b/pkgs/development/tools/build-managers/buildbot/plugins.nix @@ -4,11 +4,11 @@ let buildbot-pkg = pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot-pkg"; - version = "0.9.7"; + version = "0.9.9.post2"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0p351r10y42gwgxb2qg7xlsbhmnzdmqp6h4922l0yfii3pzmrdzv"; + sha256 = "1h24fzyr4kfm1nb2627hgg9nl5mwv1gihc3f2wb5000gxmjdasg8"; }; propagatedBuildInputs = with pythonPackages; [ setuptools ]; @@ -25,14 +25,14 @@ in { www = pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot_www"; - version = "0.9.7"; + version = "0.9.9.post2"; # NOTE: wheel is used due to buildbot circular dependency format = "wheel"; src = pythonPackages.fetchPypi { inherit pname version format; - sha256 = "1wf2spnilm0dkyw95vf57lca453sbly4r6ak3lxa8bpwhxb6lkdn"; + sha256 = "1yzk3sy9i8g8wz9vvghhxnafs5dzsd3sybmm8lg043129rh116b9"; }; meta = with stdenv.lib; { @@ -46,11 +46,11 @@ in { console-view = pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot-console-view"; - version = "0.9.7"; + version = "0.9.9.post2"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1iv77886rbbn0wlzl5qiqc08rgbymxirqh3vmimqwsabbh7fhzkm"; + sha256 = "0mmlxzlzl0r97jf0g98m7k1b13mzzy80445i0biazkj0vzkpwxza"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; @@ -66,11 +66,11 @@ in { waterfall-view = pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot-waterfall-view"; - version = "0.9.7"; + version = "0.9.9.post2"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1q42l25cryx0yp6lbbl0mxnxkb9h24wawhzhi1wkc3kj8zs5sifn"; + sha256 = "0pq45gddwjd61nxmr48cl8s533i4gy3wg9wzbj3g1yb30yrz8qf4"; }; propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; @@ -82,4 +82,25 @@ in { license = licenses.gpl2; }; }; + + grid-view = pythonPackages.buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "buildbot-grid-view"; + version = "0.9.9.post2"; + + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "16y7br1yniby8yp932ildn14cxvbw5ywx36d703c4d98dmnlrpaw"; + }; + + propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; + + meta = with stdenv.lib; { + homepage = http://buildbot.net/; + description = "Buildbot Grid View Plugin"; + maintainers = with maintainers; [ nand0p ]; + license = licenses.gpl2; + }; + }; + } diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix index 28fb719d84a..f87e8db8555 100644 --- a/pkgs/development/tools/build-managers/buildbot/worker.nix +++ b/pkgs/development/tools/build-managers/buildbot/worker.nix @@ -3,11 +3,11 @@ pythonPackages.buildPythonApplication (rec { name = "${pname}-${version}"; pname = "buildbot-worker"; - version = "0.9.7"; + version = "0.9.9.post2"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0s62i808l13a8dprmrb2dikh7d1xvvdnw3pfhl6im0i9fc64w6x4"; + sha256 = "1wb2fw0djamhn1sb7rwnf12i4ijdq9y4k33ri7dcwxxcavxsvqa0"; }; buildInputs = with pythonPackages; [ setuptoolsTrial mock ]; diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix index 590de68d52f..fb38e52811c 100644 --- a/pkgs/development/tools/build-managers/cmake/2.8.nix +++ b/pkgs/development/tools/build-managers/cmake/2.8.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2 , useNcurses ? false, ncurses, useQt4 ? false, qt4, wantPS ? false, ps ? null +, buildPlatform, hostPlatform }: with stdenv.lib; @@ -35,7 +36,7 @@ stdenv.mkDerivation rec { })] ++ # Don't search in non-Nix locations such as /usr, but do search in our libc. [ ./search-path.patch ] ++ - optional (stdenv ? cross) (fetchurl { + optional (hostPlatform != buildPlatform) (fetchurl { name = "fix-darwin-cross-compile.patch"; url = "http://public.kitware.com/Bug/file_download.php?" + "file_id=4981&type=bug"; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 460c6d44e4e..24897232fbc 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -52,12 +52,12 @@ rec { }; gradle_latest = gradleGen rec { - name = "gradle-4.0"; + name = "gradle-4.0.1"; nativeVersion = "0.14"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "1zlxnyb7iva0bb0862vbigfjrmxgbisa2zam7j896ams57g2vgan"; + sha256 = "1m2gnh1vs3f5acdqcxmc8d0pi65bzm3v1nliz29rhdfi01if85yp"; }; }; diff --git a/pkgs/development/tools/build-managers/pants/default.nix b/pkgs/development/tools/build-managers/pants/default.nix index 1e37a3f85e2..8ce495557e7 100644 --- a/pkgs/development/tools/build-managers/pants/default.nix +++ b/pkgs/development/tools/build-managers/pants/default.nix @@ -4,138 +4,37 @@ with stdenv.lib; with pythonPackages; let - # Get rid of this when pants 1.3.0 is released and make 0.5 the default - pathspec_0_3_4 = buildPythonApplication rec { - pname = "pathspec"; - version = "0.3.4"; - name = "${pname}-${version}"; + version = "1.3.0"; +in buildPythonApplication rec { + inherit version; + pname = "pantsbuild.pants"; + name = "${pname}-${version}"; - src = fetchPypi { - inherit pname version; - sha256 = "0a37yrr2jhlg8aiynxivh2xqani7l9j725qxzrm7cm7m4rfcl1bn"; - }; - - meta = { - description = "Utility library for gitignore-style pattern matching of file paths"; - homepage = "https://github.com/cpburnz/python-path-specification"; - license = licenses.mpl20; - maintainers = with maintainers; [ copumpkin ]; - }; + src = fetchPypi { + inherit pname version; + sha256 = "18fcf9047l9k006wz21g525p1w5avyjabmabh0giyz22xnm8g5gp"; }; - pants13-version = "1.3.0rc4"; - - # TODO: compile the rust native engine ourselves so we don't need to do this shit. We don't use - # fetchurl because we don't know the URL ahead of time, even though it's deterministic. So we have - # this downloader figure out the URL on the fly and then produce the deterministic result, so we - # can still be a fixed-output derivation. - pants13-native-engine-info = { - "x86_64-darwin" = { prefix = "mac/10.11"; hash = "04kfqp4fcxj7zkyb21rgp1kdrlnmayfvakpg5xips716d7pp6vc7"; }; - "x86_64-linux" = { prefix = "linux/x86_64"; hash = "0vgmcqxcabryxgvk4wmbclqjn56jbmsaysckgwfzhmif8pxyrfam"; }; - "i686-linux" = { prefix = "linux/i386"; hash = "1xgma6cwvzg1d07xq6bd3j4rpzp6wn6lz82xqprr6vflyn78qaaw"; }; - }.${stdenv.system} or (throw "Unsupported system ${stdenv.system}!"); - - pants13-native-engine = runCommand "pants-native-${pants13-version}" { - buildInputs = [ curl ]; - outputHashMode = "recursive"; - outputHashAlgo = "sha256"; - outputHash = pants13-native-engine-info.hash; - } '' - native_version=$(curl -k -L https://raw.githubusercontent.com/pantsbuild/pants/release_${pants13-version}/src/python/pants/engine/subsystem/native_engine_version) - curl -kLO "https://dl.bintray.com/pantsbuild/bin/build-support/bin/native-engine/${pants13-native-engine-info.prefix}/$native_version/native_engine.so" - - # Ugh it tries to "download" from this prefix so let's just replicate their directory structure for now... - mkdir -p $out/bin/native-engine/${pants13-native-engine-info.prefix}/$native_version/ - - # These should behave the same way in Nix land and we try not to differentiate between OS revisions... - mkdir -p $out/bin/native-engine/mac/ - ln -s 10.11 $out/bin/native-engine/mac/10.10 - ln -s 10.11 $out/bin/native-engine/mac/10.12 - - cp native_engine.so $out/bin/native-engine/${pants13-native-engine-info.prefix}/$native_version/ + prePatch = '' + sed -E -i "s/'([[:alnum:].-]+)[=><][[:digit:]=><.,]*'/'\\1'/g" setup.py ''; -in { - pants = - pythonPackages.buildPythonPackage rec { - pname = "pantsbuild.pants"; - version = "1.2.1"; - name = "${pname}-${version}"; - src = fetchPypi { - inherit pname version; - sha256 = "1bnzhhd2acwk7ckv56xzg2d9vxacl3k5bh13bsjxymnq3spm962w"; - }; + # Unnecessary, and causes some really weird behavior around .class files, which + # this package bundles. See https://github.com/NixOS/nixpkgs/issues/22520. + dontStrip = true; - prePatch = '' - sed -E -i "s/'([[:alnum:].-]+)[=><][^']*'/'\\1'/g" setup.py - ''; + propagatedBuildInputs = [ + twitter-common-collections setproctitle setuptools six ansicolors + packaging pathspec scandir twitter-common-dirutil psutil requests + pystache pex docutils markdown pygments twitter-common-confluence + fasteners coverage pywatchman futures cffi + ]; - # Unnecessary, and causes some really weird behavior around .class files, which - # this package bundles. See https://github.com/NixOS/nixpkgs/issues/22520. - dontStrip = true; - - propagatedBuildInputs = [ - ansicolors beautifulsoup4 cffi coverage docutils fasteners futures - isort lmdb markdown mock packaging pathspec_0_3_4 pep8 pex psutil pyflakes - pygments pystache pytestcov pytest pywatchman requests scandir - setproctitle setuptools six thrift wheel twitter-common-dirutil - twitter-common-confluence twitter-common-collections - ]; - - meta = { - description = "A build system for software projects in a variety of languages"; - homepage = "http://www.pantsbuild.org/"; - license = licenses.asl20; - maintainers = with maintainers; [ copumpkin ]; - platforms = platforms.unix; - }; - }; - - pants13-pre = buildPythonApplication rec { - pname = "pantsbuild.pants"; - version = pants13-version; - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "03zv3g55x056vjggwjr8lpniixcpb3kfy7xkl1bxsvjp2ih2wj6g"; - }; - - prePatch = '' - sed -E -i "s/'([[:alnum:].-]+)[=><][[:digit:]=><.,]*'/'\\1'/g" setup.py - - substituteInPlace src/pants/option/global_options.py \ - --replace "'/etc/pantsrc'" "'$out/etc/pantsrc', '/etc/pantsrc'" - ''; - - # Unnecessary, and causes some really weird behavior around .class files, which - # this package bundles. See https://github.com/NixOS/nixpkgs/issues/22520. - dontStrip = true; - - propagatedBuildInputs = [ - twitter-common-collections setproctitle setuptools six ansicolors - packaging pathspec scandir twitter-common-dirutil psutil requests - pystache pex docutils markdown pygments twitter-common-confluence - fasteners coverage pywatchman futures cffi - ]; - - # Teach pants about where its native engine lives. - # TODO: there's probably a better way to teach it this without having it "download" - # from a local file: URL to its cache, but I don't know how and this seems to work. - postFixup = '' - mkdir -p $out/etc - cat >$out/etc/pantsrc < %% @doc %% This takes an app name in the standard OTP - format -%% and returns just the app name. Why? because rebar doesn't +%% and returns just the app name. Why? Because rebar doesn't %% respect OTP conventions in some cases. -spec fixup_app_name(string()) -> string(). fixup_app_name(FileName) -> @@ -180,14 +180,14 @@ make_sure_registry_snapshot_exists(RegistrySnapshot) -> erlang:halt(1) end. --spec gather_required_data_from_the_environment(#data{}) -> {ok, map()}. +-spec gather_required_data_from_the_environment(#data{}) -> {ok, #data{}}. gather_required_data_from_the_environment(ArgData) -> {ok, ArgData#data{ version = guard_env("version") - , erl_libs = os:getenv("ERL_LIBS", []) - , plugins = os:getenv("buildPlugins", []) + , erl_libs = get_env("ERL_LIBS", []) + , plugins = get_env("buildPlugins", []) , root = code:root_dir() , name = guard_env("name") - , compile_ports = nix2bool(os:getenv("compilePorts", "")) + , compile_ports = nix2bool(get_env("compilePorts", "")) , registry_snapshot = guard_env("HEX_REGISTRY_SNAPSHOT")}}. -spec nix2bool(any()) -> boolean(). @@ -196,9 +196,17 @@ nix2bool("1") -> nix2bool("") -> false. +get_env(Name) -> + os:getenv(Name). +get_env(Name, Def) -> + case get_env(Name) of + false -> Def; + Val -> Val + end. + -spec guard_env(string()) -> string(). guard_env(Name) -> - case os:getenv(Name) of + case get_env(Name) of false -> stderr("Expected Environment variable ~s! Are you sure you are " "running in a Nix environment? Either a nix-build, " diff --git a/pkgs/development/tools/container-linux-config-transpiler/default.nix b/pkgs/development/tools/container-linux-config-transpiler/default.nix new file mode 100644 index 00000000000..eaae51f726b --- /dev/null +++ b/pkgs/development/tools/container-linux-config-transpiler/default.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, fetchFromGitHub, buildGoPackage }: + +with lib; + +buildGoPackage rec { + name = "ct-${version}"; + version = "0.4.1"; + + goPackagePath = "github.com/coreos/container-linux-config-transpiler"; + + src = fetchFromGitHub { + owner = "coreos"; + repo = "container-linux-config-transpiler"; + rev = "v${version}"; + sha256="1017xkinja30jcam8p1x2d9q4vkgkfn7gvkad004jkbbmd2216sa"; + }; + + buildFlagsArray = '' + -ldflags=-X ${goPackagePath}/internal/version.Raw=v${version} + ''; + + postInstall = '' + mv $bin/bin/{internal,ct} + rm $bin/bin/tools + ''; + + meta = { + description = "Convert a Container Linux Config into Ignition"; + license = licenses.asl20; + homepage = https://github.com/coreos/container-linux-config-transpiler; + maintainers = with maintainers; [elijahcaine]; + platforms = with platforms; unix; + }; +} + diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index e3f6e3c623c..7e11cf53199 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }: let - version = "9.2.0"; + version = "9.3.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz"; - sha256 = "0x6pwh3wjq2czvzb8rl8npa8a58snwf1f9dwr6rbbxijaf886jfc"; + sha256 = "1svml4k1zkmnw49sg4ipzl4fzvxx9rbj0643lwf6vm55j8xykhrq"; }; docker_arm = fetchurl { url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz"; - sha256 = "1y6i5dn1l1qlwyg95qw4sff2y9zypxwmvsw4mb0555vf157h88kg"; + sha256 = "0xbbbjd7hvhlzi47rzf09fzcpkd7jrf80xk1y736px75yyvq3jr2"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-ci-multi-runner"; rev = "v${version}"; - sha256 = "0gz6byjnnfn9acy40hcbyzdql4199xn0yvjx2cfjjjzd9kryjrxp"; + sha256 = "0ddsh31sqjp9xs6mv5jbmqvjq2hcy6j21grrn1m73z8blk4ylxsd"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix index d51a3270592..a3e6a063596 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }: let - version = "1.11.4"; + version = "1.11.5"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz"; - sha256 = "1ijkzn8jkzx1dzxhkf17987ligyf758xzas6ysix5b781jnkdm8z"; + sha256 = "0qy3xrq574c1lhkqw1zrkcn32w0ky3f4fppzdjhb5zwqvnaz7kx0"; }; docker_arm = fetchurl { url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz"; - sha256 = "0sq2nndnkzqv2yjljg08xwa3ppddn6vqcivhfh43zwwmansvb9ha"; + sha256 = "12clc28yc157s2kaa8239p0g086vq062jfjh2m1bxqmaypw9pyla"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-ci-multi-runner"; rev = "v${version}"; - sha256 = "1pm88546cijmrrcvvrajp2g6rsrzxhy83cwwwky8jjkl5w4hhmz4"; + sha256 = "1xgx8jbgcc3ga7dkjxa2i8nj4afsdavzpfrgpdzma03jkcq1g2sv"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/pkgs/development/tools/flamegraph/default.nix b/pkgs/development/tools/flamegraph/default.nix index 51bdf772adb..a351c325ea2 100644 --- a/pkgs/development/tools/flamegraph/default.nix +++ b/pkgs/development/tools/flamegraph/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation { - name = "FlameGraph-2017-05-11"; + name = "FlameGraph-2017-07-01"; src = fetchFromGitHub { owner = "brendangregg"; repo = "FlameGraph"; - rev = "6b2a446dfb5d8027a0adf14adf71748aa502c247"; - sha256 = "11j1776zsvhn9digqay1cbfhhxz01nv2hm44i4gnpqcxkada44l2"; + rev = "a93d905911c07c96a73b35ddbcb5ddb2f39da4b6"; + sha256 = "07z2ffnab41dz833wwgr875vjccqyh0238357g7ml1yg5445x2jy"; }; buildInputs = [ perl ]; diff --git a/pkgs/development/tools/git-ftp/default.nix b/pkgs/development/tools/git-ftp/default.nix new file mode 100644 index 00000000000..b4bc680a19a --- /dev/null +++ b/pkgs/development/tools/git-ftp/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, pandoc, man }: +stdenv.mkDerivation rec { + name = "git-ftp-${version}"; + version = "1.4.0"; + src = fetchFromGitHub { + owner = "git-ftp"; + repo = "git-ftp"; + rev = version; + sha256 = "0n8q1azamf10qql8f8c4ppbd3iisy460gwxx09v5d9hji5md27s3"; + }; + + dontBuild = true; + + installPhase = '' + make install-all prefix=$out + ''; + + buildInputs = [pandoc man]; + + meta = with stdenv.lib; { + description = "Git powered FTP client written as shell script."; + homepage = https://git-ftp.github.io/; + license = licenses.gpl3; + maintainers = with maintainers; [ tweber ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/go2nix/default.nix b/pkgs/development/tools/go2nix/default.nix index a6f5d62e29e..9a3ff192ba9 100644 --- a/pkgs/development/tools/go2nix/default.nix +++ b/pkgs/development/tools/go2nix/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { name = "go2nix-${version}"; - version = "1.2.0"; + version = "1.2.1"; rev = "v${version}"; goPackagePath = "github.com/kamilchm/go2nix"; @@ -12,7 +12,7 @@ buildGoPackage rec { inherit rev; owner = "kamilchm"; repo = "go2nix"; - sha256 = "1hlanw56r1phj89sicpsfcz6sdjba9qjwhiblcsqka4wfqkai8pn"; + sha256 = "0fr9aa50yvchfhv6h6zqblx8ynxk41i2hmv87b344zr2rz6rms72"; }; goDeps = ./deps.nix; diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index a2ff8410889..62bf6557f68 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "godot-${version}"; - version = "2.1.1-stable"; + version = "2.1.3-stable"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; rev = version; - sha256 = "071qkm1l6yn2s9ha67y15w2phvy5m5wl3wqvrslhfmnsir3q3k01"; + sha256 = "04qbab0icpv3ascr4dqgj18sqvw04a1jypcngb0ji8npa8q9wxb2"; }; buildInputs = [ diff --git a/pkgs/development/tools/godot/pkg_config_additions.patch b/pkgs/development/tools/godot/pkg_config_additions.patch index f5e835a7374..c4675322e2b 100644 --- a/pkgs/development/tools/godot/pkg_config_additions.patch +++ b/pkgs/development/tools/godot/pkg_config_additions.patch @@ -1,5 +1,5 @@ +++ build/platform/x11/detect.py -@@ -132,6 +132,10 @@ +@@ -139,6 +139,10 @@ env.ParseConfig('pkg-config xinerama --cflags --libs') env.ParseConfig('pkg-config xcursor --cflags --libs') env.ParseConfig('pkg-config xrandr --cflags --libs') @@ -9,4 +9,4 @@ + env.ParseConfig('pkg-config zlib --cflags --libs') if (env['builtin_openssl'] == 'no'): - env.ParseConfig('pkg-config openssl --cflags --libs') + # Currently not compatible with OpenSSL 1.1.0+ diff --git a/pkgs/development/tools/google-app-engine-go-sdk/default.nix b/pkgs/development/tools/google-app-engine-go-sdk/default.nix index 27ad4c996ce..e6f36b6e32e 100644 --- a/pkgs/development/tools/google-app-engine-go-sdk/default.nix +++ b/pkgs/development/tools/google-app-engine-go-sdk/default.nix @@ -4,17 +4,17 @@ with python27Packages; stdenv.mkDerivation rec { name = "google-app-engine-go-sdk-${version}"; - version = "1.9.53"; + version = "1.9.55"; src = if stdenv.system == "x86_64-linux" then fetchzip { url = "https://storage.googleapis.com/appengine-sdks/featured/go_appengine_sdk_linux_amd64-${version}.zip"; - sha256 = "04lfwf7ad7gi8xn891lz87b7pr2gyycgpaq96i0cgckrj2awayz2"; + sha256 = "1gwrmqs69h3wbx6z0a7shdr8gn1qiwrkvh3pg6mi7dybwmd1x61h"; } else fetchzip { url = "https://storage.googleapis.com/appengine-sdks/featured/go_appengine_sdk_darwin_amd64-${version}.zip"; - sha256 = "18hgl4wz3rhaklkwaxl8gm70h7l8k225f86da682kafawrr8zhv4"; + sha256 = "0b8r2fqg9m285ifz0jahd4wasv7cq61nr6p1k664w021r5y5lbvr"; }; buildInputs = [python27 makeWrapper]; diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix index 81707a6bfc3..ed6c7d73fdb 100644 --- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix +++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { name = "multi-ghc-travis-${version}"; - version = "git-2017-05-24"; + version = "git-2017-07-26"; buildInputs = [ ghc ]; src = fetchFromGitHub { owner = "hvr"; repo = "multi-ghc-travis"; - rev = "c1dcbcbcd3eadcc63adeac65d63497885b422a44"; - sha256 = "12xss8wgsqs2fghrfl4h6g5wli6wn274zmdsq5zdcib2m7da5yw2"; + rev = "800980d76f7a74f3cdfd76b3dff351d52d2c84ee"; + sha256 = "03y8b4iz5ly9vkjc551c1bxalg1vl4k2sic327s3vh00jmjgvhz6"; }; installPhase = '' @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/hvr/multi-ghc-travis"; license = licenses.bsd3; platforms = ghc.meta.platforms; - maintainers = with maintainers; [ jb55 ]; + maintainers = with maintainers; [ jb55 peti ]; }; } diff --git a/pkgs/development/tools/haskell/tinc/default.nix b/pkgs/development/tools/haskell/tinc/default.nix index 9c4b1f63148..db779ecbb0f 100644 --- a/pkgs/development/tools/haskell/tinc/default.nix +++ b/pkgs/development/tools/haskell/tinc/default.nix @@ -3,16 +3,16 @@ , hpack, hspec, HUnit, language-dot, mockery, parsec, process , QuickCheck, safe, stdenv, temporary, time, transformers, unix , unix-compat, with-location, yaml, fetchFromGitHub -, ghc, cabal2nix, cabal-install, makeWrapper +, cabal2nix, cabal-install, makeWrapper }: mkDerivation { pname = "tinc"; - version = "20170228"; + version = "20170624"; src = fetchFromGitHub { owner = "sol"; repo = "tinc"; - rev = "e829926a043a68a8a4dc551485c4d666837474af"; - sha256 = "1zdp1mqp3jn2faw0d3jlcbrkp4azgl5ahhq5pxdn24gyq70zkchc"; + rev = "70881515693fd83d381fe045ae76d5257774f5e3"; + sha256 = "0c6sx3vbcnq69dhqhpi01a4p4qss24rwxiz6jmw65rj73adhj4mw"; }; isLibrary = false; isExecutable = true; @@ -30,13 +30,12 @@ mkDerivation { postInstall = '' source ${makeWrapper}/nix-support/setup-hook wrapProgram $out/bin/tinc \ - --prefix PATH : '${ghc}/bin' \ --prefix PATH : '${cabal2nix}/bin' \ --prefix PATH : '${cabal-install}/bin' ''; description = "A dependency manager for Haskell"; homepage = "https://github.com/sol/tinc#readme"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "x86_64-linux" ]; maintainers = [ stdenv.lib.maintainers.robbinch ]; } diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix index 6334bb2e5dd..0e0a46c906e 100644 --- a/pkgs/development/tools/heroku/default.nix +++ b/pkgs/development/tools/heroku/default.nix @@ -41,6 +41,7 @@ in stdenv.mkDerivation rec { maintainers = with maintainers; [ aflatter mirdhyn peterhoeg ]; license = licenses.mit; platforms = with platforms; unix; + broken = true; # Outdated function, not supported upstream. https://github.com/NixOS/nixpkgs/issues/27447 }; binPath = lib.makeBinPath [ postgresql ruby ]; diff --git a/pkgs/development/tools/jd/default.nix b/pkgs/development/tools/jd/default.nix new file mode 100644 index 00000000000..3fe55de2ec8 --- /dev/null +++ b/pkgs/development/tools/jd/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildGoPackage, fetchgit }: + +buildGoPackage rec { + name = "jd-${version}"; + version = "0.3.1"; + rev = "2729b5af166cfd72bd953ef8959b456c4db940fc"; + + goPackagePath = "github.com/tidwall/jd"; + + src = fetchgit { + inherit rev; + url = "https://github.com/tidwall/jd"; + sha256 = "0dj4k38pf80dl77jns29vx2dj265s4ksg2q2s9n240b7b8z8mn5h"; + }; + + meta = with stdenv.lib; { + description = "Interactive JSON Editor"; + license = licenses.mit; + maintainers = [ maintainers.np ]; + }; +} diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 44a64d1ed3a..d13ea9390da 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -8,10 +8,13 @@ let version = "2.28"; basename = "binutils-${version}"; inherit (stdenv.lib) optional optionals optionalString; + # The prefix prepended to binary names to allow multiple binuntils on the + # PATH to both be usable. + prefix = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-"; in stdenv.mkDerivation rec { - name = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-" + basename; + name = prefix + basename; src = fetchurl { url = "mirror://gnu/binutils/${basename}.tar.bz2"; @@ -49,7 +52,8 @@ stdenv.mkDerivation rec { ++ [ "info" ] ++ optional (targetPlatform == hostPlatform) "dev"; - nativeBuildInputs = [ bison ]; + nativeBuildInputs = [ bison ] + ++ optional (hostPlatform != buildPlatform) buildPackages.stdenv.cc; buildInputs = [ zlib ]; inherit noSysDirs; @@ -76,15 +80,20 @@ stdenv.mkDerivation rec { then "-Wno-string-plus-int -Wno-deprecated-declarations" else "-static-libgcc"; + # TODO(@Ericson2314): Always pass "--target" and always prefix. + configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; configureFlags = [ "--enable-shared" "--enable-deterministic-archives" "--disable-werror" ] ++ optional (stdenv.system == "mips64el-linux") "--enable-fix-loongson2f-nop" - ++ optional (targetPlatform != hostPlatform) "--target=${targetPlatform.config}" # TODO: make this unconditional ++ optionals gold [ "--enable-gold" "--enable-plugins" ] ++ optional (stdenv.system == "i686-linux") "--enable-targets=x86_64-linux-gnu"; enableParallelBuilding = true; + passthru = { + inherit prefix; + }; + meta = with stdenv.lib; { description = "Tools for manipulating binaries (linker, assembler, etc.)"; longDescription = '' diff --git a/pkgs/development/tools/misc/blackmagic/default.nix b/pkgs/development/tools/misc/blackmagic/default.nix new file mode 100644 index 00000000000..ab84cb37656 --- /dev/null +++ b/pkgs/development/tools/misc/blackmagic/default.nix @@ -0,0 +1,59 @@ +{ stdenv, lib, fetchFromGitHub +, gcc-arm-embedded, bash, libftdi +, python, pythonPackages +}: + +with lib; + +stdenv.mkDerivation rec { + name = "blackmagic-${version}"; + version = "1.6.1"; + + src = fetchFromGitHub { + owner = "blacksphere"; + repo = "blackmagic"; + rev = "d3a8f27fdbf952194e8fc5ce9b2fc9bcef7c545c"; + sha256 = "0c3l7cfqag3g7zrfn4mmikkx7076hb1r856ybhhdh0f6zji2j6jx"; + fetchSubmodules = true; + }; + + buildInputs = [ + gcc-arm-embedded + libftdi + python + pythonPackages.intelhex + ]; + + postPatch = '' + # Prevent calling out to `git' to generate a version number: + substituteInPlace src/Makefile \ + --replace '`git describe --always --dirty`' '${version}' + + # Fix scripts that generate headers: + for f in $(find scripts libopencm3/scripts -type f); do + patchShebangs "$f" + done + ''; + + buildPhase = "${stdenv.shell} ${./helper.sh}"; + installPhase = ":"; # buildPhase does this. + + meta = { + description = "In-application debugger for ARM Cortex microcontrollers"; + longDescription = '' + The Black Magic Probe is a modern, in-application debugging tool + for embedded microprocessors. It allows you to see what is going + on "inside" an application running on an embedded microprocessor + while it executes. + + This package builds the firmware for all supported platforms, + placing them in separate directories under the firmware + directory. It also places the FTDI version of the blackmagic + executable in the bin directory. + ''; + homepage = https://github.com/blacksphere/blackmagic; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ pjones ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/misc/blackmagic/helper.sh b/pkgs/development/tools/misc/blackmagic/helper.sh new file mode 100755 index 00000000000..b4c7558885b --- /dev/null +++ b/pkgs/development/tools/misc/blackmagic/helper.sh @@ -0,0 +1,49 @@ +################################################################################ +# Build all of the platforms manually since the `all_platforms' target +# doesn't preserve all of the build outputs and overrides CFLAGS. +set -e +set -u + +################################################################################ +# Prevent a warning from shellcheck: +out=${out:-/tmp} + +################################################################################ +export CFLAGS=$NIX_CFLAGS_COMPILE + +################################################################################ +PRODUCTS="blackmagic.bin blackmagic.hex blackmagic_dfu.bin blackmagic_dfu.hex" + +################################################################################ +make_platform() { + echo "Building for hardware platform $1" + + make clean + make PROBE_HOST="$1" + + if [ "$1" = libftdi ]; then + mkdir -p "$out/bin" + install -m 0555 blackmagic "$out/bin" + fi + + for f in $PRODUCTS; do + if [ -r "$f" ]; then + mkdir -p "$out/firmware/$1" + install -m 0444 "$f" "$out/firmware/$1" + fi + done + +} + +################################################################################ +# Start by building libopencm3: +make -C libopencm3 + +################################################################################ +# And now all of the platforms: +cd src + +for platform in platforms/*/Makefile.inc; do + probe=$(basename "$(dirname "$platform")") + make_platform "$probe" +done diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 99348e907a9..765fdfb2ea4 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -2,15 +2,18 @@ let ccache = stdenv.mkDerivation rec { name = "ccache-${version}"; - version = "3.2.5"; + version = "3.3.4"; src = fetchurl { - sha256 = "11db1g109g0g5si0s50yd99ja5f8j4asxb081clvx78r9d9i2w0i"; + sha256 = "0ks0vk408mdppfbk8v38p46fqx3p30r9a9cwiia43373i7rmpw94"; url = "mirror://samba/ccache/${name}.tar.xz"; }; buildInputs = [ zlib ]; + # non to be fail on filesystems with unconventional blocksizes (zfs on Hydra?) + patches = [ ./skip-fs-dependent-test.patch ]; + postPatch = '' substituteInPlace Makefile.in --replace 'objs) $(extra_libs)' 'objs)' ''; diff --git a/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch b/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch new file mode 100644 index 00000000000..ecd3c4c9a74 --- /dev/null +++ b/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch @@ -0,0 +1,43 @@ +--- ccache-3.3.4.org/test.sh 2017-02-17 21:28:53.000000000 +0000 ++++ ccache-3.3.4/test.sh 2017-07-01 18:38:00.523403023 +0100 +@@ -2631,23 +2631,23 @@ + $CCACHE -F 0 -M 256K >/dev/null + $CCACHE -c >/dev/null + # floor(0.8 * 4) = 3 +- expect_file_count 3 '*.o' $CCACHE_DIR +- expect_file_count 3 '*.d' $CCACHE_DIR +- expect_file_count 3 '*.stderr' $CCACHE_DIR +- expect_stat 'files in cache' 9 +- expect_stat 'cleanups performed' 1 +- for i in 3 4 5; do +- file=$CCACHE_DIR/a/result$i-4017.o +- if [ ! -f $file ]; then +- test_failed "File $file removed when it shouldn't" +- fi +- done +- for i in 0 1 2 6 7 8 9; do +- file=$CCACHE_DIR/a/result$i-4017.o +- if [ -f $file ]; then +- test_failed "File $file not removed when it should" +- fi +- done ++ #expect_file_count 3 '*.o' $CCACHE_DIR ++ #expect_file_count 3 '*.d' $CCACHE_DIR ++ #expect_file_count 3 '*.stderr' $CCACHE_DIR ++ #expect_stat 'files in cache' 9 ++ #expect_stat 'cleanups performed' 1 ++ #for i in 3 4 5; do ++ # file=$CCACHE_DIR/a/result$i-4017.o ++ # if [ ! -f $file ]; then ++ # test_failed "File $file removed when it shouldn't" ++ # fi ++ #done ++ #for i in 0 1 2 6 7 8 9; do ++ # file=$CCACHE_DIR/a/result$i-4017.o ++ # if [ -f $file ]; then ++ # test_failed "File $file not removed when it should" ++ # fi ++ #done + + # ------------------------------------------------------------------------- + TEST "Automatic cache cleanup" diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix index d768f68576c..c8378e06df6 100644 --- a/pkgs/development/tools/misc/creduce/default.nix +++ b/pkgs/development/tools/misc/creduce/default.nix @@ -10,11 +10,11 @@ assert stdenv.isLinux -> (utillinux != null); stdenv.mkDerivation rec { name = "creduce-${version}"; - version = "2.6.0"; + version = "2.7.0"; src = fetchurl { url = "http://embed.cs.utah.edu/creduce/${name}.tar.gz"; - sha256 = "0pf5q0n8vkdcr1wrkxn2jzxv0xkrir13bwmqfw3jpbm3dh2c3b6d"; + sha256 = "0h8s4d54q6cl6i45x3143l2xmr29b2yhr3m0n5qqx63sr5csip1n"; }; buildInputs = [ diff --git a/pkgs/development/tools/misc/csmith/default.nix b/pkgs/development/tools/misc/csmith/default.nix new file mode 100644 index 00000000000..20d149f3efe --- /dev/null +++ b/pkgs/development/tools/misc/csmith/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, m4, makeWrapper, libbsd, perl, SysCPU }: + +stdenv.mkDerivation rec { + name = "csmith-${version}"; + version = "2.3.0"; + + src = fetchurl { + url = "http://embed.cs.utah.edu/csmith/${name}.tar.gz"; + sha256 = "1mb5zgixsyf86slggs756k8a5ddmj980md3ic9sa1y75xl5cqizj"; + }; + + nativeBuildInputs = [ m4 makeWrapper ]; + buildInputs = [ libbsd perl SysCPU ]; + + postInstall = '' + substituteInPlace $out/bin/compiler_test.pl \ + --replace '$CSMITH_HOME/runtime' $out/include/${name} \ + --replace ' ''${CSMITH_HOME}/runtime' " $out/include/${name}" \ + --replace '$CSMITH_HOME/src/csmith' $out/bin/csmith + + substituteInPlace $out/bin/launchn.pl \ + --replace '../compiler_test.pl' $out/bin/compiler_test.pl \ + --replace '../$CONFIG_FILE' '$CONFIG_FILE' + + wrapProgram $out/bin/launchn.pl --prefix PERL5LIB : "$PERL5LIB" $out/bin/launchn.pl + + mkdir -p $out/share/csmith + mv $out/bin/compiler_test.in $out/share/csmith/ + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A random generator of C programs"; + homepage = "https://embed.cs.utah.edu/csmith"; + # Officially, the license is this: https://github.com/csmith-project/csmith/blob/master/COPYING + license = licenses.bsd2; + longDescription = '' + Csmith is a tool that can generate random C programs that statically and + dynamically conform to the C99 standard. It is useful for stress-testing + compilers, static analyzers, and other tools that process C code. + Csmith has found bugs in every tool that it has tested, and has been used + to find and report more than 400 previously unknown compiler bugs. + ''; + maintainers = [ maintainers.dtzWill ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index 8f3818fb6b4..b8e2a9a189b 100644 --- a/pkgs/development/tools/misc/fswatch/default.nix +++ b/pkgs/development/tools/misc/fswatch/default.nix @@ -10,24 +10,17 @@ stdenv.mkDerivation rec { name = "fswatch-${version}"; - version = "1.5.0"; + version = "1.9.3"; src = fetchFromGitHub { owner = "emcrisostomo"; repo = "fswatch"; rev = version; - sha256 = "09np75m9df2nk7lc5y9wgq467ca6jsd2p5666d5rkzjvy6s0a51n"; + sha256 = "1g329aapdvbzhr39wyh295shpfq5f0nlzsqkjnr8l6zzak7f4yrg"; }; buildInputs = [ autoreconfHook gettext libtool makeWrapper texinfo ]; - postFixup = '' - for prog in fswatch-run fswatch-run-bash; do - wrapProgram $out/bin/$prog \ - --prefix PATH "${findutils}/bin" - done - ''; - meta = with stdenv.lib; { description = "A cross-platform file change monitor with multiple backends"; homepage = https://github.com/emcrisostomo/fswatch; @@ -35,5 +28,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ pSub ]; }; - } diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 1e9cf910857..78dd4a1e3f5 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -48,6 +48,9 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral"; + # TODO(@Ericson2314): Always pass "--target" and always prefix. + configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + configureFlags = with stdenv.lib; [ "--with-gmp=${gmp.dev}" "--with-mpfr=${mpfr.dev}" "--with-system-readline" "--with-system-zlib" "--with-expat" "--with-libexpat-prefix=${expat.dev}" @@ -55,8 +58,6 @@ stdenv.mkDerivation rec { # TODO(@Ericson2314): make this conditional on whether host platform is NixOS "--with-separate-debug-dir=/run/current-system/sw/lib/debug" ++ stdenv.lib.optional (!pythonSupport) "--without-python" - # TODO(@Ericson2314): This should be done in stdenv, not per-package - ++ stdenv.lib.optional (targetPlatform != hostPlatform) "--target=${targetPlatform.config}" ++ stdenv.lib.optional multitarget "--enable-targets=all"; postInstall = diff --git a/pkgs/development/tools/misc/gede/build.patch b/pkgs/development/tools/misc/gede/build.patch deleted file mode 100644 index bdd8b7ff5f9..00000000000 --- a/pkgs/development/tools/misc/gede/build.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/build.py 2017-01-16 21:12:43.000000000 +0100 -+++ b/build.py 2017-02-26 22:03:11.394625315 +0100 -@@ -71,7 +71,7 @@ - if do_build: - if not os.path.exists("Makefile"): - print("Generating makefile") -- if subprocess.call(['qmake-qt4']): -+ if subprocess.call(['qmake']): - exit(1) - - print("Compiling (please wait)") diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix index 5667e496a70..24f099a1533 100644 --- a/pkgs/development/tools/misc/gede/default.nix +++ b/pkgs/development/tools/misc/gede/default.nix @@ -1,24 +1,29 @@ -{stdenv, fetchurl, ctags, qt4, python}: +{ stdenv, fetchurl, makeWrapper, python, qt4, ctags, gdb }: stdenv.mkDerivation rec { - - version = "2.0.3"; name = "gede-${version}"; + version = "2.0.4"; + src = fetchurl { url = "http://gede.acidron.com/uploads/source/${name}.tar.xz"; - sha256 = "1znlmkjgrmjl79q73xaa9ybp1xdc3k4h4ynv3jj5z8f92gjnj3kk"; + sha256 = "0ip86ss35sc330p4aykv5qj74jbdwh38i928w1bxb6g3w0xmfqba"; }; - buildInputs = [ ctags qt4 python ]; - patches = [ ./build.patch ]; + nativeBuildInputs = [ makeWrapper python ]; - unpackPhase = '' - tar xf ${src} - cd ${name} + buildInputs = [ qt4 ]; + + postPatch = '' + sed -i build.py -e 's,qmake-qt4,qmake,' + ''; + + buildPhase = ":"; + + installPhase = '' + python build.py install --prefix="$out" + wrapProgram $out/bin/gede \ + --prefix PATH : ${stdenv.lib.makeBinPath [ ctags gdb ]} ''; - configurePhase = ""; - buildPhase = ""; - installPhase = "./build.py install --prefix=$out"; meta = with stdenv.lib; { description = "Graphical frontend (GUI) to GDB"; @@ -28,4 +33,3 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ juliendehos ]; }; } - diff --git a/pkgs/development/tools/misc/help2man/1.40.4-cygwin-nls.patch b/pkgs/development/tools/misc/help2man/1.40.4-cygwin-nls.patch index 20b99998154..82f8cf1cb37 100644 --- a/pkgs/development/tools/misc/help2man/1.40.4-cygwin-nls.patch +++ b/pkgs/development/tools/misc/help2man/1.40.4-cygwin-nls.patch @@ -16,8 +16,8 @@ that we're trying to help2man). install_preload: install_dirs preload - $(INSTALL_PROGRAM) $(preload).so $(DESTDIR)$(pkglibdir) -+ $(INSTALL_PROGRAM) lib/cygintl-8.dll $(DESTDIR)$(pkglibdir) -+ ln -sf cygintl-8.dll $(DESTDIR)$(pkglibdir)/$(preload).so ++ $(INSTALL_PROGRAM) lib/cygintl-9.dll $(DESTDIR)$(pkglibdir) ++ ln -sf cygintl-9.dll $(DESTDIR)$(pkglibdir)/$(preload).so install_l10n: install_dirs msg_l10n man_l10n info_l10n set -e; \ @@ -27,8 +27,8 @@ that we're trying to help2man). $(preload).so: $(srcdir)/$(preload).c - $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ -fPIC -shared $? $(LIBS) + mkdir -p lib -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o lib/cygintl-8.dll -shared $? $(LIBS) -+ ln -sf lib/cygintl-8.dll $@ ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o lib/cygintl-9.dll -shared $? $(LIBS) ++ ln -sf lib/cygintl-9.dll $@ man: $(target).1 $(target).1: $(srcdir)/$(target).PL $(srcdir)/$(target).h2m.PL @@ -62,7 +62,7 @@ that we're trying to help2man). return; +#ifdef __CYGWIN__ -+ if (!(RTLD_NEXT = dlopen("/usr/bin/cygintl-8.dll", RTLD_LAZY))) ++ if (!(RTLD_NEXT = dlopen("/usr/bin/cygintl-9.dll", RTLD_LAZY))) + die("libintl8 not found"); +#endif + diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 8bf3db59147..5e2edce56f0 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, gettext, LocaleGettext, makeWrapper }: +{ stdenv, hostPlatform, fetchurl, perl, gettext, LocaleGettext, makeWrapper }: stdenv.mkDerivation rec { name = "help2man-1.47.4"; @@ -12,11 +12,12 @@ stdenv.mkDerivation rec { doCheck = false; # target `check' is missing - patches = if stdenv.isCygwin then [ ./1.40.4-cygwin-nls.patch ] else null; + patches = if hostPlatform.isCygwin then [ ./1.40.4-cygwin-nls.patch ] else null; postInstall = '' wrapProgram "$out/bin/help2man" \ - --prefix PERL5LIB : "$(echo ${LocaleGettext}/lib/perl*/site_perl)" + --prefix PERL5LIB : "$(echo ${LocaleGettext}/lib/perl*/site_perl)" \ + ${stdenv.lib.optionalString hostPlatform.isCygwin "--prefix PATH : ${gettext}/bin"} ''; diff --git a/pkgs/development/tools/misc/hound/default.nix b/pkgs/development/tools/misc/hound/default.nix index e9da64b112b..f438e72b64e 100644 --- a/pkgs/development/tools/misc/hound/default.nix +++ b/pkgs/development/tools/misc/hound/default.nix @@ -2,8 +2,8 @@ buildGoPackage rec { name = "hound-unstable-${version}"; - version = "20160919-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "f95e9a9224b8878b9cd8fac0afb6d31f83a65ca7"; + version = "20170324"; + rev = "effbe5873f329fcdf982e906b756b535e2804ebc"; goPackagePath = "github.com/etsy/hound"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "etsy"; repo = "hound"; - sha256 = "0d4mhka7f8x8xfjrjhl5l0v06ng8kc868jrajpv5bjkxsj71nwbg"; + sha256 = "0zc769lygad5an63z5mivaggbmm07d9ynngi2jx3f7651wpji4aw"; }; goDeps = ./deps.nix; diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index ba2c62ce8ea..fe1bb771fca 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -62,15 +62,15 @@ let }; in releaseTools.nixBuild rec { name = "hydra-${version}"; - version = "2017-04-26"; + version = "2017-06-22"; inherit stdenv; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "1f94f0369937c9187b158f53a4a361507a62c5e9"; - sha256 = "0h013690pwm20vykccr6l4k0q1jdb065127pblfhs23a287ayqlm"; + rev = "803833aba77e1082c14857aa26933fc7fe5ae190"; + sha256 = "1cnxpsan8l6fnbr73n0qxxq1szlda1n3qfkk9k9ic8ijk7md4pvs"; }; buildInputs = diff --git a/pkgs/development/tools/misc/kibana/5.x.nix b/pkgs/development/tools/misc/kibana/5.x.nix index 4a4fc3e214f..71e21d31bb7 100644 --- a/pkgs/development/tools/misc/kibana/5.x.nix +++ b/pkgs/development/tools/misc/kibana/5.x.nix @@ -11,9 +11,9 @@ let elasticArch = archOverrides."${arch}" or arch; plat = elemAt info 1; shas = { - "x86_64-linux" = "1g5i81wq77fk6pyaq3rpfqs2m23xsbz2cndh3rg4b59ibg5qv0sq"; - "i686-linux" = "0pxnpg3g8l6hy8qz404kbkk5rd9y65jrzd0y9j8wr5fd4pqs7vgv"; - "x86_64-darwin" = "0pffl2hbck3s271jlzdibp5698djm5fdvj15w2knm815rs2kfbl5"; + "x86_64-linux" = "0b3kxd2s66pps5262khnh9yvp2mlwan6461ggxba380hfm7xxi6y"; + "i686-linux" = "1vfl1xmzvrr064nbsbwr597r7hbxyh27397n981scgb1j1y7qja9"; + "x86_64-darwin" = "19iw39qi7i8685s3mg3y6wsqnsddc6fj06g80vqbg76x8160z7dl"; }; in stdenv.mkDerivation rec { name = "kibana-${version}"; diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index a81255212da..f25fbcd00d8 100644 --- a/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/pkgs/development/tools/misc/libtool/libtool2.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, m4, perl, help2man }: +{ stdenv, fetchurl, m4, perl, help2man +, buildPlatform, hostPlatform +}: stdenv.mkDerivation rec { name = "libtool-2.4.6"; @@ -23,7 +25,7 @@ stdenv.mkDerivation rec { # Don't run the native `strip' when cross-compiling. This breaks at least # with `.a' files for MinGW. - dontStrip = stdenv ? cross; + dontStrip = hostPlatform != buildPlatform; meta = { description = "GNU Libtool, a generic library support script"; diff --git a/pkgs/development/tools/misc/linuxkit/default.nix b/pkgs/development/tools/misc/linuxkit/default.nix new file mode 100644 index 00000000000..71bc3b87a7a --- /dev/null +++ b/pkgs/development/tools/misc/linuxkit/default.nix @@ -0,0 +1,29 @@ +{ lib, buildGoPackage, go, fetchFromGitHub }: + +buildGoPackage rec { + name = "linuxkit-${version}"; + version = "2017-07-08"; + rev = "8ca19a84d5281b1b15c7a48c21e5786943b47f1c"; + + goPackagePath = "github.com/linuxkit/linuxkit"; + + src = fetchFromGitHub { + owner = "linuxkit"; + repo = "linuxkit"; + inherit rev; + sha256 = "150y7hnjhi81iik7np27y5466ldaackq72mpi7vmybbl7vr1wgw4"; + }; + + subPackages = [ "src/cmd/linuxkit" ]; + + preBuild = '' + buildFlagsArray+=("-ldflags" "-X main.GitCommit=${builtins.substring 0 7 rev} -X main.Version=0.0.0") + ''; + + meta = { + description = "A toolkit for building secure, portable and lean operating systems for containers"; + license = lib.licenses.asl20; + homepage = https://github.com/linuxkit/linuxkit; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix index 733399ebf7d..9e29487a2f3 100644 --- a/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/pkgs/development/tools/misc/lttng-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "lttng-tools-${version}"; - version = "2.9.3"; + version = "2.9.5"; src = fetchurl { url = "https://lttng.org/files/lttng-tools/${name}.tar.bz2"; - sha256 = "0kmj0ya5625mn2khbnghhsdmjr66xs0mhrvbrsdvrp3pm6mbmrm6"; + sha256 = "073kzfiwgvz7c10hihjwn1p53hh1jwvdkkway0jj2rbczjv9x0vp"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix index 2d3fc656052..3b294d13757 100644 --- a/pkgs/development/tools/misc/lttng-ust/default.nix +++ b/pkgs/development/tools/misc/lttng-ust/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, liburcu }: +{ stdenv, fetchurl, liburcu, python }: # NOTE: # ./configure ... # [...] # LTTng-UST will be built with the following options: -# +# # Java support (JNI): Disabled # sdt.h integration: Disabled # [...] @@ -13,14 +13,18 @@ stdenv.mkDerivation rec { name = "lttng-ust-${version}"; - version = "2.9.0"; + version = "2.9.1"; src = fetchurl { url = "https://lttng.org/files/lttng-ust/${name}.tar.bz2"; - sha256 = "1bsxxaqhkh9bwr1ll5acb41hvis2lhkl00h5ra2wdps27y31lm2d"; + sha256 = "196snxrs1p205jz566rwxh7dqzsa3k16c7vm6k7i3gdvrmkx54dq"; }; - buildInputs = [ liburcu ]; + buildInputs = [ liburcu python ]; + + preConfigure = '' + patchShebangs . + ''; meta = with stdenv.lib; { description = "LTTng Userspace Tracer libraries"; diff --git a/pkgs/development/tools/misc/moby/default.nix b/pkgs/development/tools/misc/moby/default.nix new file mode 100644 index 00000000000..e6f7ac3290b --- /dev/null +++ b/pkgs/development/tools/misc/moby/default.nix @@ -0,0 +1,27 @@ +{ lib, buildGoPackage, go, fetchFromGitHub }: + +buildGoPackage rec { + name = "moby-${version}"; + version = "2017-07-06"; + rev = "d87a3f9990ed24ebbb51695879cd640cb07a4b40"; + + goPackagePath = "github.com/moby/tool"; + + src = fetchFromGitHub { + owner = "moby"; + repo = "tool"; + inherit rev; + sha256 = "0xhasm69g5gwihcm8g7rff9nkx7iffvd642bknky6j3w133gs5lp"; + }; + + preBuild = '' + buildFlagsArray+=("-ldflags" "-X main.GitCommit=${builtins.substring 0 7 rev} -X main.Version=0.0.0") + ''; + + meta = { + description = "Assembly tool for the Moby project, an open framework to assemble specialized container systems without reinventing the wheel"; + license = lib.licenses.asl20; + homepage = https://mobyproject.org; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/development/tools/misc/pkgconfig/2.36.3-not-win32.patch b/pkgs/development/tools/misc/pkgconfig/2.36.3-not-win32.patch index 246173d465a..c1dd808e600 100644 --- a/pkgs/development/tools/misc/pkgconfig/2.36.3-not-win32.patch +++ b/pkgs/development/tools/misc/pkgconfig/2.36.3-not-win32.patch @@ -309,3 +309,16 @@ # else /* On old systems which lack it, use setlocale or getenv. */ +diff --git a/glib/gtypes.h b/glib/gtypes.h +index c18e0bf..816685a 100644 +--- a/glib/glib/gtypes.h ++++ b/glib/glib/gtypes.h +@@ -462,7 +462,7 @@ G_END_DECLS + * properly get exported in Windows DLLs. + */ + #ifndef GLIB_VAR +-# ifdef G_PLATFORM_WIN32 ++# ifdef G_OS_WIN32 + # ifdef GLIB_STATIC_COMPILATION + # define GLIB_VAR extern + # else /* !GLIB_STATIC_COMPILATION */ diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix index 10358df69c2..5be42855a9c 100644 --- a/pkgs/development/tools/misc/pkgconfig/default.nix +++ b/pkgs/development/tools/misc/pkgconfig/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-internal-glib" ] ++ optional (stdenv.isSunOS) [ "--with-libiconv=gnu" "--with-system-library-path" "--with-system-include-path" "CFLAGS=-DENABLE_NLS" ]; - postInstall = ''rm "$out"/bin/*-pkg-config''; # clean the duplicate file + postInstall = ''rm -f "$out"/bin/*-pkg-config''; # clean the duplicate file meta = { description = "A tool that allows packages to find out information about other packages"; diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 549872646cb..2dad1c596ab 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "strace-${version}"; - version = "4.17"; + version = "4.18"; src = fetchurl { url = "mirror://sourceforge/strace/${name}.tar.xz"; - sha256 = "06bl4dld5fk4a3iiq4pyrkm6sh63599ah8dmds0glg5vbw45pww1"; + sha256 = "026agy9nq238nx3ynhmi8h3vx96yra4xacfsm2ybs9k23ry8ibc9"; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/pkgs/development/tools/misc/teensy-loader-cli/default.nix index db86f1a56d6..7b360655c4f 100644 --- a/pkgs/development/tools/misc/teensy-loader-cli/default.nix +++ b/pkgs/development/tools/misc/teensy-loader-cli/default.nix @@ -6,8 +6,8 @@ stdenv.mkDerivation { name = "teensy-loader-cli-${version}"; src = fetchgit { url = "git://github.com/PaulStoffregen/teensy_loader_cli.git"; - rev = "001da416bc362ff24485ff97e3a729bd921afe98"; - sha256 = "36aed0a725055e36d71183ff57a023993099fdc380072177cffc7676da3c3966"; + rev = "f5b6d7aafda9a8b014b4bb08660833ca45c136d2"; + sha256 = "1a663bv3lvm7bsf2wcaj2c0vpmniak7w5hwix5qgz608bvm2v781"; }; buildInputs = [ unzip libusb ]; diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix index 84e57e267c2..1eed4c2ad86 100644 --- a/pkgs/development/tools/misc/yodl/default.nix +++ b/pkgs/development/tools/misc/yodl/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "yodl-${version}"; - version = "3.08.02"; + version = "4.01.00"; nativeBuildInputs = [ icmake ]; buildInputs = [ perl ]; src = fetchFromGitHub { - sha256 = "0z4pjrl4bq03fxc50c9h0bnc90vqn5c2dy830mjyzjrn1ms3i003"; + sha256 = "1aahwmj4gmf59lrij2373lkgfj77i3ghdas9c7iqrjwaizb0430p"; rev = version; repo = "yodl"; owner = "fbb-git"; diff --git a/pkgs/development/tools/nailgun/default.nix b/pkgs/development/tools/nailgun/default.nix new file mode 100644 index 00000000000..aef851e6476 --- /dev/null +++ b/pkgs/development/tools/nailgun/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchMavenArtifact, fetchFromGitHub, bash, jre, makeWrapper }: + +let + version = "0.9.1"; + nailgun-server = fetchMavenArtifact { + groupId = "com.martiansoftware"; + artifactId = "nailgun-server"; + inherit version; + sha256 = "09ggkkd1s58jmpc74s6m10d3hyf6bmif31advk66zljbpykgl625"; + }; +in +stdenv.mkDerivation rec { + name = "nailgun-${version}"; + + src = fetchFromGitHub { + owner = "martylamb"; + repo = "nailgun"; + rev = "1ad9ad9d2d17c895144a9ee0e7acb1d3d90fb66f"; + sha256 = "1f8ac5kg7imhix9kqdzwiav1bxh8vljv2hb1mq8yz4rqsrx2r4w3"; + }; + + makeFlags = "PREFIX=$(out)"; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + install -D ng $out/bin/ng + + makeWrapper ${jre}/bin/java $out/bin/ng-server \ + --add-flags '-cp ${nailgun-server.jar}:$CLASSPATH com.martiansoftware.nailgun.NGServer' + ''; + + meta = with stdenv.lib; { + description = "Client, protocol, and server for running Java programs from the command line without incurring the JVM startup overhead"; + homepage = http://martiansoftware.com/nailgun/; + license = licenses.apsl20; + platforms = platforms.linux; + maintainer = with maintainers; [ volth ]; + }; +} diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index bc98e6454d1..648ec965d35 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -6,11 +6,11 @@ in stdenv.mkDerivation { - name = "camlp5${if transitional then "_transitional" else ""}-6.17"; + name = "camlp5${if transitional then "_transitional" else ""}-7.01"; src = fetchzip { - url = https://github.com/camlp5/camlp5/archive/rel617.tar.gz; - sha256 = "0finmr6y0lyd7mnl61kmvwd32cmmf64m245vdh1iy0139rxf814c"; + url = https://github.com/camlp5/camlp5/archive/rel701.tar.gz; + sha256 = "1gxhj7y30f1hbcqnqgg80wz0ymbslsfh09kl2kiackp49fywl606"; }; buildInputs = [ ocaml ]; diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 71da6dd6d32..846546ae769 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ocaml-findlib-${version}"; - version = "1.7.1"; + version = "1.7.3"; src = fetchurl { url = "http://download.camlcity.org/download/findlib-${version}.tar.gz"; - sha256 = "1vsys5gpahi36nxv5yx29zhwn8b2d7sqqswza05vxy5bx5wrljsx"; + sha256 = "12xx8si1qv3xz90qsrpazjjk4lc1989fzm97rsmc4diwla7n15ni"; }; buildInputs = [m4 ncurses ocaml]; diff --git a/pkgs/development/tools/ocaml/findlib/install_topfind.patch b/pkgs/development/tools/ocaml/findlib/install_topfind.patch index 096330a31ae..7cd32991d0e 100644 --- a/pkgs/development/tools/ocaml/findlib/install_topfind.patch +++ b/pkgs/development/tools/ocaml/findlib/install_topfind.patch @@ -1,12 +1,12 @@ --- a/src/findlib/Makefile +++ b/src/findlib/Makefile -@@ -114,7 +114,7 @@ clean: +@@ -123,7 +123,7 @@ clean: install: all mkdir -p "$(prefix)$(OCAML_SITELIB)/$(NAME)" mkdir -p "$(prefix)$(OCAMLFIND_BIN)" - test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)" + test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_SITELIB)" - files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib.a findlib.cmxs topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib_top.cmxa findlib_top.a findlib_top.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload.a findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \ + files=`$(SH) $(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib.a findlib.cmxs topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib_top.cmxa findlib_top.a findlib_top.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload.a findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \ cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)" f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \ diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix index 81cd2caf7ee..23556a0edbd 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving, ppx_deriving, camlp4, ocamlbuild -, cmdliner, tyxml, reactivedata, cppo, which, base64, uchar +{ stdenv, fetchurl, ocaml, findlib, lwt, menhir, ocsigen_deriving, ppx_deriving, camlp4, ocamlbuild +, cmdliner, tyxml, reactivedata, cppo, which, base64, uchar, yojson }: let version = if stdenv.lib.versionAtLeast ocaml.version "4.02" - then "2.8.3" else "2.7"; + then "2.8.4" else "2.7"; in stdenv.mkDerivation { @@ -12,15 +12,15 @@ stdenv.mkDerivation { url = "https://github.com/ocsigen/js_of_ocaml/archive/${version}.tar.gz"; sha256 = { "2.7" = "1dali1akyd4zmkwav0d957ynxq2jj6cc94r4xiaql7ca89ajz4jj"; - "2.8.3" = "0xrw215w5saqdcdd9ipjhvg8f982z63znsds9ih445s3jr49szm7"; + "2.8.4" = "098ph50s9kqw6rc3qjn39zv9b5swdf4qr44afwqfkkjgjs5d7vbl"; }."${version}"; }; buildInputs = [ ocaml findlib menhir ocsigen_deriving ocamlbuild cmdliner reactivedata cppo which base64 ] - ++ stdenv.lib.optional (stdenv.lib.versionAtLeast ocaml.version "4.02") tyxml; - propagatedBuildInputs = [ ocaml_lwt camlp4 ppx_deriving ] - ++ stdenv.lib.optional (version == "2.8.3") uchar; + ++ stdenv.lib.optionals (stdenv.lib.versionAtLeast ocaml.version "4.02") [ yojson tyxml ]; + propagatedBuildInputs = [ lwt camlp4 ppx_deriving ] + ++ stdenv.lib.optional (version == "2.8.4") uchar; patches = [ ./Makefile.conf.diff ]; diff --git a/pkgs/development/tools/ocaml/oasis/0.4.6.nix b/pkgs/development/tools/ocaml/oasis/0.4.6.nix deleted file mode 100644 index b5e977d623b..00000000000 --- a/pkgs/development/tools/ocaml/oasis/0.4.6.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4 -, ocaml_data_notation, type_conv, ocamlmod, ocamlify, ounit, expect -}: - -stdenv.mkDerivation { - name = "ocaml-oasis-0.4.6"; - - src = fetchurl { - url = http://forge.ocamlcore.org/frs/download.php/1604/oasis-0.4.6.tar.gz; - sha256 = "1yxv3ckkf87nz0cyll0yy1kd295j5pv3jqwkfrr1y65wkz5vw90k"; - }; - - createFindlibDestdir = true; - - buildInputs = - [ - ocaml findlib ocamlbuild type_conv ocamlmod ocamlify ounit camlp4 - ]; - - propagatedBuildInputs = [ ocaml_data_notation ]; - - configurePhase = "ocaml setup.ml -configure --prefix $out"; - buildPhase = "ocaml setup.ml -build"; - installPhase = "ocaml setup.ml -install"; - - meta = with stdenv.lib; { - homepage = http://oasis.forge.ocamlcore.org/; - description = "Configure, build and install system for OCaml projects"; - license = licenses.lgpl21; - platforms = ocaml.meta.platforms or []; - maintainers = with maintainers; [ - vbgl z77z - ]; - }; -} diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix index 214a2239688..6ff5ee72666 100644 --- a/pkgs/development/tools/ocaml/oasis/default.nix +++ b/pkgs/development/tools/ocaml/oasis/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "0.4.7"; + version = "0.4.10"; name = "ocaml-oasis-${version}"; # You must manually update the url, not just the version. OCamlforge keys off # the number after download.php, not the filename. src = fetchurl { - url = "http://forge.ocamlcore.org/frs/download.php/1635/oasis-${version}.tar.gz"; - sha256 = "13crvqiy0hhlnm4qfyxq2jjvs11ldxf15c4g9q91k1x3wj04pg2l"; + url = https://forge.ocamlcore.org/frs/download.php/1694/oasis-0.4.10.tar.gz; + sha256 = "13ah03pbcvrjv5lmx971hvkm9rvbvimska5wmjfvgvd20ca0gn8w"; }; createFindlibDestdir = true; diff --git a/pkgs/development/tools/ocaml/obuild/default.nix b/pkgs/development/tools/ocaml/obuild/default.nix new file mode 100644 index 00000000000..1de95f73037 --- /dev/null +++ b/pkgs/development/tools/ocaml/obuild/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchzip, ocaml }: + +let version = "0.1.8"; in + +stdenv.mkDerivation { + name = "obuild-${version}"; + + src = fetchzip { + url = "https://github.com/ocaml-obuild/obuild/archive/obuild-v${version}.tar.gz"; + sha256 = "1q1k2qqd08j1zakvydgvwgwpyn0ll7rs65gap0pvg3amnh5cp3wd"; + }; + + buildInputs = [ ocaml ]; + + buildPhase = '' + patchShebangs ./bootstrap + ./bootstrap + ''; + + installPhase = '' + mkdir -p $out/bin + cp dist/build/obuild/obuild dist/build/obuild-from-oasis/obuild-from-oasis dist/build/obuild-simple/obuild-simple $out/bin/ + ''; + + meta = { + homepage = https://github.com/ocaml-obuild/obuild; + platforms = ocaml.meta.platforms or []; + description = "Simple package build system for OCaml"; + license = stdenv.lib.licenses.lgpl21; + maintainers = with stdenv.lib.maintainers; [ volth ]; + }; +} diff --git a/pkgs/development/tools/ocaml/ocaml-top/default.nix b/pkgs/development/tools/ocaml/ocaml-top/default.nix index e194a77fbe8..e9331d078cf 100644 --- a/pkgs/development/tools/ocaml/ocaml-top/default.nix +++ b/pkgs/development/tools/ocaml/ocaml-top/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchzip, ncurses , ocamlPackages -, opam }: +, jbuilder }: stdenv.mkDerivation { - name = "ocaml-top-1.1.3"; + name = "ocaml-top-1.1.4"; src = fetchzip { - url = https://github.com/OCamlPro/ocaml-top/archive/1.1.3.tar.gz; - sha256 = "0islyinv7lwhg8hkg4xn30wwz1nv50rj0wpsis8jpimw6jdsnax3"; + url = https://github.com/OCamlPro/ocaml-top/archive/1.1.4.tar.gz; + sha256 = "1lmzjmnzsg8xdz0q5nm95zclihi9z80kzsalapg0s9wq0id8qm4j"; }; - buildInputs = [ ncurses opam ] + buildInputs = [ ncurses jbuilder ] ++ (with ocamlPackages; [ ocaml ocpBuild findlib lablgtk ocp-index ]); configurePhase = '' @@ -17,9 +17,9 @@ stdenv.mkDerivation { ocp-build -init ''; - buildPhase = "ocp-build ocaml-top"; + buildPhase = "jbuilder build"; - installPhase = "opam-installer --prefix=$out"; + inherit (jbuilder) installPhase; meta = { homepage = http://www.typerex.org/ocaml-top.html; diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix index 931e6989aa1..2a9a634d0a4 100644 --- a/pkgs/development/tools/ocaml/ocp-build/default.nix +++ b/pkgs/development/tools/ocaml/ocp-build/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, ocaml, findlib, ncurses, buildOcaml }: let - version = "1.99.18-beta"; + version = "1.99.19-beta"; in buildOcaml { @@ -11,7 +11,7 @@ buildOcaml { owner = "OCamlPro"; repo = "ocp-build"; rev = version; - sha256 = "14vzam8p1d2c5qxljrhsfppd8a3j9lxx8kzxlplwclkr2laar0ss"; + sha256 = "162k5l0cxyqanxlml5v8mqapdq5qbqc9m4b8wdjq7mf523b3h2zj"; }; buildInputs = [ ocaml ]; diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index 9e394751761..0f73f4c54af 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -2,6 +2,10 @@ , lambdaTerm, ocaml_lwt, camomile, zed, cppo, ppx_tools, makeWrapper }: +if !stdenv.lib.versionAtLeast ocaml.version "4.02" +then throw "utop is not available for OCaml ${ocaml.version}" +else + stdenv.mkDerivation rec { version = "1.19.3"; name = "utop-${version}"; diff --git a/pkgs/development/tools/parsing/antlr/4.7.nix b/pkgs/development/tools/parsing/antlr/4.7.nix new file mode 100644 index 00000000000..acf7edf0145 --- /dev/null +++ b/pkgs/development/tools/parsing/antlr/4.7.nix @@ -0,0 +1,41 @@ +{stdenv, fetchurl, jre}: + +stdenv.mkDerivation rec { + name = "antlr-${version}"; + version = "4.7"; + src = fetchurl { + url ="http://www.antlr.org/download/antlr-${version}-complete.jar"; + sha256 = "0r08ay63s5aajix5j8j7lf7j7l7wiwdkr112b66nyhkj5f6c72yd"; + }; + + unpackPhase = "true"; + + installPhase = '' + mkdir -p "$out"/{share/java,bin} + cp "$src" "$out/share/java/antlr-${version}-complete.jar" + + echo "#! ${stdenv.shell}" >> "$out/bin/antlr" + echo "'${jre}/bin/java' -cp '$out/share/java/antlr-${version}-complete.jar:$CLASSPATH' -Xmx500M org.antlr.v4.Tool \"\$@\"" >> "$out/bin/antlr" + + echo "#! ${stdenv.shell}" >> "$out/bin/grun" + echo "'${jre}/bin/java' -cp '$out/share/java/antlr-${version}-complete.jar:$CLASSPATH' org.antlr.v4.gui.TestRig \"\$@\"" >> "$out/bin/grun" + + chmod a+x "$out/bin/antlr" "$out/bin/grun" + ln -s "$out/bin/antlr"{,4} + ''; + + inherit jre; + + meta = with stdenv.lib; { + description = "Powerful parser generator"; + longDescription = '' + ANTLR (ANother Tool for Language Recognition) is a powerful parser + generator for reading, processing, executing, or translating structured + text or binary files. It's widely used to build languages, tools, and + frameworks. From a grammar, ANTLR generates a parser that can build and + walk parse trees. + ''; + homepage = http://www.antlr.org/; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix index a70afe51179..dcf89d1604d 100644 --- a/pkgs/development/tools/parsing/re2c/default.nix +++ b/pkgs/development/tools/parsing/re2c/default.nix @@ -4,22 +4,22 @@ stdenv.mkDerivation rec { name = "re2c-${version}"; version = "0.16"; - sourceRoot = "${name}-src/re2c"; + sourceRoot = "${src.name}/re2c"; src = fetchFromGitHub { - owner = "skvadrik"; - repo = "re2c"; - rev = version; + owner = "skvadrik"; + repo = "re2c"; + rev = version; sha256 = "0cijgmbyx34nwl2jmsswggkgvzy364871rkbxz8biq9x8xrhhjw5"; }; nativeBuildInputs = [ autoreconfHook ]; - meta = { + meta = with stdenv.lib; { description = "Tool for writing very fast and very flexible scanners"; homepage = "http://re2c.org"; - license = stdenv.lib.licenses.publicDomain; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = licenses.publicDomain; + platforms = platforms.all; + maintainers = with maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix index 79c400fd334..8fb668df5b9 100644 --- a/pkgs/development/tools/rust/bindgen/default.nix +++ b/pkgs/development/tools/rust/bindgen/default.nix @@ -4,13 +4,13 @@ rustPlatform.buildRustPackage rec { name = "rust-bindgen-${version}"; - version = "0.24.0"; + version = "0.26.1"; src = fetchFromGitHub { owner = "servo"; repo = "rust-bindgen"; rev = "v${version}"; - sha256 = "1nzva8g5nj7m2w8vax86p4rd02ci8793nhnm7sf76ajr4hfnx323"; + sha256 = "1w1vbfhmcrcl0vacxkivmavjp51cvpyq5lk75n9zs80q5x38ypna"; }; nativeBuildInputs = [ makeWrapper ]; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/bindgen --set LIBCLANG_PATH "${llvmPackages.clang-unwrapped}/lib" ''; - depsSha256 = "1l8c48y67azzwmv4hzghia1c53b5dw6qiv22cgv8zbyrg20aj8as"; + depsSha256 = "0s1x4ygjwc14fbl2amz5g6n7lq07zy8b00mvwfw6vi6k4bq1g59i"; doCheck = false; # A test fails because it can't find standard headers in NixOS diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index d1cb4a8cd2e..b79d7e0670d 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { installPhase = '' mkdir -p $out/bin cp -p target/release/racer $out/bin/ - wrapProgram $out/bin/racer --set RUST_SRC_PATH "${rustPlatform.rust.rustc.src}/src" + wrapProgram $out/bin/racer --set RUST_SRC_PATH "${rustPlatform.rustcSrc}" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix index 95f014cc2d7..166e3320d9c 100644 --- a/pkgs/development/tools/rust/racerd/default.nix +++ b/pkgs/development/tools/rust/racerd/default.nix @@ -1,23 +1,24 @@ -{ stdenv, fetchgit, rustPlatform, makeWrapper }: +{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper }: with rustPlatform; buildRustPackage rec { name = "racerd-${version}"; - version = "2016-12-24"; - src = fetchgit { - url = "git://github.com/jwilm/racerd.git"; - rev = "dc090ea11d550cd513416d21227d558dbfd2fcb6"; - sha256 = "0jfryb1b32m6bn620gd7y670cfipaswj1cppzkybm4xg6abqh07b"; + version = "2017-02-17"; + src = fetchFromGitHub { + owner = "jwilm"; + repo = "racerd"; + rev = "e3f3ff010fce2c67195750d9a6a669ffb3c2ac5f"; + sha256 = "125pmbkjnjh83xwikcwfbb8g150nldz7wh0ly1gv9kl1b521dydk"; }; doCheck = false; - depsSha256 = "1vv6fyisi11bcajxkq3ihpl59yh504xmnsr222zj15hmivn0jwf2"; + depsSha256 = "0db18m0vxzvg821gb5g8njhlnxw7im81m089i4982n8hmnhm1497"; buildInputs = [ makeWrapper ]; - RUST_SRC_PATH = ''${rustPlatform.rust.rustc.src}/src''; + RUST_SRC_PATH = rustPlatform.rustcSrc; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix index f8569249c06..d32ea74cf7b 100644 --- a/pkgs/development/tools/sauce-connect/default.nix +++ b/pkgs/development/tools/sauce-connect/default.nix @@ -4,18 +4,18 @@ with lib; stdenv.mkDerivation rec { name = "sauce-connect-${version}"; - version = "4.4.2"; + version = "4.4.7"; src = fetchurl ( if stdenv.system == "x86_64-linux" then { url = "https://saucelabs.com/downloads/sc-${version}-linux.tar.gz"; - sha256 = "0n3c9ihrxqy4y4mzgchggqa2v7c0y9jw2yqnjdd7cf4nd24fixbq"; + sha256 = "0n7x9mvv6sww0h77k3d8rms78vah0j48ndsv4vnxq9znwjiglmva"; } else if stdenv.system == "i686-linux" then { url = "https://saucelabs.com/downloads/sc-${version}-linux32.tar.gz"; - sha256 = "1pdvx4apd4x1bsyl8lhzlpv3jp3xzyv7yrsl3wjrql17p2asaba6"; + sha256 = "1vwp8iqc5sk5kf7r86dld4767w4sm36hympnh1n2qza57ni7vy0g"; } else { url = "https://saucelabs.com/downloads/sc-${version}-osx.zip"; - sha256 = "03kn7i0a6mpxfc6mz9h560wadhmw5qxn15is7cl9kgkz5j874xlz"; + sha256 = "1dwjysj3kjydz096bm5x0s1g3jm4a7y0qkgbsc6bwl44vxz81f66"; } ); diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index d1ea6a2e12b..f9c5ee1b7b9 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -1,22 +1,22 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, gpgme, libgpgerror, devicemapper, btrfs-progs }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, gpgme, libgpgerror, devicemapper, btrfs-progs, pkgconfig, ostree }: with stdenv.lib; buildGoPackage rec { name = "skopeo-${version}"; - version = "0.1.18"; + version = "0.1.22"; rev = "v${version}"; goPackagePath = "github.com/projectatomic/skopeo"; excludedPackages = "integration"; - buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs ]; + buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs pkgconfig ostree ]; src = fetchFromGitHub { inherit rev; owner = "projectatomic"; repo = "skopeo"; - sha256 = "13k29i5hx909hvddl2xkyw4qzxq2q20ay9bkal3xi063s6l0sh0z"; + sha256 = "0aivs37bcvx3g22a9r3q1vj2ahw323g1vaq9jzbmifm9k0pb07jy"; }; patches = [ diff --git a/pkgs/development/tools/skopeo/path.patch b/pkgs/development/tools/skopeo/path.patch index deb63b27945..eb3c54ae66c 100644 --- a/pkgs/development/tools/skopeo/path.patch +++ b/pkgs/development/tools/skopeo/path.patch @@ -1,25 +1,38 @@ diff --git a/cmd/skopeo/main.go b/cmd/skopeo/main.go -index 51f918d..6681d73 100644 +index 50e29b2..7108df5 100644 --- a/cmd/skopeo/main.go +++ b/cmd/skopeo/main.go @@ -3,6 +3,7 @@ package main import ( "fmt" "os" -+ "path/filepath" - ++ "path/filepath" + "github.com/Sirupsen/logrus" "github.com/containers/image/signature" -@@ -84,6 +85,12 @@ func getPolicyContext(c *cli.Context) (*signature.PolicyContext, error) { +@@ -88,6 +89,11 @@ func getPolicyContext(c *cli.Context) (*signature.PolicyContext, error) { policyPath := c.GlobalString("policy") var policy *signature.Policy // This could be cached across calls, if we had an application context. var err error -+ var dir string -+ if policyPath == "" { -+ dir, err = filepath.Abs(filepath.Dir(os.Args[0])) -+ policyPath = dir + "/../etc/default-policy.json" -+ } -+ - if policyPath == "" { - policy, err = signature.DefaultPolicy(nil) - } else { ++ var dir string ++ if policyPath == "" { ++ dir, err = filepath.Abs(filepath.Dir(os.Args[0])) ++ policyPath = dir + "/../etc/default-policy.json" ++ } + if c.GlobalBool("insecure-policy") { + policy = &signature.Policy{Default: []signature.PolicyRequirement{signature.NewPRInsecureAcceptAnything()}} + } else if policyPath == "" { +diff --git a/vendor/github.com/containers/image/docker/docker_client.go b/vendor/github.com/containers/image/docker/docker_client.go +index b989770..697d2ee 100644 +--- a/vendor/github.com/containers/image/docker/docker_client.go ++++ b/vendor/github.com/containers/image/docker/docker_client.go +@@ -154,6 +154,9 @@ func setupCertificates(dir string, tlsc *tls.Config) error { + if os.IsNotExist(err) { + return nil + } ++ if os.IsPermission(err) { ++ return nil ++ } + return err + } + diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index 9e692e214b9..6603ac510b7 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, php }: let - version = "1.2.0"; + version = "1.2.1"; bin = "bin/wp"; ini = "etc/php/wp-cli.ini"; @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar"; - sha256 = "1v51230gpw3ghz8vp3s1ykrwnmka9gj0r7xjad79bc9y250vr920"; + sha256 = "1ds9nhm0akajwykblg0s131vki02k3rpf72a851r3wjw2qv116wz"; }; buildCommand = '' diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index 376018c45a4..8b6f751d3aa 100644 --- a/pkgs/development/tools/yarn/default.nix +++ b/pkgs/development/tools/yarn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yarn-${version}"; - version = "0.24.6"; + version = "0.27.5"; src = fetchzip { url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; - sha256 = "1dxshqmz0im1a09p0x8zx1clkmkgjg3pg1gyl95fzzn6jai3nnrb"; + sha256 = "0djjbdbwzlhdh6aww6awfl63nz72kj109kjxvmwk25x8dkvw795a"; }; buildInputs = [makeWrapper nodejs]; diff --git a/pkgs/development/web/mailcatcher/Gemfile b/pkgs/development/web/mailcatcher/Gemfile new file mode 100644 index 00000000000..8cc16fad7e5 --- /dev/null +++ b/pkgs/development/web/mailcatcher/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'mailcatcher' diff --git a/pkgs/development/web/mailcatcher/Gemfile.lock b/pkgs/development/web/mailcatcher/Gemfile.lock new file mode 100644 index 00000000000..9a4969c1167 --- /dev/null +++ b/pkgs/development/web/mailcatcher/Gemfile.lock @@ -0,0 +1,43 @@ +GEM + remote: https://rubygems.org/ + specs: + daemons (1.2.4) + eventmachine (1.0.9.1) + mail (2.6.6) + mime-types (>= 1.16, < 4) + mailcatcher (0.6.5) + eventmachine (= 1.0.9.1) + mail (~> 2.3) + rack (~> 1.5) + sinatra (~> 1.2) + skinny (~> 0.2.3) + sqlite3 (~> 1.3) + thin (~> 1.5.0) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + rack (1.6.8) + rack-protection (1.5.3) + rack + sinatra (1.4.8) + rack (~> 1.5) + rack-protection (~> 1.4) + tilt (>= 1.3, < 3) + skinny (0.2.4) + eventmachine (~> 1.0.0) + thin (>= 1.5, < 1.7) + sqlite3 (1.3.13) + thin (1.5.1) + daemons (>= 1.0.9) + eventmachine (>= 0.12.6) + rack (>= 1.0.0) + tilt (2.0.7) + +PLATFORMS + ruby + +DEPENDENCIES + mailcatcher + +BUNDLED WITH + 1.14.4 diff --git a/pkgs/development/web/mailcatcher/default.nix b/pkgs/development/web/mailcatcher/default.nix new file mode 100644 index 00000000000..49c5c4d81af --- /dev/null +++ b/pkgs/development/web/mailcatcher/default.nix @@ -0,0 +1,33 @@ +{ stdenv, bundlerEnv, ruby, makeWrapper }: + +stdenv.mkDerivation rec { + name = "mailcatcher-${version}"; + + version = (import ./gemset.nix).mailcatcher.version; + + env = bundlerEnv { + name = "${name}-gems"; + + inherit ruby; + + gemdir = ./.; + }; + + buildInputs = [ makeWrapper ]; + + unpackPhase = ":"; + + installPhase = '' + mkdir -p $out/bin + makeWrapper ${env}/bin/mailcatcher $out/bin/mailcatcher + makeWrapper ${env}/bin/catchmail $out/bin/catchmail + ''; + + meta = with stdenv.lib; { + description = "SMTP server and web interface to locally test outbound emails"; + homepage = https://mailcatcher.me/; + license = licenses.mit; + maintainers = [ maintainers.zarelit ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/web/mailcatcher/gemset.nix b/pkgs/development/web/mailcatcher/gemset.nix new file mode 100644 index 00000000000..d9e95454a50 --- /dev/null +++ b/pkgs/development/web/mailcatcher/gemset.nix @@ -0,0 +1,106 @@ +{ + daemons = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bmb4qrd95b5gl3ym5j3q6mf090209f4vkczggn49n56w6s6zldz"; + type = "gem"; + }; + version = "1.2.4"; + }; + eventmachine = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17jr1caa3ggg696dd02g2zqzdjqj9x9q2nl7va82l36f7c5v6k4z"; + type = "gem"; + }; + version = "1.0.9.1"; + }; + mail = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0d7lhj2dw52ycls6xigkfz6zvfhc6qggply9iycjmcyj9760yvz9"; + type = "gem"; + }; + version = "2.6.6"; + }; + mailcatcher = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h6gk8n18i5f651f244al1hscjzl27fpma4vqw0qhszqqpd5p3bx"; + type = "gem"; + }; + version = "0.6.5"; + }; + mime-types = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0087z9kbnlqhci7fxh9f6il63hj1k02icq2rs0c6cppmqchr753m"; + type = "gem"; + }; + version = "3.1"; + }; + mime-types-data = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04my3746hwa4yvbx1ranhfaqkgf6vavi1kyijjnw8w3dy37vqhkm"; + type = "gem"; + }; + version = "3.2016.0521"; + }; + rack = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19m7aixb2ri7p1n0iqaqx8ldi97xdhvbxijbyrrcdcl6fv5prqza"; + type = "gem"; + }; + version = "1.6.8"; + }; + rack-protection = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r"; + type = "gem"; + }; + version = "1.5.3"; + }; + sinatra = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0byxzl7rx3ki0xd7aiv1x8mbah7hzd8f81l65nq8857kmgzj1jqq"; + type = "gem"; + }; + version = "1.4.8"; + }; + skinny = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1y3yvx88ylgz4d2s1wskjk5rkmrcr15q3ibzp1q88qwzr5y493a9"; + type = "gem"; + }; + version = "0.2.4"; + }; + sqlite3 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01ifzp8nwzqppda419c9wcvr8n82ysmisrs0hph9pdmv1lpa4f5i"; + type = "gem"; + }; + version = "1.3.13"; + }; + thin = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hrq9m3hb6pm8yrqshhg0gafkphdpvwcqmr7k722kgdisp3w91ga"; + type = "gem"; + }; + version = "1.5.1"; + }; + tilt = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1is1ayw5049z8pd7slsk870bddyy5g2imp4z78lnvl8qsl8l0s7b"; + type = "gem"; + }; + version = "2.0.7"; + }; +} \ No newline at end of file diff --git a/pkgs/development/web/nodejs/v4.nix b/pkgs/development/web/nodejs/v4.nix index edef6f7663c..24832b6b8be 100644 --- a/pkgs/development/web/nodejs/v4.nix +++ b/pkgs/development/web/nodejs/v4.nix @@ -10,11 +10,11 @@ let baseName = if enableNpm then "nodejs" else "nodejs-slim"; in stdenv.mkDerivation (nodejs // rec { - version = "4.8.1"; + version = "4.8.4"; name = "${baseName}-${version}"; src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz"; - sha256 = "0kcalypjf1036gr4mv1gy682hc1rp18ms3cv7mz0941qnizkzrms"; + sha256 = "35fe633a48cbe93c79327161d9dc964ac9810f4ceb2ed8628487e6e14a15905b"; }; }) diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix index 5fb122aefa8..9419b59e921 100644 --- a/pkgs/development/web/nodejs/v6.nix +++ b/pkgs/development/web/nodejs/v6.nix @@ -10,10 +10,10 @@ let baseName = if enableNpm then "nodejs" else "nodejs-slim"; in stdenv.mkDerivation (nodejs // rec { - version = "6.9.5"; + version = "6.11.1"; name = "${baseName}-${version}"; src = fetchurl { url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; - sha256 = "1cxnsprv2sy2djskx6yfw14f578s1fwzvmvnw7rh75djajix3znp"; + sha256 = "6f6655b85919aa54cb045a6d69a226849802fcc26491d0db4ce59873e41cc2b8"; }; }) diff --git a/pkgs/development/web/nodejs/v7.nix b/pkgs/development/web/nodejs/v7.nix index 1c074fa4751..86d4fed8eab 100644 --- a/pkgs/development/web/nodejs/v7.nix +++ b/pkgs/development/web/nodejs/v7.nix @@ -10,13 +10,12 @@ let baseName = if enableNpm then "nodejs" else "nodejs-slim"; in stdenv.mkDerivation (nodejs // rec { - version = "7.10.0"; + version = "7.10.1"; name = "${baseName}-${version}"; src = fetchurl { url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; - sha256 = "08czj7ssvzgv13zvhg2y9mhy4cc6pvm4bcp7rbzj3a2ba8axsd6w"; + sha256 = "654db852149a1cc59ece68ec573b0486907e8febe8353cee097dd29ea5a56cfa"; }; patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; }) - diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix index 273eb014180..84f4e496070 100644 --- a/pkgs/development/web/nodejs/v8.nix +++ b/pkgs/development/web/nodejs/v8.nix @@ -10,11 +10,11 @@ let baseName = if enableNpm then "nodejs" else "nodejs-slim"; in stdenv.mkDerivation (nodejs // rec { - version = "8.1.0"; + version = "8.2.0"; name = "${baseName}-${version}"; src = fetchurl { url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; - sha256 = "1z3pcyxni8qmxljz6vbghm8242sr63l0dbc7x22ywbbqkfv21zzj"; + sha256 = "10a72gl24kzdhf598wnlpvld1lz175h6l9fsr06bc3k3fr8rgs2c"; }; patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index ce935512178..ba9cd1e5805 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -7,12 +7,12 @@ let dfVersion = "0.43.05"; # version = "${dfVersion}-r1"; # rev = "refs/tags/${version}"; - version = "${dfVersion}-alpha4"; + version = "${dfVersion}-r1"; rev = "refs/tags/${version}"; - sha256 = "0wnwdapw955k69ds5xh5qsh7h0l547wjxgcy8hkvly6wp5c16sls"; + sha256 = "1hw0miimzx52p36jm9bimsm5j68rb7dd9kw0yivcwbwixbajsi1w"; # revision of library/xml submodule - xmlRev = "bb4228f58b1601c4868c95be6763f5ff2e5d0a08"; + xmlRev = "a8e80088b9cc934da993dc244ece2d0ae14143da"; arch = if stdenv.system == "x86_64-linux" then "64" diff --git a/pkgs/games/dwarf-fortress/dfhack/skip-ruby.patch b/pkgs/games/dwarf-fortress/dfhack/skip-ruby.patch index 619060dc253..877f6c3d215 100644 --- a/pkgs/games/dwarf-fortress/dfhack/skip-ruby.patch +++ b/pkgs/games/dwarf-fortress/dfhack/skip-ruby.patch @@ -1,16 +1,10 @@ -diff -ru3 dfhack-ae59b4f/plugins/ruby/CMakeLists.txt dfhack-ae59b4f-new/plugins/ruby/CMakeLists.txt ---- dfhack-ae59b4f/plugins/ruby/CMakeLists.txt 1970-01-01 03:00:01.000000000 +0300 -+++ dfhack-ae59b4f-new/plugins/ruby/CMakeLists.txt 2016-11-23 15:29:09.907286546 +0300 -@@ -1,3 +1,4 @@ -+IF(FALSE) - IF (APPLE) - SET(RUBYLIB ${CMAKE_CURRENT_SOURCE_DIR}/osx${DFHACK_BUILD_ARCH}/libruby.dylib) - SET(RUBYLIB_INSTALL_NAME "libruby.dylib") -@@ -48,6 +49,7 @@ - "482c1c418f4ee1a5f04203eee1cda0ef") - ENDIF() - ENDIF() -+ENDIF() +diff --git a/plugins/ruby/CMakeLists.txt b/plugins/ruby/CMakeLists.txt +index f1ef12ac..0976e18a 100644 +--- a/plugins/ruby/CMakeLists.txt ++++ b/plugins/ruby/CMakeLists.txt +@@ -1,5 +1,5 @@ + # Allow build system to turn off downloading of libruby.so. +-OPTION(DOWNLOAD_RUBY "Download prebuilt libruby.so for ruby plugin." ON) ++OPTION(DOWNLOAD_RUBY "Download prebuilt libruby.so for ruby plugin." OFF) - IF (APPLE OR UNIX) - SET(RUBYAUTOGEN ruby-autogen-gcc.rb) + IF (DOWNLOAD_RUBY) diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index 861a44fea8c..5c24c3ec807 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -10,7 +10,7 @@ assert releaseType == "alpha" || releaseType == "headless" || releaseType == "de with stdenv.lib; let - version = if releaseType != "demo" then "0.15.16" else "0.14.23"; + version = if releaseType != "demo" then "0.15.30" else "0.15.25"; arch = if stdenv.system == "x86_64-linux" then { inUrl = "linux64"; @@ -23,13 +23,12 @@ let authenticatedFetch = callPackage ./fetch.nix { inherit username password; }; fetch = rec { - extension = if releaseType != "demo" then "tar.xz" else "tar.gz"; url = "https://www.factorio.com/get-download/${version}/${releaseType}/${arch.inUrl}"; - name = "factorio_${releaseType}_${arch.inTar}-${version}.${extension}"; + name = "factorio_${releaseType}_${arch.inTar}-${version}.tar.xz"; x64 = { - headless = fetchurl { inherit name url; sha256 = "0ig0nrvqllb9294qn2ci5j5s31ycsjn23bp6hc633xqkgfmklmic"; }; - alpha = authenticatedFetch { inherit name url; sha256 = "0bf0z6fi0cpbq487hz4sz8ljapchzhld01sj767wsldakjfkm9g9"; }; - demo = fetchurl { inherit name url; sha256 = "10a2lwmspqviwgymn3zhjgpiynsa6dplgnikdirma5sl2hhcfb6s"; }; + headless = fetchurl { inherit name url; sha256 = "0nmr73i9acnqgphfmsps7f8jlw0f2gyal9l8pldlp4rk0cjgvszy"; }; + alpha = authenticatedFetch { inherit name url; sha256 = "1ydh44na2lbvdv4anrblym7d6wxwapfbwap40n3722llrsad0zsz"; }; + demo = fetchurl { inherit name url; sha256 = "1qz6g8mf221ic663zk92l6rs77ggfydaw2d8g2s7wy0j9097qbsl"; }; }; i386 = { headless = abort "Factorio 32-bit headless binaries are not available for download."; diff --git a/pkgs/games/factorio/fetch.sh b/pkgs/games/factorio/fetch.sh index 30d9c9fdefe..312dc9b6d61 100644 --- a/pkgs/games/factorio/fetch.sh +++ b/pkgs/games/factorio/fetch.sh @@ -33,7 +33,7 @@ $curl --data-urlencode csrf_token="$csrf" \ if grep -q 'Location: https://' headers; then # Now download. We need --insecure for this, but the sha256 should cover us. - $curl --insecure --location $url > $out + $curl --insecure --location --fail $url > $out || { echo "Login succeeded, but subsequent fetch failed."; exit 1; } set +x else set +x diff --git a/pkgs/games/qgo/default.nix b/pkgs/games/qgo/default.nix new file mode 100644 index 00000000000..b6a76001ad0 --- /dev/null +++ b/pkgs/games/qgo/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchFromGitHub, makeWrapper, qmake, qt56 }: + +stdenv.mkDerivation rec { + name = "qgo-${version}"; + version = "unstable-2016-06-23"; + + meta = with stdenv.lib; { + description = "A Go client based on Qt5"; + longDescription = '' + qGo is a Go Client based on Qt 5. It supports playing online at + IGS-compatible servers (including some special tweaks for WING and LGS, + also NNGS was reported to work) and locally against gnugo (or other + GTP-compliant engines). It also has rudimentary support for editing SGF + files and parital support for CyberORO/WBaduk, Tygem, Tom, and eWeiqi + (developers of these backends are currently inactive, everybody is welcome + to take them over). + + Go is an ancient Chinese board game. It's called "圍棋(Wei Qi)" in + Chinese, "囲碁(Yi Go)" in Japanese, "바둑(Baduk)" in Korean. + ''; + homepage = "https://github.com/pzorin/qgo"; + license = licenses.gpl2; + maintainers = with maintainers; [ zalakain ]; + }; + + src = fetchFromGitHub { + owner = "pzorin"; + repo = "qgo"; + rev = "1e65b0c74914e534ea4d040f8f0ef8908383e374"; + sha256 = "1xzkayclmhsi07p9mnbf8185jw8n5ikxp2mik3x8qz1i6rmrfl5b"; + }; + + patches = [ ./fix-paths.patch ]; + postPatch = '' + sed -i 's|@out@|'"''${out}"'|g' src/src.pro src/defines.h + ''; + nativeBuildInputs = [ makeWrapper qmake ]; + # qt58 does not provide platform plugins + # We need lib/qt*/plugins/platforms/libqxcb.so + buildInputs = with qt56; [ qtbase.out qtmultimedia qttranslations ]; + enableParallelBuilding = true; + postFixup = '' + # libQt5XcbQpa is a platform plugin dependency and doesn't get linked + patchelf --add-needed libQt5XcbQpa.so.5 $out/bin/qgo + wrapProgram $out/bin/qgo \ + --set QT_QPA_PLATFORM_PLUGIN_PATH "${qt56.qtbase}/lib/qt-5.6/plugins/platforms/" + ''; +} diff --git a/pkgs/games/qgo/fix-paths.patch b/pkgs/games/qgo/fix-paths.patch new file mode 100644 index 00000000000..c1d1e399ec1 --- /dev/null +++ b/pkgs/games/qgo/fix-paths.patch @@ -0,0 +1,50 @@ +diff --git a/src/defines.h b/src/defines.h +index 5d40955..82d0627 100644 +--- a/src/defines.h ++++ b/src/defines.h +@@ -48,7 +48,7 @@ + * GNUgo default level + */ + #define DEFAULT_ENGINE "gnugo" +-#define DEFAULT_ENGINE_PATH "/usr/games/" ++#define DEFAULT_ENGINE_PATH "" + #define DEFAULT_ENGINE_OPTIONS "--mode gtp --quiet --level 10" + + +@@ -220,8 +220,8 @@ extern QString applicationPath; + #define SOUND_PATH_PREFIX "qGo.app/Contents/Resources/Sounds/" + #define TRANSLATIONS_PATH "qGo.app/Contents/Resources/Translations/" + #else +- #define SOUND_PATH_PREFIX "/usr/share/qgo/sounds/" +- #define TRANSLATIONS_PATH "/usr/share/qgo/languages" ++ #define SOUND_PATH_PREFIX "/@out@/share/qgo/sounds/" ++ #define TRANSLATIONS_PATH "/@out@/share/qgo/languages" + #endif + + #endif +diff --git a/src/src.pro b/src/src.pro +index f989ce7..b7d691f 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -165,17 +165,17 @@ SOURCES += displayboard.cpp \ + newgamedialog.cpp + + unix*:!macx-* { +- QGO_INSTALL_PATH = /usr/share/qgo +- QGO_INSTALL_BIN_PATH = /usr/bin ++ QGO_INSTALL_PATH = @out@/share/qgo ++ QGO_INSTALL_BIN_PATH = /@out@/bin + +- icon.path = /usr/share/pixmaps ++ icon.path = @out@/share/pixmaps + icon.files = resources/pics/qgo.png + icon.files += resources/pics/qgo_16x16.xpm + icon.files += resources/pics/qgo_32x32.xpm + icon.files += resources/pics/qgo_48x48.png + icon.files += resources/pics/qgo_48x48.xpm + INSTALLS += icon +- desktopfile.path = /usr/share/applications ++ desktopfile.path = @out@/share/applications + desktopfile.files = qgo.desktop + INSTALLS += desktopfile + } diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index 29ba75f9aa2..e965fc459ad 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsaLib, mesa }: +{ stdenv +, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsaLib, mesa +, hostPlatform +}: stdenv.mkDerivation rec { name = "scummvm-1.9.0"; @@ -16,7 +19,7 @@ stdenv.mkDerivation rec { preConfigure = '' # Remove the --build flag set by the gcc cross wrapper setup # hook - export configureFlags="--host=${stdenv.cross.config}" + export configureFlags="--host=${hostPlatform.config}" ''; postConfigure = '' # They use 'install -s', that calls the native strip instead of the cross diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix index d6bcb787d60..d1416b0685a 100644 --- a/pkgs/games/uqm/default.nix +++ b/pkgs/games/uqm/default.nix @@ -18,7 +18,7 @@ let inherit stdenv requireFile writeText fetchurl haskellPackages; }; - remixPacks = imap (num: sha256: fetchurl rec { + remixPacks = imap1 (num: sha256: fetchurl rec { name = "uqm-remix-disc${toString num}.uqm"; url = "mirror://sourceforge/sc2/${name}"; inherit sha256; diff --git a/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix b/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix new file mode 100644 index 00000000000..0a0f5e3782f --- /dev/null +++ b/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix @@ -0,0 +1,109 @@ +{ stdenv, lib, fetchzip, + autoconf, automake, libtool, + cups, popt, libtiff, libpng, + ghostscript }: + +/* this derivation is basically just a transcription of the rpm .spec + file included in the tarball */ + +stdenv.mkDerivation rec { + name = "cnijfilter-${version}"; + + /* important note about versions: cnijfilter packages seem to use + versions in a non-standard way. the version indicates which + printers are supported in the package. so this package should + not be "upgraded" in the usual way. + + instead, if you want to include another version supporting your + printer, you should try to abstract out the common things (which + should be pretty much everything except the version and the 'pr' + and 'pr_id' values to loop over). */ + version = "2.80"; + + src = fetchzip { + url = "http://gdlp01.c-wss.com/gds/1/0100000841/01/cnijfilter-common-2.80-1.tar.gz"; + sha256 = "06s9nl155yxmx56056y22kz1p5b2sb5fhr3gf4ddlczjkd1xch53"; + }; + + buildInputs = [ autoconf libtool automake + cups popt libtiff libpng + ghostscript ]; + + patches = [ ./patches/missing-include.patch + ./patches/libpng15.patch ]; + + postPatch = '' + sed -i "s|/usr/lib/cups/backend|$out/lib/cups/backend|" backend/src/Makefile.am; + sed -i "s|/usr|$out|" backend/src/cnij_backend_common.c; + sed -i "s|/usr/bin|${ghostscript}/bin|" pstocanonij/filter/pstocanonij.c; + sed -i "s|/usr/local|$out|" libs/bjexec/bjexec.c; + ''; + + configurePhase = '' + cd libs + ./autogen.sh --prefix=$out; + + cd ../cngpij + ./autogen.sh --prefix=$out --enable-progpath=$out/bin; + + cd ../pstocanonij + ./autogen.sh --prefix=$out --enable-progpath=$out/bin; + + cd ../backend + ./autogen.sh --prefix=$out; + cd ..; + ''; + + preInstall = '' + mkdir -p $out/bin $out/lib/cups/filter $out/share/cups/model; + ''; + + postInstall = '' + for pr in mp140 mp210 ip3500 mp520 ip4500 mp610; do + cd ppd; + ./autogen.sh --prefix=$out --program-suffix=$pr + make clean; + make; + make install; + + cd ../cnijfilter; + ./autogen.sh --prefix=$out --program-suffix=$pr --enable-libpath=/var/lib/cups/path/lib/bjlib --enable-binpath=$out/bin; + make clean; + make; + make install; + + cd ..; + done; + + mkdir -p $out/lib/bjlib; + for pr_id in 315 316 319 328 326 327; do + install -c -m 755 $pr_id/database/* $out/lib/bjlib; + install -c -s -m 755 $pr_id/libs_bin/*.so.* $out/lib; + done; + + pushd $out/lib; + for so_file in *.so.*; do + ln -s $so_file ''${so_file/.so.*/}.so; + patchelf --set-rpath $out/lib $so_file; + done; + popd; + ''; + + /* the tarball includes some pre-built shared libraries. we run + 'patchelf --set-rpath' on them just a few lines above, so that + they can find each other. but that's not quite enough. some of + those libraries load each other in non-standard ways -- they + don't list each other in the DT_NEEDED section. so, if the + standard 'patchelf --shrink-rpath' (from + pkgs/development/tools/misc/patchelf/setup-hook.sh) is run on + them, it undoes the --set-rpath. this prevents that. */ + dontPatchELF = true; + + meta = with lib; { + description = "Canon InkJet printer drivers for the iP5400, MP520, MP210, MP140, iP3500, and MP610 series. (MP520 drivers also work for MX700.)"; + homepage = "http://support-asia.canon-asia.com/content/EN/0100084101.html"; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = with maintainers; [ jerith666 ]; + }; +} diff --git a/pkgs/misc/cups/drivers/cnijfilter_2_80/patches/libpng15.patch b/pkgs/misc/cups/drivers/cnijfilter_2_80/patches/libpng15.patch new file mode 100644 index 00000000000..f5b3a1b13db --- /dev/null +++ b/pkgs/misc/cups/drivers/cnijfilter_2_80/patches/libpng15.patch @@ -0,0 +1,23 @@ +diff -aur cnijfilter-source-3.20-1/cnijfilter/src/bjfimage.c cnijfilter-source-3.20-1.new/cnijfilter/src/bjfimage.c +--- cnijfilter-source-3.20-1/cnijfilter/src/bjfimage.c 2009-03-26 06:11:05.000000000 +0100 ++++ cnijfilter-source-3.20-1.new/cnijfilter/src/bjfimage.c 2012-02-10 09:33:52.512334139 +0100 +@@ -1520,8 +1520,8 @@ + short tmpformat; + short retbyte = 0; + short bpp = 3; +- long width = 0; +- long length = 0; ++ png_uint_32 width = 0; ++ png_uint_32 length = 0; + long rstep = 0; + long RasterLength = 0; + long i; +@@ -1574,7 +1574,7 @@ + goto onErr; + } + +- if (setjmp (png_p->jmpbuf)) ++ if (setjmp (png_jmpbuf(png_p))) + { + png_destroy_read_struct(&png_p, &info_p, (png_infopp)NULL); + goto onErr; diff --git a/pkgs/misc/cups/drivers/cnijfilter_2_80/patches/missing-include.patch b/pkgs/misc/cups/drivers/cnijfilter_2_80/patches/missing-include.patch new file mode 100644 index 00000000000..20c2d756d1e --- /dev/null +++ b/pkgs/misc/cups/drivers/cnijfilter_2_80/patches/missing-include.patch @@ -0,0 +1,20 @@ +--- a/backend/src/cnij_backend_common.c 2008-09-01 10:05:44.000000000 +0200 ++++ b/backend/src/cnij_backend_common.c 2012-05-06 17:38:40.000000000 +0200 +@@ -39,6 +39,7 @@ + // CUPS Header + #include + #include ++#include + + // Header file for CANON + #include "cnij_backend_common.h" +--- a/cngpijmon/src/bjcupsmon_cups.c 2008-09-02 12:28:24.000000000 +0200 ++++ b/cngpijmon/src/bjcupsmon_cups.c 2012-05-06 17:39:20.000000000 +0200 +@@ -21,6 +21,7 @@ + /*** Includes ***/ + #include + #include ++#include + #include + #include + #include diff --git a/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix new file mode 100644 index 00000000000..0378aac6d70 --- /dev/null +++ b/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix @@ -0,0 +1,44 @@ +{ coreutils, dpkg, fetchurl, gnugrep, gnused, makeWrapper, mfcl2700dnlpr, perl, stdenv }: + +stdenv.mkDerivation rec { + name = "mfcl2700dncupswrapper-${meta.version}"; + + src = fetchurl { + url = "http://download.brother.com/welcome/dlf102086/${name}.i386.deb"; + sha256 = "07w48mah0xbv4h8vsh1qd5cd4b463bx8y6gc5x9pfgsxsy6h6da1"; + }; + + nativeBuildInputs = [ dpkg makeWrapper ]; + + phases = [ "installPhase" ]; + + installPhase = '' + dpkg-deb -x $src $out + + basedir=${mfcl2700dnlpr}/opt/brother/Printers/MFCL2700DN + dir=$out/opt/brother/Printers/MFCL2700DN + + substituteInPlace $dir/cupswrapper/brother_lpdwrapper_MFCL2700DN \ + --replace /usr/bin/perl ${perl}/bin/perl \ + --replace "basedir =~" "basedir = \"$basedir\"; #" \ + --replace "PRINTER =~" "PRINTER = \"MFCL2700DN\"; #" + + wrapProgram $dir/cupswrapper/brother_lpdwrapper_MFCL2700DN \ + --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gnugrep gnused ]} + + mkdir -p $out/lib/cups/filter + mkdir -p $out/share/cups/model + + ln $dir/cupswrapper/brother_lpdwrapper_MFCL2700DN $out/lib/cups/filter + ln $dir/cupswrapper/brother-MFCL2700DN-cups-en.ppd $out/share/cups/model + ''; + + meta = { + description = "Brother MFC-L2700DN CUPS wrapper driver"; + homepage = "http://www.brother.com/"; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ stdenv.lib.maintainers.tv ]; + platforms = stdenv.lib.platforms.linux; + version = "3.2.0-1"; + }; +} diff --git a/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix new file mode 100644 index 00000000000..1be1351bb82 --- /dev/null +++ b/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix @@ -0,0 +1,44 @@ +{ coreutils, dpkg, fetchurl, ghostscript, gnugrep, gnused, makeWrapper, perl, stdenv, which }: + +stdenv.mkDerivation rec { + name = "mfcl2700dnlpr-${version}"; + version = "3.2.0-1"; + + src = fetchurl { + url = "http://download.brother.com/welcome/dlf102085/${name}.i386.deb"; + sha256 = "170qdzxlqikzvv2wphvfb37m19mn13az4aj88md87ka3rl5knk4m"; + }; + + nativeBuildInputs = [ dpkg makeWrapper ]; + + phases = [ "installPhase" ]; + + installPhase = '' + dpkg-deb -x $src $out + + dir=$out/opt/brother/Printers/MFCL2700DN + + substituteInPlace $dir/lpd/filter_MFCL2700DN \ + --replace /usr/bin/perl ${perl}/bin/perl \ + --replace "BR_PRT_PATH =~" "BR_PRT_PATH = \"$dir\"; #" \ + --replace "PRINTER =~" "PRINTER = \"MFCL2700DN\"; #" + + wrapProgram $dir/lpd/filter_MFCL2700DN \ + --prefix PATH : ${stdenv.lib.makeBinPath [ + coreutils ghostscript gnugrep gnused which + ]} + + interpreter=$(cat $NIX_CC/nix-support/dynamic-linker) + patchelf --set-interpreter "$interpreter" $dir/inf/braddprinter + patchelf --set-interpreter "$interpreter" $dir/lpd/brprintconflsr3 + patchelf --set-interpreter "$interpreter" $dir/lpd/rawtobr3 + ''; + + meta = { + description = "Brother MFC-L2700DN LPR driver"; + homepage = "http://www.brother.com/"; + license = stdenv.lib.licenses.unfree; + maintainers = [ stdenv.lib.maintainers.tv ]; + platforms = [ "i686-linux" ]; + }; +} diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index 499e1177c3e..ed44ea59311 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -1,23 +1,17 @@ { stdenv, gcc, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib -, gettext, git, libpthreadstubs, libXrandr, libXext, readline -, openal, libXdmcp, portaudio, fetchgit, libusb, libevdev +, pcre, gettext, libpthreadstubs, libXrandr, libXext, libSM, readline +, openal, libXdmcp, portaudio, fetchFromGitHub, libusb, libevdev , libpulseaudio ? null }: stdenv.mkDerivation rec { - name = "dolphin-emu-20150802"; - src = fetchgit { - url = git://github.com/dolphin-emu/dolphin.git; - rev = "5097a22844b850b429872f4de390bd958b11a616"; - sha256 = "09jx61cxvfimnq1snkv6w3m9qidrgp0j0w81c7pbkpmcwysz8xya"; - fetchSubmodules = false; + name = "dolphin-emu-20170705"; + src = fetchFromGitHub { + owner = "dolphin-emu"; + repo = "dolphin"; + rev = "29cc009706f133aac39ebaa7003d37555b926109"; + sha256 = "0axd2z14lyqlaxrjssc0dkqnjdk3ccxh2fqrhya0jc2rsm8ighlz"; }; - postPatch = '' - for f in Source/Core/VideoBackends/{Software,OGL}/RasterFont.{h,cpp}; do - substituteInPlace "$f" --replace " CHAR_WIDTH " " CHARWIDTH " - done - ''; - cmakeFlags = '' -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include @@ -27,9 +21,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ gcc pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib - gettext libpthreadstubs libXrandr libXext readline openal - libevdev git libXdmcp portaudio libusb libpulseaudio ]; + buildInputs = [ gcc pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib pcre + gettext libpthreadstubs libXrandr libXext libSM readline openal + libevdev libXdmcp portaudio libusb libpulseaudio ]; meta = { homepage = http://dolphin-emu.org/; diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 92815ffaa0a..348b52dd492 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { buildInputs = toBuildInputs pkgArches (with supportFlags; (pkgs: [ pkgs.freetype ] + ++ lib.optional stdenv.isLinux pkgs.libcap ++ lib.optional pngSupport pkgs.libpng ++ lib.optional jpegSupport pkgs.libjpeg ++ lib.optional cupsSupport pkgs.cups diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index e0db6285df8..e92c77462ca 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -6,9 +6,9 @@ let fetchurl = args@{url, sha256, ...}: in rec { stable = fetchurl rec { - version = "2.0.1"; + version = "2.0.2"; url = "https://dl.winehq.org/wine/source/2.0/wine-${version}.tar.xz"; - sha256 = "10qm0xxqzvl4y3mhvaxcaacrcs8d5kdz5wf0gbxpmp36wnm4xyvc"; + sha256 = "16iwf48cfi39aqyy8131jz4x7lr551c9yc0mnks7g24j77sq867p"; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { @@ -24,31 +24,31 @@ in rec { ## see http://wiki.winehq.org/Mono mono = fetchurl rec { - version = "4.6.4"; + version = "4.7.0"; url = "http://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}.msi"; - sha256 = "0lj1rhp9s8aaxd6764mfvnyswwalafaanz80vxg3badrfy0xbdwi"; + sha256 = "18d5djnsb70740xs475jg1xsjsrq6zzjv0dmjq3vi7nbv56lg63n"; }; }; unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "2.7"; + version = "2.12"; url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz"; - sha256 = "0k711vdn1h2x6ar20hpvb5b6zh21niy2n9s9mgvlag1iiq446np5"; + sha256 = "19qk880fk7xxzx9jcl6sjzilhzssn0csqlqr9vnfd1qlhjpi2v29"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { inherit (unstable) version; - sha256 = "0ipz160mpg9di47xin9whcq986nrbadmcvpdbwgrpwlxf63x4k63"; + sha256 = "00qqpw5fmpwg4589q2dwlv3jrcyj0yzv4mk63w5ydhvmy5gq48wy"; owner = "wine-compholio"; repo = "wine-staging"; rev = "v${version}"; }; winetricks = fetchFromGitHub rec { - version = "20170327"; - sha256 = "1iplk8nl37k94bhhy3q3jxkif0mnpc09xhwxn2xic16nvfavrmhy"; + version = "20170614"; + sha256 = "1xszflrdmixxr0v7vjby8fpnl8fgc9gldr1gnjpwzq1rnb84idqa"; owner = "Winetricks"; repo = "winetricks"; rev = version; diff --git a/pkgs/misc/gnash/default.nix b/pkgs/misc/gnash/default.nix new file mode 100644 index 00000000000..d7a6cebcc56 --- /dev/null +++ b/pkgs/misc/gnash/default.nix @@ -0,0 +1,120 @@ +{ stdenv, fetchgit, autoreconfHook +, pkgconfig, libtool, boost, SDL +, glib, pango, gettext, curl, xorg +, libpng, libjpeg, giflib, speex, atk + +# renderers +, enableAGG ? true, agg ? null +, enableCairo ? false, cairo ? null +, enableOpenGL ? false, mesa ? null + +# GUI toolkits +, enableGTK ? true, gtk2 ? null, gnome2 ? null, gnome3 ? null +, enableSDL ? false +, enableQt ? false, qt4 ? null + +# media +, enableFFmpeg ? true, ffmpeg_2 ? null +, enableGstreamer ? false, gst-plugins-base ? null + , gst-plugins-ugly ? null + , gst-ffmpeg ? null + +# misc +, enableJemalloc ? true, jemalloc ? null +, enableHwAccel ? true +, enablePlugins ? false, xulrunner ? null, npapi_sdk ? null +}: + +with stdenv.lib; + +let + available = x: x != null; + + sound = + if enableFFmpeg then "ffmpeg" else + if enableGstreamer then "gst" else "none"; + + renderers = [] + ++ optional enableAGG "agg" + ++ optional enableCairo "cairo" + ++ optional enableOpenGL "opengl"; + + toolkits = [] + ++ optional enableGTK "gtk" + ++ optional enableSDL "sdl" + ++ optional enableQt "qt4"; + +in + +# renderers +assert enableAGG -> available agg; +assert enableCairo -> available cairo; +assert enableOpenGL -> available mesa; + +# GUI toolkits +assert enableGTK -> all available [ gtk2 gnome2.gtkglext gnome3.gconf ]; +assert enableSDL -> available SDL; +assert enableQt -> available qt4; + +# media libraries +assert enableFFmpeg -> available ffmpeg_2 ; +assert enableGstreamer -> all available [ gst-plugins-base gst-plugins-ugly gst-ffmpeg ]; + +# misc +assert enableJemalloc -> available jemalloc; +assert enableHwAccel -> available mesa; +assert enablePlugins -> all available [ xulrunner npapi_sdk ]; + +assert length toolkits == 0 -> throw "at least one GUI toolkit must be enabled"; +assert length renderers == 0 -> throw "at least one renderer must be enabled"; + + +stdenv.mkDerivation rec { + name = "gnash-${version}"; + version = "0.8.11-2017-03-08"; + + src = fetchgit { + url = "git://git.sv.gnu.org/gnash.git"; + rev = "8a11e60585db4ed6bc4eafadfbd9b3123ced45d9"; + sha256 = "1qas084gc4s9cb2jbwi2s1h4hk7m92xmrsb596sd14h0i44dai02"; + }; + + postPatch = '' + sed -i 's|jemalloc.h|jemalloc/jemalloc.h|' libbase/jemalloc_gnash.c + ''; + + nativeBuildInputs = [ autoreconfHook pkgconfig libtool ]; + buildInputs = [ + glib gettext boost curl SDL speex + xorg.libXmu xorg.libSM xorg.libXt + libpng libjpeg giflib pango atk + ] ++ optional enableAGG agg + ++ optional enableCairo cairo + ++ optional enableOpenGL mesa + ++ optional enableQt qt4 + ++ optional enableFFmpeg ffmpeg_2 + ++ optional enableJemalloc jemalloc + ++ optional enableHwAccel mesa + ++ optionals enablePlugins [ xulrunner npapi_sdk ] + ++ optionals enableGTK [ gtk2 gnome2.gtkglext gnome3.gconf ] + ++ optionals enableGstreamer [ gst-plugins-base gst-plugins-ugly gst-ffmpeg ]; + + configureFlags = with stdenv.lib; [ + "--with-boost-incl=${boost.dev}/include" + "--with-boost-lib=${boost.out}/lib" + "--enable-renderer=${concatStringsSep "," renderers}" + "--enable-gui=${concatStringsSep "," toolkits}" + "--enable-media=${sound}" + "--with-npapi-install=prefix" + (enableFeature enablePlugins "plugins") + (enableFeature enableJemalloc "jemalloc") + (optionalString enableHwAccel "--enable-device=egl") + ]; + + meta = { + homepage = https://savannah.gnu.org/projects/gnash; + description = "A flash (SWF) player and browser plugin"; + license = licenses.gpl3; + maintainers = with maintainers; [ rnhmjoj ]; + }; +} diff --git a/pkgs/misc/lilypond/with-fonts.nix b/pkgs/misc/lilypond/with-fonts.nix index 861d8cf14de..2218b75a2e0 100644 --- a/pkgs/misc/lilypond/with-fonts.nix +++ b/pkgs/misc/lilypond/with-fonts.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { install -m755 -Dt $out/bin ${lilypond}/bin/* for p in $out/bin/*; do - substituteInPlace $p --replace "exec -a ${lilypond}" "exec -a $out" + substituteInPlace $p --replace "exec -a \"${lilypond}" "exec -a \"$out" done ''; } diff --git a/pkgs/misc/logging/beats/default.nix b/pkgs/misc/logging/beats/default.nix index d4c78389e66..ec2fc975b33 100644 --- a/pkgs/misc/logging/beats/default.nix +++ b/pkgs/misc/logging/beats/default.nix @@ -8,7 +8,7 @@ let beat = package : extraArgs : buildGoPackage (rec { owner = "elastic"; repo = "beats"; rev = "v${version}"; - sha256 = "1if16sqbhgxc7ahn9pak8av9rq9l8ldk44hr4w4g7lhxnqhmhsji"; + sha256 = "03pvzikl5wa6agf3aszx96xvd6yjbvdf0kdwjsr4vfga0h797s32"; }; goPackagePath = "github.com/elastic/beats"; diff --git a/pkgs/misc/misc.nix b/pkgs/misc/misc.nix index 6357c4e6f90..6e8c6f4486f 100644 --- a/pkgs/misc/misc.nix +++ b/pkgs/misc/misc.nix @@ -23,7 +23,7 @@ in */ collection = {list, name} : runCommand "collection-${name}" {} '' mkdir -p $out/nix-support - echo ${builtins.toString list} > $out/nix-support/propagated-user-env-packages + printLines ${builtins.toString list} > $out/nix-support/propagated-user-env-packages ''; /* creates a derivation symlinking references C/C++ libs into one include and lib directory called $out/cdt-envs/${name} diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/misc/screensavers/alock/default.nix index 6f2ebbc5158..f05073469b7 100644 --- a/pkgs/misc/screensavers/alock/default.nix +++ b/pkgs/misc/screensavers/alock/default.nix @@ -2,27 +2,30 @@ , libX11, pam, libgcrypt, libXrender, imlib2 }: stdenv.mkDerivation rec { - date = "20150418"; + date = "20170720"; name = "alock-${date}"; src = fetchgit { url = https://github.com/Arkq/alock; - rev = "69b547602d965733d415f877eb59d05966bd158d"; - sha256 = "0lv2ng5qxzcq0vwbl61dbwigv79sin4zg90y9cgsz6ydvm4ncpas"; + rev = "2035e1d4a2293432f5503e82d10f899232eb0f38"; + sha256 = "1by954fjn0ryqda89zlmq3gclakg3gz7zy1wjrbgw4lzsk538va6"; }; + PAM_DEFAULT_SERVICE = "login"; + configureFlags = [ "--enable-pam" "--enable-hash" "--enable-xrender" "--enable-imlib2" ]; + buildInputs = [ pkgconfig autoreconfHook libX11 pam libgcrypt libXrender imlib2 ]; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/Arkq/alock; description = "Simple screen lock application for X server"; longDescription = '' @@ -31,10 +34,10 @@ stdenv.mkDerivation rec { the X server is unlocked and the user can continue to work. alock does not provide any fancy animations like xlock or - xscreensaver and never will. Its just for locking the current + xscreensaver and never will. It's just for locking the current X session. ''; - platforms = with stdenv.lib.platforms; allBut cygwin; - maintainers = [ stdenv.lib.maintainers.ftrvxmtrx ]; + platforms = with platforms; allBut cygwin; + maintainers = with maintainers; [ ftrvxmtrx chris-martin ]; }; } diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix index 2a2be06fde6..55765a520da 100644 --- a/pkgs/misc/screensavers/slock/default.nix +++ b/pkgs/misc/screensavers/slock/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { installFlags = "DESTDIR=\${out} PREFIX="; + patchPhase = "sed -i '/chmod u+s/d' Makefile"; + preBuild = optionalString (conf != null) '' cp ${writeText "config.def.h" conf} config.def.h ''; diff --git a/pkgs/misc/screensavers/vlock/default.nix b/pkgs/misc/screensavers/vlock/default.nix index 031afeeca2f..0e5e87245f3 100644 --- a/pkgs/misc/screensavers/vlock/default.nix +++ b/pkgs/misc/screensavers/vlock/default.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation { }; prePatch = '' - sed -i -e '/INSTALL/s/-[og] [^ ]*//g' Makefile modules/Makefile + sed -i -e '/INSTALL/ { + s/-[og] [^ ]*//g; s/4711/755/ + }' Makefile modules/Makefile ''; patches = [ ./eintr.patch ]; diff --git a/pkgs/misc/themes/gtk2/gtk-engine-bluecurve/default.nix b/pkgs/misc/themes/gtk2/gtk-engine-bluecurve/default.nix new file mode 100644 index 00000000000..c01fb7f15dd --- /dev/null +++ b/pkgs/misc/themes/gtk2/gtk-engine-bluecurve/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gtk2 }: + +stdenv.mkDerivation { + name = "gtk-engine-bluecurve-1.0"; + + src = fetchurl { + url = "http://ftp.gnome.org/pub/gnome/teams/art.gnome.org/archive/themes/gtk2/GTK2-Wonderland-Engine-1.0.tar.bz2"; + sha256 = "1nim3lhmbs5mw1hh76d9258c1p923854x2j6i30gmny812c7qjnm"; + }; + + nativeBuildInputs = [ pkgconfig intltool ]; + + buildInputs = [ gtk2 ]; + + meta = { + description = "Original Bluecurve engine from Red Hat's artwork package"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.gnidorah ]; + }; +} diff --git a/pkgs/misc/themes/zuki/default.nix b/pkgs/misc/themes/zuki/default.nix index 491885a14b3..8fa6176f22e 100644 --- a/pkgs/misc/themes/zuki/default.nix +++ b/pkgs/misc/themes/zuki/default.nix @@ -4,20 +4,23 @@ stdenv.mkDerivation rec { name = "zuki-themes-${version}"; version = "${gnome3.version}.${date}"; date = { - "3.20" = "2017-02-09"; - "3.22" = "2017-02-17"; + "3.20" = "2017-05-03"; + "3.22" = "2017-04-23"; + "3.24" = "2017-06-26"; }."${gnome3.version}"; src = fetchFromGitHub { owner = "lassekongo83"; repo = "zuki-themes"; rev = { - "3.20" = "b9106c3c05012b7e91394819ca550def3357d2eb"; - "3.22" = "fc3cf7c372bcc439870c4785f91b8ea7af73e1cc"; + "3.20" = "ce7ae498df7d5c81acaf48ed957b9f828356d58c"; + "3.22" = "e97f2c3cf75b5205bc5ecd6072696327169fde5d"; + "3.24" = "d25e0a2fb6e08ad107d8bb627451433362f2a830"; }."${gnome3.version}"; sha256 = { - "3.20" = "03k18p25gsscv05934vs0py26vpcrx93wi5bj6di277c6kwgjzxg"; - "3.22" = "02ppk8wsx0k7j3zgmcb1l8jgij0m5rdkrahfv884jxkyjr6wwgs5"; + "3.20" = "0na81q9mc8kwn9m04kkcchrdr67087dqf3q155imhjgqrxjhh3w4"; + "3.22" = "195v0d2sgqh92c104xqm00p68yxp6kzp5mzx8q7s36bdv9p972q4"; + "3.24" = "0z5swi5aah3s4yinfglh491qydxgjkqwf6zxyz7k9c1d7lrvj3ww"; }."${gnome3.version}"; }; diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 07ccd419f4b..a3e4f12cd89 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, bc, dtc, python2 }: +{ stdenv, fetchurl, bc, dtc, python2 +, hostPlatform +}: let buildUBoot = { targetPlatforms @@ -43,8 +45,8 @@ let crossAttrs = { makeFlags = [ - "ARCH=${stdenv.cross.platform.kernelArch}" - "CROSS_COMPILE=${stdenv.cross.config}-" + "ARCH=${hostPlatform.platform.kernelArch}" + "CROSS_COMPILE=${stdenv.cc.prefix}" ]; }; diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index dbba9597ce7..1523010b6d7 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -169,22 +169,22 @@ rec { }; Supertab = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Supertab-2016-11-27"; + name = "Supertab-2017-06-20"; src = fetchgit { url = "git://github.com/ervandew/supertab"; - rev = "cdaa5c27c5a7f8b08a43d0b2e65929512299e33a"; - sha256 = "0hym28chljfglqdrxajbh92r35cppxl5wyxdrgqwpa0am9d2xdvg"; + rev = "22aac5c2cb6a8ebe906bf1495eb727717390e62e"; + sha256 = "1m70rx9ba2aqydfr9yxsrff61qyzmnda24qkgn666ypnsai7cfbn"; }; dependencies = []; }; Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Syntastic-2017-05-30"; + name = "Syntastic-2017-07-07"; src = fetchgit { url = "git://github.com/scrooloose/syntastic"; - rev = "159900a1a2d3db2c4d3757f1085f377c6e59ac02"; - sha256 = "1bq3di4kr855sma0qp6gyrrphy23hy2mn9ws5knnzicxmq5fixqb"; + rev = "e1161a723a353db99780f9a9351340df7abbb106"; + sha256 = "00gvx33yz199n7lynli0fb8cf58lb5cs0jxrqggjjy261xv2lcq1"; }; dependencies = []; @@ -202,11 +202,11 @@ rec { }; Tagbar = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Tagbar-2017-06-05"; + name = "Tagbar-2017-06-15"; src = fetchgit { url = "git://github.com/majutsushi/tagbar"; - rev = "87a1263f5d8b3623bee5e6036254480e668b5f74"; - sha256 = "1s6727vwrcikv9dmkl6s1c2r2r107p733j8sjjxshl68bi62ms8z"; + rev = "f5792732de16b8a2cc202f920e363eb413d7241d"; + sha256 = "188xdmrp2g7bfzg95pv1qa2l17sqwy1g2p4syj7546fksddmwgms"; }; dependencies = []; @@ -224,22 +224,22 @@ rec { }; The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_tree-2017-06-05"; + name = "The_NERD_tree-2017-06-30"; src = fetchgit { url = "git://github.com/scrooloose/nerdtree"; - rev = "a9ab90198be0581fe961125bba3f282a666ef7ff"; - sha256 = "0qf2xjr2hyz08xalgv6yjr5rrrcxgv76sshr7d62sygg6qfsnbgw"; + rev = "2e43ad074bb3b7fafc77b9eea5098047d6fe6e90"; + sha256 = "1mbj0qcjmrc4n0p9i96rm29qpi5j1shp69iv5kcv8sxiqgfrlqlm"; }; dependencies = []; }; UltiSnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "UltiSnips-2017-01-20"; + name = "UltiSnips-2017-06-30"; src = fetchgit { url = "git://github.com/SirVer/ultisnips"; - rev = "5352d98f212e273b3e8b1d84efdbe2d6a6d557e9"; - sha256 = "0d27823qnfd9qcj2a2x77slsw725jfa9s40ilw4qp9ab03bma1ci"; + rev = "423f264e753cec260b4f14455126e6db7ba429af"; + sha256 = "19g3k0nqzizv39rxwgkca9n2gsd19z2wwsmicr0zcgnf50nhkznh"; }; dependencies = []; @@ -408,11 +408,11 @@ rec { }; vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-autoformat-2017-06-02"; + name = "vim-autoformat-2017-06-26"; src = fetchgit { url = "https://github.com/Chiel92/vim-autoformat"; - rev = "41d1c14de27f76f400c51d45b1617319266d9f4a"; - sha256 = "0myhs5fjq9lr0ag49scdhchsifhc7djmyrx88nhsing33l4nbjzk"; + rev = "ad189cdde5a50699a1d6b2b4b669e73942e47710"; + sha256 = "0jk1qigvz2xkpr13ii0pg0nszrnzwn51gckxjvgaqwbsz967ccsj"; }; dependencies = []; @@ -441,11 +441,11 @@ rec { }; deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-nvim-2017-06-06"; + name = "deoplete-nvim-2017-07-05"; src = fetchgit { url = "https://github.com/Shougo/deoplete.nvim"; - rev = "8bd63b7e4f9bb3cf2040724dd71cff195564166a"; - sha256 = "1jf6l5li7m4m2ijfndqgm95mpw9c188vfbsggnzp2ivcxc7bd8bv"; + rev = "376b0c9bbdd30e51a253319ff63762165f30d41a"; + sha256 = "0r6bwwsl9r40nv02hca1h00wgakmrjqzamz3whf7xnb0vx9p29n9"; }; dependencies = []; @@ -462,12 +462,23 @@ rec { }; + nerdtree-git-plugin = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "nerdtree-git-plugin-2017-03-12"; + src = fetchgit { + url = "https://github.com/albfan/nerdtree-git-plugin"; + rev = "d79a5d5a1b3bc5fab3ba94db44a8b2e5a211d61d"; + sha256 = "0i77wijbr021zfv096ja15f5l52phvsd5gziqn1m3k60qkmb9gkj"; + }; + dependencies = []; + + }; + vim-closetag = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-closetag-2017-05-13"; + name = "vim-closetag-2017-07-04"; src = fetchgit { url = "https://github.com/alvan/vim-closetag"; - rev = "52a0747c9e1a52b1aedcace4801657d63462718f"; - sha256 = "0499cmyq7hs9b5rcnw1xd2w56xyw73qw9v5iqx3c7nsjka46ffys"; + rev = "e15684e10eb456399fc496467cc9ece1e18a7ec8"; + sha256 = "1rs1dlnn5syxny3qrgggyz8rc6anr8gkhkn19i72nmrvcbb40w0k"; }; dependencies = []; @@ -485,11 +496,11 @@ rec { }; clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "clighter8-2017-06-10"; + name = "clighter8-2017-07-08"; src = fetchgit { url = "https://github.com/bbchung/clighter8"; - rev = "c83091b35c0d09cee0d6850c91824f72a0d8c513"; - sha256 = "105a4c753n57svyz8abs5w0v2747pyfly7dzjyh6i5yraaq2g7bx"; + rev = "83ebf9e3961fcf1a4ccc557ab5f8c55cb813bc3b"; + sha256 = "0rv16fbg0ga5csk9p2zczh100i55j1h70s0rcvdbgzfmbbmgsda7"; }; dependencies = []; preFixup = '' @@ -499,11 +510,11 @@ rec { }; neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neomake-2017-06-10"; + name = "neomake-2017-07-07"; src = fetchgit { url = "https://github.com/benekastah/neomake"; - rev = "cc916f35fa3d131b2d6529d0e47bde141d99b7c3"; - sha256 = "00kz9ny3z4j6nhgzxarj8d072k6sf4qiwgfj4ckmllq5fyb2ik4l"; + rev = "79c7dba684e3b179d7416d84fc86fac38f8190fe"; + sha256 = "039b76n7d2nbbzrd83y4j8g103dvnrmk1pa84is5r5qv33hdpc0x"; }; dependencies = []; @@ -543,11 +554,11 @@ rec { }; vim-tmux-navigator = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-tmux-navigator-2017-06-01"; + name = "vim-tmux-navigator-2017-06-20"; src = fetchgit { url = "https://github.com/christoomey/vim-tmux-navigator"; - rev = "b93e176b7150942d9f0556347d1c8f6d0b690124"; - sha256 = "1xjvx4svv1kdqmv114ghx7cfrb5kmbljlwac8bsw36rq3kyknwrn"; + rev = "3e83ddc509c66ac86b0c2961613076f74f34a2b6"; + sha256 = "0zp81qkaahcl85s60cphqh7rsw3hpvnlr98p5lwzp5dsbxxh0iby"; }; dependencies = []; @@ -565,11 +576,11 @@ rec { }; ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-vim-2017-06-04"; + name = "ctrlp-vim-2017-07-04"; src = fetchgit { url = "https://github.com/ctrlpvim/ctrlp.vim"; - rev = "019f20a6f280b875b3812ea4d03a4cf1647cd0d9"; - sha256 = "1zyl140ykjc1g7kc306f03q7xcxjzx757hphdgcb63ksql2k1f33"; + rev = "b9b334b7ee07f03bbbc46193bb544124bd430148"; + sha256 = "1pzhffbbmw45x6izdhyi7zp6wy2x2r93g6jz03fdj0qmja0wk1b4"; }; dependencies = []; @@ -631,11 +642,11 @@ rec { }; neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neco-ghc-2017-04-30"; + name = "neco-ghc-2017-06-17"; src = fetchgit { url = "https://github.com/eagletmt/neco-ghc"; - rev = "aeb84b9ef05d1c5b0c835365ddcd424930fb0cd2"; - sha256 = "1yhdrjqw5chq7jgk397swh4axpv6m4aqracyqmx4bb65pzqbwdxl"; + rev = "ea515ae60a0523539fe75680f07aa2a588de9a99"; + sha256 = "1pj5a5v3x8vnkck60kc25ph9b5xx0d8ipa4f4llxpc0q8d2xzk6w"; }; dependencies = []; @@ -686,11 +697,11 @@ rec { }; vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-localvimrc-2017-03-30"; + name = "vim-localvimrc-2017-07-06"; src = fetchgit { url = "https://github.com/embear/vim-localvimrc"; - rev = "f2c576cda5a4dfd7a1030564c602dd6ab8589732"; - sha256 = "10wvglf8dygai0094bwwcilffms0m3y36h2sb46iaqw8yz00d78b"; + rev = "48c01c214ea0312e8045aaa1a28b30850e98a194"; + sha256 = "158ajdg3n8j0cxk2ry8rmnpfvnzmznhl573v8ddw6xni58b7bg4d"; }; dependencies = []; @@ -708,11 +719,11 @@ rec { }; ensime-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ensime-vim-2017-04-06"; + name = "ensime-vim-2017-07-06"; src = fetchgit { url = "https://github.com/ensime/ensime-vim"; - rev = "4fd7886b169388e07261c525826c0e453094e446"; - sha256 = "194qwj3glw3l9yxvd26vn10kl06v1sykqx2cznskqa3vj3z8jb01"; + rev = "a8a2f024283af8e0b69165960ba59d850d1b80a4"; + sha256 = "0vn7iv05jil7j1k4wgnnb9b1b4yqlxjkqmmz8a71291qg17bs5c8"; }; dependencies = ["vimproc" "vimshell" "self" "forms"]; pythonDependencies = with pythonPackages; [ sexpdata websocket_client ]; @@ -730,11 +741,11 @@ rec { }; vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-go-2017-06-10"; + name = "vim-go-2017-07-06"; src = fetchgit { url = "https://github.com/fatih/vim-go"; - rev = "7b93bae4b08091c4d6243dafc2e040a84ea91d1d"; - sha256 = "0hrzgxlkqvlh45pvli2aqnzx58vyjhmcz6rr28cm7x8b0wf20r00"; + rev = "f08fcab5c51bee18174340405b773a950446e9f5"; + sha256 = "1hsfaca9mhp7829b6kl7bmrwm03kjjhz9grmjzgr7v3arlpcv9sa"; }; dependencies = []; @@ -763,11 +774,11 @@ rec { }; psc-ide-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "psc-ide-vim-2017-06-10"; + name = "psc-ide-vim-2017-07-05"; src = fetchgit { url = "https://github.com/frigoeu/psc-ide-vim"; - rev = "f5fc6aadf805ec0186efc63cbf294f251c1b2056"; - sha256 = "0syrvkbbrcxmss07sppgsg43j241fm6yqj8ii54fm51vss02qxp8"; + rev = "22813d6222766d773e77fadf36ee5eed4162ece4"; + sha256 = "0261nkzj7412f55l6yxsr9xh2ynvnm5zb6ciasj809ynqapqvx2i"; }; dependencies = []; @@ -818,11 +829,11 @@ rec { }; calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "calendar-vim-2017-05-28"; + name = "calendar-vim-2017-07-02"; src = fetchgit { url = "https://github.com/itchyny/calendar.vim"; - rev = "12c06ba87f32002b3c9f34fe881bcbaf3ab1721b"; - sha256 = "02ss39227c8jfn95hqwwpgn1rvrgwib8h5h0j9rvl6x491jj98wg"; + rev = "1b4bff01dbcf81e9415c4181e702762f2c4f5638"; + sha256 = "0lsyy7xn460sawpki2svc29b2dm7n6vi0r22jm4djk7n5y9y4xj4"; }; dependencies = []; @@ -906,22 +917,22 @@ rec { }; auto-pairs = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "auto-pairs-2017-03-22"; + name = "auto-pairs-2017-07-03"; src = fetchgit { url = "https://github.com/jiangmiao/auto-pairs"; - rev = "20ec5b043f82ffa11a079f545438e6544ef112ed"; - sha256 = "14pypb2kfrylhn73gx964hls040zaqnpl1am6f0yi01h524xz0xf"; + rev = "f0019fc6423e7ce7bbd01d196a7e027077687fda"; + sha256 = "1kzrdq3adwxwm3fw65g05ww9405lwqi368win5kayamyj9i0z7r6"; }; dependencies = []; }; vim-nerdtree-tabs = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-nerdtree-tabs-2017-02-22"; + name = "vim-nerdtree-tabs-2017-07-04"; src = fetchgit { url = "https://github.com/jistr/vim-nerdtree-tabs"; - rev = "01ae3cdc7018fa33f140cce3e7cdf210c04ffbab"; - sha256 = "01z2xp95sqi5mxhdxm8q0zkx83rn16qbv884rj2irmbl1k8fhv62"; + rev = "47bbe5afc26f701f08d31b2bbdb660f117367ded"; + sha256 = "0a1gqdvmpa4gylnb7sxs6zr89i60fl16p477200x18hgh2zd2v02"; }; dependencies = []; @@ -961,11 +972,11 @@ rec { }; fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fzf-vim-2017-06-10"; + name = "fzf-vim-2017-07-01"; src = fetchgit { url = "https://github.com/junegunn/fzf.vim"; - rev = "cf60e546476f73514a326416916b6a98f88d8abd"; - sha256 = "11cls65zfv9gzz8qmg44q0i03hmwhqb8i53lb42vdz2bzicdasv3"; + rev = "55f6bc83677235a7f6ffc35496ecae2e2a764417"; + sha256 = "0yir125q9cgpk5b07ns9rg0s8f65g7jfka1jq9ir02w47090kgnb"; }; dependencies = []; @@ -1038,11 +1049,11 @@ rec { }; vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimtex-2017-06-09"; + name = "vimtex-2017-07-06"; src = fetchgit { url = "https://github.com/lervag/vimtex"; - rev = "0ae4e776cb78ce0c18635fecd6f518e3f40e5f80"; - sha256 = "1iz87nr89wamxpg4whfqdfhp6qmfff6jjp58sjzh5q32lzzmi48s"; + rev = "b31b49f0dca7c7acff9b7256315c3dc3bcedac98"; + sha256 = "1qbhypswa2pa61ksyqp987q9413wvwkhj0avcbvli2n3hn8scz5f"; }; dependencies = []; @@ -1107,12 +1118,23 @@ rec { }; + Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "Jenkinsfile-vim-syntax-2017-05-16"; + src = fetchgit { + url = "https://github.com/martinda/Jenkinsfile-vim-syntax"; + rev = "d3ad4bc4888740c524bfa2f8b3192cfb23ddec3f"; + sha256 = "1sw1rwxspa94aak9gq6i1z47cqhkm2nbbj8xlkzbk3c04mqljksf"; + }; + dependencies = []; + + }; + vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-startify-2017-06-05"; + name = "vim-startify-2017-06-15"; src = fetchgit { url = "https://github.com/mhinz/vim-startify"; - rev = "53c53b24440d14d7886484ad662549fc78550c40"; - sha256 = "1w3kxvydnd7rh2fp3ra677dw11rsnmnm9bav92j3dkkb5afhmj3v"; + rev = "7f910ed4367de96310fedc98d5a12b97173a405f"; + sha256 = "1l5q8mqqp6gzmxqm5i0lx6lbm181vmkcg8w24ypa77vnid0ihd93"; }; dependencies = []; @@ -1163,11 +1185,11 @@ rec { }; vim-indent-guides = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-indent-guides-2016-04-17"; + name = "vim-indent-guides-2017-07-03"; src = fetchgit { url = "https://github.com/nathanaelkane/vim-indent-guides"; - rev = "018298ead9d3aa9cd3b4ae222f81022a33978b09"; - sha256 = "0zyrs9r3vza2kqhqir6qpkygy6yljpn877bvycspv89ljzczmwrs"; + rev = "b40687195c01caf40f62d20093296590b48e3a75"; + sha256 = "17hc3bdb707lkg0kyac2czjjijdrzarnh6sr78s9rqpwrj3fj4i4"; }; dependencies = []; @@ -1229,11 +1251,11 @@ rec { }; vim-watchdogs = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-watchdogs-2017-05-08"; + name = "vim-watchdogs-2017-06-23"; src = fetchgit { url = "https://github.com/osyo-manga/vim-watchdogs"; - rev = "fcf1b1bacba95ac9739adb3851c3595136c96d0e"; - sha256 = "11qldi4p34x8y974ajvv88pw2wjxsrlpx03n846nyhqridgpfsj9"; + rev = "22a08dcd33223ddbe95c977ca72e77d62d2c75d9"; + sha256 = "0d3i39cz5kpps2gxlbz2l73bz0rs67lhh6qrpzl3a2p014hixbyi"; }; dependencies = []; @@ -1251,11 +1273,11 @@ rec { }; python-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "python-mode-2017-06-09"; + name = "python-mode-2017-07-04"; src = fetchgit { url = "https://github.com/python-mode/python-mode"; - rev = "4c426b98c2f9094f44bdbe02f43e44badfa61724"; - sha256 = "0lpd5k2j22r5wx5x5wh97mdsfyspfxf23kh241l7zbfm573r4jy0"; + rev = "d2dead6ce9d900b26dbf1a06c52969f4194eda64"; + sha256 = "1iq26a2l9maapz3433pwywmqla4wf7jass7s7bh32h10m2fh88a0"; }; dependencies = []; @@ -1284,22 +1306,22 @@ rec { }; vim-grammarous = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-grammarous-2017-05-07"; + name = "vim-grammarous-2017-07-02"; src = fetchgit { url = "https://github.com/rhysd/vim-grammarous"; - rev = "607fc41ebd8dcd1fb00eecde52a3c9e4fbab3c64"; - sha256 = "0pv9747lkmhwxcdrhbnd28rh6rsslzrf9yqlznhjxqa6z9in81ca"; + rev = "d117cd139b58319d8ac94f2fd36ee548b6ea1e88"; + sha256 = "0a5a65j9a3s54z9asjmfbqsvawx014bq772jqgpsxww53lap3s5x"; }; dependencies = []; }; vim-puppet = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-puppet-2017-04-06"; + name = "vim-puppet-2017-07-02"; src = fetchgit { url = "https://github.com/rodjek/vim-puppet"; - rev = "cce0312adcaa15c462aba89057565520c1928685"; - sha256 = "1cmgmrn534ycw0jc1m8fsrw7qjis2529bvb1jiv5jqqdyff3bw2f"; + rev = "cb1863af2ba4de9fb1c1d952d82692502348fb92"; + sha256 = "0a3q6f8jplxbvpjaz9vnh589al64vg567nc00xabp46vcm83nk4x"; }; dependencies = []; @@ -1317,33 +1339,33 @@ rec { }; neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neoformat-2017-06-09"; + name = "neoformat-2017-07-06"; src = fetchgit { url = "https://github.com/sbdchd/neoformat"; - rev = "a52b155f6cc2f401afb04f865b2198d47b393ddd"; - sha256 = "1a0j1k3bm9mp9d622m4kh5n9r2q4330kd0n3n9n60kmy3bnpa5w1"; + rev = "0a4904771ee0df76f01146bdcbac5dde4f5a61af"; + sha256 = "09i4ngih8cd3613mhsz0bbpwppbwsx723k7xx9ha6ybnfrmhx1ra"; }; dependencies = []; }; deoplete-rust = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-rust-2017-05-30"; + name = "deoplete-rust-2017-06-28"; src = fetchgit { url = "https://github.com/sebastianmarkow/deoplete-rust"; - rev = "5447ee448d3d63cda4681e6309b1c18c493e1cd1"; - sha256 = "1dr95vnp11zzia7vnwdhhrmkslnak77nps4zr447f34lxk185v5d"; + rev = "505735576e29d30fee5074a9a49fdeb989c632b2"; + sha256 = "0nqvk7f7asbfcfiv2lw3hinsaln648xc8k5jd630q0p4gyyxqpdm"; }; dependencies = []; }; vim-polyglot = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-polyglot-2017-05-17"; + name = "vim-polyglot-2017-06-12"; src = fetchgit { url = "https://github.com/sheerun/vim-polyglot"; - rev = "d5b9c4ae84aaa98bdfbf15cba90eeafa5aded091"; - sha256 = "17crapp8l2d77cpw6ac4a2y3q7ipi11in2jz2169m78y643gbz42"; + rev = "8eab5f5403afc1c33a7593459a27f7ff625fa60b"; + sha256 = "0q2xfmqk5iad6gv8zzlpcv48xpv7lwr6mswc7mdllzkgaqilz75g"; }; dependencies = []; @@ -1361,44 +1383,44 @@ rec { }; neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neocomplete-vim-2017-05-27"; + name = "neocomplete-vim-2017-06-24"; src = fetchgit { url = "https://github.com/shougo/neocomplete.vim"; - rev = "4fd73faa262f5e3063422d9fc244c65f1b758cf3"; - sha256 = "0hl5incxkxb491vnf3j2hndv4x31ic6dgj7wqka1bfqjcl53wjfl"; + rev = "186881fc40d9b774766a81189af17826d27406c2"; + sha256 = "0x9fmvliwxm49q8970byaqrnrffcxjf29z0y7xsfi56sv277lpl5"; }; dependencies = []; }; neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-snippets-2017-06-11"; + name = "neosnippet-snippets-2017-07-05"; src = fetchgit { url = "https://github.com/shougo/neosnippet-snippets"; - rev = "0507e9c200a904a21fa5d15ee66a1ea9fe07bb01"; - sha256 = "1rc67yqfhzqxq15sl258kdwgk8r55w470s0vcd1ax2h8yd4s7sc7"; + rev = "b89c544264912b064c79da2a90fc5d4e69d621b2"; + sha256 = "1cqgagzxl559mf06kkggdm90g27is0x80qqrrha09ng16hf6qf7a"; }; dependencies = []; }; neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-vim-2017-06-11"; + name = "neosnippet-vim-2017-06-24"; src = fetchgit { url = "https://github.com/shougo/neosnippet.vim"; - rev = "6f87e27d4e20ea8b71821df06f71818716a13cf3"; - sha256 = "0wfbicqblz91w5rzndy8zirzf819abmjv1az8yd26q1bbh3j0jpb"; + rev = "867149c56651f0958bfde1f56e203f90afba134d"; + sha256 = "19cwpans16ahmmnjfqxz5x3zw89qn93c9sc80sscw76i4ih4skml"; }; dependencies = []; }; unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "unite-vim-2017-05-27"; + name = "unite-vim-2017-07-01"; src = fetchgit { url = "https://github.com/shougo/unite.vim"; - rev = "ada33d888934d8a9e60aa8ff828b651aaedb6457"; - sha256 = "0f4vnp3avpy7ns5ndr29ibff9d8hazji95y6m5idvziswywzpwsy"; + rev = "ad15f96365b5cb43a45d0ca779df6a497f954f15"; + sha256 = "0pigwfwyas4zdzrazk08p9bnbmi51np4gb0mf5dy434glw9rrvjz"; }; dependencies = []; @@ -1511,11 +1533,11 @@ rec { }; vim-dispatch = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-dispatch-2017-06-06"; + name = "vim-dispatch-2017-06-23"; src = fetchgit { url = "https://github.com/tpope/vim-dispatch"; - rev = "1beee74e5ae75c46fd3f1255cce2543769102dc0"; - sha256 = "0jvcxr22i3yqcfvshl97939kki9ng9mvmf79qph3y9x2h0fhzikm"; + rev = "ca10dc106a5a3684573a3841560b167f4b86fde1"; + sha256 = "1ad98k08i5zcyggjxcxygr4j513fg43di99gqg1jbi8xvyhgha69"; }; dependencies = []; @@ -1566,22 +1588,22 @@ rec { }; vim-haskellconceal = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-haskellconceal-2014-10-28"; + name = "vim-haskellconceal-2017-06-15"; src = fetchgit { url = "https://github.com/twinside/vim-haskellconceal"; - rev = "f73c5dd660b7009a050b131783d7c17b4954e4d9"; - sha256 = "1a1v0m3qj0gian3mp5xynf2ghscr3xaid37b0wi38bb4f2qrigqy"; + rev = "802f82a5afee56e9e1251e6f756104a3bd114234"; + sha256 = "1kh6853hi4rgl4z1xs8kz9l1q9w7lh0r42y2m0rabfpr6yh3091r"; }; dependencies = []; }; youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "youcompleteme-2017-06-05"; + name = "youcompleteme-2017-07-07"; src = fetchgit { url = "https://github.com/valloric/youcompleteme"; - rev = "b20809332c3298cb954cff20006cb52955b54b2d"; - sha256 = "19a9lyc2xx1qp39dgyyi74bnslh6vhdi4y55b61li07b5qa4sh20"; + rev = "d299f9eb708ec83713f904dbb49c4260b6b22240"; + sha256 = "0g2spq5c9sps0zql8pg0xbnxbcqn0aacy96jd1ixxh6dg9gijkp0"; }; dependencies = []; buildPhase = '' @@ -1603,11 +1625,11 @@ rec { }; vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-themes-2017-05-24"; + name = "vim-airline-themes-2017-06-24"; src = fetchgit { url = "https://github.com/vim-airline/vim-airline-themes"; - rev = "43fe3927b884dcf722f9109e39801db110186dab"; - sha256 = "1rl4im3pllkfvc5z3shmwblzvp4s3lri3clzpirzqmywa027d0p8"; + rev = "7865fd8ba435edd01ff7b59de06a9be73e01950d"; + sha256 = "0fd4s8y6w5flbrikislcvj2a0jb77rd6gwg207qskxfqncxsbswn"; }; dependencies = []; @@ -1757,22 +1779,22 @@ rec { }; vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-wakatime-2017-06-08"; + name = "vim-wakatime-2017-07-03"; src = fetchgit { url = "https://github.com/wakatime/vim-wakatime"; - rev = "a96180dd0e694e9a5dadfb65e4c3465a9184840f"; - sha256 = "0wf108myrfjslf56xqiwsl2mkaqz7qn5k7ggvcfwmhp91lzl5aan"; + rev = "0c5368cf01f4d452a05eb5e5569e6fe78dca2657"; + sha256 = "025d0gz0fs3jb062jp7js11b8vb20zyxa32llqsjkyy4gr8kv53b"; }; dependencies = []; buildInputs = [ python ]; }; command-t = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "command-t-2017-06-08"; + name = "command-t-2017-06-23"; src = fetchgit { url = "https://github.com/wincent/command-t"; - rev = "3f0d21a06d9b936bcd79970c1b2301b05dd297bc"; - sha256 = "15wil973sqfgvix9li15qk49kv9l3rn8zqis2cl71k6xh1xvd9ff"; + rev = "29f2606a9665058a98b56f2d8062ba614a3f246e"; + sha256 = "0q6kqjy88w1478k2q6vqyyid69whd72746i0cd33xnslgykwm2hn"; }; dependencies = []; buildInputs = [ perl ruby git ]; @@ -1805,6 +1827,17 @@ rec { }; + nim-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "nim-vim-2016-05-19"; + src = fetchgit { + url = "https://github.com/zah/nim.vim"; + rev = "dcf25798f4a3f75e9538f9915959061edbff97cf"; + sha256 = "1jaiqkspfz2a4ny130dl0h6x9752flpcwwy0kscrqmlqf5fqiyvm"; + }; + dependencies = []; + + }; + deoplete-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "deoplete-go-2017-05-26"; src = fetchgit { @@ -1813,7 +1846,7 @@ rec { sha256 = "1ixav3d78wy9zs9a8hg8yqk812srkbkwsaz17lg5sxjq6azljgvq"; }; dependencies = []; - buildInputs = [ python3 ]; + buildInputs = [ python3 ]; buildPhase = '' pushd ./rplugin/python3/deoplete/ujson python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build @@ -2207,11 +2240,11 @@ rec { }; vim-addon-syntax-checker = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-syntax-checker-2013-07-12"; + name = "vim-addon-syntax-checker-2017-06-26"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-syntax-checker"; - rev = "8eb7217e636ca717d4de5cd03cc0180c5b66ae77"; - sha256 = "0gcvb922w4jsi203ygbnij9xhmgc6knj9b3ivw3m0fv5ckk4iw5f"; + rev = "739e5719b77c6aea3299c27fc1f4238ac54a8344"; + sha256 = "1rcn1ps06156nyglvxg6m7pn3vhvmnv5ad6kidp59hggyr5332i9"; }; dependencies = ["vim-addon-mw-utils" "tlib"]; @@ -2240,11 +2273,11 @@ rec { }; vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-2017-05-08"; + name = "vim-airline-2017-07-07"; src = fetchgit { url = "git://github.com/vim-airline/vim-airline"; - rev = "466198adc015a9d81e975374d8e206dcf3efd173"; - sha256 = "1dq47y24dc84dkpgv44jh5n2q5jqm5xvriql81441lbwldyq99ld"; + rev = "e03afa1733c6296774ca95ef981bd8fd39bb1151"; + sha256 = "0n8l4al4hicnz1xyhcbyb6iw3fxrjslmxk18zanyqcamhfj94vy3"; }; dependencies = []; @@ -2306,11 +2339,11 @@ rec { }; vim-latex-live-preview = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-latex-live-preview-2016-03-16"; + name = "vim-latex-live-preview-2017-06-22"; src = fetchgit { url = "git://github.com/xuhdev/vim-latex-live-preview"; - rev = "99501642c1dd3f703ac6301ae13469f4990b7a06"; - sha256 = "0dkm3v1jqi8aq0jfpa6fdwgbfbwidc32ci1y9vhqb1prs15qrqfl"; + rev = "becc9d4f1a774e6deb7a96015200de35f1bec1a3"; + sha256 = "0mqvzk94byiccm7v8kdk0hcbz05k9l69kv3ljg8djbvj5q6zzi2m"; }; dependencies = []; @@ -2328,11 +2361,11 @@ rec { }; vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signature-2016-11-20"; + name = "vim-signature-2017-06-20"; src = fetchgit { url = "git://github.com/kshenoy/vim-signature"; - rev = "7e13913188809c45e14988270213744d1c3bb485"; - sha256 = "0lcmv8fxj50r1r51379sxdy0ra3s0i1cgyqi4wp2zmpz06c1c2nx"; + rev = "c6decc68d644a66a34345ea09677469d6e482e1f"; + sha256 = "1iflyvskimq74hzb6l8mzjv3rh0i15bw9jv5x6arns86q3201l23"; }; dependencies = []; @@ -2350,11 +2383,11 @@ rec { }; vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-snippets-2017-06-09"; + name = "vim-snippets-2017-07-07"; src = fetchgit { url = "git://github.com/honza/vim-snippets"; - rev = "d21f43c210ac7b04ec1bcda39f10b03a934a9ae8"; - sha256 = "1vv7kpin3aqzz47937b5w5q2hcr9gldz0x39i6z3wa3q4x2sg366"; + rev = "0817950a4fb8ccd48ec38a2b65cf046b597eecb3"; + sha256 = "0hxd96zl5gjkx5d381yzyrbahwbz3r9dljzn2cxbdbjsb7im6aks"; }; dependencies = []; @@ -2390,14 +2423,15 @@ rec { sha256 = "0hzmssyz7y7hv3mv67zkqwxc13crkpwv0plm7z701943h2zxj08h"; }; dependencies = []; + }; vinegar = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vinegar-2017-05-23"; + name = "vinegar-2017-06-27"; src = fetchgit { url = "git://github.com/tpope/vim-vinegar"; - rev = "9abe956acc14444c0fda75eb98c8e31cf81b4c26"; - sha256 = "16a85lk20v50krl899w0i9zl6gp7478f4pd6mqz8519d76vbmy99"; + rev = "c795cb739347cbddeeb288c3c35da9f140a513c9"; + sha256 = "1dcirb0b73s2l14ppn8mlh79pjpf9kgym9im05039ynr9rl83fv3"; }; dependencies = []; @@ -2413,4 +2447,5 @@ rec { dependencies = []; }; + } diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index b83660b220b..da5c1d62a2f 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -27,6 +27,7 @@ "github:LnL7/vim-nix" "github:Quramy/tsuquyomi" "github:Shougo/deoplete.nvim" +"github:albfan/nerdtree-git-plugin" "github:ajh17/Spacegray.vim" "github:alvan/vim-closetag" "github:ap/vim-css-color" @@ -83,6 +84,7 @@ "github:luochen1990/rainbow" "github:lyokha/vim-xkbswitch" "github:machakann/vim-highlightedyank" +"github:martinda/Jenkinsfile-vim-syntax" "github:mhinz/vim-startify" "github:michaeljsmith/vim-indent-object" "github:mileszs/ack.vim" @@ -100,6 +102,7 @@ "github:rhysd/vim-grammarous" "github:rodjek/vim-puppet" "github:rust-lang/rust.vim" +"github:sebastianmarkow/deoplete-rust" "github:sbdchd/neoformat" "github:sheerun/vim-polyglot" "github:shougo/neco-vim" @@ -141,6 +144,7 @@ "github:wincent/command-t" "github:xolox/vim-easytags" "github:xolox/vim-misc" +"github:zah/nim.vim" "github:zchee/deoplete-jedi" "github:zchee/deoplete-go" "goyo" diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_csp/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_csp/default.nix index 04b1e2f21fe..1018100ba9c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_csp/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_csp/default.nix @@ -1,4 +1,4 @@ -{ appleDerivation, apple_sdk, libsecurity_asn1, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_cdsa_utils, libsecurity_utilities, osx_private_sdk, stdenv }: +{ appleDerivation, apple_sdk, libsecurity_asn1, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_cdsa_utils, libsecurity_utilities, CommonCrypto, stdenv }: appleDerivation { buildInputs = [ libsecurity_cdsa_utilities @@ -19,7 +19,7 @@ appleDerivation { for file in lib/castContext.h lib/gladmanContext.h lib/desContext.h lib/rc4Context.h; do substituteInPlace ''$file --replace \ '/usr/local/include/CommonCrypto/CommonCryptorSPI.h' \ - '${osx_private_sdk}/PrivateSDK10.9.sparse.sdk/usr/include/CommonCrypto/CommonCryptorSPI.h' + '${CommonCrypto}/include/CommonCrypto/CommonCryptorSPI.h' done substituteInPlace lib/opensshWrap.cpp --replace RSA_DSA_Keys.h RSA_DSA_keys.h diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_cl/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_cl/default.nix index d2f15e19ccf..c5e9418ce91 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_cl/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_cl/default.nix @@ -1,4 +1,4 @@ -{ appleDerivation, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_filedb, libsecurity_keychain, libsecurity_utilities, libsecurityd, osx_private_sdk }: +{ appleDerivation, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_filedb, libsecurity_keychain, libsecurity_utilities, libsecurityd }: appleDerivation { buildInputs = [ libsecurity_cdsa_plugin diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_asn1/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_asn1/default.nix index ab11d893d19..a1c3204c15a 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_asn1/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_asn1/default.nix @@ -1,4 +1,4 @@ -{ appleDerivation, libsecurity_cdsa_utilities, libsecurity_utilities, osx_private_sdk }: +{ appleDerivation, libsecurity_cdsa_utilities, libsecurity_utilities }: appleDerivation { __propagatedImpureHostDeps = [ "/System/Library/Frameworks/Security.framework/Security" diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_plugin/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_plugin/default.nix index b0c35f0e30c..b2dbb75f297 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_plugin/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_plugin/default.nix @@ -1,4 +1,4 @@ -{ appleDerivation, libsecurity_cdsa_utilities, libsecurity_cssm, libsecurity_utilities, osx_private_sdk, perl }: +{ appleDerivation, libsecurity_cdsa_utilities, libsecurity_cssm, libsecurity_utilities, perl }: appleDerivation { buildInputs = [ libsecurity_cdsa_utilities @@ -12,4 +12,4 @@ appleDerivation { preBuild = '' perl lib/generator.pl lib lib/generator.cfg lib lib || exit 1 ''; -} \ No newline at end of file +} diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utilities/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utilities/default.nix index 6f2436f2149..26515353b73 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utilities/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utilities/default.nix @@ -1,4 +1,4 @@ -{ CommonCrypto, appleDerivation, libsecurity_codesigning, libsecurity_utilities, m4, osx_private_sdk }: +{ CommonCrypto, appleDerivation, libsecurity_codesigning, libsecurity_utilities, m4 }: appleDerivation { buildInputs = [ libsecurity_utilities diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utils/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utils/default.nix index d9b594bc47c..aa73c281cab 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utils/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utils/default.nix @@ -1,4 +1,4 @@ -{ Security, appleDerivation, apple_sdk, cppcheck, libsecurity_cdsa_utilities, libsecurity_utilities, m4, osx_private_sdk }: +{ Security, appleDerivation, libsecurity_cdsa_utilities, libsecurity_utilities, m4 }: appleDerivation { buildInputs = [ libsecurity_utilities diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_ocspd/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_ocspd/default.nix index 25701442d2b..81551e9a76e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_ocspd/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_ocspd/default.nix @@ -1,4 +1,4 @@ -{ appleDerivation, bootstrap_cmds, libsecurity_cdsa_utilities, libsecurity_utilities, osx_private_sdk }: +{ appleDerivation, bootstrap_cmds, libsecurity_cdsa_utilities, libsecurity_utilities }: appleDerivation { buildInputs = [ libsecurity_utilities diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_pkcs12/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_pkcs12/default.nix index f84c2d8963f..b225d062dc9 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_pkcs12/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_pkcs12/default.nix @@ -1,4 +1,4 @@ -{ appleDerivation, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_utils, libsecurity_keychain, osx_private_sdk }: +{ appleDerivation, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_utils, libsecurity_keychain }: appleDerivation { patchPhase = '' substituteInPlace lib/pkcsoids.h --replace '#error' '#warning' diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix index 9de1d120cc9..8dae6072413 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix @@ -1,4 +1,4 @@ -{ IOKit, appleDerivation, apple_sdk, libauto, libobjc, libsecurity_codesigning, osx_private_sdk, sqlite, stdenv }: +{ IOKit, appleDerivation, apple_sdk, libauto, libobjc, libsecurity_codesigning, sqlite, stdenv, osx_private_sdk }: appleDerivation { buildInputs = [ libauto @@ -16,7 +16,7 @@ appleDerivation { substituteInPlace lib/ccaudit.cpp --replace '' '"bsm/libbsm.h"' substituteInPlace lib/powerwatch.h --replace \ '' \ - '"${osx_private_sdk}/PrivateSDK10.9.sparse.sdk/System/Library/Frameworks/IOKit.framework/Versions/A/PrivateHeaders/pwr_mgt/IOPMLibPrivate.h"' + '"${IOKit}/Library/Frameworks/IOKit.framework/Headers/pwr_mgt/IOPMLibPrivate.h"' cp ${osx_private_sdk}/PrivateSDK10.9.sparse.sdk/usr/include/security_utilities/utilities_dtrace.h lib cp -R ${osx_private_sdk}/PrivateSDK10.9.sparse.sdk/usr/local/include/bsm lib diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurityd/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurityd/default.nix index d311f678337..48bb80eb751 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurityd/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurityd/default.nix @@ -1,4 +1,4 @@ -{ appleDerivation, bootstrap_cmds, libsecurity_cdsa_client, libsecurity_cdsa_utilities, libsecurity_utilities, osx_private_sdk }: +{ appleDerivation, bootstrap_cmds, libsecurity_cdsa_client, libsecurity_cdsa_utilities, libsecurity_utilities }: appleDerivation { buildInputs = [ libsecurity_cdsa_utilities @@ -20,4 +20,4 @@ appleDerivation { postInstall = '' ln -s ''$out/include/securityd ''$out/include/securityd_client ''; -} \ No newline at end of file +} diff --git a/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix index b4b2b685895..bd219ae434c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libunwind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, dyld, osx_private_sdk }: +{ stdenv, appleDerivation }: appleDerivation { buildPhase = ":"; diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix index f88f761f65a..933e7558dbb 100644 --- a/pkgs/os-specific/darwin/binutils/default.nix +++ b/pkgs/os-specific/darwin/binutils/default.nix @@ -2,11 +2,12 @@ , hostPlatform, targetPlatform }: -let - prefix = stdenv.lib.optionalString - (targetPlatform != hostPlatform) - "${targetPlatform.config}-"; +# Make sure both underlying packages claim to have prepended their binaries +# with the same prefix. +assert binutils-raw.prefix == cctools.prefix; +let + inherit (binutils-raw) prefix; cmds = [ "ar" "ranlib" "as" "dsymutil" "install_name_tool" "ld" "strip" "otool" "lipo" "nm" "strings" "size" @@ -50,4 +51,8 @@ stdenv.mkDerivation { ln -s ${cctools}/libexec $out/libexec ''; + + passthru = { + inherit prefix; + }; } diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index 222c51603fd..9fdb00d66be 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -1,10 +1,12 @@ { stdenv, fetchFromGitHub, makeWrapper, autoconf, automake, libtool_2 , llvm, libcxx, libcxxabi, clang, libuuid , libobjc ? null, maloader ? null, xctoolchain ? null -, buildPlatform, hostPlatform, targetPlatform +, hostPlatform, targetPlatform }: let + # The prefix prepended to binary names to allow multiple binuntils on the + # PATH to both be usable. prefix = stdenv.lib.optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-"; @@ -38,13 +40,10 @@ let enableParallelBuilding = true; + # TODO(@Ericson2314): Always pass "--target" and always prefix. + configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; configureFlags = stdenv.lib.optionals (!stdenv.isDarwin) [ "CXXFLAGS=-I${libcxx}/include/c++/v1" - ] ++ stdenv.lib.optionals (targetPlatform != buildPlatform) [ - # TODO make unconditional next hash break - "--build=${buildPlatform.config}" - "--host=${hostPlatform.config}" - "--target=${targetPlatform.config}" ]; postPatch = '' @@ -104,6 +103,10 @@ let done ''; + passthru = { + inherit prefix; + }; + meta = { homepage = "http://www.opensource.apple.com/source/cctools/"; description = "Mac OS X Compiler Tools (cross-platform port)"; diff --git a/pkgs/os-specific/darwin/ios-cross/default.nix b/pkgs/os-specific/darwin/ios-cross/default.nix index e5375ef6091..f56c8148317 100644 --- a/pkgs/os-specific/darwin/ios-cross/default.nix +++ b/pkgs/os-specific/darwin/ios-cross/default.nix @@ -6,6 +6,8 @@ , stdenv , coreutils , gnugrep +, buildPackages +, hostPlatform , targetPlatform }: @@ -28,14 +30,14 @@ let sdk = "/Applications/Xcode.app/Contents/Developer/Platforms/iPhone${sdkType}.platform/Developer/SDKs/iPhone${sdkType}${sdkVer}.sdk"; - /* TODO: Properly integrate with gcc-cross-wrapper */ - wrapper = import ../../../build-support/cc-wrapper { - inherit stdenv coreutils gnugrep; +in (import ../../../build-support/cc-wrapper { + inherit stdenv coreutils gnugrep runCommand buildPackages; nativeTools = false; nativeLibc = false; inherit binutils; libc = runCommand "empty-libc" {} "mkdir -p $out/{lib,include}"; - cc = clang; + inherit (clang) cc; + inherit hostPlatform targetPlatform; extraBuildCommands = '' if ! [ -d ${sdk} ]; then echo "You must have ${sdkVer} of the iPhone${sdkType} sdk installed at ${sdk}" >&2 @@ -49,27 +51,6 @@ let # Purposefully overwrite libc-ldflags-before, cctools ld doesn't know dynamic-linker and cc-wrapper doesn't do cross-compilation well enough to adjust echo "-arch ${arch} -L${sdk}/usr/lib ${lib.optionalString simulator "-L${sdk}/usr/lib/system "}-i${if simulator then "os_simulator" else "phoneos"}_version_min 7.0.0" > $out/nix-support/libc-ldflags-before ''; - }; -in { - cc = runCommand "${prefix}-cc" { passthru = { inherit sdkType sdkVer sdk; }; } '' - mkdir -p $out/bin - ln -sv ${wrapper}/bin/clang $out/bin/${prefix}-cc - mkdir -p $out/nix-support - echo ${llvm} > $out/nix-support/propagated-native-build-inputs - cat > $out/nix-support/setup-hook <= KERNEL_VERSION(4, 12, 0) ++ enum nl80211_iftype type, struct vif_params *params); ++#else + enum nl80211_iftype type, u32 *flags, struct vif_params *params); ++#endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) + static s32 + wl_cfg80211_scan(struct wiphy *wiphy, +@@ -466,7 +470,11 @@ wl_dev_ioctl(struct net_device *dev, u32 cmd, void *arg, u32 len) + + static s32 + wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) ++ enum nl80211_iftype type, ++#else + enum nl80211_iftype type, u32 *flags, ++#endif + struct vif_params *params) + { + struct wl_cfg80211_priv *wl = wiphy_to_wl(wiphy); +@@ -2361,6 +2369,20 @@ wl_bss_roaming_done(struct wl_cfg80211_priv *wl, struct net_device *ndev, + const wl_event_msg_t *e, void *data) + { + struct wl_cfg80211_connect_info *conn_info = wl_to_conn(wl); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) ++ struct cfg80211_bss *bss; ++ struct wlc_ssid *ssid; ++ ssid = &wl->profile->ssid; ++ bss = cfg80211_get_bss(wl_to_wiphy(wl), NULL, (s8 *)&wl->bssid, ++ ssid->SSID, ssid->SSID_len, WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS); ++ struct cfg80211_roam_info roam_info = { ++ .bss = bss, ++ .req_ie = conn_info->req_ie, ++ .req_ie_len = conn_info->req_ie_len, ++ .resp_ie = conn_info->resp_ie, ++ .resp_ie_len = conn_info->resp_ie_len, ++ }; ++#endif + s32 err = 0; + + wl_get_assoc_ies(wl); +@@ -2368,12 +2390,17 @@ wl_bss_roaming_done(struct wl_cfg80211_priv *wl, struct net_device *ndev, + memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN); + wl_update_bss_info(wl); + cfg80211_roamed(ndev, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) ++ &roam_info, ++#else + #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39) + &wl->conf->channel, + #endif + (u8 *)&wl->bssid, + conn_info->req_ie, conn_info->req_ie_len, +- conn_info->resp_ie, conn_info->resp_ie_len, GFP_KERNEL); ++ conn_info->resp_ie, conn_info->resp_ie_len, ++#endif ++ GFP_KERNEL); + WL_DBG(("Report roaming result\n")); + + set_bit(WL_STATUS_CONNECTED, &wl->status); diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 4956f13950d..5447f13abc4 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -1,8 +1,9 @@ -{ stdenv, lib, fetchurl, glibc, musl +{ stdenv, lib, buildPackages, fetchurl , enableStatic ? false , enableMinimal ? false -, useMusl ? false +, useMusl ? false, musl , extraConfig ? "" +, buildPlatform, hostPlatform }: let @@ -26,11 +27,11 @@ let in stdenv.mkDerivation rec { - name = "busybox-1.26.2"; + name = "busybox-1.27.0"; src = fetchurl { url = "http://busybox.net/downloads/${name}.tar.bz2"; - sha256 = "05mg6rh5smkzfwqfcazkpwy6h6555llsazikqnvwkaf17y8l8gns"; + sha256 = "1kcr0jvik0c31ls4f3li359xv7w0b60hv64fknj28bwlkdgbvpx5"; }; hardeningDisable = [ "format" ] ++ lib.optional enableStatic [ "fortify" ]; @@ -62,7 +63,7 @@ stdenv.mkDerivation rec { CONFIG_DEFAULT_SETFONT_DIR "/etc/kbd" ${extraConfig} - $extraCrossConfig + CONFIG_CROSS_COMPILER_PREFIX "${stdenv.cc.prefix}" EOF make oldconfig @@ -71,21 +72,13 @@ stdenv.mkDerivation rec { ''; postConfigure = lib.optionalString useMusl '' - makeFlagsArray+=("CC=gcc -isystem ${musl}/include -B${musl}/lib -L${musl}/lib") + makeFlagsArray+=("CC=${stdenv.cc.prefix}gcc -isystem ${musl}/include -B${musl}/lib -L${musl}/lib") ''; + nativeBuildInputs = lib.optional (hostPlatform != buildPlatform) buildPackages.stdenv.cc; + buildInputs = lib.optionals (enableStatic && !useMusl) [ stdenv.cc.libc stdenv.cc.libc.static ]; - crossAttrs = { - extraCrossConfig = '' - CONFIG_CROSS_COMPILER_PREFIX "${stdenv.cross.config}-" - ''; - - postConfigure = stdenv.lib.optionalString useMusl '' - makeFlagsArray+=("CC=$crossConfig-gcc -isystem ${musl.crossDrv}/include -B${musl.crossDrv}/lib -L${musl.crossDrv}/lib") - ''; - }; - enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index cf7fe8fc841..1bbe8dbb160 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { ''; preBuild = '' - sed -e "s@/etc/@$out/etc/@g" -i Makefile + sed -e "s@/etc/@$out/etc/@g" -e "/chmod u+s/d" -i Makefile ''; meta = { 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 b81c8f257b8..2f4689beea4 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 = "2017-04-16"; + version = "2017-07-05"; # This repo is built by merging the latest versions of # http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/ @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "fpletz"; repo = "linux-firmware"; rev = version; - sha256 = "0ar29vjjpsw7r7pqqa8b0jxx03k230cn7x8fkqi23bj68bd9x5pc"; + sha256 = "0vlk043y7c32g4d9hz93j64x372qqrwsq65mh8s5s5xrvamja2if"; }; preInstall = '' diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 4ffc99b6ced..404e21bcbce 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "iproute2-${version}"; - version = "4.11.0"; + version = "4.12.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz"; - sha256 = "09l0phf09mw17bn3xlzfr80sbhw14mq8xv28iz5x15m6pll10rvj"; + sha256 = "0zdxdsxyaazl85xhwskvsmpyzwf5qp21cvjsi1lw3xnrc914q2if"; }; patches = lib.optionals enableFan [ diff --git a/pkgs/os-specific/linux/iptstate/default.nix b/pkgs/os-specific/linux/iptstate/default.nix new file mode 100644 index 00000000000..a9be26a2026 --- /dev/null +++ b/pkgs/os-specific/linux/iptstate/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, libnetfilter_conntrack, ncurses }: + +stdenv.mkDerivation rec { + name = "iptstate-${version}"; + version = "2.2.6"; + + src = fetchurl { + url = "https://github.com/jaymzh/iptstate/releases/download/v${version}/${name}.tar.bz2"; + sha256 = "bef8eb67a4533e53079f397b71e91dd34da23f8cbd65cb2d5b67cb907b00c068"; + }; + + buildInputs = [ libnetfilter_conntrack ncurses ]; + + meta = with stdenv.lib; { + description = "Conntrack top like tool"; + homepage = https://github.com/jaymzh/iptstate; + platforms = platforms.linux; + maintainers = with maintainers; [ trevorj ]; + downloadPage = "https://github.com/jaymzh/iptstate/releases"; + }; + + installPhase = '' + install -m755 -D iptstate $out/bin/iptstate + ''; +} + diff --git a/pkgs/os-specific/linux/iw/default.nix b/pkgs/os-specific/linux/iw/default.nix index 53aa15ec62e..2a6294e3b5b 100644 --- a/pkgs/os-specific/linux/iw/default.nix +++ b/pkgs/os-specific/linux/iw/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libnl, pkgconfig}: stdenv.mkDerivation rec { - name = "iw-4.3"; + name = "iw-4.9"; src = fetchurl { url = "https://www.kernel.org/pub/software/network/iw/${name}.tar.xz"; - sha256 = "085jyvrxzarvn5jl0fk618jjxy50nqx7ifngszc4jxk6a4ddibd6"; + sha256 = "1klpvv98bnx1zm6aqalnri2vd7w80scmdaxr2qnblb6mz82whk1j"; }; buildInputs = [ libnl pkgconfig ]; diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index 028ce53275c..adaca90650d 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -7,12 +7,12 @@ let sha256 = "12k1f1iarm29j8k16mhw83xx7r3bama4lp0fchhnj7iwxrpgs4gh"; }; in stdenv.mkDerivation rec { - name = "iwd-unstable-2017-04-21"; + name = "iwd-unstable-2017-06-02"; src = fetchgit { url = https://git.kernel.org/pub/scm/network/wireless/iwd.git; - rev = "f64dea81b8490e5e09888be645a4325419bb269c"; - sha256 = "0maqhx5264ykgmwaf90s2806i1kx2028if34ph2axlirxrhdd3lg"; + rev = "6c64ae34619bf7f18cba007d8b0374badbe7c17e"; + sha256 = "19rkf6lk213hdfs40ija7salars08zw6k5i5djdlpcn1j6y69i36"; }; configureFlags = [ diff --git a/pkgs/os-specific/linux/kbdlight/default.nix b/pkgs/os-specific/linux/kbdlight/default.nix index 1bc07f357a8..44a63c9f1ec 100644 --- a/pkgs/os-specific/linux/kbdlight/default.nix +++ b/pkgs/os-specific/linux/kbdlight/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace Makefile \ - --replace /usr/local $out + --replace /usr/local $out \ + --replace 4755 0755 ''; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index a33d24fc847..da67747b8b2 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -1,4 +1,6 @@ -{ stdenv, kernel, perl }: +{ stdenv, kernel, perl +, hostPlatform +}: let baseBuildFlags = [ "INSTALL_HDR_PATH=$(out)" "headers_install" ]; @@ -13,7 +15,7 @@ in stdenv.mkDerivation { crossAttrs = { inherit (kernel.crossDrv) src patches; - buildFlags = [ "ARCH=${stdenv.cross.platform.kernelArch}" ] ++ baseBuildFlags; + buildFlags = [ "ARCH=${hostPlatform.platform.kernelArch}" ] ++ baseBuildFlags; }; installPhase = '' diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index b23d52b39e3..9700373c852 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -39,7 +39,7 @@ with stdenv.lib; SCHEDSTATS n DETECT_HUNG_TASK y - ${optionalString (versionOlder version "4.10") '' + ${optionalString (versionOlder version "4.4") '' CPU_NOTIFIER_ERROR_INJECT? n ''} @@ -92,6 +92,14 @@ with stdenv.lib; # module, so that the initrd gets a good I/O scheduler. IOSCHED_CFQ y BLK_CGROUP y # required by CFQ + IOSCHED_DEADLINE y + ${optionalString (versionAtLeast version "4.11") '' + MQ_IOSCHED_DEADLINE y + ''} + ${optionalString (versionAtLeast version "4.12") '' + MQ_IOSCHED_KYBER y + IOSCHED_BFQ m + ''} # Enable NUMA. NUMA? y @@ -294,7 +302,9 @@ with stdenv.lib; CIFS_UPCALL y CIFS_ACL y CIFS_DFS_UPCALL y - CIFS_SMB2 y + ${optionalString (versionOlder version "4.13") '' + CIFS_SMB2 y + ''} ${optionalString (versionAtLeast version "3.12") '' CEPH_FSCACHE y ''} @@ -472,8 +482,10 @@ with stdenv.lib; SCHED_TRACER y STACK_TRACER y - ${optionalString (versionOlder version "4.11") '' + ${if versionOlder version "4.11" then '' UPROBE_EVENT? y + '' else '' + UPROBE_EVENTS? y ''} ${optionalString (versionAtLeast version "4.4") '' @@ -497,7 +509,7 @@ with stdenv.lib; KVM_APIC_ARCHITECTURE y ''} KVM_ASYNC_PF y - ${optionalString (versionAtLeast version "4.0") '' + ${optionalString ((versionAtLeast version "4.0") && (versionOlder version "4.12")) '' KVM_COMPAT? y ''} ${optionalString (versionOlder version "4.12") '' @@ -511,27 +523,29 @@ with stdenv.lib; ${optionalString (versionAtLeast version "3.13") '' KVM_VFIO y ''} - XEN? y - XEN_DOM0? y - ${optionalString ((versionAtLeast version "3.18") && (features.xen_dom0 or false)) '' - PCI_XEN? y - HVC_XEN? y - HVC_XEN_FRONTEND? y - XEN_SYS_HYPERVISOR? y - SWIOTLB_XEN? y - XEN_BACKEND? y - XEN_BALLOON? y - XEN_BALLOON_MEMORY_HOTPLUG? y - XEN_EFI? y - XEN_HAVE_PVMMU? y - XEN_MCE_LOG? y - XEN_PVH? y - XEN_PVHVM? y - XEN_SAVE_RESTORE? y - XEN_SCRUB_PAGES? y - XEN_SELFBALLOONING? y - XEN_STUB? y - XEN_TMEM? y + ${optionalString (stdenv.isx86_64 || stdenv.isi686) '' + XEN? y + XEN_DOM0? y + ${optionalString ((versionAtLeast version "3.18") && (features.xen_dom0 or false)) '' + PCI_XEN? y + HVC_XEN? y + HVC_XEN_FRONTEND? y + XEN_SYS_HYPERVISOR? y + SWIOTLB_XEN? y + XEN_BACKEND? y + XEN_BALLOON? y + XEN_BALLOON_MEMORY_HOTPLUG? y + XEN_EFI? y + XEN_HAVE_PVMMU? y + XEN_MCE_LOG? y + XEN_PVH? y + XEN_PVHVM? y + XEN_SAVE_RESTORE? y + XEN_SCRUB_PAGES? y + XEN_SELFBALLOONING? y + XEN_STUB? y + XEN_TMEM? y + ''} ''} KSM y ${optionalString (!stdenv.is64bit) '' @@ -591,14 +605,15 @@ with stdenv.lib; FW_LOADER_USER_HELPER_FALLBACK? n # Disable various self-test modules that have no use in a production system - ARM_KPROBES_TEST? n + ${optionalString (versionOlder version "4.4") '' + ARM_KPROBES_TEST? n + ''} + ASYNC_RAID6_TEST? n ATOMIC64_SELFTEST? n BACKTRACE_SELF_TEST? n CRC32_SELFTEST? n CRYPTO_TEST? n - DRM_DEBUG_MM_SELFTEST? n - EFI_TEST? n GLOB_SELFTEST? n INTERVAL_TREE_TEST? n LNET_SELFTEST? n @@ -607,29 +622,37 @@ with stdenv.lib; NOTIFIER_ERROR_INJECTION? n PERCPU_TEST? n RBTREE_TEST? n - RCU_PERF_TEST? n RCU_TORTURE_TEST? n - TEST_ASYNC_DRIVER_PROBE? n - TEST_BITMAP? n TEST_BPF? n TEST_FIRMWARE? n - TEST_HASH? n TEST_HEXDUMP? n TEST_KSTRTOX? n TEST_LIST_SORT? n TEST_LKM? n - TEST_PARMAN? n TEST_PRINTF? n TEST_RHASHTABLE? n - TEST_SORT? n TEST_STATIC_KEYS? n TEST_STRING_HELPERS? n TEST_UDELAY? n TEST_USER_COPY? n - TEST_UUID? n - WW_MUTEX_SELFTEST? n XZ_DEC_TEST? n + ${optionalString (versionOlder version "4.4") '' + EFI_TEST? n + RCU_PERF_TEST? n + TEST_ASYNC_DRIVER_PROBE? n + TEST_BITMAP? n + TEST_HASH? n + TEST_UUID? n + ''} + + ${optionalString (versionAtLeast version "4.11") '' + DRM_DEBUG_MM_SELFTEST? n + TEST_PARMAN? n + TEST_SORT? n + WW_MUTEX_SELFTEST? n + ''} + # ChromiumOS support ${optionalString (features.chromiumos or false) '' CHROME_PLATFORMS y diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 16b35e9aa3e..bbe86792692 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -25,6 +25,7 @@ kernelPatches ? [] , ignoreConfigErrors ? stdenv.platform.name != "pc" , extraMeta ? {} +, hostPlatform , ... }: @@ -59,7 +60,7 @@ let arch = stdenv.platform.kernelArch; crossAttrs = let - cp = stdenv.cross.platform; + cp = hostPlatform.platform; in { arch = cp.kernelArch; platformName = cp.name; @@ -128,7 +129,7 @@ let }; config = configWithPlatform stdenv.platform; - configCross = configWithPlatform stdenv.cross.platform; + configCross = configWithPlatform hostPlatform.platform; nativeDrv = lib.addPassthru kernel.nativeDrv passthru; diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index 8ab879f7b00..9587ba356ff 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, buildLinux, ... } @ args: +{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { version = "3.10.105"; diff --git a/pkgs/os-specific/linux/kernel/linux-4.11.nix b/pkgs/os-specific/linux/kernel/linux-4.11.nix index 92525b115ee..9bb4e85d3f9 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.11.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.11.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, perl, buildLinux, ... } @ args: +{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.11.6"; + version = "4.11.11"; extraMeta.branch = "4.11"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0ccna0hrqcza3jz83gaxlcg5vijl83w5w3g87v93a5x06ky9nlr5"; + sha256 = "1dvs1r3vq15akyv0yxvim6j09pqac5dagqbchvdlsw5yi4fnylc8"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-4.12.nix b/pkgs/os-specific/linux/kernel/linux-4.12.nix new file mode 100644 index 00000000000..4cb408d33cb --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-4.12.nix @@ -0,0 +1,18 @@ +{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: + +import ./generic.nix (args // rec { + version = "4.12.2"; + extraMeta.branch = "4.12"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; + sha256 = "1ql5y6bvb1bx9b2k5iksdzjgzxnq852rvq69kdnkwa98p8p8ayha"; + }; + + kernelPatches = args.kernelPatches; + + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + features.netfilterRPFilter = true; +} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 5328bb9a043..76dc8f030cd 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, perl, buildLinux, ... } @ args: +{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.73"; + version = "4.4.77"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1dj4gpv01si4wiihm8wijkhx0l6ashvydniqrbpq78sby6sn5180"; + sha256 = "1s5l5b3hpm691w94a3ddliy4gcxi2s9xm3hsazdwgzqrqdv70ysy"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 521f53e309b..260b776999d 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, perl, buildLinux, ... } @ args: +{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.33"; + version = "4.9.38"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0d2cai3bq1bkmisbsl6l27di765xmzn3lscwray30ldbssijpjpm"; + sha256 = "0x4h2b6xapqyxgivj9ay5yclmyl434bjfmq9ikajy7fmgpc8kmvn"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-chromiumos-3.18.nix b/pkgs/os-specific/linux/kernel/linux-chromiumos-3.18.nix index b80c9acd659..e27b2afb200 100644 --- a/pkgs/os-specific/linux/kernel/linux-chromiumos-3.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-chromiumos-3.18.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, perl, buildLinux, ncurses, ... } @ args: +{ stdenv, hostPlatform, fetchgit, perl, buildLinux, ncurses, ... } @ args: # ChromiumOS requires a 64bit build host assert stdenv.is64bit; diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix new file mode 100644 index 00000000000..878f69dbaa5 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix @@ -0,0 +1,27 @@ +{ stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args: + +let + version = "4.12.2"; + revision = "a"; + sha256 = "0w3k5a30li2qz2msach9sg9qsvmjsc4mf9k3ad5dxd0667a0hygm"; +in + +import ./generic.nix (args // { + version = "${version}-${revision}"; + extraMeta.branch = "4.12"; + modDirVersion = "${version}"; + + src = fetchFromGitHub { + inherit sha256; + owner = "copperhead"; + repo = "linux-hardened"; + rev = "${version}.${revision}"; + }; + + kernelPatches = args.kernelPatches; + + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + features.netfilterRPFilter = true; +} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix index 3d244b794e9..7e6110bf4a3 100644 --- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix +++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, buildLinux, ... } @ args: +{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { mptcpVersion = "0.91.3"; diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index 9bc6feb3de2..0e7f332e617 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl, buildLinux, ... } @ args: +{ stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args: let modDirVersion = "4.9.24"; diff --git a/pkgs/os-specific/linux/kernel/linux-samus-4.12.nix b/pkgs/os-specific/linux/kernel/linux-samus-4.12.nix new file mode 100644 index 00000000000..5599e1325d9 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-samus-4.12.nix @@ -0,0 +1,23 @@ +{ stdenv, hostPlatform, fetchFromGitHub, perl, buildLinux, ncurses, ... } @ args: + +assert stdenv.is64bit; + +import ./generic.nix (args // rec { + version = "4.12.2"; + extraMeta.branch = "4.12-2"; + + src = + let upstream = fetchFromGitHub { + owner = "raphael"; + repo = "linux-samus"; + rev = "v${extraMeta.branch}"; + sha256 = "1dr74i79p8r13522w2ppi8gnjd9bhngc9d2hsn91ji6f5a8fbxx9"; + }; in "${upstream}/build/linux"; + + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + features.netfilterRPFilter = true; + + extraMeta.hydraPlatforms = []; +} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 6bde598c47a..c7a4ca30a7c 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, perl, buildLinux, ... } @ args: +{ stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.12-rc6"; - modDirVersion = "4.12.0-rc6"; - extraMeta.branch = "4.12"; + version = "4.13-rc1"; + modDirVersion = "4.13.0-rc1"; + extraMeta.branch = "4.13"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "0yqs65kmrksphca8f959g9ca9kpdwbp3ad5v594wvwsdk0q4sqgc"; + sha256 = "1pdbykp2336vk7ynrz0l95rwqags6kklbr08wjc7zpmdaad6yd6m"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 3466cafa266..c295293fa2c 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,5 +1,6 @@ { stdenv, runCommand, nettools, bc, perl, gmp, libmpc, mpfr, kmod, openssl , writeTextFile, ubootChooser +, hostPlatform }: let @@ -232,7 +233,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.platform (kernelPatches ++ nativeKe karch = stdenv.platform.kernelArch; - crossAttrs = let cp = stdenv.cross.platform; in + crossAttrs = let cp = hostPlatform.platform; in (drvAttrs crossConfig cp (kernelPatches ++ crossKernelPatches) crossConfigfile) // { makeFlags = commonMakeFlags ++ [ "ARCH=${cp.kernelArch}" diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index 0a3b4070be1..3fbad924568 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { /* I don't want cross-python or cross-perl - I don't know if cross-python even works */ propagatedBuildInputs = [ elfutils.crossDrv newt.crossDrv ]; - makeFlags = "CROSS_COMPILE=${stdenv.cross.config}-"; + makeFlags = "CROSS_COMPILE=${stdenv.cc.prefix}"; elfutils = elfutils.crossDrv; inherit (kernel.crossDrv) src patches; }; diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix index 84b66ac0d9c..92ac1a77898 100644 --- a/pkgs/os-specific/linux/klibc/default.nix +++ b/pkgs/os-specific/linux/klibc/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, linuxHeaders, perl }: +{ stdenv, fetchurl, linuxHeaders, perl +, buildPlatform, hostPlatform +}: let commonMakeFlags = [ @@ -23,17 +25,12 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" "stackprotector" ]; makeFlags = commonMakeFlags ++ [ - "KLIBCARCH=${stdenv.platform.kernelArch}" + "KLIBCARCH=${hostPlatform.platform.kernelArch}" "KLIBCKERNELSRC=${linuxHeaders}" - ] ++ stdenv.lib.optional (stdenv.platform.kernelArch == "arm") "CONFIG_AEABI=y"; - - crossAttrs = { - makeFlags = commonMakeFlags ++ [ - "KLIBCARCH=${stdenv.cross.platform.kernelArch}" - "KLIBCKERNELSRC=${linuxHeaders.crossDrv}" - "CROSS_COMPILE=${stdenv.cross.config}-" - ] ++ stdenv.lib.optional (stdenv.cross.platform.kernelArch == "arm") "CONFIG_AEABI=y"; - }; + ] # TODO(@Ericson2314): We now can get the ABI from + # `hostPlatform.parsed.abi`, is this still a good idea? + ++ stdenv.lib.optional (hostPlatform.platform.kernelArch == "arm") "CONFIG_AEABI=y" + ++ stdenv.lib.optional (hostPlatform != buildPlatform) "CROSS_COMPILE=${stdenv.cc.prefix}"; # Install static binaries as well. postInstall = '' diff --git a/pkgs/os-specific/linux/kmod-debian-aliases/default.nix b/pkgs/os-specific/linux/kmod-debian-aliases/default.nix index eac3fb92001..a7b6561239d 100644 --- a/pkgs/os-specific/linux/kmod-debian-aliases/default.nix +++ b/pkgs/os-specific/linux/kmod-debian-aliases/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "22-1.1"; src = fetchurl { - url = "mirror://debian/pool/main/k/kmod/kmod_${version}.debian.tar.xz"; + url = "http://snapshot.debian.org/archive/debian/20160404T220610Z/pool/main/k/kmod/kmod_${version}.debian.tar.xz"; sha256 = "0daap2n4bvjqcnksaayy6csmdb1px4r02w3xp36bcp6w3lbnqamh"; }; diff --git a/pkgs/os-specific/linux/libcgroup/default.nix b/pkgs/os-specific/linux/libcgroup/default.nix index b51211e9aaf..a70ab13db62 100644 --- a/pkgs/os-specific/linux/libcgroup/default.nix +++ b/pkgs/os-specific/linux/libcgroup/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { buildInputs = [ pam yacc flex ]; + postPatch = '' + substituteInPlace src/tools/Makefile.in \ + --replace 'chmod u+s' 'chmod +x' + ''; + meta = { description = "Library and tools to manage Linux cgroups"; homepage = "http://libcg.sourceforge.net/"; diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 2f5b50b3b58..d323c277814 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "lttng-modules-${version}"; name = "${pname}-${kernel.version}"; - version = "2.9.1"; + version = "2.9.3"; src = fetchurl { url = "http://lttng.org/files/lttng-modules/lttng-modules-${version}.tar.bz2"; - sha256 = "0m0d8sp7fj1qha7qz1204yzpsyfd8a8fawjbvdlmk9jc4piqy1v2"; + sha256 = "1zms8q199489ym0x1ri54napyi6pva80641x9x3qg9q23flbq4gr"; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/mdadm/4.nix b/pkgs/os-specific/linux/mdadm/4.nix index 05d98de0b23..a83e7c852ee 100644 --- a/pkgs/os-specific/linux/mdadm/4.nix +++ b/pkgs/os-specific/linux/mdadm/4.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl, groff }: +{ stdenv +, fetchurl, groff +, buildPlatform, hostPlatform +}: assert stdenv.isLinux; @@ -19,8 +22,8 @@ stdenv.mkDerivation rec { makeFlags = [ "NIXOS=1" "INSTALL=install" "INSTALL_BINDIR=$(out)/sbin" "MANDIR=$(out)/share/man" "RUN_DIR=/dev/.mdadm" - ] ++ stdenv.lib.optionals (stdenv ? cross) [ - "CROSS_COMPILE=${stdenv.cross.config}-" + ] ++ stdenv.lib.optionals (hostPlatform != buildPlatform) [ + "CROSS_COMPILE=${stdenv.cc.prefix}" ]; nativeBuildInputs = [ groff ]; diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index e0109791ef2..589099c911c 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl, groff }: +{ stdenv +, fetchurl, groff +, buildPlatform, hostPlatform +}: assert stdenv.isLinux; @@ -19,8 +22,8 @@ stdenv.mkDerivation rec { makeFlags = [ "NIXOS=1" "INSTALL=install" "INSTALL_BINDIR=$(out)/sbin" "MANDIR=$(out)/share/man" "RUN_DIR=/dev/.mdadm" - ] ++ stdenv.lib.optionals (stdenv ? cross) [ - "CROSS_COMPILE=${stdenv.cross.config}-" + ] ++ stdenv.lib.optionals (hostPlatform != buildPlatform) [ + "CROSS_COMPILE=${stdenv.cc.prefix}" ]; nativeBuildInputs = [ groff ]; diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index ee9d25dfe20..facab712826 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "microcode-intel-${version}"; - version = "20161104"; + version = "20170511"; src = fetchurl { - url = "http://downloadmirror.intel.com/26400/eng/microcode-${version}.tgz"; - sha256 = "1lg3bvznvwcxf66k038c57brkcxfva8crpnzj5idmczr5yk4q5bh"; + url = "http://downloadmirror.intel.com/26798/eng/microcode-${version}.tgz"; + sha256 = "18w1ysklvkf4l9xgnl1wvhbgr3wbdaiphv56056pafs0hwnzsxrg"; }; buildInputs = [ libarchive ]; diff --git a/pkgs/os-specific/linux/mingetty/default.nix b/pkgs/os-specific/linux/mingetty/default.nix index 4e2888fa942..a8348acd5d7 100644 --- a/pkgs/os-specific/linux/mingetty/default.nix +++ b/pkgs/os-specific/linux/mingetty/default.nix @@ -8,10 +8,6 @@ stdenv.mkDerivation { sha256 = "05yxrp44ky2kg6qknk1ih0kvwkgbn9fbz77r3vci7agslh5wjm8g"; }; - crossAttrs = { - makeFlags = "CC=${stdenv.cross.config}-gcc"; - }; - preInstall = '' mkdir -p $out/sbin $out/share/man/man8 makeFlagsArray=(SBINDIR=$out/sbin MANDIR=$out/share/man/man8) diff --git a/pkgs/os-specific/linux/net-tools/default.nix b/pkgs/os-specific/linux/net-tools/default.nix index ac3cad41479..9fbf3055715 100644 --- a/pkgs/os-specific/linux/net-tools/default.nix +++ b/pkgs/os-specific/linux/net-tools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "net-tools-1.60_p20120127084908"; + name = "net-tools-1.60_p20161110235919"; src = fetchurl { url = "mirror://gentoo/distfiles/${name}.tar.xz"; - sha256 = "408a51964aa142a4f45c4cffede2478abbd5630a7c7346ba0d3611059a2a3c94"; + sha256 = "1kbgwkys45kb5wqhchi1kf0sfw93c1cl0hgyw7yhacxzdfxjmdfr"; }; preBuild = @@ -13,7 +13,15 @@ stdenv.mkDerivation rec { cp ${./config.h} config.h ''; - makeFlags = "BASEDIR=$(out) mandir=/share/man"; + makeFlags = [ + "BASEDIR=$(out)" + "mandir=/share/man" + "HAVE_ARP_TOOLS=1" + "HAVE_PLIP_TOOLS=1" + "HAVE_SERIAL_TOOLS=1" + "HAVE_HOSTNAME_TOOLS=1" + "HAVE_HOSTNAME_SYMLINKS=1" + ]; meta = { homepage = http://net-tools.sourceforge.net/; diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 0db6c4ec67e..2e410fec561 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -39,6 +39,9 @@ in stdenv.mkDerivation rec { sed -i "s,^PATH=.*,PATH=$out/bin:${statdPath}," utils/statd/start-statd configureFlags="--with-start-statd=$out/bin/start-statd $configureFlags" + + substituteInPlace systemd/nfs-utils.service \ + --replace "/bin/true" "${coreutils}/bin/true" substituteInPlace utils/mount/Makefile.in \ --replace "chmod 4511" "chmod 0511" diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index c52dfbe461a..2fcf6dbf3c0 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -15,10 +15,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - crossAttrs = { - CC = stdenv.cross.config + "-gcc"; - }; - # Too red configureFlags = [ "--disable-modern-top" ]; @@ -27,6 +23,6 @@ stdenv.mkDerivation rec { description = "Utilities that give information about processes using the /proc filesystem"; priority = 10; # less than coreutils, which also provides "kill" and "uptime" license = lib.licenses.gpl2; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux ++ lib.platforms.cygwin; }; } diff --git a/pkgs/os-specific/linux/procps/watch.nix b/pkgs/os-specific/linux/procps/watch.nix index 2547e26def4..5fdd1287a64 100644 --- a/pkgs/os-specific/linux/procps/watch.nix +++ b/pkgs/os-specific/linux/procps/watch.nix @@ -15,10 +15,6 @@ stdenv.mkDerivation { enableParallelBuilding = true; - crossAttrs = { - CC = stdenv.cross.config + "-gcc"; - }; - installPhase = "mkdir $out; mkdir -p $out/bin; cp -p watch $out/bin"; meta = { diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix index 7209c44ff3c..edc7220d658 100644 --- a/pkgs/os-specific/linux/psmisc/default.nix +++ b/pkgs/os-specific/linux/psmisc/default.nix @@ -3,11 +3,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "psmisc-23.0"; + name = "psmisc-23.1"; src = fetchurl { url = "mirror://sourceforge/psmisc/${name}.tar.xz"; - sha256 = "0k7hafh9388s3hh9j943jy1qk9g1c43j02nyk0xis0ngbs632lvm"; + sha256 = "0c5s94hqpwfmyswx2f96gifa6wdbpxxpkyxcrlzbxpvmrxsd911f"; }; buildInputs = [ncurses]; diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index 6d83c98a422..0c0edde05e2 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -1,11 +1,13 @@ { stdenv, fetchpatch, fetchFromGitHub, autoreconfHook, libxslt, libxml2 , docbook_xml_dtd_412, docbook_xsl, gnome_doc_utils, flex, bison -, pam ? null, glibcCross ? null }: +, pam ? null, glibcCross ? null +, buildPlatform, hostPlatform +}: let glibc = - if stdenv ? cross + if hostPlatform != buildPlatform then glibcCross else assert stdenv ? glibc; stdenv.glibc; diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 26cc8ea7c71..941bd8a8671 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -62,11 +62,11 @@ in assert buildKernel -> kernel != null; { splStable = common { - version = "0.6.5.10"; - sha256 = "1zdxggpdz9j0lpcqfnkvf4iym7mp2k246sg1s4frqaw1pwwcw9vi"; + version = "0.6.5.11"; + sha256 = "192val8035pj2rryi3fwb134avzirhv5ifaj5021vh8bbjx75pd5"; }; splUnstable = common { - version = "0.7.0-rc4"; - sha256 = "13r5qwrdnaabqfy9fvizvdj4n4cvfv6zy4jh0vijzjvbjd4an9g1"; + version = "0.7.0-rc5"; + sha256 = "17y25g02c9swi3n90lhjvazcnsr69nh50dz3b8g1c08zlz9n2akp"; }; } diff --git a/pkgs/os-specific/linux/statifier/default.nix b/pkgs/os-specific/linux/statifier/default.nix index f666ac3e135..3cb9179f535 100644 --- a/pkgs/os-specific/linux/statifier/default.nix +++ b/pkgs/os-specific/linux/statifier/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, gcc_multi, glibc_multi }: -let version = "1.7.3"; in +let version = "1.7.4"; in stdenv.mkDerivation { name = "statifier-${version}"; src = fetchurl { url = "mirror://sourceforge/statifier/statifier-${version}.tar.gz"; - sha256 = "0jc67kq3clkdwvahpr2bjp2zix4j7z7z8b7bcn1b3g3sybh1cbd6"; + sha256 = "03lzkla6knjhh186b43cac410x2fmhi28pkmzb3d211n3zp5i9y8"; }; buildInputs = [ gcc_multi glibc_multi ]; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 3092aba506b..41f9c1e3e99 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "nixos"; repo = "systemd"; - rev = "a5af87e469ed3bd806d1ac34716d4f17ce9d3464"; - sha256 = "14slhk9p1f4ngxhhsmk8i1irl6jiffs1ln84ddcqc8iy22cyqvs3"; + rev = "72782e7ad96f9da9b0e5873f87a64007068cee06"; + sha256 = "1cj20zrfr8g0vkxiv3h9bbd89xbj3mrsij3rjr1lbh4nkl5mcwpa"; }; outputs = [ "out" "lib" "man" "dev" ]; diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix index 042e601ec14..6ec8abdc176 100644 --- a/pkgs/os-specific/linux/sysvinit/default.nix +++ b/pkgs/os-specific/linux/sysvinit/default.nix @@ -15,11 +15,7 @@ stdenv.mkDerivation { sed -i -e "s,/sbin/,$out/sbin/," src/halt.c src/init.c src/paths.h ''; - makeFlags = "SULOGINLIBS=-lcrypt ROOT=$(out) MANDIR=/share/man"; - - crossAttrs = { - makeFlags = "SULOGINLIBS=-lcrypt ROOT=$(out) MANDIR=/share/man CC=${stdenv.cross.config}-gcc"; - }; + makeFlags = [ "SULOGINLIBS=-lcrypt" "ROOT=$(out)" "MANDIR=/share/man" ]; preInstall = '' diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 79f63f8c27a..8e16a3165f6 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -4,8 +4,8 @@ let version = lib.concatStringsSep "." ([ majorVersion ] ++ lib.optional (patchVersion != "") patchVersion); - majorVersion = "2.29"; - patchVersion = "2"; + majorVersion = "2.30"; + patchVersion = ""; fstrimPatch = fetchpatch { url = "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/patch/?id=155d48f590a50bb5dc265162ff2f9a971daed543"; @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${name}.tar.xz"; - sha256 = "1qz81w8vzrmy8xn9yx7ls4amkbgwx6vr62pl6kv9g7r0g3ba9kmc"; + sha256 = "13d0ax8bcapga8phj2nclx86w57ddqxbr98ajibpzjq6d7zs8262"; }; patches = [ diff --git a/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch b/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch index 2dd3fcc4ebe..5f38861bf68 100644 --- a/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch +++ b/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch @@ -2,7 +2,7 @@ Search $PATH for the shutdown binary instead of hard-coding /sbin/shutdown, which isn't valid on NixOS (and a compatibility link on most other modern distros anyway). - -- nckx + -- nckx --- a/include/pathnames.h +++ b/include/pathnames.h @@ -53,7 +53,7 @@ diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 3ccf703370c..63e2e4ef493 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10"; let name = "wireguard-${version}"; - version = "0.0.20170613"; + version = "0.0.20170706"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "88ac77569eeb79c517318d58a0954caa0a4d2a6a1694e74c2a3b1c14438ac941"; + sha256 = "0cvc2iv1836l6f0c3v3kqn3zqrr80i123f1cz5kilhk5c91vjqsp"; }; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 8a6d727a696..f281e5b590e 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -125,10 +125,10 @@ in # comment/uncomment if breaking kernel versions are known incompatibleKernelVersion = "4.12"; - version = "0.6.5.10"; + version = "0.6.5.11"; # this package should point to the latest release. - sha256 = "04gn5fj22z17zq2nazxwl3j9dr33l79clha6ipxvdz241bhjqrk3"; + sha256 = "1wqz43cjr21m3f52ahcikl2798pbzj5sfy16zqxwiqpv7iy09kr3"; extraPatches = [ (fetchpatch { url = "https://github.com/Mic92/zfs/compare/zfs-0.6.5.8...nixos-zfs-0.6.5.8.patch"; @@ -141,10 +141,10 @@ in # comment/uncomment if breaking kernel versions are known incompatibleKernelVersion = null; - version = "0.7.0-rc4"; + version = "0.7.0-rc5"; # this package should point to a version / git revision compatible with the latest kernel release - sha256 = "16jiq2h7m2ljg5xv7m5lqmsszzclkhvj1iq1wa9w740la4vl22kf"; + sha256 = "1k0fl6lbi5winri58v26k7gngd560hbj0247rnwcbc6j01ixsr5n"; extraPatches = [ (fetchpatch { url = "https://github.com/Mic92/zfs/compare/zfs-0.7.0-rc3...nixos-zfs-0.7.0-rc3.patch"; diff --git a/pkgs/os-specific/windows/jom/default.nix b/pkgs/os-specific/windows/jom/default.nix index 6537503add8..b2b23f20045 100644 --- a/pkgs/os-specific/windows/jom/default.nix +++ b/pkgs/os-specific/windows/jom/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { QTDIR = qt48; crossAttrs = { - # cmakeFlags = "-DWIN32=1 -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_RC_COMPILER=${stdenv.cross.config}-windres"; + # cmakeFlags = "-DWIN32=1 -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_RC_COMPILER=${stdenv.cc.prefix}windres"; QTDIR = qt48.crossDrv; preBuild = '' export NIX_CROSS_CFLAGS_COMPILE=-fpermissive diff --git a/pkgs/os-specific/windows/mingw-w64/common.nix b/pkgs/os-specific/windows/mingw-w64/common.nix new file mode 100644 index 00000000000..ece2586dc80 --- /dev/null +++ b/pkgs/os-specific/windows/mingw-w64/common.nix @@ -0,0 +1,11 @@ +{ fetchurl }: + +rec { + version = "4.0.6"; + name = "mingw-w64-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2"; + sha256 = "0p01vm5kx1ixc08402z94g1alip4vx66gjpvyi9maqyqn2a76h0c"; + }; +} diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix index 49612b0b461..6e21826381b 100644 --- a/pkgs/os-specific/windows/mingw-w64/default.nix +++ b/pkgs/os-specific/windows/mingw-w64/default.nix @@ -1,36 +1,7 @@ -{ stdenv, fetchurl, binutils ? null, gccCross ? null -, onlyHeaders ? false -, onlyPthreads ? false -}: - -let - version = "4.0.6"; - name = "mingw-w64-${version}"; -in -stdenv.mkDerivation ({ - inherit name; - - src = fetchurl { - url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2"; - sha256 = "0p01vm5kx1ixc08402z94g1alip4vx66gjpvyi9maqyqn2a76h0c"; - }; -} // -(if onlyHeaders then { - name = name + "-headers"; - preConfigure = '' - cd mingw-w64-headers - ''; - configureFlags = "--without-crt"; -} else if onlyPthreads then { - name = name + "-pthreads"; - preConfigure = '' - cd mingw-w64-libraries/winpthreads - ''; -} else { - buildInputs = [ gccCross binutils ]; - - crossConfig = gccCross.crossConfig; +{ stdenv, callPackage, windows }: +stdenv.mkDerivation { + inherit (callPackage ./common.nix {}) name src; + buildInputs = [ windows.mingw_w64_headers ]; dontStrip = true; -}) -) +} diff --git a/pkgs/os-specific/windows/mingw-w64/headers.nix b/pkgs/os-specific/windows/mingw-w64/headers.nix new file mode 100644 index 00000000000..03dbf712e2e --- /dev/null +++ b/pkgs/os-specific/windows/mingw-w64/headers.nix @@ -0,0 +1,13 @@ +{ stdenvNoCC, callPackage }: + +let + inherit (callPackage ./common.nix {}) name src; + +in stdenvNoCC.mkDerivation { + name = name + "-headers"; + inherit src; + + preConfigure = '' + cd mingw-w64-headers + ''; +} diff --git a/pkgs/os-specific/windows/mingw-w64/pthreads.nix b/pkgs/os-specific/windows/mingw-w64/pthreads.nix new file mode 100644 index 00000000000..c585ab54ff8 --- /dev/null +++ b/pkgs/os-specific/windows/mingw-w64/pthreads.nix @@ -0,0 +1,13 @@ +{ stdenvNoCC, callPackage }: + +let + inherit (callPackage ./common.nix {}) name src; + +in stdenvNoCC.mkDerivation { + name = name + "-pthreads"; + inherit src; + + preConfigure = '' + cd mingw-w64-libraries/winpthreads + ''; +} diff --git a/pkgs/os-specific/windows/pthread-w32/default.nix b/pkgs/os-specific/windows/pthread-w32/default.nix index dde4f5d7371..f0b6852d5bf 100644 --- a/pkgs/os-specific/windows/pthread-w32/default.nix +++ b/pkgs/os-specific/windows/pthread-w32/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, mingw_headers }: # This file is tweaked for cross-compilation only. -assert stdenv ? cross; +assert hostPlatform != buildPlatform; stdenv.mkDerivation { name = "pthread-w32-1.10.0"; diff --git a/pkgs/os-specific/windows/wxMSW-2.8/default.nix b/pkgs/os-specific/windows/wxMSW-2.8/default.nix index 5c79460060a..8770140cc63 100644 --- a/pkgs/os-specific/windows/wxMSW-2.8/default.nix +++ b/pkgs/os-specific/windows/wxMSW-2.8/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchurl, compat24 ? false, compat26 ? true, unicode ? true, +{ stdenv, fetchurl, compat24 ? false, compat26 ? true, unicode ? true +, hostPlatform }: -assert stdenv ? cross -> stdenv.cross.libc == "msvcrt"; +assert hostPlatform.isWindows; stdenv.mkDerivation { name = "wxMSW-2.8.11"; @@ -19,12 +20,6 @@ stdenv.mkDerivation { "--with-opengl" ]; - # Cross build only tested for mingw32 - checkCross = throw "This package can only be cross-built" false; - crossAttrs = { - checkCross = true; - }; - preConfigure = " substituteInPlace configure --replace /usr /no-such-path "; diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 5e5ac3bcafd..77c83630514 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "caddy-${version}"; - version = "0.10.3"; + version = "0.10.4"; goPackagePath = "github.com/mholt/caddy"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "mholt"; repo = "caddy"; rev = "v${version}"; - sha256 = "0srz1cji1z6ag591vfwjd0aypi32hr7hh9ypps8p5szf075rkr8p"; + sha256 = "0zch19a38487dflx84dlkwz67by9g4v2v8d7wrslqhs14a0sifhk"; }; buildFlagsArray = '' @@ -20,12 +20,10 @@ buildGoPackage rec { -X github.com/mholt/caddy/caddy/caddymain.gitTag=v${version} ''; - goDeps = ./deps.nix; - meta = with stdenv.lib; { homepage = https://caddyserver.com; description = "Fast, cross-platform HTTP/2 web server with automatic HTTPS"; license = licenses.asl20; - maintainers = with maintainers; [ rushmorem fpletz ]; + maintainers = with maintainers; [ rushmorem fpletz zimbatm ]; }; } diff --git a/pkgs/servers/caddy/deps.nix b/pkgs/servers/caddy/deps.nix deleted file mode 100644 index e2b318ca60e..00000000000 --- a/pkgs/servers/caddy/deps.nix +++ /dev/null @@ -1,201 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.0 -[ - { - goPackagePath = "github.com/codahale/aesnicheck"; - fetch = { - type = "git"; - url = "https://github.com/codahale/aesnicheck"; - rev = "349fcc471aaccc29cd074e1275f1a494323826cd"; - sha256 = "1zab6jjs5hiqpq484pbpx490zlj42v7hf4wwkqmicyaq7wclfnka"; - }; - } - { - goPackagePath = "github.com/dustin/go-humanize"; - fetch = { - type = "git"; - url = "https://github.com/dustin/go-humanize"; - rev = "259d2a102b871d17f30e3cd9881a642961a1e486"; - sha256 = "1jiada1pfhw2wwkx7cjsa6ixa8c37w51b3x09vlr4m0l945pval9"; - }; - } - { - goPackagePath = "github.com/flynn/go-shlex"; - fetch = { - type = "git"; - url = "https://github.com/flynn/go-shlex"; - rev = "3f9db97f856818214da2e1057f8ad84803971cff"; - sha256 = "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia"; - }; - } - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "a91eba7f97777409bc2c443f5534d41dd20c5720"; - sha256 = "13cg6wwkk2ddqbm0nh9fpx4mq7f6qym12ch4lvs53n028ycdgw87"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-syslog"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-syslog"; - rev = "b609c7d9de4658cded34a7336b90886c56f9dbdb"; - sha256 = "1k0dqkizj4vwgdsb7x7fzmcgz9079sczhpn9whd0r3xcnqs7pkkb"; - }; - } - { - goPackagePath = "github.com/hashicorp/golang-lru"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/golang-lru"; - rev = "0a025b7e63adc15a622f29b0b2c4c3848243bbf6"; - sha256 = "1iq7lbpsz7ks052mpznmkf8s4k43p51z4dik2n9ivrxk666q2wxi"; - }; - } - { - goPackagePath = "github.com/jimstudt/http-authentication"; - fetch = { - type = "git"; - url = "https://github.com/jimstudt/http-authentication"; - rev = "3eca13d6893afd7ecabe15f4445f5d2872a1b012"; - sha256 = "1drw3bhrxpjzwryqz9nq5s0yyjqyd42iym3bh1zjs5qsh401cq08"; - }; - } - { - goPackagePath = "github.com/lucas-clemente/aes12"; - fetch = { - type = "git"; - url = "https://github.com/lucas-clemente/aes12"; - rev = "25700e67be5c860bcc999137275b9ef8b65932bd"; - sha256 = "08zbfy5n6ki6fjaihk7y686dwksdglds9c8f1klkldvjbg8mw4vp"; - }; - } - { - goPackagePath = "github.com/lucas-clemente/fnv128a"; - fetch = { - type = "git"; - url = "https://github.com/lucas-clemente/fnv128a"; - rev = "393af48d391698c6ae4219566bfbdfef67269997"; - sha256 = "1cvq0p0k86p668yz9rb3z98fz3f9phvbvqp6ilbasiy4y2x5w184"; - }; - } - { - goPackagePath = "github.com/lucas-clemente/quic-go"; - fetch = { - type = "git"; - url = "https://github.com/lucas-clemente/quic-go"; - rev = "bb280f29be75d6d78c64a32692b668e2a99c57bb"; - sha256 = "1a6xqh7z8amb1372kb63kmn764w6c0ypcl7c4c7kyy2sqx8lyjyc"; - }; - } - { - goPackagePath = "github.com/lucas-clemente/quic-go-certificates"; - fetch = { - type = "git"; - url = "https://github.com/lucas-clemente/quic-go-certificates"; - rev = "d2f86524cced5186554df90d92529757d22c1cb6"; - sha256 = "033099nv0y9pbv0v292x6g0mvwr2w02jf4vvpwx6sjpwbla4xjxd"; - }; - } - { - goPackagePath = "github.com/miekg/dns"; - fetch = { - type = "git"; - url = "https://github.com/miekg/dns"; - rev = "e78414ef75607394ad7d917824f07f381df2eafa"; - sha256 = "1g5rgbjy7nr0l6074plh2aqiwiy9nck9bhhks9c5ki3r00fjj3ay"; - }; - } - { - goPackagePath = "github.com/naoina/go-stringutil"; - fetch = { - type = "git"; - url = "https://github.com/naoina/go-stringutil"; - rev = "6b638e95a32d0c1131db0e7fe83775cbea4a0d0b"; - sha256 = "00831p1wn3rimybk1z8l30787kn1akv5jax5wx743nn76qcmkmc6"; - }; - } - { - goPackagePath = "github.com/naoina/toml"; - fetch = { - type = "git"; - url = "https://github.com/naoina/toml"; - rev = "e6f5723bf2a66af014955e0888881314cf294129"; - sha256 = "0kh7xnckw689kksh23ginyl3g8h2yqyvjh54nmnfvjaj886lvbsf"; - }; - } - { - goPackagePath = "github.com/russross/blackfriday"; - fetch = { - type = "git"; - url = "https://github.com/russross/blackfriday"; - rev = "067529f716f4c3f5e37c8c95ddd59df1007290ae"; - sha256 = "1l61ib6r6mg587p58li5zhafjkkmrzacachcjg1cvw0k4zza9137"; - }; - } - { - goPackagePath = "github.com/xenolf/lego"; - fetch = { - type = "git"; - url = "https://github.com/xenolf/lego"; - rev = "aaa8e70aec58a858b6bef0706b367dd5e8d58128"; - sha256 = "0899mdgb01bpz83zyxzln8ygyll78gmcslw5i36q9m60pqj59z60"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "e7ba82683099cae71475961448ab8f903ea77c26"; - sha256 = "0w6zvzchgzk197siq3qbsh6pdpnx7g9xc08k5axv5yc6w8qhgx11"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "1a68b1313cf4ad7778376e82641197b60c02f65c"; - sha256 = "1nfva16dasc9h5y1njcfnr2g09damk754g3yliij3ar06k06p1xf"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "210eee5cf7323015d097341bcf7166130d001cd8"; - sha256 = "0sm9548ky5vi2sr5zjzwwna5f4pfs0nmlaw0pjnamxwfjzy4jnfb"; - }; - } - { - goPackagePath = "gopkg.in/natefinch/lumberjack.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/natefinch/lumberjack.v2"; - rev = "a96e63847dc3c67d17befa69c303767e2f84e54f"; - sha256 = "1l3vlv72b7rfkpy1164kwd3qzrqmmjnb67akzxqp2mlvc66k6p3d"; - }; - } - { - goPackagePath = "gopkg.in/square/go-jose.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/square/go-jose.v1"; - rev = "aa2e30fdd1fe9dd3394119af66451ae790d50e0d"; - sha256 = "0drajyadd6c4m5qv0jxcv748qczg8sgxz28nva1jn39f234m02is"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b"; - sha256 = "1hj2ag9knxflpjibck0n90jrhsrqz7qvad4qnif7jddyapi9bqzl"; - }; - } -] diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 311d707e9c5..69afd479af3 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -1,19 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, curl, python, munge, perl, pam, openssl +{ stdenv, fetchurl, pkgconfig, libtool, curl, python, munge, perl, pam, openssl , ncurses, mysql, gtk2, lua, hwloc, numactl }: stdenv.mkDerivation rec { - name = "slurm-llnl-${version}"; - version = "15-08-5-1"; + name = "slurm-${version}"; + version = "17.02.6"; src = fetchurl { - url = "https://github.com/SchedMD/slurm/archive/slurm-${version}.tar.gz"; - sha256 = "05si1cn7zivggan25brsqfdw0ilvrlnhj96pwv16dh6vfkggzjr1"; + url = "https://www.schedmd.com/downloads/latest/slurm-17.02.6.tar.bz2"; + sha256 = "1sp4xg15jc569r6dh61svgk2fmy3ndcgr5358yryajslf1w14mzh"; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + # nixos test fails to start slurmd with 'undefined symbol: slurm_job_preempt_mode' + # https://groups.google.com/forum/#!topic/slurm-devel/QHOajQ84_Es + # this doesn't fix tests completely at least makes slurmd to launch + hardeningDisable = [ "bindnow" ]; + + nativeBuildInputs = [ pkgconfig libtool ]; buildInputs = [ curl python munge perl pam openssl mysql.lib ncurses gtk2 lua hwloc numactl ]; @@ -25,8 +30,8 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional (gtk2 == null) "--disable-gtktest"; preConfigure = '' - substituteInPlace ./doc/html/shtml2html.py --replace "/usr/bin/env python" "${python.interpreter}" - substituteInPlace ./doc/man/man2html.py --replace "/usr/bin/env python" "${python.interpreter}" + patchShebangs ./doc/html/shtml2html.py + patchShebangs ./doc/man/man2html.py ''; postInstall = '' diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index c18b7c46376..45abcff2776 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -3,14 +3,14 @@ assert enableSeccomp -> libseccomp != null; -let version = "9.10.5-P1"; in +let version = "9.11.1-P2"; in stdenv.mkDerivation rec { name = "bind-${version}"; src = fetchurl { url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "1kg59a9118460k5wznqayxzqb6l3vbpybd8b1bdv9z97x5fqiyw2"; + sha256 = "19gyh7yij6cpvk5b199ghhns5wmsz67d2rpgvl91dbkm2m1wclxz"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 57c3acbd534..f1ae382aa38 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in # Note: ATM only the libraries have been tested in nixpkgs. stdenv.mkDerivation rec { name = "knot-dns-${version}"; - version = "2.5.1"; + version = "2.5.2"; src = fetchurl { url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "1643q2pj5sjhgv19jp8r2bhvqyk6mmlajdmr6qhjcbhql30cs23c"; + sha256 = "286671a4ee35a5207b2e45fd0812962b481b1b543bf3d5df3a8c319c26e2f5e9"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 1fec8ef11b7..441e1f1ab0f 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -10,11 +10,11 @@ let in stdenv.mkDerivation rec { name = "knot-resolver-${version}"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; - sha256 = "667002dc3ee0b0f755628997ef4f71be769a06fb8b9ccd935db329c8709c2af4"; + sha256 = "cc9631fe1a92628e81e74b324a7f70c0b29840d426de05d7d045fdf85ab01117"; }; outputs = [ "out" "dev" ]; @@ -62,7 +62,8 @@ stdenv.mkDerivation rec { description = "Caching validating DNS resolver, from .cz domain registry"; homepage = https://knot-resolver.cz; license = licenses.gpl3Plus; - platforms = platforms.unix; + # Platforms using negative pointers for stack won't work ATM due to LuaJIT impl. + platforms = filter (p: p != "aarch64-linux") platforms.unix; maintainers = [ maintainers.vcunat /* upstream developer */ ]; }; } diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index 1bf92b2247c..7e4c69e3862 100644 --- a/pkgs/servers/emby/default.nix +++ b/pkgs/servers/emby/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "emby-${version}"; - version = "3.2.19.0"; + version = "3.2.22.0"; src = fetchurl { url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip"; - sha256 = "14gwkglngaf29zzjqyph8pqz8i8i9j2vha9g2m17slgdxif4ijzc"; + sha256 = "0vc9391q1mi16k05yl5lqs2cmsgcid339pbqm9fyqzm33fk7d73r"; }; buildInputs = with pkgs; [ diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index 117fa8782c9..ec6610b8245 100644 --- a/pkgs/servers/freeradius/default.nix +++ b/pkgs/servers/freeradius/default.nix @@ -40,11 +40,11 @@ assert withCollectd -> collectd != null; with stdenv.lib; stdenv.mkDerivation rec { name = "freeradius-${version}"; - version = "3.0.12"; + version = "3.0.14"; src = fetchurl { url = "ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-${version}.tar.gz"; - sha256 = "182xnb9pdsivlyfm471l90m37q9i04h7jadhkgm0ivvzrzpzcnja"; + sha256 = "02ar0xn4dfrs95cmd4c798k95rmnzzvcryyyl2vjv53ak16igmpw"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/servers/gpm/default.nix b/pkgs/servers/gpm/default.nix index ac5e0b7c1b1..e260ccfb761 100644 --- a/pkgs/servers/gpm/default.nix +++ b/pkgs/servers/gpm/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { homepage = http://www.nico.schottelius.org/software/gpm/; description = "A daemon that provides mouse support on the Linux console"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.cygwin; maintainers = with maintainers; [ eelco wkennington ]; }; } diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index f70d6266e8d..568b0ee6c04 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -16,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null; assert http2Support -> nghttp2 != null; stdenv.mkDerivation rec { - version = "2.4.25"; + version = "2.4.26"; name = "apache-httpd-${version}"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "1cl0bkqg6srb1sypga0cn8dcmdyxldavij73zmmkxvlz3kgw4zpq"; + sha1 = "b10b0f569a0e5adfef61d8c7f0813d42046e399a"; }; # FIXME: -dev depends on -doc diff --git a/pkgs/servers/http/darkhttpd/default.nix b/pkgs/servers/http/darkhttpd/default.nix index ba733c5bde5..0ca888fd6ed 100644 --- a/pkgs/servers/http/darkhttpd/default.nix +++ b/pkgs/servers/http/darkhttpd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "darkhttpd-${version}"; - version = "1.11"; + version = "1.12"; src = fetchurl { url = "https://unix4lyfe.org/darkhttpd/${name}.tar.bz2"; - sha256 = "0lbcv6pa82md0gqyyskxndf8hm58y76nrnkanc831ia3vm529bdg"; + sha256 = "0185wlyx4iqiwfigp1zvql14zw7gxfacncii3d15yaxk4av1f155"; }; installPhase = '' @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Small and secure static webserver"; - homepage = http://dmr.ath.cx/net/darkhttpd/; + homepage = https://unix4lyfe.org/darkhttpd/; license = stdenv.lib.licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.all; maintainers = [ maintainers.bobvanderlinden ]; }; } diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index a24eedce7c7..ced0fd0976f 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix (args // { - version = "1.13.1"; - sha256 = "0xk7gcsgwhz047h54adn8crnkrkr7g1z79w8ik34v6k0lrr6r1d5"; + version = "1.13.3"; + sha256 = "0whdpgfb1y9r7f3y91r4m0wpgrwwdl2byahp9a7gn0n30j0gjwsv"; }) diff --git a/pkgs/servers/http/nginx/stable.nix b/pkgs/servers/http/nginx/stable.nix index bc8b831eec7..aa03d6162dd 100644 --- a/pkgs/servers/http/nginx/stable.nix +++ b/pkgs/servers/http/nginx/stable.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "1.12.0"; - sha256 = "0c2vg6530qplwk8rhldww5r3cwcbw1avka53qg9sh85nzlk2w8ml"; + version = "1.12.1"; + sha256 = "1yvnmj7vlykrqdi6amkvs63lva6qkxd98sqv0a8hz8w5ci1bz4w7"; }) diff --git a/pkgs/servers/http/thttpd/default.nix b/pkgs/servers/http/thttpd/default.nix index 692bba846ea..96652515f7a 100644 --- a/pkgs/servers/http/thttpd/default.nix +++ b/pkgs/servers/http/thttpd/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { prePatch = '' sed -i -e 's/getline/getlineX/' extras/htpasswd.c + sed -i -e 's/chmod 2755/chmod 755/' extras/Makefile.in ''; preInstall = '' diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index bf7b5d8d6ed..d503a4d7b57 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -1,4 +1,4 @@ -{ coreutils, fetchurl, db, openssl, pcre, perl, pkgconfig, stdenv }: +{ coreutils, fetchurl, db, openssl, pcre, perl, pkgconfig, stdenv, fetchpatch }: stdenv.mkDerivation rec { name = "exim-4.89"; @@ -8,6 +8,14 @@ stdenv.mkDerivation rec { sha256 = "09lndv34jsxwglq5zsh9y4xaqj5g37g9ca4x0zb25fvvm4f0lj8c"; }; + patches = [ + (fetchpatch { + name = "CVE-2017-1000369.patch"; + url = "https://anonscm.debian.org/git/pkg-exim4/exim4.git/plain/debian/patches/79_CVE-2017-1000369.patch?h=4.89-2%2bdeb9u1"; + sha256 = "0v46zywgkv1rdqhybqqrd0rwkdaj6q1f4x0a3vm9p0wz8vad3023"; + }) + ]; + buildInputs = [ coreutils db openssl pcre perl pkgconfig ]; preBuild = '' diff --git a/pkgs/servers/mail/mailhog/default.nix b/pkgs/servers/mail/mailhog/default.nix new file mode 100644 index 00000000000..554634d5a79 --- /dev/null +++ b/pkgs/servers/mail/mailhog/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "MailHog-${version}"; + version = "1.0.0"; + rev = "v${version}"; + + goPackagePath = "github.com/mailhog/MailHog"; + + src = fetchFromGitHub { + inherit rev; + owner = "mailhog"; + repo = "MailHog"; + sha256 = "0r6zidkffb8q12zyxd063jy0ig2x93llna4zb5i2qjh9gb971i83"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "Web and API based SMTP testing"; + homepage = "https://github.com/mailhog/MailHog"; + maintainers = with maintainers; [ disassembler ]; + license = licenses.mit; + }; +} diff --git a/pkgs/servers/mail/mailhog/deps.nix b/pkgs/servers/mail/mailhog/deps.nix new file mode 100644 index 00000000000..9967c3a549a --- /dev/null +++ b/pkgs/servers/mail/mailhog/deps.nix @@ -0,0 +1,191 @@ +[ + { + goPackagePath = "github.com/gorilla/pat"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/pat"; + rev = "cf955c3d1f2c27ee96f93e9738085c762ff5f49d"; + sha256 = "1jnhdhba3cwgsgv6qf7shvmk2nbbp8z30n9cimz9w6vd940ipisf"; + }; + } + { + goPackagePath = "github.com/gorilla/context"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/context"; + rev = "1ea25387ff6f684839d82767c1733ff4d4d15d0a"; + sha256 = "1nh1nzxcsgd215x4xn59wc4cbqfa8zvhvnnx5p8fkrn4bj1cgak4"; + }; + } + { + goPackagePath = "github.com/gorilla/mux"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/mux"; + rev = "bcd8bc72b08df0f70df986b97f95590779502d31"; + sha256 = "0majd18zn8v1b1agn015vnk3xk2v8j5nyckczlf72gm3kaq3icga"; + }; + } + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "3ab3a8b8831546bd18fd182c20687ca853b2bb13"; + sha256 = "17y94ngp1yrswq5pxxy97naiw6jgxz2yvm8zydi83gfixdgs99fc"; + }; + } + { + goPackagePath = "github.com/ian-kent/go-log"; + fetch = { + type = "git"; + url = "https://github.com/ian-kent/go-log"; + rev = "5731446c36ab9f716106ce0731f484c50fdf1ad1"; + sha256 = "1qr0myg68r9zq43fnx0rbnxcny2jpyg3gc269pc2riskqk0a731d"; + }; + } + { + goPackagePath = "github.com/ian-kent/envconf"; + fetch = { + type = "git"; + url = "https://github.com/ian-kent/envconf"; + rev = "c19809918c02ab33dc8635d68c77649313185275"; + sha256 = "1085863rnx4h0q9xvg4zlsc7xf7jngfmjrq83cpcv1ayi664mzdx"; + }; + } + { + goPackagePath = "github.com/ian-kent/goose"; + fetch = { + type = "git"; + url = "https://github.com/ian-kent/goose"; + rev = "c3541ea826ad9e0f8a4a8c15ca831e8b0adde58c"; + sha256 = "0v98d2554vlrm8mzk2zx8wj3daq076273w0zs8ww1aa57a1l74qv"; + }; + } + { + goPackagePath = "github.com/ian-kent/linkio"; + fetch = { + type = "git"; + url = "https://github.com/ian-kent/linkio"; + rev = "77fb4b01842cb4b019137c0227df9a8f9779d0bd"; + sha256 = "0fixidplxzmw7aakw19d64nvrykwm5xk55fj1q74n70s8j5d8hiq"; + }; + } + { + goPackagePath = "github.com/mailhog/MailHog-Server"; + fetch = { + type = "git"; + url = "https://github.com/mailhog/MailHog-Server"; + rev = "50f74a1aa2991b96313144d1ac718ce4d6739dfd"; + sha256 = "1h0qs66bvgygpq0sz3w6y445vm3pvlrljr5x7xr13y0087mrpjla"; + }; + } + { + goPackagePath = "github.com/mailhog/MailHog-UI"; + fetch = { + type = "git"; + url = "https://github.com/mailhog/MailHog-UI"; + rev = "24b31a47cc5b65d23576bb9884c941d2b88381f7"; + sha256 = "0309jmryhx3n0yksssk2j4xkh1xb01468i5f2sy3a83xkz9p3d54"; + }; + } + { + goPackagePath = "github.com/mailhog/http"; + fetch = { + type = "git"; + url = "https://github.com/mailhog/http"; + rev = "2e653938bf190d0e2fbe4825ce74e5bc149a62f2"; + sha256 = "18j03lvyis7z0mv3fym3j9a7pi2qvnhggmhpxnjbwvwb86dhxjm8"; + }; + } + { + goPackagePath = "github.com/mailhog/mhsendmail"; + fetch = { + type = "git"; + url = "https://github.com/mailhog/mhsendmail"; + rev = "002527025ef50364446d7560600aedc5daaa1997"; + sha256 = "11l2y0xb7hwk0zs7pwif3xkclhz32sc0jff3jkaxi3jdf3q3kz91"; + }; + } + { + goPackagePath = "github.com/mailhog/data"; + fetch = { + type = "git"; + url = "https://github.com/mailhog/data"; + rev = "024d554958b5bea5db220bfd84922a584d878ded"; + sha256 = "0dgh0pcsn0xrxsn1qlxgdssaimch57kxj5vyvhqjnsdnh814g9vf"; + }; + } + { + goPackagePath = "github.com/mailhog/smtp"; + fetch = { + type = "git"; + url = "https://github.com/mailhog/smtp"; + rev = "0c4e9b7e0625fec61d0c30d7b2f6c62852be6c54"; + sha256 = "1w46w3asdxsgzyall16hi2s4jvkka1k3a1l52ryfhrzg187krir6"; + }; + } + { + goPackagePath = "github.com/mailhog/storage"; + fetch = { + type = "git"; + url = "https://github.com/mailhog/storage"; + rev = "6d871fb23ecd873cb10cdfc3a8dec5f50d2af8fa"; + sha256 = "1ya0xigm2xysin59zlp2sbqncnmw9h77r9dn9k7vxhf0z8vvbibk"; + }; + } + { + goPackagePath = "github.com/ogier/pflag"; + fetch = { + type = "git"; + url = "https://github.com/ogier/pflag"; + rev = "32a05c62658bd1d7c7e75cbc8195de5d585fde0f"; + sha256 = "1lyrr9wx0j087mnpsxcbspjcgh9a5c6bqwrasd8s237jlyc50qmj"; + }; + } + { + goPackagePath = "github.com/tinylib/msgp"; + fetch = { + type = "git"; + url = "https://github.com/tinylib/msgp"; + rev = "02d047e07459c5a7b02b1244161d0f2f6d8f660d"; + sha256 = "12y7qz1x266m0a0w3zwd49achxbh036yhkmx93xfs2283xh70q1r"; + }; + } + { + goPackagePath = "github.com/philhofer/fwd"; + fetch = { + type = "git"; + url = "https://github.com/philhofer/fwd"; + rev = "1612a298117663d7bc9a760ae20d383413859798"; + sha256 = "155l0nvvblpx0fy683q6bzins7csh8fw7yf64hbia8hc7wh0gjdl"; + }; + } + { + goPackagePath = "github.com/t-k/fluent-logger-golang"; + fetch = { + type = "git"; + url = "https://github.com/t-k/fluent-logger-golang"; + rev = "0f8ec08f2057a61574b6943e75045fffbeae894e"; + sha256 = "0ic5bj87wpq1kncixd5mklwqn1jjwqfqfvkyl0mrnwp3p5p24v5c"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "c197bcf24cde29d3f73c7b4ac6fd41f4384e8af6"; + sha256 = "1y2bbghi594m8p4pcm9pwrzql06179xj6zvhaghwcc6y0l48rbgp"; + }; + } + { + goPackagePath = "gopkg.in/mgo.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/mgo.v2"; + rev = "d90005c5262a3463800497ea5a89aed5fe22c886"; + sha256 = "1z81k6mnfk07hkrkw31l16qycyiwa6wzyhysmywgkh58sm5dc9m7"; + }; + } +] diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix index b18ab016c44..3c028b1ac17 100644 --- a/pkgs/servers/mail/mailman/default.nix +++ b/pkgs/servers/mail/mailman/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { installTargets = "doinstall"; # Leave out the 'update' target that's implied by 'install'. + makeFlags = [ "DIRSETGID=:" ]; + meta = { homepage = "http://www.gnu.org/software/mailman/"; description = "Free software for managing electronic mail discussion and e-newsletter lists"; diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index 7ad5f6e9ad5..d2667597c62 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { substituteInPlace smtpd/smtpctl.c --replace \ 'if (geteuid())' \ 'if (geteuid() != 0 && !(argc > 1 && !strcmp(argv[1], "encrypt")))' + substituteInPlace mk/smtpctl/Makefile.in --replace "chmod 2555" "chmod 0555" ''; configureFlags = [ diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 9c72aa01898..bfdea71c5d7 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -3,6 +3,7 @@ , withPgSQL ? false, postgresql , withMySQL ? false, libmysql , withSQLite ? false, sqlite +, withLDAP ? false, openldap }: let @@ -11,12 +12,14 @@ let "-DHAS_DB_BYPASS_MAKEDEFS_CHECK" ] ++ lib.optional withPgSQL "-DHAS_PGSQL" ++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${lib.getDev libmysql}/include/mysql" ] - ++ lib.optional withSQLite "-DHAS_SQLITE"); + ++ lib.optional withSQLite "-DHAS_SQLITE" + ++ lib.optional withLDAP "-DHAS_LDAP"); auxlibs = lib.concatStringsSep " " ([ "-ldb" "-lnsl" "-lresolv" "-lsasl2" "-lcrypto" "-lssl" ] ++ lib.optional withPgSQL "-lpq" ++ lib.optional withMySQL "-lmysqlclient" - ++ lib.optional withSQLite "-lsqlite3"); + ++ lib.optional withSQLite "-lsqlite3" + ++ lib.optional withLDAP "-lldap"); in stdenv.mkDerivation rec { @@ -32,7 +35,8 @@ in stdenv.mkDerivation rec { buildInputs = [ makeWrapper gnused db openssl cyrus_sasl icu pcre ] ++ lib.optional withPgSQL postgresql ++ lib.optional withMySQL libmysql - ++ lib.optional withSQLite sqlite; + ++ lib.optional withSQLite sqlite + ++ lib.optional withLDAP openldap; hardeningDisable = [ "format" ]; hardeningEnable = [ "pie" ]; diff --git a/pkgs/servers/mail/postfix/pfixtools.nix b/pkgs/servers/mail/postfix/pfixtools.nix index 1bbe6f3466b..6a0d7fb588f 100644 --- a/pkgs/servers/mail/postfix/pfixtools.nix +++ b/pkgs/servers/mail/postfix/pfixtools.nix @@ -10,7 +10,7 @@ let sha256 = "1vmbrw686f41n6xfjphfshn96vl07ynvnsyjdw9yfn9bfnldcjcq"; }; - srcRoot = "pfixtools-${pfixtoolsSrc.rev}-src"; + srcRoot = pfixtoolsSrc.name; libCommonSrc = fetchFromGitHub { owner = "Fruneau"; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 39be4e8bdad..c7c33928714 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -24,13 +24,13 @@ let }; in pythonPackages.buildPythonApplication rec { name = "matrix-synapse-${version}"; - version = "0.21.0"; + version = "0.22.1"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - sha256 = "0mxgpfyh7265kh379hsb53lni43xcq9nffanbxwrg8hp8c79pcg3"; + sha256 = "06kqqsfqmziff7i99yyxqvkqjm7fwi56abc2vy25g9kqzpdvkay7"; }; patches = [ ./matrix-synapse.patch ]; diff --git a/pkgs/servers/meteor/main.patch b/pkgs/servers/meteor/main.patch index b5834bf6292..4c21a29a05c 100644 --- a/pkgs/servers/meteor/main.patch +++ b/pkgs/servers/meteor/main.patch @@ -2,7 +2,7 @@ diff --git a/tools/cli/main.js b/tools/cli/main.js index 84f94bc..4fbda17 100644 --- a/tools/cli/main.js +++ b/tools/cli/main.js -@@ -484,6 +484,44 @@ var springboard = function (rel, options) { +@@ -484,6 +484,45 @@ var springboard = function (rel, options) { process.exit(ret.wait()); } @@ -10,6 +10,7 @@ index 84f94bc..4fbda17 100644 + // patch shebang: + var fs = require('fs'); + var path = require("path") ++ var Future = require("fibers/future") + var srcOld = fs.readFileSync(executable, 'utf8'); + srcNew = srcOld.replace(/^#!\/bin\/bash/, '#!/bin/sh'); + if (srcOld !== srcNew) { diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 28b6136d90e..48b5279772a 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "minio-${shortVersion}"; - shortVersion = "20170316"; - longVersion = "2017-03-16T21-50-32Z"; + shortVersion = "20170613"; + longVersion = "2017-06-13T19-01-01Z"; src = fetchurl { url = "https://github.com/minio/minio/archive/RELEASE.${lib.replaceStrings [":"] ["-"] longVersion}.tar.gz"; - sha256 = "1331lxsfr22x1sh7cyh9xz3aa70715wm1bk1f1r053kyz03q903c"; + sha256 = "1rrlgn0nsvfn0lr9ffihjdb96n4znsvjlz1h7bwvz8nwhbn0lfsf"; }; buildInputs = [ go ]; diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index 1eaef1010d3..ccbcce26033 100644 --- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "blackbox_exporter-${version}"; - version = "0.4.0"; + version = "0.5.0"; rev = version; goPackagePath = "github.com/prometheus/blackbox_exporter"; @@ -11,7 +11,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "prometheus"; repo = "blackbox_exporter"; - sha256 = "1wx3lbhg8ljq6ryl1yji0fkrl6hcsda9i5cw042nhqy29q0ymqsh"; + sha256 = "1q719q7xslksj9m5c5d8jmap9380nsrdc71yjyn70rimv8xmzfj1"; }; meta = with stdenv.lib; { diff --git a/pkgs/servers/monitoring/prometheus/consul-exporter.nix b/pkgs/servers/monitoring/prometheus/consul-exporter.nix new file mode 100644 index 00000000000..47abcb33ee7 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/consul-exporter.nix @@ -0,0 +1,23 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "consul_exporter-${version}"; + version = "0.3.0"; + + goPackagePath = "github.com/prometheus/consul_exporter"; + + src = fetchFromGitHub { + owner = "prometheus"; + repo = "consul_exporter"; + rev = "v${version}"; + sha256 = "1zffbxyfmqpbdqkx5rb5vjgd9j4p4zcrh6jvn1zhbdzrcs7khnd9"; + }; + + meta = with stdenv.lib; { + description = "Prometheus exporter for Consul metrics"; + homepage = https://github.com/prometheus/consul_exporter; + license = licenses.asl20; + maintainers = with maintainers; [ hectorj ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/nas/default.nix b/pkgs/servers/nas/default.nix new file mode 100644 index 00000000000..1dba428e0ae --- /dev/null +++ b/pkgs/servers/nas/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, imake, bison, flex_2_6_1, gccmakedep +, xproto, libXau, libXt, libXext, libXaw, libXpm, xorgcffiles }: + +let + pname = "nas"; + version = "1.9.4"; +in stdenv.mkDerivation { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${pname}-${version}.src.tar.gz"; + sha256 = "17dk0ckm6mp1ajc0cd6bwyi638ynw2f6bhbn7gynrs0wfmiyldng"; + }; + + nativeBuildInputs = [ imake bison flex_2_6_1 gccmakedep ]; + + buildInputs = [ xproto libXau libXt libXext libXaw libXpm ]; + + buildPhase = '' + xmkmf + make WORLDOPTS="" World + ''; + + installFlags = "LDLIBS=-lfl DESTDIR=\${out}"; + + postInstall = '' + mv $out/${xorgcffiles}/* $out + rm -r $out/nix + ''; + + meta = with stdenv.lib; { + description = "A network transparent, client/server audio transport system"; + homepage = http://radscan.com/nas.html; + license = licenses.mit; + maintainers = [ maintainers.gnidorah ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/news/leafnode/default.nix b/pkgs/servers/news/leafnode/default.nix index a3579aa8309..9a8a0a80e52 100644 --- a/pkgs/servers/news/leafnode/default.nix +++ b/pkgs/servers/news/leafnode/default.nix @@ -10,6 +10,10 @@ stdenv.mkDerivation rec { configureFlags = "--enable-runas-user=nobody"; + prePatch = '' + substituteInPlace Makefile.in --replace 02770 0770 + ''; + preConfigure = '' # configure uses id to check environment; we don't want this check sed -re 's/^ID[=].*/ID="echo whatever"/' -i configure diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index d87aefd37fb..2666ddc5a43 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, lua }: stdenv.mkDerivation rec { - version = "3.2.8"; + version = "3.2.9"; name = "redis-${version}"; src = fetchurl { url = "http://download.redis.io/releases/${name}.tar.gz"; - sha256 = "0b28d0fpkvf4m186gr2k53f1cqkccxzspmb959swrrhq7p177cv1"; + sha256 = "09pzb468jfps1w7bx2xpsvalj5r3q8hav7l3s10f91xjhflwzakf"; }; buildInputs = [ lua ]; diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index 5e22cb11882..cc82e75a615 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "rethinkdb-${version}"; - version = "2.3.5"; + version = "2.3.6"; src = fetchurl { url = "https://download.rethinkdb.com/dist/${name}.tgz"; - sha256 = "047fz3r0rn95mqr5p1xfdprf0hq4avq2a1q8zsdifxxid7hyx2nx"; + sha256 = "0a6wlgqa2flf87jrp4fq4y9aihwyhgwclmss56z03b8hd5k5j8f4"; }; postPatch = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/servers/openpts/default.nix b/pkgs/servers/openpts/default.nix index b1f33ff99cf..8b17da99b9a 100644 --- a/pkgs/servers/openpts/default.nix +++ b/pkgs/servers/openpts/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = { description = "TCG Platform Trust Service (PTS)"; - homepage = "ttp://sourceforge.jp/projects/openpts"; + homepage = "http://sourceforge.jp/projects/openpts"; license = stdenv.lib.licenses.cpl10; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ tstrobel ]; diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix index 618bc17d0a7..a1d5ce4147f 100644 --- a/pkgs/servers/plex/default.nix +++ b/pkgs/servers/plex/default.nix @@ -6,9 +6,9 @@ let plexPass = throw "Plex pass has been removed at upstream's request; please unset nixpkgs.config.plex.pass"; plexpkg = if enablePlexPass then plexPass else { - version = "1.5.5.3634"; - vsnHash = "995f1dead"; - sha256 = "0zk2zv7r4mf582gfbv4ahxzl8pbspzkf3514qmqhhx2z4grng49h"; + version = "1.5.7.4016"; + vsnHash = "25d94bad9"; + sha256 = "0lc1shlyg7rvzfpjm9kww7rva33b3bip2bms64a4d5nb3lj4wilh"; }; in stdenv.mkDerivation rec { @@ -74,7 +74,7 @@ in stdenv.mkDerivation rec { homepage = http://plex.tv/; license = licenses.unfree; platforms = platforms.linux; - maintainers = with stdenv.lib.maintainers; [ colemickens forkk thoughtpolice pjones ]; + maintainers = with stdenv.lib.maintainers; [ colemickens forkk thoughtpolice pjones lnl7 ]; description = "Media / DLNA server"; longDescription = '' Plex is a media server which allows you to store your media and play it diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index 861aaa71cde..23969dc2a23 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "radarr-${version}"; - version = "0.2.0.696"; + version = "0.2.0.778"; src = fetchurl { url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz"; - sha256 = "0rqxhzn8hmg6a8di1gaxlrfp5f7mykf2lxrzhri10zqs975i3a29"; + sha256 = "0145nsdnhsd3nbg2nml5malm4kn28k2siaimqb41dcmc88fws015"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/radicale/default.nix b/pkgs/servers/radicale/default.nix index f36d19bfb20..b6d61e29395 100644 --- a/pkgs/servers/radicale/default.nix +++ b/pkgs/servers/radicale/default.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { name = "radicale-${version}"; - version = "1.1.2"; + version = "1.1.4"; src = fetchurl { url = "mirror://pypi/R/Radicale/Radicale-${version}.tar.gz"; - sha256 = "1g20p3998f46ywda7swv0py63wjbrhvk0nrafajlbb6wgzxjmqpb"; + sha256 = "17p0hayyw30pfb81xqvd7jhjm6yrk2dnbgvqagx1nqdsr89ar0ss"; }; propagatedBuildInputs = stdenv.lib.optionals (!pythonPackages.isPy3k) [ diff --git a/pkgs/servers/search/elasticsearch/5.x.nix b/pkgs/servers/search/elasticsearch/5.x.nix index 512337cf382..6f9895509ee 100644 --- a/pkgs/servers/search/elasticsearch/5.x.nix +++ b/pkgs/servers/search/elasticsearch/5.x.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz"; - sha256 = "1ml2dvwxxhj3azj13wa8xd08kpapal2477lpcaxzw5gnzizgyx5z"; + sha256 = "0l31i6dp3q6d6gqsnji1ym0abqphzf1yxswwn4s3na8s216i41h2"; }; patches = [ ./es-home-5.x.patch ./es-classpath-5.x.patch ]; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 4f64afe3d92..1356915c1fa 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -18,8 +18,9 @@ common = rec { # attributes common to both builds version = "10.1.21"; src = fetchurl { - url = "https://downloads.mariadb.org/interstitial/mariadb-${version}/source/mariadb-${version}.tar.gz"; + url = "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz/from/http%3A//ftp.hosteurope.de/mirror/archive.mariadb.org/?serve"; sha256 = "144lcm5awcf0k6a7saqfr4p2kg8r5wbdhdm4cmn2m8hyg1an70as"; + name = "mariadb-${version}.tar.gz"; }; prePatch = '' diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 2362ee84329..b9c940a01cd 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, glibc, fetchurl, zlib, readline, libossp_uuid, openssl, makeWrapper }: +{ lib, stdenv, glibc, fetchurl, zlib, readline, libossp_uuid, openssl, libxml2, makeWrapper }: let @@ -15,7 +15,7 @@ let setOutputFlags = false; # $out retains configureFlags :-/ buildInputs = - [ zlib readline openssl makeWrapper ] + [ zlib readline openssl libxml2 makeWrapper ] ++ lib.optionals (!stdenv.isDarwin) [ libossp_uuid ]; enableParallelBuilding = true; @@ -24,6 +24,7 @@ let configureFlags = [ "--with-openssl" + "--with-libxml" "--sysconfdir=/etc" "--libdir=$(lib)/lib" ] @@ -97,33 +98,33 @@ in { }; postgresql92 = common { - version = "9.2.20"; + version = "9.2.21"; psqlSchema = "9.2"; - sha256 = "09lgvl996py3mciybnlv0hycfwfxr41n0wksb2jvxjh0hjpbv2hb"; + sha256 = "0697e843523ee60c563f987f9c65bc4201294b18525d6e5e4b2c50c6d4058ef9"; }; postgresql93 = common { - version = "9.3.16"; + version = "9.3.17"; psqlSchema = "9.3"; - sha256 = "0wv8qsi0amdhcl1qvkvas3lm37w6zsi818f5fxm6n0ngr155wpw4"; + sha256 = "9c03e5f280cfe9bd202fa01af773eb146abd8ab3065f7279d574c568f6948dbe"; }; postgresql94 = common { - version = "9.4.11"; + version = "9.4.12"; psqlSchema = "9.4"; - sha256 = "08wxrk8wdhnz0756dsa8jkj0pqanjfpw7w715lyv10618p853sz3"; + sha256 = "fca055481875d1c49e31c28443f56472a1474b3fbe25b7ae64440c6118f82e64"; }; postgresql95 = common { - version = "9.5.6"; + version = "9.5.7"; psqlSchema = "9.5"; - sha256 = "0bz1b9r249ffjfvldaiah2g78ccwq30ddh8hdvlq61z26inmz7mv"; + sha256 = "8b1e936f82109325decc0f5575e846b93fb4fd384e8c4bde83ff5e7f87fc6cad"; }; postgresql96 = common { - version = "9.6.2"; + version = "9.6.3"; psqlSchema = "9.6"; - sha256 = "1jahzqqw5inyvmacic2ihhj5f8z50lapci2fwws91h719ccbb1q1"; + sha256 = "1645b3736901f6d854e695a937389e68ff2066ce0cde9d73919d6ab7c995b9c6"; }; } diff --git a/pkgs/servers/sql/postgresql/plv8/default.nix b/pkgs/servers/sql/postgresql/plv8/default.nix new file mode 100644 index 00000000000..15863373562 --- /dev/null +++ b/pkgs/servers/sql/postgresql/plv8/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, v8, perl, postgresql }: + +stdenv.mkDerivation rec { + name = "plv8-${version}"; + version = "2.0.3"; + + nativeBuildInputs = [ perl ]; + buildInputs = [ v8 postgresql ]; + + src = fetchFromGitHub { + owner = "plv8"; + repo = "plv8"; + rev = "v${version}"; + sha256 = "0cn7ynckmdb08dkzjilvc55xz61d1jiya7yrnphizw404j84y3qc"; + }; + + preConfigure = '' + substituteInPlace Makefile --replace '-lv8_libplatform' '-lv8_libplatform -lv8_libbase' + ''; + + installPhase = '' + mkdir -p $out/bin + install -D plv8.so -t $out/lib + install -D {plls,plcoffee,plv8}{--${version}.sql,.control} -t $out/share/extension + ''; + + meta = with stdenv.lib; { + description = "PL/v8 - A Procedural Language in JavaScript powered by V8"; + homepage = https://pgxn.org/dist/plv8/; + maintainers = with maintainers; [ volth ]; + platforms = platforms.linux; + license = licenses.postgresql; + }; +} diff --git a/pkgs/servers/tt-rss/default.nix b/pkgs/servers/tt-rss/default.nix index d42656cf0f6..2cc0cac8a60 100644 --- a/pkgs/servers/tt-rss/default.nix +++ b/pkgs/servers/tt-rss/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "tt-rss-${version}"; - version = "16.3"; + version = "17.4"; src = fetchgit { - url = "https://tt-rss.org/gitlab/fox/tt-rss.git"; + url = "https://git.tt-rss.org/git/tt-rss.git"; rev = "refs/tags/${version}"; - sha256 = "1584lcq6kcy9f8ik5djb9apck9hxvfpl54sn6yhl3pdfrfdj3nw5"; + sha256 = "07ng21n4pva56cxnxkzd6vzs381zn67psqpm51ym5wnl644jqh08"; }; buildPhases = ["unpackPhase" "installPhase"]; diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index 2ce0ba1d5f5..7237bbdcd96 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "unifi-controller-${version}"; - version = "5.5.11"; + version = "5.5.19"; src = fetchurl { - url = "https://www.ubnt.com/downloads/unifi/5.5.11-5107276ec2/unifi_sysvinit_all.deb"; - sha256 = "1jsixz7g7h7fdwb512flcwk0vblrsxpg4i9jdz7r72bkmvnxk7mm"; + url = "https://www.ubnt.com/downloads/unifi/${version}/unifi_sysvinit_all.deb"; + sha256 = "0bsfq48xjp230ir8pm9wpa5p4dh88zfy51lbi2xwpr454371ixcl"; }; buildInputs = [ dpkg ]; diff --git a/pkgs/servers/web-apps/piwik/bootstrap.php b/pkgs/servers/web-apps/piwik/bootstrap.php new file mode 100644 index 00000000000..a8163f33e5c --- /dev/null +++ b/pkgs/servers/web-apps/piwik/bootstrap.php @@ -0,0 +1,6 @@ + '127.0.0.1'," "=> 'localhost'," + cp ${./bootstrap.php} bootstrap.php + ''; + + # TODO: Move more unnecessary files from share/, especially using PIWIK_INCLUDE_PATH. + # See https://forum.piwik.org/t/bootstrap-php/5926/10 and + # https://github.com/piwik/piwik/issues/11654#issuecomment-297730843 + installPhase = '' + runHook preInstall + + # copy evertything to share/, used as webroot folder, and then remove what's known to be not needed + mkdir -p $out/share + cp -ra * $out/share/ + # tmp/ is created by piwik in PIWIK_USER_PATH + rmdir $out/share/tmp + # config/ needs to be copied to PIWIK_USER_PATH anyway + mv $out/share/config $out/ + + makeWrapper ${php}/bin/php $out/bin/piwik-console \ + --add-flags "$out/share/console" + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "A real-time web analytics application"; + license = licenses.gpl3Plus; + homepage = https://piwik.org/; + platforms = platforms.all; + maintainers = [ maintainers.florianjacob ]; + }; +} diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix index 26e3f92931b..41a27690a2a 100644 --- a/pkgs/servers/web-apps/shaarli/default.nix +++ b/pkgs/servers/web-apps/shaarli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "shaarli-${version}"; - version = "0.8.4"; + version = "0.9.0"; src = fetchurl { url = "https://github.com/shaarli/Shaarli/releases/download/v${version}/shaarli-v${version}-full.tar.gz"; - sha256 = "1p6yljl8v8p74n71az1h68nnsvffw2hkcfk9p2dldspi4k51vnb7"; + sha256 = "1l8waa26cq9rjh8hvhnlrsvj4606pz81msdmhljgqx7fdn5wzs5c"; }; outputs = [ "out" "doc" ]; @@ -45,7 +45,8 @@ stdenv.mkDerivation rec { installPhase = '' rm -r {cache,pagecache,tmp,data}/ - mv doc/ $doc/ + mkdir -p $doc/share/doc + mv doc/ $doc/share/doc/shaarli mkdir $out/ cp -R ./* $out ''; diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix index c7067ffbd53..215e9fade0a 100644 --- a/pkgs/servers/web-apps/wallabag/default.nix +++ b/pkgs/servers/web-apps/wallabag/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "wallabag-${version}"; - version = "2.2.2"; + version = "2.2.3"; # remember to rm -r var/cache/* after a rebuild or unexpected errors will occur src = fetchurl { url = "https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz"; - sha256 = "0l8zba2risi8lsmff0fbgplfqdiqp7jz0f93z4lbqv8iavaqpna0"; + sha256 = "0myqarwny9p53g2gmwmg1mcn17jlx5ah0bri13panhf7ryvmrzhk"; }; outputs = [ "out" "doc" ]; @@ -22,7 +22,8 @@ stdenv.mkDerivation rec { ''; # exposes $WALLABAG_DATA installPhase = '' - mv docs $doc/ + mkdir -p $doc/share/doc + mv docs $doc/share/doc/wallabag mkdir $out/ cp -R * $out/ ''; diff --git a/pkgs/shells/bash-completion/default.nix b/pkgs/shells/bash-completion/default.nix index 3ac1ca2172d..1c1b83d67b9 100644 --- a/pkgs/shells/bash-completion/default.nix +++ b/pkgs/shells/bash-completion/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bash-completion-${version}"; - version = "2.5"; + version = "2.7"; src = fetchurl { url = "https://github.com/scop/bash-completion/releases/download/${version}/${name}.tar.xz"; - sha256 = "1kwmii1z1ljx5i4z702ynsr8jgrq64bj9w9hl3n2aa2kcl659fdh"; + sha256 = "07j484vb3k90f4989xh1g1x99g01akrp69p3dml4lza27wnqkfj1"; }; doCheck = true; diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix index 061f183e96e..dba31e41ca3 100644 --- a/pkgs/shells/bash/4.4.nix +++ b/pkgs/shells/bash/4.4.nix @@ -1,15 +1,16 @@ -{ stdenv, fetchurl, readline70 ? null, interactive ? false, texinfo ? null -, binutils ? null, bison +{ stdenv, buildPackages +, fetchurl, readline70 ? null, texinfo ? null, binutils ? null, bison +, buildPlatform, hostPlatform +, interactive ? false }: assert interactive -> readline70 != null; -assert stdenv.isDarwin -> binutils != null; +assert hostPlatform.isDarwin -> binutils != null; let version = "4.4"; realName = "bash-${version}"; shortName = "bash44"; - baseConfigureFlags = if interactive then "--with-installed-readline" else "--disable-readline"; sha256 = "1jyz6snd63xjn6skk7za6psgidsd53k05cr3lksqybi0q6936syq"; upstreamPatches = @@ -22,7 +23,7 @@ let in import ./bash-4.4-patches.nix patch; - inherit (stdenv.lib) optional optionalString; + inherit (stdenv.lib) optional optionals optionalString; in stdenv.mkDerivation rec { @@ -51,27 +52,27 @@ stdenv.mkDerivation rec { patchFlags = "-p0"; - patches = upstreamPatches - ++ optional stdenv.isCygwin ./cygwin-bash-4.3.33-1.src.patch; + patches = upstreamPatches; - crossAttrs = { - configureFlags = baseConfigureFlags + - " bash_cv_job_control_missing=nomissing bash_cv_sys_named_pipes=nomissing bash_cv_getcwd_malloc=yes" + - optionalString stdenv.isCygwin '' - --without-libintl-prefix --without-libiconv-prefix - --with-installed-readline - bash_cv_dev_stdin=present - bash_cv_dev_fd=standard - bash_cv_termcap_lib=libncurses - ''; - }; + postPatch = optionalString hostPlatform.isCygwin "patch -p2 < ${./cygwin-bash-4.4.11-2.src.patch}"; - configureFlags = baseConfigureFlags; + configureFlags = [ + (if interactive then "--with-installed-readline" else "--disable-readline") + ] ++ optionals (hostPlatform != buildPlatform) [ + "bash_cv_job_control_missing=nomissing bash_cv_sys_named_pipes=nomissing bash_cv_getcwd_malloc=yes" + ] ++ optionals hostPlatform.isCygwin [ + "--without-libintl-prefix --without-libiconv-prefix" + "--with-installed-readline" + "bash_cv_dev_stdin=present" + "bash_cv_dev_fd=standard" + "bash_cv_termcap_lib=libncurses" + ]; # Note: Bison is needed because the patches above modify parse.y. nativeBuildInputs = [bison] ++ optional (texinfo != null) texinfo - ++ optional stdenv.isDarwin binutils; + ++ optional hostPlatform.isDarwin binutils + ++ optional (hostPlatform != buildPlatform) buildPackages.stdenv.cc; buildInputs = optional interactive readline70; @@ -79,6 +80,11 @@ stdenv.mkDerivation rec { # build `version.h'. enableParallelBuilding = false; + makeFlags = optional hostPlatform.isCygwin [ + "LOCAL_LDFLAGS=-Wl,--export-all,--out-implib,libbash.dll.a" + "SHOBJ_LIBS=-lbash" + ]; + postInstall = '' ln -s bash "$out/bin/sh" rm $out/lib/bash/Makefile.inc diff --git a/pkgs/shells/bash/cygwin-bash-4.3.33-1.src.patch b/pkgs/shells/bash/cygwin-bash-4.3.33-1.src.patch deleted file mode 100644 index e0959d0446a..00000000000 --- a/pkgs/shells/bash/cygwin-bash-4.3.33-1.src.patch +++ /dev/null @@ -1,1393 +0,0 @@ ---- bashline.c 2015-02-06 17:12:55.823275600 -0700 -+++ bashline.c 2015-02-06 17:14:11.000103800 -0700 -@@ -71,6 +71,16 @@ - # include "pcomplete.h" - #endif - -+#if __CYGWIN__ -+# ifdef __x86_64__ -+# define IMP(x) __imp_##x -+# else -+# define IMP(x) _imp__##x -+# endif -+#else -+# define IMP(x) x -+#endif -+ - /* These should agree with the defines for emacs_mode and vi_mode in - rldefs.h, even though that's not a public readline header file. */ - #ifndef EMACS_EDITING_MODE -@@ -264,6 +274,11 @@ int no_empty_command_completion; - are the only possible matches, even if FIGNORE says to. */ - int force_fignore = 1; - -+#if __CYGWIN__ -+/* If set, shorten "foo.exe" to "foo" when they are the same file. */ -+int completion_strip_exe; -+#endif /* __CYGWIN__ */ -+ - /* Perform spelling correction on directory names during word completion */ - int dircomplete_spelling = 0; - -@@ -491,11 +506,12 @@ initialize_readline () - kseq[0] = CTRL('J'); - kseq[1] = '\0'; - func = rl_function_of_keyseq (kseq, emacs_meta_keymap, (int *)NULL); -- if (func == rl_vi_editing_mode) -+ extern rl_command_func_t *IMP(rl_vi_editing_mode); -+ if (func == rl_vi_editing_mode || func == IMP(rl_vi_editing_mode)) - rl_unbind_key_in_map (CTRL('J'), emacs_meta_keymap); - kseq[0] = CTRL('M'); - func = rl_function_of_keyseq (kseq, emacs_meta_keymap, (int *)NULL); -- if (func == rl_vi_editing_mode) -+ if (func == rl_vi_editing_mode || func == IMP(rl_vi_editing_mode)) - rl_unbind_key_in_map (CTRL('M'), emacs_meta_keymap); - #if defined (VI_MODE) - rl_unbind_key_in_map (CTRL('E'), vi_movement_keymap); -@@ -514,7 +530,8 @@ initialize_readline () - kseq[0] = '~'; - kseq[1] = '\0'; - func = rl_function_of_keyseq (kseq, emacs_meta_keymap, (int *)NULL); -- if (func == 0 || func == rl_tilde_expand) -+ extern rl_command_func_t *IMP(rl_tilde_expand); -+ if (func == 0 || func == rl_tilde_expand || func == IMP(rl_tilde_expand)) - rl_bind_keyseq_in_map (kseq, bash_complete_username, emacs_meta_keymap); - - rl_bind_key_if_unbound_in_map ('~', bash_possible_username_completions, emacs_ctlx_keymap); -@@ -537,7 +554,8 @@ initialize_readline () - kseq[0] = TAB; - kseq[1] = '\0'; - func = rl_function_of_keyseq (kseq, emacs_meta_keymap, (int *)NULL); -- if (func == 0 || func == rl_tab_insert) -+ extern rl_command_func_t *IMP(rl_tab_insert); -+ if (func == 0 || func == rl_tab_insert || func == IMP(rl_tab_insert)) - rl_bind_key_in_map (TAB, dynamic_complete_history, emacs_meta_keymap); - - /* Tell the completer that we want a crack first. */ -@@ -2109,6 +2127,21 @@ globword: - - if (match && executable_completion ((searching_path ? val : cval), searching_path)) - { -+#if __CYGWIN__ -+ if (completion_strip_exe) -+ { -+ size_t val_len = strlen (val); -+ char *candidate; -+ if (val_len > 4 && !strcasecmp (&val[val_len - 4], ".exe") -+ && (candidate = strdup (val))) -+ { -+ candidate[val_len - 4] = '\0'; -+ if (same_file (val, candidate, NULL, NULL)) -+ temp[strlen (temp) - 4] = '\0'; -+ free (candidate); -+ } -+ } -+#endif - if (cval != val) - free (cval); - free (val); -@@ -2844,6 +2877,17 @@ test_for_directory (name) - int r; - - fn = bash_tilde_expand (name, 0); -+#if __CYGWIN__ -+ /* stat("//server") can only be successful as a directory, but takes -+ a several-second timeout to fail. It is much faster to assume -+ that //server is a valid name than it is to wait for the stat, -+ even though it gives false positives on bad names. */ -+ if (fn[0] == '/' && fn[1] == '/' && ! strchr (&fn[2], '/')) -+ { -+ free (fn); -+ return 1; -+ } -+#endif /* __CYGWIN__ */ - r = file_isdir (fn); - free (fn); - ---- builtins/evalstring.c 2015-02-06 17:12:55.682776800 -0700 -+++ builtins/evalstring.c 2015-02-06 17:14:11.015662800 -0700 -@@ -195,7 +195,7 @@ parse_and_execute (string, from_file, fl - int code, lreset; - volatile int should_jump_to_top_level, last_result; - COMMAND *volatile command; -- volatile sigset_t pe_sigmask; -+ sigset_t pe_sigmask; - - parse_prologue (string, flags, PE_TAG); - -@@ -451,7 +451,7 @@ parse_string (string, from_file, flags, - volatile int should_jump_to_top_level; - COMMAND *volatile command, *oglobal; - char *ostring; -- volatile sigset_t ps_sigmask; -+ sigset_t ps_sigmask; - - parse_prologue (string, flags, PS_TAG); - ---- builtins/set.def 2013-04-19 05:20:34.000000000 -0600 -+++ builtins/set.def 2015-02-06 17:14:11.015662800 -0700 -@@ -56,6 +56,13 @@ extern int dont_save_function_defs; - #if defined (READLINE) - extern int no_line_editing; - #endif /* READLINE */ -+#if __CYGWIN__ -+extern int igncr; -+static int set_minus_o_option_maybe (int, const char *, int); -+# define INTERACTIVE_ONLY ,1 -+#else /* ! __CYGWIN__ */ -+# define INTERACTIVE_ONLY -+#endif - - $BUILTIN set - $FUNCTION set_builtin -@@ -92,6 +99,9 @@ Options: - #if defined (HISTORY) - history enable command history - #endif -+#if __CYGWIN__ -+ igncr on cygwin, ignore \r in line endings -+#endif - ignoreeof the shell will not exit upon reading EOF - interactive-comments - allow comments to appear in interactive commands -@@ -188,29 +198,41 @@ const struct { - int *variable; - setopt_set_func_t *set_func; - setopt_get_func_t *get_func; -+#if __CYGWIN__ -+ /* Cygwin users have taken to exporting SHELLOPTS for the -+ cygwin-specific igncr. As a result, we need to make sure -+ SHELLOPTS parsing does not turn on interactive options when -+ exported from an interactive shell, but parsed in a -+ non-interactive setting, since some interactive options violate -+ POSIX /bin/sh rules. */ -+ int interactive_only; -+#endif /* __CYGWIN__ */ - } o_options[] = { - { "allexport", 'a', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, - #if defined (BRACE_EXPANSION) - { "braceexpand",'B', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, - #endif - #if defined (READLINE) -- { "emacs", '\0', (int *)NULL, set_edit_mode, get_edit_mode }, -+ { "emacs", '\0', (int *)NULL, set_edit_mode, get_edit_mode INTERACTIVE_ONLY}, - #endif - { "errexit", 'e', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, - { "errtrace", 'E', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, - { "functrace", 'T', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, - { "hashall", 'h', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, - #if defined (BANG_HISTORY) -- { "histexpand", 'H', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, -+ { "histexpand", 'H', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL INTERACTIVE_ONLY}, - #endif /* BANG_HISTORY */ - #if defined (HISTORY) -- { "history", '\0', &enable_history_list, bash_set_history, (setopt_get_func_t *)NULL }, -+ { "history", '\0', &enable_history_list, bash_set_history, (setopt_get_func_t *)NULL INTERACTIVE_ONLY}, -+#endif -+#if __CYGWIN__ -+ { "igncr", '\0', &igncr, NULL, (setopt_get_func_t *)NULL }, - #endif - { "ignoreeof", '\0', &ignoreeof, set_ignoreeof, (setopt_get_func_t *)NULL }, - { "interactive-comments", '\0', &interactive_comments, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, - { "keyword", 'k', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, - #if defined (JOB_CONTROL) -- { "monitor", 'm', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, -+ { "monitor", 'm', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL INTERACTIVE_ONLY}, - #endif - { "noclobber", 'C', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, - { "noexec", 'n', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, -@@ -229,7 +251,7 @@ const struct { - { "privileged", 'p', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, - { "verbose", 'v', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, - #if defined (READLINE) -- { "vi", '\0', (int *)NULL, set_edit_mode, get_edit_mode }, -+ { "vi", '\0', (int *)NULL, set_edit_mode, get_edit_mode INTERACTIVE_ONLY}, - #endif - { "xtrace", 'x', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, - {(char *)NULL, 0 , (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, -@@ -416,6 +438,15 @@ int - set_minus_o_option (on_or_off, option_name) - int on_or_off; - char *option_name; -+#if __CYGWIN__ -+{ -+ /* See cygwin comments above. */ -+ return set_minus_o_option_maybe (on_or_off, option_name, 0); -+} -+static int -+set_minus_o_option_maybe (int on_or_off, const char *option_name, -+ int avoid_interactive) -+#endif /* __CYGWIN__ */ - { - register int i; - -@@ -423,6 +454,10 @@ set_minus_o_option (on_or_off, option_na - { - if (STREQ (option_name, o_options[i].name)) - { -+#if __CYGWIN__ -+ if (o_options[i].interactive_only && avoid_interactive) -+ return EXECUTION_SUCCESS; -+#endif /* __CYGWIN__ */ - if (o_options[i].letter == 0) - { - SET_BINARY_O_OPTION_VALUE (i, on_or_off, option_name); -@@ -548,7 +583,11 @@ parse_shellopts (value) - vptr = 0; - while (vname = extract_colon_unit (value, &vptr)) - { -+#if __CYGWIN__ -+ set_minus_o_option_maybe (FLAG_ON, vname, !interactive_shell); -+#else /* !__CYGWIN__ */ - set_minus_o_option (FLAG_ON, vname); -+#endif - free (vname); - } - } ---- builtins/shopt.def 2013-02-27 07:43:20.000000000 -0700 -+++ builtins/shopt.def 2015-02-06 17:14:11.015662800 -0700 -@@ -91,6 +91,11 @@ extern int glob_star; - extern int glob_asciirange; - extern int lastpipe_opt; - -+#if __CYGWIN__ -+extern int completion_strip_exe; -+#endif -+ -+ - #if defined (EXTENDED_GLOB) - extern int extended_glob; - #endif -@@ -161,6 +166,9 @@ static struct { - { "compat40", &shopt_compat40, set_compatibility_level }, - { "compat41", &shopt_compat41, set_compatibility_level }, - { "compat42", &shopt_compat41, set_compatibility_level }, -+#if __CYGWIN__ -+ { "completion_strip_exe", &completion_strip_exe, NULL }, -+#endif - #if defined (READLINE) - { "complete_fullquote", &complete_fullquote, (shopt_set_func_t *)NULL}, - { "direxpand", &dircomplete_expand, shopt_set_complete_direxpand }, ---- config-top.h 2012-08-18 18:51:30.000000000 -0600 -+++ config-top.h 2015-02-06 17:14:11.015662800 -0700 -@@ -80,10 +80,10 @@ - #define KSH_COMPATIBLE_SELECT - - /* System-wide .bashrc file for interactive shells. */ --/* #define SYS_BASHRC "/etc/bash.bashrc" */ -+#define SYS_BASHRC "/etc/bash.bashrc" - - /* System-wide .bash_logout for login shells. */ --/* #define SYS_BASH_LOGOUT "/etc/bash.bash_logout" */ -+#define SYS_BASH_LOGOUT "/etc/bash.bash_logout" - - /* Define this to make non-interactive shells begun with argv[0][0] == '-' - run the startup files when not in posix mode. */ -@@ -93,7 +93,7 @@ - sshd and source the .bashrc if so (like the rshd behavior). This checks - for the presence of SSH_CLIENT or SSH2_CLIENT in the initial environment, - which can be fooled under certain not-uncommon circumstances. */ --/* #define SSH_SOURCE_BASHRC */ -+#define SSH_SOURCE_BASHRC - - /* Define if you want the case-capitalizing operators (~[~]) and the - `capcase' variable attribute (declare -c). */ ---- doc/Makefile.in 2013-10-30 14:18:12.000000000 -0600 -+++ doc/Makefile.in 2015-02-06 17:14:11.015662800 -0700 -@@ -176,7 +176,7 @@ bashref.html: $(BASHREF_FILES) $(HSUSER) - $(TEXI2HTML) -menu -monolithic -I $(TEXINPUTDIR) $(srcdir)/bashref.texi - - bash.info: bashref.info -- ${SHELL} ${INFOPOST} < $(srcdir)/bashref.info > $@ ; \ -+ ${SHELL} ${INFOPOST} < bashref.info > $@ ; \ - - bash.txt: bash.1 - bash.ps: bash.1 -@@ -237,9 +237,9 @@ install: info installdirs bash.info - -$(INSTALL_DATA) $(srcdir)/bashbug.1 $(DESTDIR)$(man1dir)/bashbug${man1ext} - -$(INSTALL_DATA) $(OTHER_DOCS) $(DESTDIR)$(docdir) - # uncomment the next lines to install the builtins man page --# sed 's:bash\.1:man1/&:' $(srcdir)/builtins.1 > $${TMPDIR:-/var/tmp}/builtins.1 --# -$(INSTALL_DATA) $${TMPDIR:-/var/tmp}/builtins.1 $(DESTDIR)$(man1dir)/bash_builtins${man1ext} --# -$(RM) $${TMPDIR:-/var/tmp}/builtins.1 -+ sed 's:bash\.1:man1/&:' $(srcdir)/builtins.1 > $${TMPDIR:-/var/tmp}/builtins.1 -+ -$(INSTALL_DATA) $${TMPDIR:-/var/tmp}/builtins.1 $(DESTDIR)$(man1dir)/bash_builtins${man1ext} -+ -$(RM) $${TMPDIR:-/var/tmp}/builtins.1 - -if test -f bash.info; then d=.; else d=$(srcdir); fi; \ - $(INSTALL_DATA) $$d/bash.info $(DESTDIR)$(infodir)/bash.info - # run install-info if it is present to update the info directory ---- doc/bash.1 2014-02-06 07:03:52.000000000 -0700 -+++ doc/bash.1 2015-02-06 17:14:11.015662800 -0700 -@@ -1658,6 +1658,14 @@ subsequently reset. - Expands to the effective user ID of the current user, initialized at - shell startup. This variable is readonly. - .TP -+.B EXECIGNORE -+A colon-separated list of extended glob (see \fBPattern Matching\fP) -+patterns. Files with full paths matching one of these patterns are -+not considered executable for the purposes of completion and PATH -+searching, but the \fB[\fP, \fB[[\fP, and \fBtest\fP builtins are not -+affected. Use this variable to deal with systems that set the -+executable bit on files that are not actually executable. -+.TP - .B FUNCNAME - An array variable containing the names of all shell functions - currently in the execution call stack. -@@ -3308,6 +3316,10 @@ the character - .B ``.'' - at the start of a name or immediately following a slash - must be matched explicitly, unless the shell option -+.B completion_strip_exe -+If set, whenever bash sees `foo.exe' during completion, it checks if -+`foo' is the same file and strips the suffix. -+.TP 8 - .B dotglob - is set. - When matching a pathname, the slash character must always be ---- doc/bashref.texi 2014-02-22 11:20:36.000000000 -0700 -+++ doc/bashref.texi 2015-02-06 17:14:11.015662800 -0700 -@@ -4992,6 +4992,10 @@ filenames. - This variable is set by default, which is the default Bash behavior in - versions through 4.2. - -+@item completion_strip_exe -+If set, whenever bash sees `foo.exe' during completion, it checks if -+`foo' is the same file and strips the suffix. -+ - @item direxpand - If set, Bash - replaces directory names with the results of word expansion when performing -@@ -5578,6 +5582,14 @@ Similar to @code{BASH_ENV}; used when th - The numeric effective user id of the current user. This variable - is readonly. - -+@item EXECIGNORE -+A colon-separated list of extended glob ((@pxref{Pattern Matching}) -+patterns. Files with full paths matching one of these patterns are -+not considered executable for the purposes of completion and PATH -+searching, but the @code{[}, @code{[[}, and @code{test} builtins are -+not affected. Use this variable to deal with systems that set the -+executable bit on files that are not actually executable. -+ - @item FCEDIT - The editor used as a default by the @option{-e} option to the @code{fc} - builtin command. ---- doc/builtins.1 2012-02-21 12:32:05.000000000 -0700 -+++ doc/builtins.1 2015-02-06 17:14:11.031260100 -0700 -@@ -19,6 +19,6 @@ shift, shopt, source, suspend, test, tim - ulimit, umask, unalias, unset, wait \- bash built-in commands, see \fBbash\fR(1) - .SH BASH BUILTIN COMMANDS - .nr zZ 1 --.so bash.1 -+.so man1/bash.1 - .SH SEE ALSO - bash(1), sh(1) ---- execute_cmd.c 2015-02-06 17:12:55.261573700 -0700 -+++ execute_cmd.c 2015-02-06 17:14:11.031260100 -0700 -@@ -58,6 +58,7 @@ extern int errno; - #endif - - #define NEED_FPURGE_DECL -+#define NEED_SH_SETLINEBUF_DECL /* used in externs.h */ - - #include "bashansi.h" - #include "bashintl.h" ---- expr.c 2014-01-03 06:55:00.000000000 -0700 -+++ expr.c 2015-02-06 17:14:11.031260100 -0700 -@@ -83,6 +83,7 @@ - - #include "shell.h" - #include "typemax.h" /* INTMAX_MAX, INTMAX_MIN */ -+#define exp2 exp2_ - - /* Because of the $((...)) construct, expressions may include newlines. - Here is a macro which accepts newlines, tabs and spaces as whitespace. */ ---- findcmd.c 2012-10-15 05:45:04.000000000 -0600 -+++ findcmd.c 2015-02-06 17:14:11.031260100 -0700 -@@ -48,6 +48,8 @@ - extern int errno; - #endif - -+#include -+ - extern int posixly_correct; - extern int last_command_exit_value; - -@@ -77,6 +79,38 @@ int check_hashed_filenames; - containing the file of interest. */ - int dot_found_in_search = 0; - -+static struct ignorevar execignore = -+{ -+ "EXECIGNORE", -+ (struct ign *)0, -+ 0, -+ (char *)0, -+ (sh_iv_item_func_t *)0, -+}; -+ -+void -+setup_exec_ignore (char *varname) -+{ -+ setup_ignore_patterns (&execignore); -+} -+ -+/* Return whether we should never consider file executable -+ * even if the system tells us it is. */ -+static int -+is_on_exec_blacklist (char *name) -+{ -+ struct ign *p; -+ int flags = FNM_EXTMATCH | FNM_CASEFOLD; -+ -+ for (p = execignore.ignores; p && p->val; p++) -+ { -+ if (strmatch (p->val, (char *)name, flags) != FNM_NOMATCH) -+ return (1); -+ } -+ -+ return (0); -+} -+ - /* Return some flags based on information about this file. - The EXISTS bit is non-zero if the file is found. - The EXECABLE bit is non-zero the file is executble. -@@ -104,7 +138,7 @@ file_status (name) - file access mechanisms into account. eaccess uses the effective - user and group IDs, not the real ones. We could use sh_eaccess, - but we don't want any special treatment for /dev/fd. */ -- if (eaccess (name, X_OK) == 0) -+ if (!is_on_exec_blacklist (name) && eaccess (name, X_OK) == 0) - r |= FS_EXECABLE; - if (eaccess (name, R_OK) == 0) - r |= FS_READABLE; ---- findcmd.h 2012-01-14 16:56:25.000000000 -0700 -+++ findcmd.h 2015-02-06 17:14:11.031260100 -0700 -@@ -31,5 +31,6 @@ extern char *find_user_command __P((cons - extern char *find_path_file __P((const char *)); - extern char *search_for_command __P((const char *, int)); - extern char *user_command_matches __P((const char *, int, int)); -+extern void setup_exec_ignore __P((char *)); - - #endif /* _FINDCMD_H_ */ ---- general.c 2014-01-30 14:46:15.000000000 -0700 -+++ general.c 2015-02-06 17:14:11.031260100 -0700 -@@ -44,6 +44,10 @@ - - #include - -+#ifdef __CYGWIN__ -+# include -+#endif -+ - #if !defined (errno) - extern int errno; - #endif /* !errno */ -@@ -632,7 +636,8 @@ make_absolute (string, dot_path) - { - char pathbuf[PATH_MAX + 1]; - -- cygwin_conv_to_full_posix_path (string, pathbuf); -+ cygwin_conv_path (CCP_WIN_A_TO_POSIX | CCP_ABSOLUTE, string, pathbuf, -+ sizeof pathbuf); - result = savestring (pathbuf); - } - #else ---- include/chartypes.h 2011-04-11 12:30:52.000000000 -0600 -+++ include/chartypes.h 2015-02-06 17:14:11.031260100 -0700 -@@ -40,6 +40,7 @@ - #else - # define IN_CTYPE_DOMAIN(c) isascii(c) - #endif -+#define to_uchar(c) ((unsigned char)(c)) - - #if !defined (isspace) && !defined (HAVE_ISSPACE) - # define isspace(c) ((c) == ' ' || (c) == '\t' || (c) == '\n' || (c) == '\f') -@@ -67,16 +68,16 @@ - - #undef ISPRINT - --#define ISPRINT(c) (IN_CTYPE_DOMAIN (c) && isprint (c)) --#define ISDIGIT(c) (IN_CTYPE_DOMAIN (c) && isdigit (c)) --#define ISALNUM(c) (IN_CTYPE_DOMAIN (c) && isalnum (c)) --#define ISALPHA(c) (IN_CTYPE_DOMAIN (c) && isalpha (c)) --#define ISCNTRL(c) (IN_CTYPE_DOMAIN (c) && iscntrl (c)) --#define ISLOWER(c) (IN_CTYPE_DOMAIN (c) && islower (c)) --#define ISPUNCT(c) (IN_CTYPE_DOMAIN (c) && ispunct (c)) --#define ISSPACE(c) (IN_CTYPE_DOMAIN (c) && isspace (c)) --#define ISUPPER(c) (IN_CTYPE_DOMAIN (c) && isupper (c)) --#define ISXDIGIT(c) (IN_CTYPE_DOMAIN (c) && isxdigit (c)) -+#define ISPRINT(c) (IN_CTYPE_DOMAIN (c) && isprint (to_uchar (c))) -+#define ISDIGIT(c) (IN_CTYPE_DOMAIN (c) && isdigit (to_uchar (c))) -+#define ISALNUM(c) (IN_CTYPE_DOMAIN (c) && isalnum (to_uchar (c))) -+#define ISALPHA(c) (IN_CTYPE_DOMAIN (c) && isalpha (to_uchar (c))) -+#define ISCNTRL(c) (IN_CTYPE_DOMAIN (c) && iscntrl (to_uchar (c))) -+#define ISLOWER(c) (IN_CTYPE_DOMAIN (c) && islower (to_uchar (c))) -+#define ISPUNCT(c) (IN_CTYPE_DOMAIN (c) && ispunct (to_uchar (c))) -+#define ISSPACE(c) (IN_CTYPE_DOMAIN (c) && isspace (to_uchar (c))) -+#define ISUPPER(c) (IN_CTYPE_DOMAIN (c) && isupper (to_uchar (c))) -+#define ISXDIGIT(c) (IN_CTYPE_DOMAIN (c) && isxdigit (to_uchar (c))) - - #define ISLETTER(c) (ISALPHA(c)) - ---- include/posixjmp.h 2012-12-23 20:20:50.000000000 -0700 -+++ include/posixjmp.h 2015-02-06 17:14:11.031260100 -0700 -@@ -27,13 +27,13 @@ - - #if defined (HAVE_POSIX_SIGSETJMP) - # define procenv_t sigjmp_buf --# if !defined (__OPENNT) -+# if !defined (__OPENNT) && !defined __CYGWIN__ - # undef setjmp - # define setjmp(x) sigsetjmp((x), 1) --# define setjmp_nosigs(x) sigsetjmp((x), 0) - # undef longjmp - # define longjmp(x, n) siglongjmp((x), (n)) - # endif /* !__OPENNT */ -+# define setjmp_nosigs(x) sigsetjmp((x), 0) - #else - # define procenv_t jmp_buf - # define setjmp_nosigs setjmp ---- input.c 2014-02-07 07:13:08.000000000 -0700 -+++ input.c 2015-02-06 17:14:11.031260100 -0700 -@@ -44,6 +44,10 @@ - #include "quit.h" - #include "trap.h" - -+#if __CYGWIN__ -+int igncr; -+#endif -+ - #if !defined (errno) - extern int errno; - #endif /* !errno */ -@@ -561,6 +565,19 @@ buffered_getchar () - { - CHECK_TERMSIG; - -+#if __CYGWIN__ -+ /* shopt igncr means to discard carriage returns from input stream. -+ If cr is the only character in the buffer, then recurse to pick -+ up the next character; otherwise flatten the buffer. */ -+ if (igncr) -+ { -+ int ch; -+ while ((ch = bufstream_getc (buffers[bash_input.location.buffered_fd])) -+ == '\r') -+ ; -+ return ch; -+ } -+#endif /* __CYGWIN__ */ - #if !defined (DJGPP) - return (bufstream_getc (buffers[bash_input.location.buffered_fd])); - #else ---- lib/readline/bind.c 2013-04-06 15:46:38.000000000 -0600 -+++ lib/readline/bind.c 2015-02-06 17:14:11.031260100 -0700 -@@ -452,7 +452,7 @@ rl_translate_keyseq (seq, array, len) - { - register int i, c, l, temp; - -- for (i = l = 0; c = seq[i]; i++) -+ for (i = l = 0; (c = seq[i]); i++) - { - if (c == '\\') - { -@@ -1210,7 +1210,7 @@ _rl_skip_to_delim (string, start, delim) - { - int i, c, passc; - -- for (i = start,passc = 0; c = string[i]; i++) -+ for (i = start,passc = 0; (c = string[i]); i++) - { - if (passc) - { -@@ -1297,7 +1297,6 @@ rl_parse_and_bind (string) - if (_rl_stricmp (string, "set") == 0) - { - char *var, *value, *e; -- int s; - - var = string + i; - /* Make VAR point to start of variable name. */ -@@ -2198,7 +2197,7 @@ rl_function_dumper (print_readably) - - fprintf (rl_outstream, "\n"); - -- for (i = 0; name = names[i]; i++) -+ for (i = 0; (name = names[i]); i++) - { - rl_command_func_t *function; - char **invokers; ---- lib/readline/chardefs.h 2011-07-25 19:47:56.000000000 -0600 -+++ lib/readline/chardefs.h 2015-02-06 17:14:11.046889800 -0700 -@@ -71,6 +71,7 @@ - #else - # define IN_CTYPE_DOMAIN(c) isascii(c) - #endif -+#define to_uchar(c) ((unsigned char)(c)) - - #if !defined (isxdigit) && !defined (HAVE_ISXDIGIT) && !defined (__cplusplus) - # define isxdigit(c) (isdigit((c)) || ((c) >= 'a' && (c) <= 'f') || ((c) >= 'A' && (c) <= 'F')) -@@ -87,13 +88,13 @@ - - /* Beware: these only work with single-byte ASCII characters. */ - --#define ISALNUM(c) (IN_CTYPE_DOMAIN (c) && isalnum (c)) --#define ISALPHA(c) (IN_CTYPE_DOMAIN (c) && isalpha (c)) --#define ISDIGIT(c) (IN_CTYPE_DOMAIN (c) && isdigit (c)) --#define ISLOWER(c) (IN_CTYPE_DOMAIN (c) && islower (c)) --#define ISPRINT(c) (IN_CTYPE_DOMAIN (c) && isprint (c)) --#define ISUPPER(c) (IN_CTYPE_DOMAIN (c) && isupper (c)) --#define ISXDIGIT(c) (IN_CTYPE_DOMAIN (c) && isxdigit (c)) -+#define ISALNUM(c) (IN_CTYPE_DOMAIN (c) && isalnum (to_uchar (c))) -+#define ISALPHA(c) (IN_CTYPE_DOMAIN (c) && isalpha (to_uchar (c))) -+#define ISDIGIT(c) (IN_CTYPE_DOMAIN (c) && isdigit (to_uchar (c))) -+#define ISLOWER(c) (IN_CTYPE_DOMAIN (c) && islower (to_uchar (c))) -+#define ISPRINT(c) (IN_CTYPE_DOMAIN (c) && isprint (to_uchar (c))) -+#define ISUPPER(c) (IN_CTYPE_DOMAIN (c) && isupper (to_uchar (c))) -+#define ISXDIGIT(c) (IN_CTYPE_DOMAIN (c) && isxdigit (to_uchar (c))) - - #define _rl_lowercase_p(c) (NON_NEGATIVE(c) && ISLOWER(c)) - #define _rl_uppercase_p(c) (NON_NEGATIVE(c) && ISUPPER(c)) ---- lib/readline/complete.c 2013-10-14 07:27:10.000000000 -0600 -+++ lib/readline/complete.c 2015-02-06 17:14:11.046889800 -0700 -@@ -1082,7 +1082,7 @@ _rl_find_completion_word (fp, dp) - /* We didn't find an unclosed quoted substring upon which to do - completion, so use the word break characters to find the - substring on which to complete. */ -- while (rl_point = MB_PREVCHAR (rl_line_buffer, rl_point, MB_FIND_ANY)) -+ while ((rl_point = MB_PREVCHAR (rl_line_buffer, rl_point, MB_FIND_ANY))) - { - scan = rl_line_buffer[rl_point]; - -@@ -2116,7 +2116,7 @@ rl_completion_matches (text, entry_funct - match_list = (char **)xmalloc ((match_list_size + 1) * sizeof (char *)); - match_list[1] = (char *)NULL; - -- while (string = (*entry_function) (text, matches)) -+ while ((string = (*entry_function) (text, matches))) - { - if (RL_SIG_RECEIVED ()) - { -@@ -2190,7 +2190,7 @@ rl_username_completion_function (text, s - } - - #if defined (HAVE_GETPWENT) -- while (entry = getpwent ()) -+ while ((entry = getpwent ())) - { - /* Null usernames should result in all users as possible completions. */ - if (namelen == 0 || (STREQN (username, entry->pw_name, namelen))) -@@ -2723,7 +2723,7 @@ rl_menu_complete (count, ignore) - static int full_completion = 0; /* set to 1 if menu completion should reinitialize on next call */ - static int orig_start, orig_end; - static char quote_char; -- static int delimiter, cstate; -+ static int delimiter; - - /* The first time through, we generate the list of matches and set things - up to insert them. */ ---- lib/readline/display.c 2015-02-06 17:12:54.793574600 -0700 -+++ lib/readline/display.c 2015-02-06 17:14:11.046889800 -0700 -@@ -66,7 +66,6 @@ extern char *strchr (), *strrchr (); - static void update_line PARAMS((char *, char *, int, int, int, int)); - static void space_to_eol PARAMS((int)); - static void delete_chars PARAMS((int)); --static void insert_some_chars PARAMS((char *, int, int)); - static void open_some_spaces PARAMS((int)); - static void cr PARAMS((void)); - -@@ -1314,7 +1313,7 @@ update_line (old, new, current_line, oma - int current_line, omax, nmax, inv_botlin; - { - register char *ofd, *ols, *oe, *nfd, *nls, *ne; -- int temp, lendiff, wsatend, od, nd, twidth, o_cpos; -+ int temp, lendiff, wsatend, od, nd, o_cpos; - int current_invis_chars; - int col_lendiff, col_temp; - int bytes_to_insert; -@@ -2485,6 +2484,7 @@ _rl_clear_screen () - #endif /* __DJGPP__ */ - } - -+#if 0 - /* Insert COUNT characters from STRING to the output stream at column COL. */ - static void - insert_some_chars (string, count, col) -@@ -2494,6 +2494,7 @@ insert_some_chars (string, count, col) - open_some_spaces (col); - _rl_output_some_chars (string, count); - } -+#endif - - /* Insert COL spaces, keeping the cursor at the same position. We follow the - ncurses documentation and use either im/ei with explicit spaces, or IC/ic ---- lib/readline/histexpand.c 2013-12-02 07:22:30.000000000 -0700 -+++ lib/readline/histexpand.c 2015-02-06 17:14:11.046889800 -0700 -@@ -204,7 +204,7 @@ get_history_event (string, caller_index, - } - - /* Only a closing `?' or a newline delimit a substring search string. */ -- for (local_index = i; c = string[i]; i++) -+ for (local_index = i; (c = string[i]); i++) - { - #if defined (HANDLE_MULTIBYTE) - if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) -@@ -677,7 +677,7 @@ history_expand_internal (string, start, - case 's': - { - char *new_event; -- int delimiter, failed, si, l_temp, ws, we; -+ int delimiter, failed, si, l_temp, we; - - if (c == 's') - { -@@ -776,7 +776,6 @@ history_expand_internal (string, start, - { - for (; temp[si] && whitespace (temp[si]); si++) - ; -- ws = si; - we = history_tokenize_word (temp, si); - } - ---- lib/readline/histfile.c 2013-07-19 06:17:17.000000000 -0600 -+++ lib/readline/histfile.c 2015-02-06 17:14:11.046889800 -0700 -@@ -104,7 +104,7 @@ int history_write_timestamps = 0; - - /* Does S look like the beginning of a history timestamp entry? Placeholder - for more extensive tests. */ --#define HIST_TIMESTAMP_START(s) (*(s) == history_comment_char && isdigit ((s)[1]) ) -+#define HIST_TIMESTAMP_START(s) (*(s) == history_comment_char && isdigit ((unsigned char) (s)[1]) ) - - /* Return the string that should be used in the place of this - filename. This only matters when you don't specify the ---- lib/readline/input.c 2015-02-06 17:12:55.027577800 -0700 -+++ lib/readline/input.c 2015-02-06 17:14:11.046889800 -0700 -@@ -431,7 +431,7 @@ rl_read_key () - else - { - /* If input is coming from a macro, then use that. */ -- if (c = _rl_next_macro_key ()) -+ if ((c = _rl_next_macro_key ())) - return (c); - - /* If the user has an event function, then call it periodically. */ ---- lib/readline/isearch.c 2013-10-14 07:08:40.000000000 -0600 -+++ lib/readline/isearch.c 2015-02-06 17:14:11.046889800 -0700 -@@ -740,7 +740,7 @@ rl_search_history (direction, invoking_k - int direction, invoking_key; - { - _rl_search_cxt *cxt; /* local for now, but saved globally */ -- int c, r; -+ int r; - - RL_SETSTATE(RL_STATE_ISEARCH); - cxt = _rl_isearch_init (direction); -@@ -755,7 +755,7 @@ rl_search_history (direction, invoking_k - r = -1; - for (;;) - { -- c = _rl_search_getchar (cxt); -+ _rl_search_getchar (cxt); - /* We might want to handle EOF here (c == 0) */ - r = _rl_isearch_dispatch (cxt, cxt->lastc); - if (r <= 0) -@@ -778,9 +778,9 @@ int - _rl_isearch_callback (cxt) - _rl_search_cxt *cxt; - { -- int c, r; -+ int r; - -- c = _rl_search_getchar (cxt); -+ _rl_search_getchar (cxt); - /* We might want to handle EOF here */ - r = _rl_isearch_dispatch (cxt, cxt->lastc); - ---- lib/readline/misc.c 2015-02-06 17:12:55.230384200 -0700 -+++ lib/readline/misc.c 2015-02-06 17:14:11.046889800 -0700 -@@ -455,7 +455,7 @@ _rl_revert_all_lines () - entry = (hpos == history_length) ? previous_history () : current_history (); - while (entry) - { -- if (ul = (UNDO_LIST *)entry->data) -+ if ((ul = (UNDO_LIST *)entry->data)) - { - if (ul == saved_undo_list) - saved_undo_list = 0; -@@ -502,7 +502,7 @@ rl_clear_history () - for (i = 0; i < history_length; i++) - { - hent = hlist[i]; -- if (ul = (UNDO_LIST *)hent->data) -+ if ((ul = (UNDO_LIST *)hent->data)) - { - if (ul == saved_undo_list) - saved_undo_list = 0; ---- lib/readline/nls.c 2013-03-09 12:51:10.000000000 -0700 -+++ lib/readline/nls.c 2015-02-06 17:14:11.046889800 -0700 -@@ -80,7 +80,7 @@ static char *legal_lang_values[] = - static char *normalize_codeset PARAMS((char *)); - #endif /* !HAVE_SETLOCALE */ - --static char *find_codeset PARAMS((char *, size_t *)); -+static char *find_codeset PARAMS((char *, size_t *)) __attribute__ ((__unused__)); - - static char *_rl_get_locale_var PARAMS((const char *)); - -@@ -104,12 +104,13 @@ utf8locale (lspec) - char *lspec; - { - char *cp; -- size_t len; - - #if HAVE_LANGINFO_CODESET - cp = nl_langinfo (CODESET); - return (STREQ (cp, "UTF-8") || STREQ (cp, "utf8")); - #else -+ size_t len; -+ - cp = find_codeset (lspec, &len); - - if (cp == 0 || len < 4 || len > 5) ---- lib/readline/parens.c 2009-04-19 11:12:06.000000000 -0600 -+++ lib/readline/parens.c 2015-02-06 17:14:11.046889800 -0700 -@@ -106,7 +106,7 @@ rl_insert_close (count, invoking_key) - else - { - #if defined (HAVE_SELECT) -- int orig_point, match_point, ready; -+ int orig_point, match_point; - struct timeval timer; - fd_set readfds; - -@@ -126,7 +126,7 @@ rl_insert_close (count, invoking_key) - orig_point = rl_point; - rl_point = match_point; - (*rl_redisplay_function) (); -- ready = select (1, &readfds, (fd_set *)NULL, (fd_set *)NULL, &timer); -+ select (1, &readfds, (fd_set *)NULL, (fd_set *)NULL, &timer); - rl_point = orig_point; - #else /* !HAVE_SELECT */ - _rl_insert_char (count, invoking_key); ---- lib/readline/posixjmp.h 2012-12-23 20:20:50.000000000 -0700 -+++ lib/readline/posixjmp.h 2015-02-06 17:14:11.046889800 -0700 -@@ -27,13 +27,13 @@ - - #if defined (HAVE_POSIX_SIGSETJMP) - # define procenv_t sigjmp_buf --# if !defined (__OPENNT) -+# if !defined (__OPENNT) && !defined __CYGWIN__ - # undef setjmp - # define setjmp(x) sigsetjmp((x), 1) --# define setjmp_nosigs(x) sigsetjmp((x), 0) - # undef longjmp - # define longjmp(x, n) siglongjmp((x), (n)) - # endif /* !__OPENNT */ -+# define setjmp_nosigs(x) sigsetjmp((x), 0) - #else - # define procenv_t jmp_buf - # define setjmp_nosigs setjmp ---- lib/readline/readline.c 2015-02-06 17:12:54.310964200 -0700 -+++ lib/readline/readline.c 2015-02-06 17:14:11.046889800 -0700 -@@ -95,7 +95,7 @@ static void bind_arrow_keys_internal PAR - static void bind_arrow_keys PARAMS((void)); - - static void readline_default_bindings PARAMS((void)); --static void reset_default_bindings PARAMS((void)); -+//static void reset_default_bindings PARAMS((void)); - - static int _rl_subseq_result PARAMS((int, Keymap, int, int)); - static int _rl_subseq_getchar PARAMS((int)); -@@ -522,7 +522,7 @@ readline_internal_char () - readline_internal_charloop () - #endif - { -- static int lastc, eof_found; -+ static int lastc, eof_found __attribute__((unused)); - int c, code, lk; - - lastc = -1; -@@ -1204,6 +1204,7 @@ readline_default_bindings () - rl_tty_set_default_bindings (_rl_keymap); - } - -+#if 0 - /* Reset the default bindings for the terminal special characters we're - interested in back to rl_insert and read the new ones. */ - static void -@@ -1215,6 +1216,7 @@ reset_default_bindings () - rl_tty_set_default_bindings (_rl_keymap); - } - } -+#endif - - /* Bind some common arrow key sequences in MAP. */ - static void ---- lib/readline/rltty.c 2013-08-25 14:57:05.000000000 -0600 -+++ lib/readline/rltty.c 2015-02-06 17:14:11.062454900 -0700 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - #if defined (HAVE_UNISTD_H) - # include ---- lib/readline/shell.c 2013-03-13 08:17:00.000000000 -0600 -+++ lib/readline/shell.c 2015-02-06 17:14:11.062454900 -0700 -@@ -123,8 +123,10 @@ sh_single_quote (string) - /* Set the environment variables LINES and COLUMNS to lines and cols, - respectively. */ - static char setenv_buf[INT_STRLEN_BOUND (int) + 1]; -+# if !defined (HAVE_SETENV) && defined (HAVE_PUTENV) - static char putenv_buf1[INT_STRLEN_BOUND (int) + 6 + 1]; /* sizeof("LINES=") == 6 */ - static char putenv_buf2[INT_STRLEN_BOUND (int) + 8 + 1]; /* sizeof("COLUMNS=") == 8 */ -+# endif - - void - sh_set_lines_and_columns (lines, cols) ---- lib/readline/signals.c 2014-01-10 13:06:48.000000000 -0700 -+++ lib/readline/signals.c 2015-02-06 17:14:11.062454900 -0700 -@@ -576,7 +576,6 @@ rl_free_line_state () - /* **************************************************************** */ - - #if defined (HAVE_POSIX_SIGNALS) --static sigset_t sigint_set, sigint_oset; - static sigset_t sigwinch_set, sigwinch_oset; - #else /* !HAVE_POSIX_SIGNALS */ - # if defined (HAVE_BSD_SIGNALS) ---- lib/readline/terminal.c 2013-09-18 07:12:01.000000000 -0600 -+++ lib/readline/terminal.c 2015-02-06 17:14:11.062454900 -0700 -@@ -31,6 +31,7 @@ - #if defined (HAVE_SYS_FILE_H) - # include - #endif /* HAVE_SYS_FILE_H */ -+#include - - #if defined (HAVE_UNISTD_H) - # include ---- lib/readline/text.c 2013-10-14 07:25:05.000000000 -0600 -+++ lib/readline/text.c 2015-02-06 17:14:11.062454900 -0700 -@@ -859,11 +859,10 @@ _rl_overwrite_char (count, c) - int i; - #if defined (HANDLE_MULTIBYTE) - char mbkey[MB_LEN_MAX]; -- int k; - - /* Read an entire multibyte character sequence to insert COUNT times. */ - if (count > 0 && MB_CUR_MAX > 1 && rl_byte_oriented == 0) -- k = _rl_read_mbstring (c, mbkey, MB_LEN_MAX); -+ _rl_read_mbstring (c, mbkey, MB_LEN_MAX); - #endif - - rl_begin_undo_group (); ---- lib/readline/tilde.c 2010-07-25 15:42:13.000000000 -0600 -+++ lib/readline/tilde.c 2015-02-06 17:14:11.062454900 -0700 -@@ -196,7 +196,7 @@ tilde_expand (string) - int result_size, result_index; - - result_index = result_size = 0; -- if (result = strchr (string, '~')) -+ if ((result = strchr (string, '~'))) - result = (char *)xmalloc (result_size = (strlen (string) + 16)); - else - result = (char *)xmalloc (result_size = (strlen (string) + 1)); ---- lib/readline/undo.c 2014-02-02 13:47:46.000000000 -0700 -+++ lib/readline/undo.c 2015-02-06 17:14:11.062454900 -0700 -@@ -124,7 +124,7 @@ _rl_free_undo_list (ul) - void - rl_free_undo_list () - { -- UNDO_LIST *release, *orig_list; -+ UNDO_LIST *orig_list; - - orig_list = rl_undo_list; - _rl_free_undo_list (rl_undo_list); ---- lib/readline/vi_mode.c 2012-09-01 16:55:30.000000000 -0600 -+++ lib/readline/vi_mode.c 2015-02-06 17:14:11.062454900 -0700 -@@ -1089,7 +1089,7 @@ static int - rl_domove_motion_callback (m) - _rl_vimotion_cxt *m; - { -- int c, save, r; -+ int c, r; - int old_end; - - _rl_vi_last_motion = c = m->motion; -@@ -1257,7 +1257,6 @@ int - rl_vi_domove (x, ignore) - int x, *ignore; - { -- int r; - _rl_vimotion_cxt *m; - - m = _rl_vimvcxt; ---- lib/sh/pathphys.c 2013-05-28 13:33:58.000000000 -0600 -+++ lib/sh/pathphys.c 2015-02-06 17:14:11.062454900 -0700 -@@ -35,6 +35,7 @@ - #include - #include - #include -+#include - - #include "shell.h" - -@@ -76,6 +77,10 @@ sh_physpath (path, flags) - char *path; - int flags; - { -+#if __CYGWIN__ -+ /* realpath does this correctly without all the hassle */ -+ return realpath (path, NULL); -+#else - char tbuf[PATH_MAX+1], linkbuf[PATH_MAX+1]; - char *result, *p, *q, *qsave, *qbase, *workpath; - int double_slash_path, linklen, nlink; -@@ -214,11 +219,7 @@ error: - { - q = result; - /* Duplicating some code here... */ --#if defined (__CYGWIN__) -- qbase = (ISALPHA((unsigned char)workpath[0]) && workpath[1] == ':') ? workpath + 3 : workpath + 1; --#else - qbase = workpath + 1; --#endif - double_slash_path = DOUBLE_SLASH (workpath); - qbase += double_slash_path; - -@@ -249,6 +250,7 @@ error: - } - - return (result); -+#endif /* ! __CYGWIN__ */ - } - - char * ---- lib/sh/tmpfile.c 2013-12-18 15:50:13.000000000 -0700 -+++ lib/sh/tmpfile.c 2015-02-06 17:14:11.062454900 -0700 -@@ -96,7 +96,7 @@ get_tmpdir (flags) - if (tdir && (file_iswdir (tdir) == 0 || strlen (tdir) > PATH_MAX)) - tdir = 0; - -- if (tdir == 0) -+ if (tdir == 0 || !file_iswdir (tdir)) - tdir = get_sys_tmpdir (); - - #if defined (HAVE_PATHCONF) && defined (_PC_NAME_MAX) -@@ -118,14 +118,15 @@ sh_mktmpname (nameroot, flags) - struct stat sb; - int r, tdlen; - -- filename = (char *)xmalloc (PATH_MAX + 1); -+ filename = NULL; - tdir = get_tmpdir (flags); - tdlen = strlen (tdir); - - lroot = nameroot ? nameroot : DEFAULT_NAMEROOT; - - #ifdef USE_MKTEMP -- sprintf (filename, "%s/%s.XXXXXX", tdir, lroot); -+ if (asprintf (&filename, "%s/%s.XXXXXX", tdir, lroot) < 0) -+ return NULL; - if (mktemp (filename) == 0) - { - free (filename); -@@ -138,7 +139,9 @@ sh_mktmpname (nameroot, flags) - (unsigned long) time ((time_t *)0) ^ - (unsigned long) dollar_dollar_pid ^ - (unsigned long) ((flags & MT_USERANDOM) ? random () : ntmpfiles++); -- sprintf (filename, "%s/%s-%lu", tdir, lroot, filenum); -+ free (filename); -+ if (asprintf (&filename, "%s/%s-%lu", tdir, lroot, filenum) < 0) -+ return NULL; - if (tmpnamelen > 0 && tmpnamelen < 32) - filename[tdlen + 1 + tmpnamelen] = '\0'; - # ifdef HAVE_LSTAT -@@ -163,14 +166,19 @@ sh_mktmpfd (nameroot, flags, namep) - char *filename, *tdir, *lroot; - int fd, tdlen; - -- filename = (char *)xmalloc (PATH_MAX + 1); -+ filename = NULL; - tdir = get_tmpdir (flags); - tdlen = strlen (tdir); - - lroot = nameroot ? nameroot : DEFAULT_NAMEROOT; - - #ifdef USE_MKSTEMP -- sprintf (filename, "%s/%s.XXXXXX", tdir, lroot); -+ if (asprintf (&filename, "%s/%s.XXXXXX", tdir, lroot) < 0) -+ { -+ if (namep) -+ *namep = NULL; -+ return -1; -+ } - fd = mkstemp (filename); - if (fd < 0 || namep == 0) - { -@@ -187,7 +195,13 @@ sh_mktmpfd (nameroot, flags, namep) - (unsigned long) time ((time_t *)0) ^ - (unsigned long) dollar_dollar_pid ^ - (unsigned long) ((flags & MT_USERANDOM) ? random () : ntmpfiles++); -- sprintf (filename, "%s/%s-%lu", tdir, lroot, filenum); -+ free (filename); -+ if (asprintf (&filename, "%s/%s-%lu", tdir, lroot, filenum) < 0) -+ { -+ if (namep) -+ *namep = NULL; -+ return -1; -+ } - if (tmpnamelen > 0 && tmpnamelen < 32) - filename[tdlen + 1 + tmpnamelen] = '\0'; - fd = open (filename, BASEOPENFLAGS | ((flags & MT_READWRITE) ? O_RDWR : O_WRONLY), 0600); ---- mksyntax.c 2012-07-29 17:48:38.000000000 -0600 -+++ mksyntax.c 2015-02-06 17:14:11.062454900 -0700 -@@ -29,13 +29,13 @@ - - #ifdef HAVE_UNISTD_H - # include -+#else -+extern int optind; -+extern char *optarg; - #endif - - #include "syntax.h" - --extern int optind; --extern char *optarg; -- - #ifndef errno - extern int errno; - #endif ---- parse.y 2015-02-06 17:12:55.682776800 -0700 -+++ parse.y 2015-02-06 17:14:11.062454900 -0700 -@@ -1531,14 +1531,20 @@ yy_string_get () - string = bash_input.location.string; - - /* If the string doesn't exist, or is empty, EOF found. */ -- if (string && *string) -+ while (string && *string) - { - c = *string++; - bash_input.location.string = string; -+#if __CYGWIN__ -+ { -+ extern int igncr; -+ if (igncr && c == '\r') -+ continue; -+ } -+#endif - return (c); - } -- else -- return (EOF); -+ return (EOF); - } - - static int -@@ -2305,7 +2311,7 @@ shell_getc (remove_quoted_newline) - if (n <= 2) /* we have to save 1 for the newline added below */ - { - if (truncating == 0) -- internal_warning("shell_getc: shell_input_line_size (%zu) exceeds SIZE_MAX (%llu): line truncated", shell_input_line_size, SIZE_MAX); -+ internal_warning("shell_getc: shell_input_line_size (%zu) exceeds SIZE_MAX (%zu): line truncated", shell_input_line_size, SIZE_MAX); - shell_input_line[i] = '\0'; - truncating = 1; - } -@@ -3582,7 +3588,6 @@ parse_comsub (qc, open, close, lenp, fla - - while (count) - { --comsub_readchar: - ch = shell_getc (qc != '\'' && (tflags & (LEX_INCOMMENT|LEX_PASSNEXT)) == 0); - - if (ch == EOF) ---- pathexp.h 2009-01-04 12:32:40.000000000 -0700 -+++ pathexp.h 2015-02-06 17:14:11.062454900 -0700 -@@ -86,7 +86,7 @@ struct ign { - typedef int sh_iv_item_func_t __P((struct ign *)); - - struct ignorevar { -- char *varname; /* FIGNORE or GLOBIGNORE */ -+ char *varname; /* FIGNORE or GLOBIGNORE or EXECIGNORE */ - struct ign *ignores; /* Store the ignore strings here */ - int num_ignores; /* How many are there? */ - char *last_ignoreval; /* Last value of variable - cached for speed */ ---- redir.c 2013-10-14 07:19:59.000000000 -0600 -+++ redir.c 2015-02-06 17:14:11.078059300 -0700 -@@ -156,7 +156,6 @@ redirection_error (temp, error) - #endif - else if (expandable_redirection_filename (temp)) - { --expandable_filename: - oflags = temp->redirectee.filename->flags; - if (posixly_correct && interactive_shell == 0) - temp->redirectee.filename->flags |= W_NOGLOB; ---- subst.c 2015-02-06 17:12:55.370841100 -0700 -+++ subst.c 2015-02-06 17:14:11.078059300 -0700 -@@ -41,6 +41,7 @@ - #include "posixstat.h" - #include "bashintl.h" - -+#define NEED_SH_SETLINEBUF_DECL /* used in externs.h */ - #include "shell.h" - #include "parser.h" - #include "flags.h" -@@ -5268,6 +5269,13 @@ read_comsub (fd, quoted, rflag) - #endif - continue; - } -+#if __CYGWIN__ -+ { -+ extern int igncr; -+ if (igncr && c == '\r') -+ continue; -+ } -+#endif /* __CYGWIN__ */ - - /* Add the character to ISTRING, possibly after resizing it. */ - RESIZE_MALLOCED_BUFFER (istring, istring_index, 2, istring_size, DEFAULT_ARRAY_SIZE); -@@ -5385,6 +5393,28 @@ command_substitute (string, quoted) - goto error_exit; - } - -+#if __CYGWIN__ -+ /* Passing a pipe through std fds can cause hangs when talking to a -+ non-cygwin child. Move it. */ -+ if (fildes[0] < 3) -+ { -+ int fd = fcntl (fildes[0], F_DUPFD, 3); -+ close (fildes[0]); -+ fildes[0] = fd; -+ } -+ if (fildes[1] < 3) -+ { -+ int fd = fcntl (fildes[1], F_DUPFD, 3); -+ close (fildes[1]); -+ fildes[1] = fd; -+ } -+ if (fildes[0] < 0 || fildes[1] < 0) -+ { -+ sys_error (_("cannot make pipe for command substitution")); -+ goto error_exit; -+ } -+#endif /* __CYGWIN__ */ -+ - old_pid = last_made_pid; - #if defined (JOB_CONTROL) - old_pipeline_pgrp = pipeline_pgrp; ---- support/bashversion.c 2008-09-09 07:31:53.000000000 -0600 -+++ support/bashversion.c 2015-02-06 17:14:11.078059300 -0700 -@@ -26,6 +26,9 @@ - - #if defined (HAVE_UNISTD_H) - # include -+#else -+extern int optind; -+extern char *optarg; - #endif - - #include "bashansi.h" -@@ -41,9 +44,6 @@ - #define LFLAG 0x0020 - #define XFLAG 0x0040 - --extern int optind; --extern char *optarg; -- - extern char *dist_version; - extern int patch_level; - -@@ -65,7 +65,7 @@ main (argc, argv) - char **argv; - { - int opt, oflags; -- char dv[128], *rv; -+ char dv[128], *rv = NULL; - - if (progname = strrchr (argv[0], '/')) - progname++; ---- support/mkversion.sh 2008-08-13 06:25:57.000000000 -0600 -+++ support/mkversion.sh 2015-02-06 17:14:11.078059300 -0700 -@@ -29,7 +29,7 @@ source_dir="." - while [ $# -gt 0 ]; do - case "$1" in - -o) shift; OUTFILE=$1; shift ;; -- -b) shift; inc_build=yes ;; -+ -b) shift; ;;# inc_build=yes ;; # hacked out for cygport - -s) shift; rel_status=$1; shift ;; - -p) shift; patch_level=$1; shift ;; - -d) shift; dist_version=$1; shift ;; ---- variables.c 2015-02-06 17:12:55.729569600 -0700 -+++ variables.c 2015-02-06 17:14:11.078059300 -0700 -@@ -2526,9 +2526,9 @@ bind_variable_internal (name, value, tab - - newname = 0; - #if defined (ARRAY_VARS) -- if ((aflags & ASS_FROMREF) && (hflags & HASH_NOSRCH) == 0 && valid_array_reference (name)) -+ if ((aflags & ASS_FROMREF) && (hflags & HASH_NOSRCH) == 0 && valid_array_reference ((char *)name)) - { -- newname = array_variable_name (name, &subp, &sublen); -+ newname = array_variable_name ((char*)name, &subp, &sublen); - if (newname == 0) - return (SHELL_VAR *)NULL; /* XXX */ - entry = hash_lookup (newname, table); -@@ -2573,13 +2573,13 @@ bind_variable_internal (name, value, tab - entry = make_new_array_variable (newname); /* indexed array by default */ - if (entry == 0) - return entry; -- ind = array_expand_index (name, subp, sublen); -+ ind = array_expand_index (entry, subp, sublen); - bind_array_element (entry, ind, value, aflags); - } - #endif - else if (entry == 0) - { -- entry = make_new_variable (name, table); -+ entry = make_new_variable ((char*)name, table); - var_setvalue (entry, make_variable_value (entry, value, 0)); /* XXX */ - } - else if (entry->assign_func) /* array vars have assign functions now */ -@@ -4679,6 +4679,8 @@ static struct name_and_function special_ - { "COMP_WORDBREAKS", sv_comp_wordbreaks }, - #endif - -+ { "EXECIGNORE", sv_execignore }, -+ - { "FUNCNEST", sv_funcnest }, - - { "GLOBIGNORE", sv_globignore }, -@@ -4877,6 +4879,13 @@ sv_globignore (name) - setup_glob_ignore (name); - } - -+/* What to do when EXECIGNORE changes. */ -+void -+sv_execignore (char *name) -+{ -+ setup_exec_ignore (name); -+} -+ - #if defined (READLINE) - void - sv_comp_wordbreaks (name) -@@ -4950,7 +4959,7 @@ sv_winsize (name) - /* Update the value of HOME in the export environment so tilde expansion will - work on cygwin. */ - #if defined (__CYGWIN__) --sv_home (name) -+void sv_home (name) - char *name; - { - array_needs_making = 1; ---- variables.h 2014-01-08 13:33:29.000000000 -0700 -+++ variables.h 2015-02-06 17:14:11.078059300 -0700 -@@ -372,6 +372,7 @@ extern void sv_ifs __P((char *)); - extern void sv_path __P((char *)); - extern void sv_mail __P((char *)); - extern void sv_funcnest __P((char *)); -+extern void sv_execignore __P((char *)); - extern void sv_globignore __P((char *)); - extern void sv_ignoreeof __P((char *)); - extern void sv_strict_posix __P((char *)); diff --git a/pkgs/shells/bash/cygwin-bash-4.4.11-2.src.patch b/pkgs/shells/bash/cygwin-bash-4.4.11-2.src.patch new file mode 100644 index 00000000000..c854e8828ae --- /dev/null +++ b/pkgs/shells/bash/cygwin-bash-4.4.11-2.src.patch @@ -0,0 +1,607 @@ +--- origsrc/bash-4.4/bashline.c 2017-01-23 13:28:06.955247200 -0600 ++++ src/bash-4.4/bashline.c 2017-01-23 13:55:07.992877600 -0600 +@@ -76,6 +76,16 @@ + # include "pcomplete.h" + #endif + ++#if __CYGWIN__ ++# ifdef __x86_64__ ++# define IMP(x) __imp_##x ++# else ++# define IMP(x) _imp__##x ++# endif ++#else ++# define IMP(x) x ++#endif ++ + /* These should agree with the defines for emacs_mode and vi_mode in + rldefs.h, even though that's not a public readline header file. */ + #ifndef EMACS_EDITING_MODE +@@ -271,6 +281,11 @@ int no_empty_command_completion; + are the only possible matches, even if FIGNORE says to. */ + int force_fignore = 1; + ++#if __CYGWIN__ ++/* If set, shorten "foo.exe" to "foo" when they are the same file. */ ++int completion_strip_exe; ++#endif /* __CYGWIN__ */ ++ + /* Perform spelling correction on directory names during word completion */ + int dircomplete_spelling = 0; + +@@ -498,11 +513,12 @@ initialize_readline () + kseq[0] = CTRL('J'); + kseq[1] = '\0'; + func = rl_function_of_keyseq (kseq, emacs_meta_keymap, (int *)NULL); +- if (func == rl_vi_editing_mode) ++ extern rl_command_func_t *IMP(rl_vi_editing_mode); ++ if (func == rl_vi_editing_mode || func == IMP(rl_vi_editing_mode)) + rl_unbind_key_in_map (CTRL('J'), emacs_meta_keymap); + kseq[0] = CTRL('M'); + func = rl_function_of_keyseq (kseq, emacs_meta_keymap, (int *)NULL); +- if (func == rl_vi_editing_mode) ++ if (func == rl_vi_editing_mode || func == IMP(rl_vi_editing_mode)) + rl_unbind_key_in_map (CTRL('M'), emacs_meta_keymap); + #if defined (VI_MODE) + rl_unbind_key_in_map (CTRL('E'), vi_movement_keymap); +@@ -521,7 +537,8 @@ initialize_readline () + kseq[0] = '~'; + kseq[1] = '\0'; + func = rl_function_of_keyseq (kseq, emacs_meta_keymap, (int *)NULL); +- if (func == 0 || func == rl_tilde_expand) ++ extern rl_command_func_t *IMP(rl_tilde_expand); ++ if (func == 0 || func == rl_tilde_expand || func == IMP(rl_tilde_expand)) + rl_bind_keyseq_in_map (kseq, bash_complete_username, emacs_meta_keymap); + + rl_bind_key_if_unbound_in_map ('~', bash_possible_username_completions, emacs_ctlx_keymap); +@@ -544,7 +561,8 @@ initialize_readline () + kseq[0] = TAB; + kseq[1] = '\0'; + func = rl_function_of_keyseq (kseq, emacs_meta_keymap, (int *)NULL); +- if (func == 0 || func == rl_tab_insert) ++ extern rl_command_func_t *IMP(rl_tab_insert); ++ if (func == 0 || func == rl_tab_insert || func == IMP(rl_tab_insert)) + rl_bind_key_in_map (TAB, dynamic_complete_history, emacs_meta_keymap); + + /* Tell the completer that we want a crack first. */ +@@ -2194,6 +2212,21 @@ globword: + + if (match && executable_completion ((searching_path ? val : cval), searching_path)) + { ++#if __CYGWIN__ ++ if (completion_strip_exe) ++ { ++ size_t val_len = strlen (val); ++ char *candidate; ++ if (val_len > 4 && !strcasecmp (&val[val_len - 4], ".exe") ++ && (candidate = strdup (val))) ++ { ++ candidate[val_len - 4] = '\0'; ++ if (same_file (val, candidate, NULL, NULL)) ++ temp[strlen (temp) - 4] = '\0'; ++ free (candidate); ++ } ++ } ++#endif + if (cval != val) + free (cval); + free (val); +@@ -2929,6 +2962,17 @@ test_for_directory (name) + int r; + + fn = bash_tilde_expand (name, 0); ++#if __CYGWIN ++ /* stat("//server") can only be successful as a directory, but can take ++ seconds to time out on failure. It is much faster to assume that ++ "//server" is a valid name than it is to wait for a stat, even if it ++ gives false positives on bad names. */ ++ if (fn[0] == '/' && fn[1] == '/' && ! strchr (&fn[2], '/')) ++ { ++ free (fn); ++ return 1; ++ } ++#endif + r = file_isdir (fn); + free (fn); + +--- origsrc/bash-4.4/builtins/read.def 2017-01-23 13:28:07.017686500 -0600 ++++ src/bash-4.4/builtins/read.def 2017-01-23 13:55:07.992877600 -0600 +@@ -85,7 +85,6 @@ $END + + #ifdef __CYGWIN__ + # include +-# include + #endif + + #include "../bashintl.h" +@@ -530,10 +529,6 @@ read_builtin (list) + fflush (stderr); + } + +-#if defined (__CYGWIN__) && defined (O_TEXT) +- setmode (0, O_TEXT); +-#endif +- + ps2 = 0; + for (print_ps2 = eof = retval = 0;;) + { +@@ -664,6 +659,14 @@ read_builtin (list) + if (c == '\0' && delim != '\0') + continue; /* skip NUL bytes in input */ + ++#ifdef __CYGWIN__ ++ { ++ extern igncr; ++ if (igncr && c == '\r' && delim != '\r') ++ continue; /* skip carriage return */ ++ } ++#endif ++ + if ((skip_ctlesc == 0 && c == CTLESC) || (skip_ctlnul == 0 && c == CTLNUL)) + { + saw_escape++; +--- origsrc/bash-4.4/builtins/set.def 2016-06-02 19:10:10.000000000 -0500 ++++ src/bash-4.4/builtins/set.def 2017-01-23 13:55:07.992877600 -0600 +@@ -56,6 +56,13 @@ extern int dont_save_function_defs; + #if defined (READLINE) + extern int no_line_editing; + #endif /* READLINE */ ++#ifdef __CYGWIN__ ++extern int igncr; ++static int set_minus_o_option_maybe (int, const char *, int); ++# define INTERACTIVE_ONLY ,1 ++#else ++# define INTERACTIVE_ONLY ++#endif + + $BUILTIN set + $FUNCTION set_builtin +@@ -92,6 +99,9 @@ Options: + #if defined (HISTORY) + history enable command history + #endif ++#ifdef __CYGWIN__ ++ igncr on Cygwin, ignore \r in line endings ++#endif + ignoreeof the shell will not exit upon reading EOF + interactive-comments + allow comments to appear in interactive commands +@@ -192,29 +202,39 @@ const struct { + int *variable; + setopt_set_func_t *set_func; + setopt_get_func_t *get_func; ++#ifdef __CYGWIN__ ++ /* Cygwin users have taken to exporting SHELLOPTS for the cygwin-specific ++ igncr. As a result, we want to ensure SHELLOPTS parsing does not turn ++ on interactive options when exported from an interactive shell, but ++ parse in a non-interactive setting, so as not to break POSIX /bin/sh */ ++ int interactive_only; ++#endif + } o_options[] = { + { "allexport", 'a', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + #if defined (BRACE_EXPANSION) + { "braceexpand",'B', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + #endif + #if defined (READLINE) +- { "emacs", '\0', (int *)NULL, set_edit_mode, get_edit_mode }, ++ { "emacs", '\0', (int *)NULL, set_edit_mode, get_edit_mode INTERACTIVE_ONLY }, + #endif + { "errexit", 'e', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + { "errtrace", 'E', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + { "functrace", 'T', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + { "hashall", 'h', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + #if defined (BANG_HISTORY) +- { "histexpand", 'H', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, ++ { "histexpand", 'H', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL INTERACTIVE_ONLY }, + #endif /* BANG_HISTORY */ + #if defined (HISTORY) +- { "history", '\0', &enable_history_list, bash_set_history, (setopt_get_func_t *)NULL }, ++ { "history", '\0', &enable_history_list, bash_set_history, (setopt_get_func_t *)NULL INTERACTIVE_ONLY }, ++#endif ++#ifdef __CYGWIN__ ++ { "igncr", '\0', &igncr, NULL, (setopt_get_func_t *)NULL }, + #endif + { "ignoreeof", '\0', &ignoreeof, set_ignoreeof, (setopt_get_func_t *)NULL }, + { "interactive-comments", '\0', &interactive_comments, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + { "keyword", 'k', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + #if defined (JOB_CONTROL) +- { "monitor", 'm', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, ++ { "monitor", 'm', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL INTERACTIVE_ONLY }, + #endif + { "noclobber", 'C', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + { "noexec", 'n', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, +@@ -233,7 +253,7 @@ const struct { + { "privileged", 'p', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + { "verbose", 'v', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + #if defined (READLINE) +- { "vi", '\0', (int *)NULL, set_edit_mode, get_edit_mode }, ++ { "vi", '\0', (int *)NULL, set_edit_mode, get_edit_mode INTERACTIVE_ONLY }, + #endif + { "xtrace", 'x', (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, + {(char *)NULL, 0 , (int *)NULL, (setopt_set_func_t *)NULL, (setopt_get_func_t *)NULL }, +@@ -455,6 +475,15 @@ int + set_minus_o_option (on_or_off, option_name) + int on_or_off; + char *option_name; ++#ifdef __CYGWIN__ ++{ ++ /* See Cygwin comments above. */ ++ return set_minus_o_option_maybe (on_or_off, option_name, 0); ++} ++static int ++set_minus_o_option_maybe (int on_or_off, const char *option_name, ++ int avoid_interactive) ++#endif /* __CYGWIN__ */ + { + register int i; + +@@ -462,6 +491,10 @@ set_minus_o_option (on_or_off, option_na + { + if (STREQ (option_name, o_options[i].name)) + { ++#ifdef __CYGWIN__ ++ if (o_options[i].interactive_only && avoid_interactive) ++ return EXECUTION_SUCCESS; ++#endif + if (o_options[i].letter == 0) + { + previous_option_value = GET_BINARY_O_OPTION_VALUE (i, o_options[i].name); +@@ -588,7 +621,11 @@ parse_shellopts (value) + vptr = 0; + while (vname = extract_colon_unit (value, &vptr)) + { ++#ifdef __CYGWIN__ ++ set_minus_o_option_maybe (FLAG_ON, vname, !interactive_shell); ++#else + set_minus_o_option (FLAG_ON, vname); ++#endif + free (vname); + } + } +--- origsrc/bash-4.4/builtins/shopt.def 2016-05-06 14:00:02.000000000 -0500 ++++ src/bash-4.4/builtins/shopt.def 2017-01-23 13:55:07.992877600 -0600 +@@ -92,6 +92,10 @@ extern int glob_asciirange; + extern int lastpipe_opt; + extern int inherit_errexit; + ++#ifdef __CYGWIN__ ++extern int completion_strip_exe; ++#endif ++ + #if defined (EXTENDED_GLOB) + extern int extended_glob; + #endif +@@ -169,6 +173,9 @@ static struct { + { "compat41", &shopt_compat41, set_compatibility_level }, + { "compat42", &shopt_compat42, set_compatibility_level }, + { "compat43", &shopt_compat43, set_compatibility_level }, ++#ifdef __CYGWIN__ ++ { "completion_strip_exe", &completion_strip_exe, NULL }, ++#endif + #if defined (READLINE) + { "complete_fullquote", &complete_fullquote, (shopt_set_func_t *)NULL}, + { "direxpand", &dircomplete_expand, shopt_set_complete_direxpand }, +--- origsrc/bash-4.4/config-top.h 2016-05-19 13:34:02.000000000 -0500 ++++ src/bash-4.4/config-top.h 2017-01-23 13:55:07.992877600 -0600 +@@ -87,10 +87,10 @@ + #define DEFAULT_BASHRC "~/.bashrc" + + /* System-wide .bashrc file for interactive shells. */ +-/* #define SYS_BASHRC "/etc/bash.bashrc" */ ++#define SYS_BASHRC "/etc/bash.bashrc" + + /* System-wide .bash_logout for login shells. */ +-/* #define SYS_BASH_LOGOUT "/etc/bash.bash_logout" */ ++#define SYS_BASH_LOGOUT "/etc/bash.bash_logout" + + /* Define this to make non-interactive shells begun with argv[0][0] == '-' + run the startup files when not in posix mode. */ +@@ -100,7 +100,7 @@ + sshd and source the .bashrc if so (like the rshd behavior). This checks + for the presence of SSH_CLIENT or SSH2_CLIENT in the initial environment, + which can be fooled under certain not-uncommon circumstances. */ +-/* #define SSH_SOURCE_BASHRC */ ++#define SSH_SOURCE_BASHRC + + /* Define if you want the case-capitalizing operators (~[~]) and the + `capcase' variable attribute (declare -c). */ +--- origsrc/bash-4.4/doc/Makefile.in 2015-12-06 18:55:56.000000000 -0600 ++++ src/bash-4.4/doc/Makefile.in 2017-01-23 13:55:07.992877600 -0600 +@@ -189,7 +189,7 @@ bashref.html: $(BASHREF_FILES) $(HSUSER) + $(MAKEINFO) --html --no-split -I$(TEXINPUTDIR) $(srcdir)/bashref.texi + + bash.info: bashref.info +- ${SHELL} ${INFOPOST} < $(srcdir)/bashref.info > $@ ; \ ++ ${SHELL} ${INFOPOST} < bashref.info > $@ ; \ + + bash.txt: bash.1 + bash.ps: bash.1 +@@ -252,9 +252,9 @@ install: info installdirs + -$(INSTALL_DATA) $(srcdir)/bashbug.1 $(DESTDIR)$(man1dir)/bashbug${man1ext} + -$(INSTALL_DATA) $(OTHER_DOCS) $(DESTDIR)$(docdir) + # uncomment the next lines to install the builtins man page +-# sed 's:bash\.1:man1/&:' $(srcdir)/builtins.1 > $${TMPDIR:-/var/tmp}/builtins.1 +-# -$(INSTALL_DATA) $${TMPDIR:-/var/tmp}/builtins.1 $(DESTDIR)$(man1dir)/bash_builtins${man1ext} +-# -$(RM) $${TMPDIR:-/var/tmp}/builtins.1 ++ sed 's:bash\.1:man1/&:' $(srcdir)/builtins.1 > $${TMPDIR:-/var/tmp}/builtins.1 ++ -$(INSTALL_DATA) $${TMPDIR:-/var/tmp}/builtins.1 $(DESTDIR)$(man1dir)/bash_builtins${man1ext} ++ -$(RM) $${TMPDIR:-/var/tmp}/builtins.1 + -if test -f bash.info; then d=.; else d=$(srcdir); fi; \ + $(INSTALL_DATA) $$d/bash.info $(DESTDIR)$(infodir)/bash.info + # run install-info if it is present to update the info directory +--- origsrc/bash-4.4/doc/bash.1 2016-08-26 08:45:17.000000000 -0500 ++++ src/bash-4.4/doc/bash.1 2017-01-23 13:55:08.008447700 -0600 +@@ -9607,6 +9607,10 @@ filenames. + This variable is set by default, which is the default bash behavior in + versions through 4.2. + .TP 8 ++.B completion_strip_exe ++If set, whenever bash sees \fIfoo.exe\fP during completion, it checks if ++\fIfoo\fP is the same file and strips the suffix. ++.TP 8 + .B direxpand + If set, + .B bash +--- origsrc/bash-4.4/doc/bashref.texi 2016-09-07 16:13:36.000000000 -0500 ++++ src/bash-4.4/doc/bashref.texi 2017-01-23 13:55:08.008447700 -0600 +@@ -5123,6 +5123,10 @@ filenames. + This variable is set by default, which is the default Bash behavior in + versions through 4.2. + ++@item completion_strip_exe ++If set, whenever bash sees @file{foo.exe} during completion, it checks if ++@file{foo} is the same file and strips the suffix. ++ + @item direxpand + If set, Bash + replaces directory names with the results of word expansion when performing +--- origsrc/bash-4.4/doc/builtins.1 2012-02-21 13:32:05.000000000 -0600 ++++ src/bash-4.4/doc/builtins.1 2017-01-23 13:55:08.008447700 -0600 +@@ -19,6 +19,6 @@ shift, shopt, source, suspend, test, tim + ulimit, umask, unalias, unset, wait \- bash built-in commands, see \fBbash\fR(1) + .SH BASH BUILTIN COMMANDS + .nr zZ 1 +-.so bash.1 ++.so man1/bash.1 + .SH SEE ALSO + bash(1), sh(1) +--- origsrc/bash-4.4/general.c 2016-08-11 10:16:56.000000000 -0500 ++++ src/bash-4.4/general.c 2017-01-23 13:55:08.008447700 -0600 +@@ -48,6 +48,10 @@ + + #include + ++#ifdef __CYGWIN__ ++# include ++#endif ++ + #if !defined (errno) + extern int errno; + #endif /* !errno */ +@@ -718,7 +722,8 @@ make_absolute (string, dot_path) + { + char pathbuf[PATH_MAX + 1]; + +- cygwin_conv_to_full_posix_path (string, pathbuf); ++ cygwin_conv_path (CCP_WIN_A_TO_POSIX | CCP_ABSOLUTE, string, pathbuf, ++ sizeof pathbuf); + result = savestring (pathbuf); + } + #else +--- origsrc/bash-4.4/input.c 2015-09-24 18:49:23.000000000 -0500 ++++ src/bash-4.4/input.c 2017-01-23 13:55:08.008447700 -0600 +@@ -44,6 +44,10 @@ + #include "quit.h" + #include "trap.h" + ++#ifdef __CYGWIN__ ++int igncr; ++#endif ++ + #if !defined (errno) + extern int errno; + #endif /* !errno */ +@@ -561,6 +565,19 @@ buffered_getchar () + { + CHECK_TERMSIG; + ++#ifdef __CYGWIN__ ++ /* shopt igncr discards carriage returns from the input stream. ++ If cr is the only character left in the buffer, recurse to pick ++ up the next byte; otherwise flatten the buffer. */ ++ if (igncr) ++ { ++ int ch; ++ while ((ch = bufstream_getc (buffers[bash_input.location.buffered_fd])) ++ == '\r') ++ ; ++ return ch; ++ } ++#endif + #if !defined (DJGPP) + return (bufstream_getc (buffers[bash_input.location.buffered_fd])); + #else +--- origsrc/bash-4.4/lib/sh/pathphys.c 2013-05-28 14:33:58.000000000 -0500 ++++ src/bash-4.4/lib/sh/pathphys.c 2017-01-23 13:55:08.008447700 -0600 +@@ -35,6 +35,7 @@ + #include + #include + #include ++#include + + #include "shell.h" + +@@ -76,6 +77,9 @@ sh_physpath (path, flags) + char *path; + int flags; + { ++#ifdef __CYGWIN__ ++ return realpath (path, NULL); ++#endif + char tbuf[PATH_MAX+1], linkbuf[PATH_MAX+1]; + char *result, *p, *q, *qsave, *qbase, *workpath; + int double_slash_path, linklen, nlink; +@@ -214,11 +218,7 @@ error: + { + q = result; + /* Duplicating some code here... */ +-#if defined (__CYGWIN__) +- qbase = (ISALPHA((unsigned char)workpath[0]) && workpath[1] == ':') ? workpath + 3 : workpath + 1; +-#else + qbase = workpath + 1; +-#endif + double_slash_path = DOUBLE_SLASH (workpath); + qbase += double_slash_path; + +--- origsrc/bash-4.4/lib/sh/tmpfile.c 2016-08-11 10:05:58.000000000 -0500 ++++ src/bash-4.4/lib/sh/tmpfile.c 2017-01-23 13:55:08.008447700 -0600 +@@ -101,7 +101,7 @@ get_tmpdir (flags) + if (tdir && (file_iswdir (tdir) == 0 || strlen (tdir) > PATH_MAX)) + tdir = 0; + +- if (tdir == 0) ++ if (tdir == 0 || !file_iswdir (tdir)) + tdir = get_sys_tmpdir (); + + #if defined (HAVE_PATHCONF) && defined (_PC_NAME_MAX) +--- origsrc/bash-4.4/mksyntax.c 2012-07-29 18:48:38.000000000 -0500 ++++ src/bash-4.4/mksyntax.c 2017-01-23 13:55:08.008447700 -0600 +@@ -29,13 +29,13 @@ + + #ifdef HAVE_UNISTD_H + # include ++#else ++extern int optind; ++extern char *optarg; + #endif + + #include "syntax.h" + +-extern int optind; +-extern char *optarg; +- + #ifndef errno + extern int errno; + #endif +--- origsrc/bash-4.4/parse.y 2016-09-11 10:31:46.000000000 -0500 ++++ src/bash-4.4/parse.y 2017-01-23 13:55:08.008447700 -0600 +@@ -1539,14 +1539,20 @@ yy_string_get () + string = bash_input.location.string; + + /* If the string doesn't exist, or is empty, EOF found. */ +- if (string && *string) ++ while (string && *string) + { + c = *string++; + bash_input.location.string = string; ++#ifdef __CYGWIN__ ++ { ++ extern int igncr; ++ if (igncr && c == '\r') ++ continue; ++ } ++#endif + return (c); + } +- else +- return (EOF); ++ return (EOF); + } + + static int +--- origsrc/bash-4.4/subst.c 2017-01-23 13:28:06.955247200 -0600 ++++ src/bash-4.4/subst.c 2017-01-23 13:55:08.008447700 -0600 +@@ -43,6 +43,7 @@ + #include "posixstat.h" + #include "bashintl.h" + ++#define NEED_SH_SETLINEBUF_DECL + #include "shell.h" + #include "parser.h" + #include "flags.h" +@@ -5964,6 +5965,13 @@ read_comsub (fd, quoted, rflag) + #endif + continue; + } ++#ifdef __CYGWIN__ ++ { ++ extern int igncr; ++ if (igncr && c == '\r') ++ continue; ++ } ++#endif + + /* Add the character to ISTRING, possibly after resizing it. */ + RESIZE_MALLOCED_BUFFER (istring, istring_index, 2, istring_size, DEFAULT_ARRAY_SIZE); +@@ -6088,6 +6096,28 @@ command_substitute (string, quoted) + goto error_exit; + } + ++#ifdef __CYGWIN__ ++ /* Passing a pipe through std fds can cause hangs when talking to a ++ non-cygwin child. Move it. */ ++ if (fildes[0] < 3) ++ { ++ int fd = fcntl (fildes[0], F_DUPFD, 3); ++ close (fildes[0]); ++ fildes[0] = fd; ++ } ++ if (fildes[1] < 3) ++ { ++ int fd = fcntl (fildes[1], F_DUPFD, 3); ++ close (fildes[1]); ++ fildes[1] = fd; ++ } ++ if (fildes[0] < 0 || fildes[1] < 0) ++ { ++ sys_error (_("cannot make pipe for command substitution")); ++ goto error_exit; ++ } ++#endif /* __CYGWIN__ */ ++ + old_pid = last_made_pid; + #if defined (JOB_CONTROL) + old_pipeline_pgrp = pipeline_pgrp; +--- origsrc/bash-4.4/support/bashversion.c 2008-09-09 08:31:53.000000000 -0500 ++++ src/bash-4.4/support/bashversion.c 2017-01-23 13:55:08.024037200 -0600 +@@ -26,6 +26,9 @@ + + #if defined (HAVE_UNISTD_H) + # include ++#else ++extern int optind; ++extern char *optarg; + #endif + + #include "bashansi.h" +@@ -41,9 +44,6 @@ + #define LFLAG 0x0020 + #define XFLAG 0x0040 + +-extern int optind; +-extern char *optarg; +- + extern char *dist_version; + extern int patch_level; + +--- origsrc/bash-4.4/support/mkversion.sh 2008-08-13 07:25:57.000000000 -0500 ++++ src/bash-4.4/support/mkversion.sh 2017-01-23 13:55:08.024037200 -0600 +@@ -29,7 +29,7 @@ source_dir="." + while [ $# -gt 0 ]; do + case "$1" in + -o) shift; OUTFILE=$1; shift ;; +- -b) shift; inc_build=yes ;; ++ -b) shift; ;; # inc_build=yes ;; # hacked out for cygport + -s) shift; rel_status=$1; shift ;; + -p) shift; patch_level=$1; shift ;; + -d) shift; dist_version=$1; shift ;; +--- origsrc/bash-4.4/variables.c 2016-06-15 15:05:52.000000000 -0500 ++++ src/bash-4.4/variables.c 2017-01-23 13:55:08.024037200 -0600 +@@ -5239,6 +5239,7 @@ sv_winsize (name) + /* Update the value of HOME in the export environment so tilde expansion will + work on cygwin. */ + #if defined (__CYGWIN__) ++void + sv_home (name) + char *name; + { diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index eaccb9a68da..1de2a52634b 100644 --- a/pkgs/shells/dash/default.nix +++ b/pkgs/shells/dash/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dash-0.5.8"; + name = "dash-0.5.9.1"; src = fetchurl { url = "http://gondor.apana.org.au/~herbert/dash/files/${name}.tar.gz"; - sha256 = "03y6z8akj72swa6f42h2dhq3p09xasbi6xia70h2vc27fwikmny6"; + sha256 = "5ecd5bea72a93ed10eb15a1be9951dd51b52e5da1d4a7ae020efd9826b49e659"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix index 7dc6029acb4..1d1dddd0c2a 100644 --- a/pkgs/shells/elvish/default.nix +++ b/pkgs/shells/elvish/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "elvish-${version}"; - version = "0.5"; + version = "0.9"; goPackagePath = "github.com/elves/elvish"; @@ -10,13 +10,11 @@ buildGoPackage rec { repo = "elvish"; owner = "elves"; rev = version; - sha256 = "1dk5f8a2wpgd5cw45ippvx46fxk0yap64skfpzpiqz8bkbnrwbz6"; + sha256 = "0alsv04iihrk1nffp6fmyzxid26dqhg1k45957c2ymyzyq9cglxj"; }; - goDeps = ./deps.nix; - meta = with stdenv.lib; { - description = "A Novel unix shell in go language"; + description = "A friendly and expressive Unix shell"; homepage = https://github.com/elves/elvish; license = licenses.bsd2; maintainers = with maintainers; [ vrthra ]; diff --git a/pkgs/shells/elvish/deps.nix b/pkgs/shells/elvish/deps.nix deleted file mode 100644 index cff60bad0a9..00000000000 --- a/pkgs/shells/elvish/deps.nix +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - goPackagePath = "github.com/elves/getopt"; - fetch = { - type = "git"; - url = "https://github.com/elves/getopt"; - rev = "f91a7bf920995832d55a1182f26657bc975b9c24"; - sha256 = "0wz5dz0iq1b1c2w30mmcgll9xidsrnlvs2906jw9szy0h67310za"; - }; - } - { - goPackagePath = "github.com/mattn/go-sqlite3"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-sqlite3"; - rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42"; - sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla"; - }; - } -] diff --git a/pkgs/shells/fish-foreign-env/default.nix b/pkgs/shells/fish-foreign-env/default.nix index 477c103c095..76a979bcda1 100644 --- a/pkgs/shells/fish-foreign-env/default.nix +++ b/pkgs/shells/fish-foreign-env/default.nix @@ -11,15 +11,17 @@ stdenv.mkDerivation rec { sha256 = "0lwp6hy3kfk7xfx4xvbk1ir8zkzm7gfjbm4bf6xg1y6iw9jq9dnl"; }; - buildCommand = '' + installPhase = '' mkdir -p $out/share/fish-foreign-env/functions/ - cp $src/functions/* $out/share/fish-foreign-env/functions/ + cp functions/* $out/share/fish-foreign-env/functions/ sed -e "s|sed|${gnused}/bin/sed|" \ -e "s|bash|${bash}/bin/bash|" \ -e "s|\| tr|\| ${coreutils}/bin/tr|" \ -i $out/share/fish-foreign-env/functions/* ''; + patches = [ ./hide-path-warnings.patch ]; + meta = with stdenv.lib; { description = "A foreign environment interface for Fish shell"; license = licenses.mit; diff --git a/pkgs/shells/fish-foreign-env/hide-path-warnings.patch b/pkgs/shells/fish-foreign-env/hide-path-warnings.patch new file mode 100644 index 00000000000..b7ac4edc518 --- /dev/null +++ b/pkgs/shells/fish-foreign-env/hide-path-warnings.patch @@ -0,0 +1,16 @@ +diff --git a/functions/fenv.apply.fish b/functions/fenv.apply.fish +index 34a25e3..6837e7f 100644 +--- a/functions/fenv.apply.fish ++++ b/functions/fenv.apply.fish +@@ -30,8 +30,9 @@ function fenv.apply + + if test "$key" = 'PATH' + set value (echo $value | tr ':' '\n') ++ set -g -x $key $value ^/dev/null ++ else ++ set -g -x $key $value + end +- +- set -g -x $key $value + end + end diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 798d00b0be1..b2a63e9532b 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -89,13 +89,13 @@ in stdenv.mkDerivation rec { name = "fish-${version}"; - version = "2.5.0"; + version = "2.6.0"; etcConfigAppendix = builtins.toFile "etc-config.appendix.fish" etcConfigAppendixText; src = fetchurl { url = "http://fishshell.com/files/${version}/${name}.tar.gz"; - sha256 = "19djav128nkhjxgfhwhc32i5y9d9c3karbh5yg67kqrdranyvh7q"; + sha256 = "1yzx73kg5ng5ivhi68756sl5hpb8869110l9fwim6gn7f7bbprby"; }; buildInputs = [ ncurses libiconv pcre2 ]; @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { # Python: Autocompletion generated from manpages and config editing propagatedBuildInputs = [ coreutils gnugrep gnused bc - python which groff gettext + python groff gettext ] ++ optional (!stdenv.isDarwin) man-db; postInstall = '' diff --git a/pkgs/shells/ion/default.nix b/pkgs/shells/ion/default.nix new file mode 100644 index 00000000000..4ab03b31fb9 --- /dev/null +++ b/pkgs/shells/ion/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +with rustPlatform; + +buildRustPackage rec { + name = "ion-${version}"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "redox-os"; + repo = "ion"; + rev = version; + sha256 = "0c2haw9qiwysyp1xj6qla8d6zpsdlygagzh86sk04c2b4ssyaca3"; + }; + + depsSha256 = "0w2jgbrcx57js8ihzs5acp6b1niw1c7khdxrv14y3z9mmm9j55hs"; + + meta = with stdenv.lib; { + description = "Modern system shell with simple (and powerful) syntax"; + homepage = https://github.com/redox-os/ion; + license = licenses.mit; + maintainers = with maintainers; [ dywedir ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/shells/lambda-mod-zsh-theme/default.nix b/pkgs/shells/lambda-mod-zsh-theme/default.nix index b1b17bef29d..8e2a0950d19 100644 --- a/pkgs/shells/lambda-mod-zsh-theme/default.nix +++ b/pkgs/shells/lambda-mod-zsh-theme/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation { - name = "lambda-mod-zsh-theme-unstable-2017-05-21"; + name = "lambda-mod-zsh-theme-unstable-2017-07-05"; src = fetchFromGitHub { owner = "halfo"; repo = "lambda-mod-zsh-theme"; - sha256 = "1410ryc22i20na5ypa1q6f106lkjj8n1qfjmb77q4rspi0ydaiy4"; - rev = "6fa277361ec2c84e612b5b6d876797ebe72102a5"; + sha256 = "03kdhifxsnfbly6hqpr1h6kf52kyhdbh82nvwkkyrz1lw2cxl89n"; + rev = "ba7d5fea16db91fc8de887e69250f4e501b1e36d"; }; buildPhases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/shells/nix-zsh-completions/default.nix b/pkgs/shells/nix-zsh-completions/default.nix index 5faca2fa8e8..1261a4429a4 100644 --- a/pkgs/shells/nix-zsh-completions/default.nix +++ b/pkgs/shells/nix-zsh-completions/default.nix @@ -1,13 +1,17 @@ { stdenv, fetchFromGitHub }: +let + version = "0.3.1"; +in + stdenv.mkDerivation rec { - name = "nix-zsh-completions"; + name = "nix-zsh-completions-${version}"; src = fetchFromGitHub { owner = "spwhitt"; repo = "nix-zsh-completions"; - rev = "0.3"; - sha256 = "1vwkd4nppjrvy6xb0vx4z73awrhaah1433dp6h4ghi3cdrrjn7ri"; + rev = "${version}"; + sha256 = "1sbc52f5818bcygljrji84dyvgw727x50m9v6qfrsdaji3zkqga1"; }; installPhase = '' diff --git a/pkgs/shells/oh-my-zsh/default.nix b/pkgs/shells/oh-my-zsh/default.nix index 41b834c18eb..22f5aa48d61 100644 --- a/pkgs/shells/oh-my-zsh/default.nix +++ b/pkgs/shells/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2017-05-03"; + version = "2017-06-22"; name = "oh-my-zsh-${version}"; src = fetchgit { url = "https://github.com/robbyrussell/oh-my-zsh"; - rev = "291e96dcd034750fbe7473482508c08833b168e3"; - sha256 = "0xy6ka5c8h3rh4n0436cn2f6zrbf959l2ypnnx5ddd0l723p1dzc"; + rev = "d848c94804918138375041a9f800f401bec12068"; + sha256 = "0mxmqkdpimwrskqjri3lp3haj1hzf583g7psnv34y3hyymzcx1h6"; }; pathsToLink = [ "/share/oh-my-zsh" ]; diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 7eab7ddb072..5848ee87b1b 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -56,16 +56,34 @@ rec { # Return a modified stdenv that adds a cross compiler to the # builds. - makeStdenvCross = stdenv: cross: binutils: gccCross: stdenv // { + makeStdenvCross = { stdenv + , cc + , buildPlatform, hostPlatform, targetPlatform + } @ overrideArgs: let + stdenv = overrideArgs.stdenv.override { + inherit + buildPlatform hostPlatform targetPlatform + cc; - # Overrides are surely not valid as packages built with this run on a - # different platform. - overrides = _: _: {}; + allowedRequisites = null; + # Overrides are surely not valid as packages built with this run on a + # different platform. + overrides = _: _: {}; + }; + in stdenv // { mkDerivation = { name ? "", buildInputs ? [], nativeBuildInputs ? [] , propagatedBuildInputs ? [], propagatedNativeBuildInputs ? [] - , selfNativeBuildInput ? false, ... + , # Disabling the tests by default when cross compiling, as usually the + # tests rely on being able to run produced binaries. + doCheck ? false + , configureFlags ? [] + , # Target is not included by default because most programs don't care. + # Including it then would cause needless massive rebuilds. + configurePlatforms ? args.crossAttrs.configurePlatforms or [ "build" "host" ] + , selfNativeBuildInput ? args.crossAttrs.selfNativeBuildInput or false + , ... } @ args: let @@ -88,17 +106,25 @@ rec { nativeInputsFromBuildInputs = stdenv.lib.filter hostAsNativeDrv buildInputsNotNull; in stdenv.mkDerivation (args // { - name = name + "-" + cross.config; + name = name + "-" + hostPlatform.config; nativeBuildInputs = nativeBuildInputs ++ nativeInputsFromBuildInputs - ++ [ gccCross binutils ] ++ stdenv.lib.optional selfNativeBuildInput nativeDrv # without proper `file` command, libtool sometimes fails # to recognize 64-bit DLLs - ++ stdenv.lib.optional (cross.config == "x86_64-w64-mingw32") pkgs.file - ++ stdenv.lib.optional (cross.config == "aarch64-linux-gnu") pkgs.updateAutotoolsGnuConfigScriptsHook + ++ stdenv.lib.optional (hostPlatform.config == "x86_64-w64-mingw32") pkgs.file + ++ stdenv.lib.optional (hostPlatform.config == "aarch64-linux-gnu") pkgs.updateAutotoolsGnuConfigScriptsHook ; + inherit doCheck; + + # This parameter is sometimes a string and sometimes a list, yuck + configureFlags = let inherit (stdenv.lib) optional elem; in + (if stdenv.lib.isString configureFlags then [configureFlags] else configureFlags) + ++ optional (elem "build" configurePlatforms) "--build=${buildPlatform.config}" + ++ optional (elem "host" configurePlatforms) "--host=${hostPlatform.config}" + ++ optional (elem "target" configurePlatforms) "--target=${targetPlatform.config}"; + # Cross-linking dynamic libraries, every buildInput should # be propagated because ld needs the -rpath-link to find # any library needed to link the program dynamically at @@ -107,12 +133,8 @@ rec { propagatedBuildInputs = propagatedBuildInputs ++ buildInputs; propagatedNativeBuildInputs = propagatedNativeBuildInputs; - crossConfig = cross.config; + crossConfig = hostPlatform.config; } // args.crossAttrs or {}); - - inherit gccCross binutils; - ccCross = gccCross; - }; diff --git a/pkgs/stdenv/booter.nix b/pkgs/stdenv/booter.nix index d459deb6ab5..a1055708f99 100644 --- a/pkgs/stdenv/booter.nix +++ b/pkgs/stdenv/booter.nix @@ -73,7 +73,7 @@ stageFuns: let # Take the list and disallow custom overrides in all but the final stage, # and allow it in the final flag. Only defaults this boolean field if it # isn't already set. - withAllowCustomOverrides = lib.lists.imap + withAllowCustomOverrides = lib.lists.imap1 (index: stageFun: prevStage: # So true by default for only the first element because one # 1-indexing. Since we reverse the list, this means this is true diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 7fe56725170..c83714d01f2 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -14,32 +14,29 @@ in bootStages ++ [ # Build Packages (vanillaPackages: { - buildPlatform = localSystem; - hostPlatform = localSystem; - targetPlatform = crossSystem; inherit config overlays; selfBuild = false; + stdenv = + assert vanillaPackages.hostPlatform == localSystem; + assert vanillaPackages.targetPlatform == localSystem; + vanillaPackages.stdenv.override { targetPlatform = crossSystem; }; # It's OK to change the built-time dependencies allowCustomOverrides = true; - inherit (vanillaPackages) stdenv; }) # Run Packages (buildPackages: { - buildPlatform = localSystem; - hostPlatform = crossSystem; - targetPlatform = crossSystem; inherit config overlays; selfBuild = false; - stdenv = if crossSystem.useiOSCross or false - then let - inherit (buildPackages.darwin.ios-cross) cc binutils; - in buildPackages.makeStdenvCross - buildPackages.stdenv crossSystem - binutils cc - else buildPackages.makeStdenvCross - buildPackages.stdenv crossSystem - buildPackages.binutils buildPackages.gccCrossStageFinal; + stdenv = buildPackages.makeStdenvCross { + inherit (buildPackages) stdenv; + buildPlatform = localSystem; + hostPlatform = crossSystem; + targetPlatform = crossSystem; + cc = if crossSystem.useiOSCross or false + then buildPackages.darwin.ios-cross + else buildPackages.gccCrossStageFinal; + }; }) ] diff --git a/pkgs/stdenv/custom/default.nix b/pkgs/stdenv/custom/default.nix index d5dc977b37a..b6ea8685f8e 100644 --- a/pkgs/stdenv/custom/default.nix +++ b/pkgs/stdenv/custom/default.nix @@ -15,11 +15,11 @@ in bootStages ++ [ # Additional stage, built using custom stdenv (vanillaPackages: { - buildPlatform = localSystem; - hostPlatform = localSystem; - targetPlatform = localSystem; inherit config overlays; - stdenv = config.replaceStdenv { pkgs = vanillaPackages; }; + stdenv = + assert vanillaPackages.hostPlatform == localSystem; + assert vanillaPackages.targetPlatform == localSystem; + config.replaceStdenv { pkgs = vanillaPackages; }; }) ] diff --git a/pkgs/stdenv/cygwin/rebase-i686.sh b/pkgs/stdenv/cygwin/rebase-i686.sh index e97dc66c0ad..091c9044d93 100644 --- a/pkgs/stdenv/cygwin/rebase-i686.sh +++ b/pkgs/stdenv/cygwin/rebase-i686.sh @@ -1,10 +1,10 @@ -postFixupHooks+=(_cygwinFixAutoImageBase) +fixupOutputHooks+=(_cygwinFixAutoImageBase) _cygwinFixAutoImageBase() { - if [ "$dontRebase" == 1 ]; then + if [ "$dontRebase" == 1 ] || [ ! -d "$prefix" ]; then return fi - find $out -name "*.dll" | while read DLL; do + find "$prefix" -name "*.dll" -type f | while read DLL; do if [ -f /etc/rebasenix.nextbase ]; then NEXTBASE="$(> $out/setup # Allow the user to install stdenv using nix-env and get the packages # in stdenv. mkdir $out/nix-support -echo $propagatedUserEnvPkgs > $out/nix-support/propagated-user-env-packages +if [ "$propagatedUserEnvPkgs" ]; then + printf '%s\n' $propagatedUserEnvPkgs > $out/nix-support/propagated-user-env-packages +fi diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix new file mode 100644 index 00000000000..8b2cf01f169 --- /dev/null +++ b/pkgs/stdenv/generic/check-meta.nix @@ -0,0 +1,197 @@ +# Extend a derivation with checks for brokenness, license, etc. Throw a +# descriptive error when the check fails; return `derivationArg` otherwise. +# Note: no dependencies are checked in this step. + +{ lib, config, system, meta, derivationArg, mkDerivationArg }: + +let + attrs = mkDerivationArg; # TODO: probably get rid of passing this one + + # See discussion at https://github.com/NixOS/nixpkgs/pull/25304#issuecomment-298385426 + # for why this defaults to false, but I (@copumpkin) want to default it to true soon. + shouldCheckMeta = config.checkMeta or false; + + allowUnfree = config.allowUnfree or false || builtins.getEnv "NIXPKGS_ALLOW_UNFREE" == "1"; + + whitelist = config.whitelistedLicenses or []; + blacklist = config.blacklistedLicenses or []; + + onlyLicenses = list: + lib.lists.all (license: + let l = lib.licenses.${license.shortName or "BROKEN"} or false; in + if license == l then true else + throw ''‘${showLicense license}’ is not an attribute of lib.licenses'' + ) list; + + areLicenseListsValid = + if lib.mutuallyExclusive whitelist blacklist then + assert onlyLicenses whitelist; assert onlyLicenses blacklist; true + else + throw "whitelistedLicenses and blacklistedLicenses are not mutually exclusive."; + + hasLicense = attrs: + attrs ? meta.license; + + hasWhitelistedLicense = assert areLicenseListsValid; attrs: + hasLicense attrs && builtins.elem attrs.meta.license whitelist; + + hasBlacklistedLicense = assert areLicenseListsValid; attrs: + hasLicense attrs && builtins.elem attrs.meta.license blacklist; + + allowBroken = config.allowBroken or false || builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1"; + + isUnfree = licenses: lib.lists.any (l: + !l.free or true || l == "unfree" || l == "unfree-redistributable") licenses; + + # Alow granular checks to allow only some unfree packages + # Example: + # {pkgs, ...}: + # { + # allowUnfree = false; + # allowUnfreePredicate = (x: pkgs.lib.hasPrefix "flashplayer-" x.name); + # } + allowUnfreePredicate = config.allowUnfreePredicate or (x: false); + + # Check whether unfree packages are allowed and if not, whether the + # package has an unfree license and is not explicitely allowed by the + # `allowUNfreePredicate` function. + hasDeniedUnfreeLicense = attrs: + !allowUnfree && + hasLicense attrs && + isUnfree (lib.lists.toList attrs.meta.license) && + !allowUnfreePredicate attrs; + + allowInsecureDefaultPredicate = x: builtins.elem x.name (config.permittedInsecurePackages or []); + allowInsecurePredicate = x: (config.allowUnfreePredicate or allowInsecureDefaultPredicate) x; + + hasAllowedInsecure = attrs: + (attrs.meta.knownVulnerabilities or []) == [] || + allowInsecurePredicate attrs || + builtins.getEnv "NIXPKGS_ALLOW_INSECURE" == "1"; + + showLicense = license: license.shortName or "unknown"; + + pos_str = meta.position or "«unknown-file»"; + + remediation = { + unfree = remediate_whitelist "Unfree"; + broken = remediate_whitelist "Broken"; + blacklisted = x: ""; + insecure = remediate_insecure; + unknown-meta = x: ""; + }; + remediate_whitelist = allow_attr: attrs: + '' + a) For `nixos-rebuild` you can set + { nixpkgs.config.allow${allow_attr} = true; } + in configuration.nix to override this. + + b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add + { allow${allow_attr} = true; } + to ~/.config/nixpkgs/config.nix. + ''; + + remediate_insecure = attrs: + '' + + Known issues: + + '' + (lib.fold (issue: default: "${default} - ${issue}\n") "" attrs.meta.knownVulnerabilities) + '' + + You can install it anyway by whitelisting this package, using the + following methods: + + a) for `nixos-rebuild` you can add ‘${attrs.name or "«name-missing»"}’ to + `nixpkgs.config.permittedInsecurePackages` in the configuration.nix, + like so: + + { + nixpkgs.config.permittedInsecurePackages = [ + "${attrs.name or "«name-missing»"}" + ]; + } + + b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add + ‘${attrs.name or "«name-missing»"}’ to `permittedInsecurePackages` in + ~/.config/nixpkgs/config.nix, like so: + + { + permittedInsecurePackages = [ + "${attrs.name or "«name-missing»"}" + ]; + } + + ''; + + throwEvalHelp = { reason , errormsg ? "" }: + throw ('' + Package ‘${attrs.name or "«name-missing»"}’ in ${pos_str} ${errormsg}, refusing to evaluate. + + '' + ((builtins.getAttr reason remediation) attrs)); + + metaTypes = with lib.types; rec { + # These keys are documented + description = str; + longDescription = str; + branch = str; + homepage = str; + downloadPage = str; + license = either (listOf lib.types.attrs) (either lib.types.attrs str); + maintainers = listOf str; + priority = int; + platforms = listOf str; + hydraPlatforms = listOf str; + broken = bool; + + # Weirder stuff that doesn't appear in the documentation? + version = str; + tag = str; + updateWalker = bool; + executables = listOf str; + outputsToInstall = listOf str; + position = str; + repositories = attrsOf str; + isBuildPythonPackage = platforms; + schedulingPriority = str; + downloadURLRegexp = str; + isFcitxEngine = bool; + isIbusEngine = bool; + }; + + checkMetaAttr = k: v: + if metaTypes?${k} then + if metaTypes.${k}.check v then null else "key '${k}' has a value ${v} of an invalid type ${builtins.typeOf v}; expected ${metaTypes.${k}.description}" + else "key '${k}' is unrecognized; expected one of: \n\t [${lib.concatMapStringsSep ", " (x: "'${x}'") (lib.attrNames metaTypes)}]"; + checkMeta = meta: if shouldCheckMeta then lib.remove null (lib.mapAttrsToList checkMetaAttr meta) else []; + + # Check if a derivation is valid, that is whether it passes checks for + # e.g brokenness or license. + # + # Return { valid: Bool } and additionally + # { reason: String; errormsg: String } if it is not valid, where + # reason is one of "unfree", "blacklisted" or "broken". + checkValidity = attrs: + if hasDeniedUnfreeLicense attrs && !(hasWhitelistedLicense attrs) then + { valid = false; reason = "unfree"; errormsg = "has an unfree license (‘${showLicense attrs.meta.license}’)"; } + else if hasBlacklistedLicense attrs then + { valid = false; reason = "blacklisted"; errormsg = "has a blacklisted license (‘${showLicense attrs.meta.license}’)"; } + else if !allowBroken && attrs.meta.broken or false then + { valid = false; reason = "broken"; errormsg = "is marked as broken"; } + else if !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem system attrs.meta.platforms then + { valid = false; reason = "broken"; errormsg = "is not supported on ‘${system}’"; } + else if !(hasAllowedInsecure attrs) then + { valid = false; reason = "insecure"; errormsg = "is marked as insecure"; } + else let res = checkMeta (attrs.meta or {}); in if res != [] then + { valid = false; reason = "unknown-meta"; errormsg = "has an invalid meta attrset:${lib.concatMapStrings (x: "\n\t - " + x) res}"; } + else { valid = true; }; + + # Throw an error if trying to evaluate an non-valid derivation + validityCondition = + let v = checkValidity attrs; + in if !v.valid + then throwEvalHelp (removeAttrs v ["valid"]) + else true; + +in + assert validityCondition; + derivationArg diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 8b85c5372fd..a5d3c5a8ff5 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -15,89 +15,32 @@ let lib = import ../../../lib; in lib.makeOverridable ( , stdenvSandboxProfile ? "" , extraSandboxProfile ? "" -, # The platforms here do *not* correspond to the stage the stdenv is - # used in, but rather the previous one, in which it was built. We - # use the latter two platforms, like a cross compiler, because the - # stand environment is a build tool if you squint at it, and because - # neither of these are used when building stdenv so we know the - # build platform is irrelevant. - hostPlatform, targetPlatform + ## Platform parameters + ## + ## The "build" "host" "target" terminology below comes from GNU Autotools. See + ## its documentation for more information on what those words mean. Note that + ## each should always be defined, even when not cross compiling. + ## + ## For purposes of bootstrapping, think of each stage as a "sliding window" + ## over a list of platforms. Specifically, the host platform of the previous + ## stage becomes the build platform of the current one, and likewise the + ## target platform of the previous stage becomes the host platform of the + ## current one. + ## + +, # The platform on which packages are built. Consists of `system`, a + # string (e.g.,`i686-linux') identifying the most import attributes of the + # build platform, and `platform` a set of other details. + buildPlatform + +, # The platform on which packages run. + hostPlatform + +, # The platform which build tools (especially compilers) build for in this stage, + targetPlatform }: let - inherit (targetPlatform) system; - - # See discussion at https://github.com/NixOS/nixpkgs/pull/25304#issuecomment-298385426 - # for why this defaults to false, but I (@copumpkin) want to default it to true soon. - shouldCheckMeta = config.checkMeta or false; - - allowUnfree = config.allowUnfree or false || builtins.getEnv "NIXPKGS_ALLOW_UNFREE" == "1"; - - whitelist = config.whitelistedLicenses or []; - blacklist = config.blacklistedLicenses or []; - - ifDarwin = attrs: if system == "x86_64-darwin" then attrs else {}; - - onlyLicenses = list: - lib.lists.all (license: - let l = lib.licenses.${license.shortName or "BROKEN"} or false; in - if license == l then true else - throw ''‘${showLicense license}’ is not an attribute of lib.licenses'' - ) list; - - mutuallyExclusive = a: b: - (builtins.length a) == 0 || - (!(builtins.elem (builtins.head a) b) && - mutuallyExclusive (builtins.tail a) b); - - areLicenseListsValid = - if mutuallyExclusive whitelist blacklist then - assert onlyLicenses whitelist; assert onlyLicenses blacklist; true - else - throw "whitelistedLicenses and blacklistedLicenses are not mutually exclusive."; - - hasLicense = attrs: - attrs ? meta.license; - - hasWhitelistedLicense = assert areLicenseListsValid; attrs: - hasLicense attrs && builtins.elem attrs.meta.license whitelist; - - hasBlacklistedLicense = assert areLicenseListsValid; attrs: - hasLicense attrs && builtins.elem attrs.meta.license blacklist; - - allowBroken = config.allowBroken or false || builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1"; - - isUnfree = licenses: lib.lists.any (l: - !l.free or true || l == "unfree" || l == "unfree-redistributable") licenses; - - # Alow granular checks to allow only some unfree packages - # Example: - # {pkgs, ...}: - # { - # allowUnfree = false; - # allowUnfreePredicate = (x: pkgs.lib.hasPrefix "flashplayer-" x.name); - # } - allowUnfreePredicate = config.allowUnfreePredicate or (x: false); - - # Check whether unfree packages are allowed and if not, whether the - # package has an unfree license and is not explicitely allowed by the - # `allowUNfreePredicate` function. - hasDeniedUnfreeLicense = attrs: - !allowUnfree && - hasLicense attrs && - isUnfree (lib.lists.toList attrs.meta.license) && - !allowUnfreePredicate attrs; - - allowInsecureDefaultPredicate = x: builtins.elem x.name (config.permittedInsecurePackages or []); - allowInsecurePredicate = x: (config.allowUnfreePredicate or allowInsecureDefaultPredicate) x; - - hasAllowedInsecure = attrs: - (attrs.meta.knownVulnerabilities or []) == [] || - allowInsecurePredicate attrs || - builtins.getEnv "NIXPKGS_ALLOW_INSECURE" == "1"; - - showLicense = license: license.shortName or "unknown"; - defaultNativeBuildInputs = extraBuildInputs ++ [ ../../build-support/setup-hooks/move-docs.sh ../../build-support/setup-hooks/compress-man-pages.sh @@ -106,7 +49,7 @@ let ] # FIXME this on Darwin; see # https://github.com/NixOS/nixpkgs/commit/94d164dd7#commitcomment-22030369 - ++ lib.optional result.isLinux ../../build-support/setup-hooks/audit-tmpdir.sh + ++ lib.optional hostPlatform.isLinux ../../build-support/setup-hooks/audit-tmpdir.sh ++ [ ../../build-support/setup-hooks/multiple-outputs.sh ../../build-support/setup-hooks/move-sbin.sh @@ -115,275 +58,16 @@ let cc ]; - # `mkDerivation` wraps the builtin `derivation` function to - # produce derivations that use this stdenv and its shell. - # - # See also: - # - # * https://nixos.org/nixpkgs/manual/#sec-using-stdenv - # Details on how to use this mkDerivation function - # - # * https://nixos.org/nix/manual/#ssec-derivation - # Explanation about derivations in general - mkDerivation = - { buildInputs ? [] - , nativeBuildInputs ? [] - , propagatedBuildInputs ? [] - , propagatedNativeBuildInputs ? [] - , crossConfig ? null - , meta ? {} - , passthru ? {} - , pos ? null # position used in error messages and for meta.position - , separateDebugInfo ? false - , outputs ? [ "out" ] - , __impureHostDeps ? [] - , __propagatedImpureHostDeps ? [] - , sandboxProfile ? "" - , propagatedSandboxProfile ? "" - , ... } @ attrs: - let # Rename argumemnts to avoid cycles - buildInputs__ = buildInputs; - nativeBuildInputs__ = nativeBuildInputs; - propagatedBuildInputs__ = propagatedBuildInputs; - propagatedNativeBuildInputs__ = propagatedNativeBuildInputs; - in let - getNativeDrv = drv: drv.nativeDrv or drv; - getCrossDrv = drv: drv.crossDrv or drv; - nativeBuildInputs = map getNativeDrv nativeBuildInputs__; - buildInputs = map getCrossDrv buildInputs__; - propagatedBuildInputs = map getCrossDrv propagatedBuildInputs__; - propagatedNativeBuildInputs = map getNativeDrv propagatedNativeBuildInputs__; - in let - pos' = - if pos != null then - pos - else if attrs.meta.description or null != null then - builtins.unsafeGetAttrPos "description" attrs.meta - else - builtins.unsafeGetAttrPos "name" attrs; - pos'' = if pos' != null then "‘" + pos'.file + ":" + toString pos'.line + "’" else "«unknown-file»"; - - - remediation = { - unfree = remediate_whitelist "Unfree"; - broken = remediate_whitelist "Broken"; - blacklisted = x: ""; - insecure = remediate_insecure; - unknown-meta = x: ""; - }; - remediate_whitelist = allow_attr: attrs: - '' - a) For `nixos-rebuild` you can set - { nixpkgs.config.allow${allow_attr} = true; } - in configuration.nix to override this. - - b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add - { allow${allow_attr} = true; } - to ~/.config/nixpkgs/config.nix. - ''; - - remediate_insecure = attrs: - '' - - Known issues: - - '' + (lib.fold (issue: default: "${default} - ${issue}\n") "" attrs.meta.knownVulnerabilities) + '' - - You can install it anyway by whitelisting this package, using the - following methods: - - a) for `nixos-rebuild` you can add ‘${attrs.name or "«name-missing»"}’ to - `nixpkgs.config.permittedInsecurePackages` in the configuration.nix, - like so: - - { - nixpkgs.config.permittedInsecurePackages = [ - "${attrs.name or "«name-missing»"}" - ]; - } - - b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add - ‘${attrs.name or "«name-missing»"}’ to `permittedInsecurePackages` in - ~/.config/nixpkgs/config.nix, like so: - - { - permittedInsecurePackages = [ - "${attrs.name or "«name-missing»"}" - ]; - } - - ''; - - - throwEvalHelp = { reason , errormsg ? "" }: - throw ('' - Package ‘${attrs.name or "«name-missing»"}’ in ${pos''} ${errormsg}, refusing to evaluate. - - '' + ((builtins.getAttr reason remediation) attrs)); - - metaTypes = with lib.types; rec { - # These keys are documented - description = str; - longDescription = str; - branch = str; - homepage = str; - downloadPage = str; - license = either (listOf lib.types.attrs) (either lib.types.attrs str); - maintainers = listOf str; - priority = int; - platforms = listOf str; - hydraPlatforms = listOf str; - broken = bool; - - # Weirder stuff that doesn't appear in the documentation? - version = str; - tag = str; - updateWalker = bool; - executables = listOf str; - outputsToInstall = listOf str; - position = str; - repositories = attrsOf str; - isBuildPythonPackage = platforms; - schedulingPriority = str; - downloadURLRegexp = str; - isFcitxEngine = bool; - isIbusEngine = bool; - }; - - checkMetaAttr = k: v: - if metaTypes?${k} then - if metaTypes.${k}.check v then null else "key '${k}' has a value ${v} of an invalid type ${builtins.typeOf v}; expected ${metaTypes.${k}.description}" - else "key '${k}' is unrecognized; expected one of: \n\t [${lib.concatMapStringsSep ", " (x: "'${x}'") (lib.attrNames metaTypes)}]"; - checkMeta = meta: if shouldCheckMeta then lib.remove null (lib.mapAttrsToList checkMetaAttr meta) else []; - - # Check if a derivation is valid, that is whether it passes checks for - # e.g brokenness or license. - # - # Return { valid: Bool } and additionally - # { reason: String; errormsg: String } if it is not valid, where - # reason is one of "unfree", "blacklisted" or "broken". - checkValidity = attrs: - if hasDeniedUnfreeLicense attrs && !(hasWhitelistedLicense attrs) then - { valid = false; reason = "unfree"; errormsg = "has an unfree license (‘${showLicense attrs.meta.license}’)"; } - else if hasBlacklistedLicense attrs then - { valid = false; reason = "blacklisted"; errormsg = "has a blacklisted license (‘${showLicense attrs.meta.license}’)"; } - else if !allowBroken && attrs.meta.broken or false then - { valid = false; reason = "broken"; errormsg = "is marked as broken"; } - else if !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem result.system attrs.meta.platforms then - { valid = false; reason = "broken"; errormsg = "is not supported on ‘${result.system}’"; } - else if !(hasAllowedInsecure attrs) then - { valid = false; reason = "insecure"; errormsg = "is marked as insecure"; } - else let res = checkMeta (attrs.meta or {}); in if res != [] then - { valid = false; reason = "unknown-meta"; errormsg = "has an invalid meta attrset:${lib.concatMapStrings (x: "\n\t - " + x) res}"; } - else { valid = true; }; - - outputs' = - outputs ++ - (if separateDebugInfo then assert targetPlatform.isLinux; [ "debug" ] else []); - - buildInputs' = lib.chooseDevOutputs buildInputs ++ - (if separateDebugInfo then [ ../../build-support/setup-hooks/separate-debug-info.sh ] else []); - - nativeBuildInputs' = lib.chooseDevOutputs nativeBuildInputs; - propagatedBuildInputs' = lib.chooseDevOutputs propagatedBuildInputs; - propagatedNativeBuildInputs' = lib.chooseDevOutputs propagatedNativeBuildInputs; - - in - - # Throw an error if trying to evaluate an non-valid derivation - assert let v = checkValidity attrs; - in if !v.valid - then throwEvalHelp (removeAttrs v ["valid"]) - else true; - - lib.addPassthru (derivation ( - (removeAttrs attrs - ["meta" "passthru" "crossAttrs" "pos" - "__impureHostDeps" "__propagatedImpureHostDeps" - "sandboxProfile" "propagatedSandboxProfile"]) - // (let - computedSandboxProfile = - lib.concatMap (input: input.__propagatedSandboxProfile or []) (extraBuildInputs ++ buildInputs' ++ nativeBuildInputs'); - computedPropagatedSandboxProfile = - lib.concatMap (input: input.__propagatedSandboxProfile or []) (propagatedBuildInputs' ++ propagatedNativeBuildInputs'); - computedImpureHostDeps = - lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (extraBuildInputs ++ buildInputs' ++ nativeBuildInputs')); - computedPropagatedImpureHostDeps = - lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (propagatedBuildInputs' ++ propagatedNativeBuildInputs')); - in - { - builder = attrs.realBuilder or shell; - args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)]; - stdenv = result; - system = result.system; - userHook = config.stdenv.userHook or null; - __ignoreNulls = true; - - # Inputs built by the cross compiler. - buildInputs = buildInputs'; - propagatedBuildInputs = propagatedBuildInputs'; - # Inputs built by the usual native compiler. - nativeBuildInputs = nativeBuildInputs' - ++ lib.optional - (hostPlatform.isCygwin - || (crossConfig != null && lib.hasSuffix "mingw32" crossConfig)) - ../../build-support/setup-hooks/win-dll-link.sh - ; - propagatedNativeBuildInputs = propagatedNativeBuildInputs'; - } // ifDarwin { - # TODO: remove lib.unique once nix has a list canonicalization primitive - __sandboxProfile = - let profiles = [ extraSandboxProfile ] ++ computedSandboxProfile ++ computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile sandboxProfile ]; - final = lib.concatStringsSep "\n" (lib.filter (x: x != "") (lib.unique profiles)); - in final; - __propagatedSandboxProfile = lib.unique (computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile ]); - __impureHostDeps = computedImpureHostDeps ++ computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps ++ __impureHostDeps ++ __extraImpureHostDeps ++ [ - "/dev/zero" - "/dev/random" - "/dev/urandom" - "/bin/sh" - ]; - __propagatedImpureHostDeps = computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps; - } // (if outputs' != [ "out" ] then { - outputs = outputs'; - } else { })))) ( - { - overrideAttrs = f: mkDerivation (attrs // (f attrs)); - # The meta attribute is passed in the resulting attribute set, - # but it's not part of the actual derivation, i.e., it's not - # passed to the builder and is not a dependency. But since we - # include it in the result, it *is* available to nix-env for queries. - meta = { } - # If the packager hasn't specified `outputsToInstall`, choose a default, - # which is the name of `p.bin or p.out or p`; - # if he has specified it, it will be overridden below in `// meta`. - # Note: This default probably shouldn't be globally configurable. - # Services and users should specify outputs explicitly, - # unless they are comfortable with this default. - // { outputsToInstall = - let - outs = outputs'; # the value passed to derivation primitive - hasOutput = out: builtins.elem out outs; - in [( lib.findFirst hasOutput null (["bin" "out"] ++ outs) )]; - } - // meta - # Fill `meta.position` to identify the source location of the package. - // lib.optionalAttrs (pos' != null) - { position = pos'.file + ":" + toString pos'.line; } - ; - inherit passthru; - } // - # Pass through extra attributes that are not inputs, but - # should be made available to Nix expressions using the - # derivation (e.g., in assertions). - passthru); - # The stdenv that we are producing. - result = + stdenv = derivation ( (if isNull allowedRequisites then {} else { allowedRequisites = allowedRequisites ++ defaultNativeBuildInputs; }) // { - inherit system name; + inherit name; + + # Nix itself uses the `system` field of a derivation to decide where to + # build it. This is a bit confusing for cross compilation. + inherit (buildPlatform) system; builder = shell; @@ -393,7 +77,7 @@ let inherit preHook initialPath shell defaultNativeBuildInputs; } - // ifDarwin { + // lib.optionalAttrs buildPlatform.isDarwin { __sandboxProfile = stdenvSandboxProfile; __impureHostDeps = __stdenvImpureHostDeps; }) @@ -405,6 +89,10 @@ let platforms = lib.platforms.all; }; + inherit buildPlatform hostPlatform targetPlatform; + + inherit extraBuildInputs __extraImpureHostDeps extraSandboxProfile; + # Utility flags to test the type of platform. inherit (hostPlatform) isDarwin isLinux isSunOS isHurd isCygwin isFreeBSD isOpenBSD @@ -415,7 +103,9 @@ let # Whether we should run paxctl to pax-mark binaries. needsPax = isLinux; - inherit mkDerivation; + inherit (import ./make-derivation.nix { + inherit lib config stdenv; + }) mkDerivation; # For convenience, bring in the library functions in lib/ so # packages don't have to do that themselves. @@ -434,4 +124,4 @@ let # like curl = if stdenv ? curl then stdenv.curl else ...). // extraAttrs; -in result) +in stdenv) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix new file mode 100644 index 00000000000..05221e2f3c1 --- /dev/null +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -0,0 +1,147 @@ +{ lib, config, stdenv }: + +rec { + # `mkDerivation` wraps the builtin `derivation` function to + # produce derivations that use this stdenv and its shell. + # + # See also: + # + # * https://nixos.org/nixpkgs/manual/#sec-using-stdenv + # Details on how to use this mkDerivation function + # + # * https://nixos.org/nix/manual/#ssec-derivation + # Explanation about derivations in general + mkDerivation = + { nativeBuildInputs ? [] + , buildInputs ? [] + + , propagatedNativeBuildInputs ? [] + , propagatedBuildInputs ? [] + + , crossConfig ? null + , meta ? {} + , passthru ? {} + , pos ? # position used in error messages and for meta.position + (if attrs.meta.description or null != null + then builtins.unsafeGetAttrPos "description" attrs.meta + else builtins.unsafeGetAttrPos "name" attrs) + , separateDebugInfo ? false + , outputs ? [ "out" ] + , __impureHostDeps ? [] + , __propagatedImpureHostDeps ? [] + , sandboxProfile ? "" + , propagatedSandboxProfile ? "" + , ... } @ attrs: + let + dependencies = [ + (map (drv: drv.nativeDrv or drv) nativeBuildInputs) + (map (drv: drv.crossDrv or drv) buildInputs) + ]; + propagatedDependencies = [ + (map (drv: drv.nativeDrv or drv) propagatedNativeBuildInputs) + (map (drv: drv.crossDrv or drv) propagatedBuildInputs) + ]; + in let + + outputs' = + outputs ++ + (if separateDebugInfo then assert stdenv.hostPlatform.isLinux; [ "debug" ] else []); + + dependencies' = let + justMap = map lib.chooseDevOutputs dependencies; + nativeBuildInputs = lib.head justMap + ++ lib.optional separateDebugInfo ../../build-support/setup-hooks/separate-debug-info.sh + ++ lib.optional stdenv.hostPlatform.isWindows ../../build-support/setup-hooks/win-dll-link.sh; + in [ nativeBuildInputs ] ++ lib.tail justMap; + + propagatedDependencies' = map lib.chooseDevOutputs propagatedDependencies; + + derivationArg = + (removeAttrs attrs + ["meta" "passthru" "crossAttrs" "pos" + "__impureHostDeps" "__propagatedImpureHostDeps" + "sandboxProfile" "propagatedSandboxProfile"]) + // (let + computedSandboxProfile = + lib.concatMap (input: input.__propagatedSandboxProfile or []) (stdenv.extraBuildInputs ++ lib.concatLists dependencies'); + computedPropagatedSandboxProfile = + lib.concatMap (input: input.__propagatedSandboxProfile or []) (lib.concatLists propagatedDependencies'); + computedImpureHostDeps = + lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (stdenv.extraBuildInputs ++ lib.concatLists dependencies')); + computedPropagatedImpureHostDeps = + lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (lib.concatLists propagatedDependencies')); + in + { + builder = attrs.realBuilder or stdenv.shell; + args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)]; + inherit stdenv; + inherit (stdenv) system; + userHook = config.stdenv.userHook or null; + __ignoreNulls = true; + + nativeBuildInputs = lib.elemAt dependencies' 0; + buildInputs = lib.elemAt dependencies' 1; + + propagatedNativeBuildInputs = lib.elemAt propagatedDependencies' 0; + propagatedBuildInputs = lib.elemAt propagatedDependencies' 1; + } // lib.optionalAttrs (stdenv.buildPlatform.isDarwin) { + # TODO: remove lib.unique once nix has a list canonicalization primitive + __sandboxProfile = + let profiles = [ stdenv.extraSandboxProfile ] ++ computedSandboxProfile ++ computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile sandboxProfile ]; + final = lib.concatStringsSep "\n" (lib.filter (x: x != "") (lib.unique profiles)); + in final; + __propagatedSandboxProfile = lib.unique (computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile ]); + __impureHostDeps = computedImpureHostDeps ++ computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps ++ __impureHostDeps ++ stdenv.__extraImpureHostDeps ++ [ + "/dev/zero" + "/dev/random" + "/dev/urandom" + "/bin/sh" + ]; + __propagatedImpureHostDeps = computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps; + } // (if outputs' != [ "out" ] then { + outputs = outputs'; + } else { })); + + # The meta attribute is passed in the resulting attribute set, + # but it's not part of the actual derivation, i.e., it's not + # passed to the builder and is not a dependency. But since we + # include it in the result, it *is* available to nix-env for queries. + meta = { } + # If the packager hasn't specified `outputsToInstall`, choose a default, + # which is the name of `p.bin or p.out or p`; + # if he has specified it, it will be overridden below in `// meta`. + # Note: This default probably shouldn't be globally configurable. + # Services and users should specify outputs explicitly, + # unless they are comfortable with this default. + // { outputsToInstall = + let + outs = outputs'; # the value passed to derivation primitive + hasOutput = out: builtins.elem out outs; + in [( lib.findFirst hasOutput null (["bin" "out"] ++ outs) )]; + } + // attrs.meta or {} + # Fill `meta.position` to identify the source location of the package. + // lib.optionalAttrs (pos != null) + { position = pos.file + ":" + toString pos.line; } + ; + + in + + lib.addPassthru + (derivation (import ./check-meta.nix + { + inherit lib config meta derivationArg; + mkDerivationArg = attrs; + # Nix itself uses the `system` field of a derivation to decide where + # to build it. This is a bit confusing for cross compilation. + inherit (stdenv) system; + })) + ( { + overrideAttrs = f: mkDerivation (attrs // (f attrs)); + inherit meta passthru; + } // + # Pass through extra attributes that are not inputs, but + # should be made available to Nix expressions using the + # derivation (e.g., in assertions). + passthru); +} diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index eb63b18e5f3..de94565ed6d 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -17,8 +17,9 @@ runHook() { shift local var="$hookName" if [[ "$hookName" =~ Hook$ ]]; then var+=s; else var+=Hooks; fi - eval "local -a dummy=(\"\${$var[@]}\")" - for hook in "_callImplicitHook 0 $hookName" "${dummy[@]}"; do + local -n var + local hook + for hook in "_callImplicitHook 0 $hookName" "${var[@]}"; do _eval "$hook" "$@" done return 0 @@ -32,8 +33,9 @@ runOneHook() { shift local var="$hookName" if [[ "$hookName" =~ Hook$ ]]; then var+=s; else var+=Hooks; fi - eval "local -a dummy=(\"\${$var[@]}\")" - for hook in "_callImplicitHook 1 $hookName" "${dummy[@]}"; do + local -n var + local hook + for hook in "_callImplicitHook 1 $hookName" "${var[@]}"; do if _eval "$hook" "$@"; then return 0 fi @@ -192,6 +194,7 @@ _addRpathPrefix() { # Return success if the specified file is an ELF object. isELF() { local fn="$1" + local fd local magic exec {fd}< "$fn" read -n 4 -u $fd magic @@ -203,6 +206,7 @@ isELF() { # "#!"). isScript() { local fn="$1" + local fd local magic if ! [ -x /bin/sh ]; then return 0; fi exec {fd}< "$fn" @@ -211,6 +215,11 @@ isScript() { if [[ "$magic" =~ \#! ]]; then return 0; else return 1; fi } +# printf unfortunately will print a trailing newline regardless +printLines() { + [[ $# -gt 0 ]] || return 0 + printf '%s\n' "$@" +} ###################################################################### # Initialisation. @@ -296,9 +305,12 @@ findInputs() { fi if [ -f "$pkg/nix-support/$propagatedBuildInputsFile" ]; then - for i in $(cat "$pkg/nix-support/$propagatedBuildInputsFile"); do - findInputs "$i" $var $propagatedBuildInputsFile + local fd pkgNext + exec {fd}<"$pkg/nix-support/$propagatedBuildInputsFile" + while IFS= read -r -u $fd pkgNext; do + findInputs "$pkgNext" $var $propagatedBuildInputsFile done + exec {fd}<&- fi } @@ -790,17 +802,17 @@ fixupPhase() { fi if [ -n "$propagated" ]; then mkdir -p "${!outputDev}/nix-support" - echo "$propagated" > "${!outputDev}/nix-support/propagated-native-build-inputs" + printLines $propagated > "${!outputDev}/nix-support/propagated-native-build-inputs" fi else if [ -n "$propagatedBuildInputs" ]; then mkdir -p "${!outputDev}/nix-support" - echo "$propagatedBuildInputs" > "${!outputDev}/nix-support/propagated-build-inputs" + printLines $propagatedBuildInputs > "${!outputDev}/nix-support/propagated-build-inputs" fi if [ -n "$propagatedNativeBuildInputs" ]; then mkdir -p "${!outputDev}/nix-support" - echo "$propagatedNativeBuildInputs" > "${!outputDev}/nix-support/propagated-native-build-inputs" + printLines $propagatedNativeBuildInputs > "${!outputDev}/nix-support/propagated-native-build-inputs" fi fi @@ -813,7 +825,7 @@ fixupPhase() { if [ -n "$propagatedUserEnvPkgs" ]; then mkdir -p "${!outputBin}/nix-support" - echo "$propagatedUserEnvPkgs" > "${!outputBin}/nix-support/propagated-user-env-packages" + printLines $propagatedUserEnvPkgs > "${!outputBin}/nix-support/propagated-user-env-packages" fi runHook postFixup diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index b3399cc29b3..c475d2d1e92 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -52,8 +52,11 @@ let let thisStdenv = import ../generic { - inherit config extraBuildInputs; name = "stdenv-linux-boot"; + buildPlatform = localSystem; + hostPlatform = localSystem; + targetPlatform = localSystem; + inherit config extraBuildInputs; preHook = '' # Don't patch #!/interpreter because it leads to retained @@ -64,9 +67,6 @@ let shell = "${bootstrapTools}/bin/bash"; initialPath = [bootstrapTools]; - hostPlatform = localSystem; - targetPlatform = localSystem; - fetchurlBoot = import ../../build-support/fetchurl/boot.nix { inherit system; }; @@ -76,6 +76,11 @@ let else lib.makeOverridable (import ../../build-support/cc-wrapper) { nativeTools = false; nativeLibc = false; + buildPackages = lib.optionalAttrs (prevStage ? stdenv) { + inherit (prevStage) stdenv; + }; + hostPlatform = localSystem; + targetPlatform = localSystem; cc = prevStage.gcc-unwrapped; isGNU = true; libc = prevStage.glibc; @@ -97,9 +102,6 @@ let }; in { - buildPlatform = localSystem; - hostPlatform = localSystem; - targetPlatform = localSystem; inherit config overlays; stdenv = thisStdenv; }; @@ -239,6 +241,11 @@ in nativeTools = false; nativeLibc = false; isGNU = true; + buildPackages = { + inherit (prevStage) stdenv; + }; + hostPlatform = localSystem; + targetPlatform = localSystem; cc = prevStage.gcc-unwrapped; libc = self.glibc; inherit (self) stdenv binutils coreutils gnugrep; @@ -259,11 +266,11 @@ in # dependency (`nix-store -qR') on bootstrapTools or the first # binutils built. (prevStage: { - buildPlatform = localSystem; - hostPlatform = localSystem; - targetPlatform = localSystem; inherit config overlays; stdenv = import ../generic rec { + buildPlatform = localSystem; + hostPlatform = localSystem; + targetPlatform = localSystem; inherit config; preHook = '' @@ -276,9 +283,6 @@ in initialPath = ((import ../common-path.nix) {pkgs = prevStage;}); - hostPlatform = localSystem; - targetPlatform = localSystem; - extraBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++ # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64. lib.optional (system == "aarch64-linux") prevStage.updateAutotoolsGnuConfigScriptsHook; diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index 0378891b27a..90c9d2cef67 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -81,7 +81,6 @@ rec { nativeBuildInputs = [ pkgs.buildPackages.nukeReferences pkgs.buildPackages.cpio - pkgs.buildPackages.binutils ]; buildCommand = '' diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 77c868a02f8..02734f2f3e5 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -81,6 +81,7 @@ let { cc, fetchurl, extraPath ? [], overrides ? (self: super: { }) }: import ../generic { + buildPlatform = localSystem; hostPlatform = localSystem; targetPlatform = localSystem; @@ -102,7 +103,7 @@ let fetchurlBoot = fetchurl; - inherit system shell cc overrides config; + inherit shell cc overrides config; }; in @@ -138,9 +139,6 @@ in # First build a stdenv based only on tools outside the store. (prevStage: { - buildPlatform = localSystem; - hostPlatform = localSystem; - targetPlatform = localSystem; inherit config overlays; stdenv = makeStdenv { inherit (prevStage) cc fetchurl; @@ -150,9 +148,6 @@ in # Using that, build a stdenv that adds the ‘xz’ command (which most systems # don't have, so we mustn't rely on the native environment providing it). (prevStage: { - buildPlatform = localSystem; - hostPlatform = localSystem; - targetPlatform = localSystem; inherit config overlays; stdenv = makeStdenv { inherit (prevStage.stdenv) cc fetchurl; diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index ef088ecbf64..aaf6c523ea4 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -10,10 +10,13 @@ bootStages ++ [ (prevStage: let inherit (prevStage) stdenv; in { - inherit (prevStage) buildPlatform hostPlatform targetPlatform; inherit config overlays; stdenv = import ../generic rec { + buildPlatform = localSystem; + hostPlatform = localSystem; + targetPlatform = localSystem; + inherit config; preHook = '' diff --git a/pkgs/tools/X11/xautomation/default.nix b/pkgs/tools/X11/xautomation/default.nix new file mode 100644 index 00000000000..79ef4cb56dc --- /dev/null +++ b/pkgs/tools/X11/xautomation/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, libpng, libX11, libXext, libXi, libXtst }: + +let version = "1.09"; in +stdenv.mkDerivation { + name = "xautomation-${version}"; + src = fetchurl { + url = "https://www.hoopajoo.net/static/projects/xautomation-${version}.tar.gz"; + sha256 = "03azv5wpg65h40ip2kk1kdh58vix4vy1r9bihgsq59jx2rhjr3zf"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libpng libX11 libXext libXi libXtst ]; + + meta = { + homepage = https://www.hoopajoo.net/projects/xautomation.html; + description = "Control X from the command line for scripts, and do \"visual scraping\" to find things on the screen"; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = with stdenv.lib.maintainers; [ vaibhavsagar ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/tools/X11/xcwd/default.nix b/pkgs/tools/X11/xcwd/default.nix new file mode 100644 index 00000000000..1d42f791fb5 --- /dev/null +++ b/pkgs/tools/X11/xcwd/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, libX11 }: + +stdenv.mkDerivation rec { + version = "2016-09-30"; + name = "xcwd-${version}"; + + src = fetchFromGitHub { + owner = "schischi"; + repo = "xcwd"; + rev = "3f0728b932904985b703b33bd5c936ea96cf15a0"; + sha256 = "0lwfz6qg7fkiq86skp51vpav33yik22ps4dvr48asv3570skhlf9"; + }; + + buildInputs = [ libX11 ]; + + makeFlags = "prefix=$(out)"; + + installPhase = '' + install -D xcwd "$out/bin/xcwd" + ''; + + meta = with stdenv.lib; { + description = '' + A simple tool which print the current working directory of the currently focused window + ''; + homepage = https://github.com/schischi/xcwd; + maintainers = [ maintainers.grburst ]; + license = licenses.bsd3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/X11/xvkbd/default.nix b/pkgs/tools/X11/xvkbd/default.nix index c7c7b9e5567..399531f71eb 100644 --- a/pkgs/tools/X11/xvkbd/default.nix +++ b/pkgs/tools/X11/xvkbd/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "xvkbd-${version}"; - version = "3.7"; + version = "3.8"; src = fetchurl { - url = "http://homepage3.nifty.com/tsato/xvkbd/xvkbd-${version}.tar.gz"; - sha256 = "02y9ks9sa4sn3vkbgswjs5qcd85xhwvarnmhg41pq3l2d617cpw9"; + url = "http://t-sato.in.coocan.jp/xvkbd/xvkbd-3.8.tar.gz"; + sha256 = "16r5wbb5za02ha0ilwswx37lrwa6j40px8c9gkpnmmpb5r7kv91c"; }; buildInputs = [ imake libXt libXaw libXtst xextproto libXi Xaw3d libXpm gccmakedep ]; diff --git a/pkgs/tools/admin/cli53/default.nix b/pkgs/tools/admin/cli53/default.nix index 4e284c46193..23c35dab57c 100644 --- a/pkgs/tools/admin/cli53/default.nix +++ b/pkgs/tools/admin/cli53/default.nix @@ -1,27 +1,21 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, python2Packages, fetchurl }: -buildGoPackage rec { +python2Packages.buildPythonApplication rec { name = "cli53-${version}"; - version = "0.8.8"; + version = "0.4.4"; - goPackagePath = "github.com/barnybug/cli53"; - - src = fetchFromGitHub { - owner = "barnybug"; - repo = "cli53"; - rev = version; - sha256 = "1hbx64rn25qzp2xlfwv8xaqyfcax9b6pl30j9vciw7cb346i84gc"; + src = fetchurl { + url = "mirror://pypi/c/cli53/${name}.tar.gz"; + sha256 = "0s9jzigq6a16m2c3qklssx2lz16cf13g5zh80vh24kxazaxqzbig"; }; - buildPhase = '' - pushd go/src/${goPackagePath}/cmd/cli53 - go get . - popd - ''; + propagatedBuildInputs = with python2Packages; [ + argparse + boto + dns + ]; - goDeps = ./deps.nix; - - meta = with stdenv.lib; { + meta = with lib; { description = "CLI tool for the Amazon Route 53 DNS service"; homepage = https://github.com/barnybug/cli53; license = licenses.mit; diff --git a/pkgs/tools/admin/google-cloud-sdk/alpha__init__.py b/pkgs/tools/admin/google-cloud-sdk/alpha__init__.py new file mode 100755 index 00000000000..d120969d8fb --- /dev/null +++ b/pkgs/tools/admin/google-cloud-sdk/alpha__init__.py @@ -0,0 +1,23 @@ +# Copyright 2013 Google Inc. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +"""Auth for the Google Cloud SDK. +""" + +from googlecloudsdk.calliope import base + + +@base.ReleaseTracks(base.ReleaseTrack.ALPHA) +class Alpha(base.Group): + """Alpha versions of gcloud commands.""" diff --git a/pkgs/tools/admin/google-cloud-sdk/beta__init__.py b/pkgs/tools/admin/google-cloud-sdk/beta__init__.py new file mode 100755 index 00000000000..bb52c5a0bc4 --- /dev/null +++ b/pkgs/tools/admin/google-cloud-sdk/beta__init__.py @@ -0,0 +1,23 @@ +# Copyright 2013 Google Inc. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +"""Auth for the Google Cloud SDK. +""" + +from googlecloudsdk.calliope import base + + +@base.ReleaseTracks(base.ReleaseTrack.BETA) +class Beta(base.Group): + """Beta versions of gcloud commands.""" diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index b66c4c041f7..26e63283f8d 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -7,25 +7,26 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" || stden stdenv.mkDerivation rec { name = "google-cloud-sdk-${version}"; - version = "155.0.0"; + version = "161.0.0"; src = if stdenv.system == "i686-linux" then fetchurl { url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86.tar.gz"; - sha256 = "1xh8xy9p3qqmirvhih7vf96i5xn0z0zr5mmbqr6vfzx16r47bi2z"; + sha256 = "43a78a9d2c3ee9d9e50200b1e90512cd53ded40b56e05effe31fe9847b1bdd4c"; } else if stdenv.system == "x86_64-darwin" then fetchurl { url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-darwin-x86_64.tar.gz"; - sha256 = "19pr1pld6vdp5ig5i7zddfl1l5xjv9nx5sn00va4l1nnb410ac69"; + sha256 = "0706dbea1279be2bc98a497d1bfed61a9cc29c305d908a376bcdb4403035b323"; } else fetchurl { url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86_64.tar.gz"; - sha256 = "18hnabhdlrprhg8micy2z63jxyah3qr3pv9pgb64i7lbv6lznr2b"; + sha256 = "7aa6094d1f9c87f4c2c4a6bdad6a1113aac5e72ea673e659d9acbb059dfd037e"; }; + buildInputs = [python27 makeWrapper]; phases = [ "installPhase" "fixupPhase" ]; @@ -34,6 +35,12 @@ stdenv.mkDerivation rec { mkdir -p "$out" tar -xzf "$src" -C "$out" google-cloud-sdk + mkdir $out/google-cloud-sdk/lib/surface/alpha + cp ${./alpha__init__.py} $out/google-cloud-sdk/lib/surface/alpha/__init__.py + + mkdir $out/google-cloud-sdk/lib/surface/beta + cp ${./beta__init__.py} $out/google-cloud-sdk/lib/surface/beta/__init__.py + # create wrappers with correct env for program in gcloud bq gsutil git-credential-gcloud.sh; do programPath="$out/google-cloud-sdk/bin/$program" diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 8e9db09147e..3550b7d7de3 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -10,9 +10,10 @@ stdenv.mkDerivation rec { }; patches = [ - (fetchpatch { - url = "https://sources.debian.net/data/main/p/p7zip/16.02+dfsg-2/debian/patches/12-CVE-2016-9296.patch"; - sha256 = "1i7099h27gmb9dv0lb7jnqfm504gs1c3129r6kvi94yb2gzrzk41"; + (fetchpatch rec { + name = "CVE-2016-9296.patch"; + url = "https://src.fedoraproject.org/cgit/rpms/p7zip.git/plain/${name}?id=4b3973f6a5d"; + sha256 = "09wbkzai46bwm8zmplsz0m4jck3qn7snr68i9p1gsih300zidj0m"; }) ]; diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index 0086891da29..a1454229a1c 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unrar-${version}"; - version = "5.4.5"; + version = "5.5.5"; src = fetchurl { url = "http://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"; - sha256 = "0v3rz2245bp2nh4115ysqv34vqlrpln9y11fnlzqj8i46f2caw74"; + sha256 = "1vv1s1pa0pf1r0h7dw89ha9y68x7hdm82csnkh6ms0igrcwkhmd4"; }; postPatch = '' diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix index b9fa760c019..a35e473ec36 100644 --- a/pkgs/tools/archivers/unzip/default.nix +++ b/pkgs/tools/archivers/unzip/default.nix @@ -1,5 +1,7 @@ -{ stdenv, fetchurl, bzip2 -, enableNLS ? false, libnatspec }: +{ stdenv, fetchurl +, bzip2 +, enableNLS ? false, libnatspec +}: stdenv.mkDerivation { name = "unzip-6.0"; @@ -11,6 +13,8 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; + patchFlags = "-p1 -F3"; + patches = [ ./CVE-2014-8139.diff ./CVE-2014-8140.diff @@ -20,6 +24,7 @@ stdenv.mkDerivation { ./CVE-2015-7697.diff ./CVE-2014-9913.patch ./CVE-2016-9844.patch + ./dont-hardcode-cc.patch ] ++ stdenv.lib.optional enableNLS (fetchurl { url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-arch/unzip/files/unzip-6.0-natspec.patch?revision=1.1"; @@ -32,7 +37,7 @@ stdenv.mkDerivation { makefile = "unix/Makefile"; - NIX_LDFLAGS = [ "-lbz2" ] ++ stdenv.lib.optional enableNLS "-lnatspec"; + ${"NIX_${stdenv.cc.infixSalt_}LDFLAGS"} = [ "-lbz2" ] ++ stdenv.lib.optional enableNLS "-lnatspec"; buildFlags = "generic D_USE_BZ2=-DUSE_BZIP2 L_BZ2=-lbz2"; diff --git a/pkgs/tools/archivers/unzip/dont-hardcode-cc.patch b/pkgs/tools/archivers/unzip/dont-hardcode-cc.patch new file mode 100644 index 00000000000..15dbbfe4c53 --- /dev/null +++ b/pkgs/tools/archivers/unzip/dont-hardcode-cc.patch @@ -0,0 +1,14 @@ +--- a/unix/Makefile ++++ b/unix/Makefile +@@ -42,9 +42,9 @@ + # such as -DDOSWILD). + + # UnZip flags +-CC = cc# try using "gcc" target rather than changing this (CC and LD ++CC ?= cc# try using "gcc" target rather than changing this (CC and LD + LD = $(CC)# must match, else "unresolved symbol: ___main" is possible) +-AS = as ++AS ?= as + LOC = $(D_USE_BZ2) $(LOCAL_UNZIP) + AF = $(LOC) + CFLAGS = -O diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 35b4557a33c..ff033e62a8b 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -8,7 +8,9 @@ , enableDiscogs ? true , enableEmbyupdate ? true , enableFetchart ? true +, enableGmusic ? true , enableKeyfinder ? true, keyfinder-cli ? null +, enableKodiupdate ? true , enableLastfm ? true , enableMpd ? true , enableReplaygain ? true, bs1770gain ? null @@ -27,9 +29,10 @@ assert enableBadfiles -> flac != null && mp3val != null; assert enableConvert -> ffmpeg != null; assert enableDiscogs -> pythonPackages.discogs_client != null; assert enableFetchart -> pythonPackages.responses != null; +assert enableGmusic -> pythonPackages.gmusicapi != null; assert enableKeyfinder -> keyfinder-cli != null; assert enableLastfm -> pythonPackages.pylast != null; -assert enableMpd -> pythonPackages.mpd != null; +assert enableMpd -> pythonPackages.mpd2 != null; assert enableReplaygain -> bs1770gain != null; assert enableThumbnails -> pythonPackages.pyxdg != null; assert enableWeb -> pythonPackages.flask != null; @@ -45,7 +48,9 @@ let discogs = enableDiscogs; embyupdate = enableEmbyupdate; fetchart = enableFetchart; + gmusic = enableGmusic; keyfinder = enableKeyfinder; + kodiupdate = enableKodiupdate; lastgenre = enableLastfm; lastimport = enableLastfm; mpdstats = enableMpd; @@ -74,13 +79,13 @@ let in pythonPackages.buildPythonApplication rec { name = "beets-${version}"; - version = "1.4.3"; + version = "1.4.5"; src = fetchFromGitHub { owner = "beetbox"; repo = "beets"; rev = "v${version}"; - sha256 = "0sh2ap7jbqh7p8h63kgrx1ja9lyqlxjpfnh6axxw9p1mh78cgc1v"; + sha256 = "0fvfp9ckq3dhs4f8abg9fprfppyf0g6mv8br2xz99plg4wnffzmy"; }; propagatedBuildInputs = [ @@ -99,13 +104,15 @@ in pythonPackages.buildPythonApplication rec { ] ++ optional enableAcoustid pythonPackages.pyacoustid ++ optional (enableFetchart || enableEmbyupdate + || enableKodiupdate || enableAcousticbrainz) pythonPackages.requests ++ optional enableConvert ffmpeg ++ optional enableDiscogs pythonPackages.discogs_client + ++ optional enableGmusic pythonPackages.gmusicapi ++ optional enableKeyfinder keyfinder-cli ++ optional enableLastfm pythonPackages.pylast - ++ optional enableMpd pythonPackages.mpd + ++ optional enableMpd pythonPackages.mpd2 ++ optional enableThumbnails pythonPackages.pyxdg ++ optional enableWeb pythonPackages.flask ++ optional enableAlternatives (import ./alternatives-plugin.nix { @@ -146,7 +153,7 @@ in pythonPackages.buildPythonApplication rec { s,"mp3val","${mp3val}/bin/mp3val", }' beetsplug/badfiles.py '' + optionalString enableConvert '' - sed -i -e 's,\(util\.command_output(\)\([^)]\+\)),\1[b"${ffmpeg.bin}/bin/ffmpeg" if args[0] == b"ffmpeg" else args[0]] + \2[1:]),' beetsplug/convert.py + sed -i -e 's,\(util\.command_output(\)\([^)]\+\)),\1[b"${ffmpeg.bin}/bin/ffmpeg" if args[0] == b"ffmpeg" else args[0]] + \2[1:]),' beetsplug/convert.py '' + optionalString enableReplaygain '' sed -i -re ' s!^( *cmd *= *b?['\'''"])(bs1770gain['\'''"])!\1${bs1770gain}/bin/\2! diff --git a/pkgs/tools/audio/ezstream/default.nix b/pkgs/tools/audio/ezstream/default.nix new file mode 100644 index 00000000000..6524bedf939 --- /dev/null +++ b/pkgs/tools/audio/ezstream/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, libiconv, libshout, taglib, libxml2, pkgconfig }: + +stdenv.mkDerivation rec { + name = "ezstream-${version}"; + version = "0.6.0"; + + src = fetchurl { + url = "https://ftp.osuosl.org/pub/xiph/releases/ezstream/${name}.tar.gz"; + sha256 = "f86eb8163b470c3acbc182b42406f08313f85187bd9017afb8b79b02f03635c9"; + }; + + buildInputs = [ libiconv libshout taglib libxml2 ]; + nativeBuildInputs = [ pkgconfig ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "A command line source client for Icecast media streaming servers"; + longDescription = '' + Ezstream is a command line source client for Icecast media + streaming servers. It began as the successor of the old "shout" + utility, and has since gained a lot of useful features. + + In its basic mode of operation, it streams media files or data + from standard input without reencoding and thus requires only + very little CPU resources. + ''; + homepage = http://icecast.org/ezstream/; + license = licenses.gpl2; + maintainers = [ maintainers.barrucadu ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/backup/burp/1.3.48.nix b/pkgs/tools/backup/burp/1.3.48.nix deleted file mode 100644 index bff46992d8b..00000000000 --- a/pkgs/tools/backup/burp/1.3.48.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchgit, acl, librsync_0_9, ncurses, openssl, zlib }: - -stdenv.mkDerivation rec { - name = "burp-1.3.48"; - - src = fetchgit { - url = "https://github.com/grke/burp.git"; - rev = "3636ce0a992904a374234d68170fc1c265bff357"; - sha256 = "1vycivml5r87y4fmcpi9q82nhiydrq3zqvkr2gsp9d1plwsbgizz"; - }; - - patches = [ ./burp_1.3.48.patch ]; - - buildInputs = [ librsync_0_9 ncurses openssl zlib ] - # next two lines copied from bacula, as burp needs acl as well - # acl relies on attr, which I can't get to build on darwin - ++ stdenv.lib.optional (!stdenv.isDarwin) acl; - - configureFlags = [ - "--sbindir=$out/bin" - ]; - - meta = with stdenv.lib; { - description = "BURP - BackUp and Restore Program"; - homepage = http://burp.grke.org; - license = licenses.agpl3; - maintainers = with maintainers; [ tokudan ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/tools/backup/burp/burp_1.3.48.patch b/pkgs/tools/backup/burp/burp_1.3.48.patch deleted file mode 100644 index fe57202bc34..00000000000 --- a/pkgs/tools/backup/burp/burp_1.3.48.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur burp~/Makefile.in burp/Makefile.in ---- burp~/Makefile.in 2015-11-01 21:14:52.621376413 +0000 -+++ burp/Makefile.in 2015-11-01 22:09:25.098997115 +0000 -@@ -90,8 +90,6 @@ - $(MKDIR) $(DESTDIR)$(sbindir) - $(MKDIR) $(DESTDIR)$(sysconfdir) - $(MKDIR) $(DESTDIR)$(sysconfdir)/CA-client -- $(MKDIR) $(DESTDIR)/var/run -- $(MKDIR) $(DESTDIR)/var/spool/burp - @if [ ! -d $(DESTDIR)$(sysconfdir)/clientconfdir ] ; then $(MKDIR) $(DESTDIR)$(sysconfdir)/clientconfdir ; cp configs/server/clientconfdir/testclient $(DESTDIR)$(sysconfdir)/clientconfdir/testclient ; fi - @if [ ! -d $(DESTDIR)$(sysconfdir)/clientconfdir/incexc ] ; then $(MKDIR) $(DESTDIR)$(sysconfdir)/clientconfdir/incexc ; cp configs/server/clientconfdir/incexc $(DESTDIR)$(sysconfdir)/clientconfdir/incexc/example ; fi - @if [ ! -d $(DESTDIR)$(sysconfdir)/autoupgrade/client ] ; then $(MKDIR) $(DESTDIR)$(sysconfdir)/autoupgrade/client ; fi diff --git a/pkgs/tools/backup/burp/burp_1.4.40.patch b/pkgs/tools/backup/burp/burp_1.4.40.patch deleted file mode 100644 index fe57202bc34..00000000000 --- a/pkgs/tools/backup/burp/burp_1.4.40.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur burp~/Makefile.in burp/Makefile.in ---- burp~/Makefile.in 2015-11-01 21:14:52.621376413 +0000 -+++ burp/Makefile.in 2015-11-01 22:09:25.098997115 +0000 -@@ -90,8 +90,6 @@ - $(MKDIR) $(DESTDIR)$(sbindir) - $(MKDIR) $(DESTDIR)$(sysconfdir) - $(MKDIR) $(DESTDIR)$(sysconfdir)/CA-client -- $(MKDIR) $(DESTDIR)/var/run -- $(MKDIR) $(DESTDIR)/var/spool/burp - @if [ ! -d $(DESTDIR)$(sysconfdir)/clientconfdir ] ; then $(MKDIR) $(DESTDIR)$(sysconfdir)/clientconfdir ; cp configs/server/clientconfdir/testclient $(DESTDIR)$(sysconfdir)/clientconfdir/testclient ; fi - @if [ ! -d $(DESTDIR)$(sysconfdir)/clientconfdir/incexc ] ; then $(MKDIR) $(DESTDIR)$(sysconfdir)/clientconfdir/incexc ; cp configs/server/clientconfdir/incexc $(DESTDIR)$(sysconfdir)/clientconfdir/incexc/example ; fi - @if [ ! -d $(DESTDIR)$(sysconfdir)/autoupgrade/client ] ; then $(MKDIR) $(DESTDIR)$(sysconfdir)/autoupgrade/client ; fi diff --git a/pkgs/tools/backup/burp/default.nix b/pkgs/tools/backup/burp/default.nix index eb4240d33c6..783a0796e91 100644 --- a/pkgs/tools/backup/burp/default.nix +++ b/pkgs/tools/backup/burp/default.nix @@ -1,24 +1,24 @@ -{ stdenv, fetchgit, acl, librsync, ncurses, openssl, zlib }: +{ stdenv, fetchFromGitHub, autoreconfHook +, acl, librsync, ncurses, openssl, zlib, uthash }: stdenv.mkDerivation rec { - name = "burp-1.4.40"; + name = "burp-${version}"; + version = "2.0.54"; - src = fetchgit { - url = "https://github.com/grke/burp.git"; - rev = "1e8eebac420f2b0dc29102602b7e5e437d58d5b7"; - sha256 = "02gpgcyg1x0bjk8349019zp3m002lmdhil6g6n8xv0kzz54v6gaw"; + src = fetchFromGitHub { + owner = "grke"; + repo = "burp"; + rev = version; + sha256 = "1z1w013hqxbfjgri0fan2570qwhgwvm4k4ghajbzqg8kly4fgk5x"; }; - patches = [ ./burp_1.4.40.patch ]; - - buildInputs = [ librsync ncurses openssl zlib ] - # next two lines copied from bacula, as burp needs acl as well - # acl relies on attr, which I can't get to build on darwin + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ librsync ncurses openssl zlib uthash ] ++ stdenv.lib.optional (!stdenv.isDarwin) acl; - configureFlags = [ - "--sbindir=$out/bin" - ]; + configureFlags = [ "--localstatedir=/var" ]; + + installFlags = [ "localstatedir=/tmp" ]; meta = with stdenv.lib; { description = "BURP - BackUp and Restore Program"; diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index 742c1cafc93..8f918dda59b 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "restic-${version}"; - version = "0.6.1"; + version = "0.7.0"; goPackagePath = "github.com/restic/restic"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "restic"; repo = "restic"; rev = "v${version}"; - sha256 = "1rp4s1gh07j06457rhl4r0qnxqn0h7n4i8k50akdr87nwyikkn17"; + sha256 = "1whzzma2c199i604qy1a807zhi8qgri1r9bbxl5l7wlfh7x0n6sd"; }; buildPhase = '' diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix index 0f95a26c940..9fca48bde1b 100644 --- a/pkgs/tools/backup/tarsnap/default.nix +++ b/pkgs/tools/backup/tarsnap/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { name = "tarsnap-${version}"; - version = "1.0.37"; + version = "1.0.38"; src = fetchurl { url = "https://www.tarsnap.com/download/tarsnap-autoconf-${version}.tgz"; - sha256 = "1ynv323qi6775lzjb6hvifl8ajkv2bizy43sajadjfqvcl9r96gs"; + sha256 = "0nyd722i7q8h81h5mvwxai0f3jmwd93r3ahjkmr12k55p8c0rvkn"; }; preConfigure = '' diff --git a/pkgs/tools/backup/tarsnapper/default.nix b/pkgs/tools/backup/tarsnapper/default.nix new file mode 100644 index 00000000000..54d85343e2d --- /dev/null +++ b/pkgs/tools/backup/tarsnapper/default.nix @@ -0,0 +1,25 @@ +{ python3Packages, fetchFromGitHub , tarsnap }: + +python3Packages.buildPythonApplication rec { + name = "tarsnapper-${version}"; + version = "0.4"; + + src = fetchFromGitHub { + owner = "miracle2k"; + repo = "tarsnapper"; + rev = version; + sha256 = "03db49188f4v1946c8mqqj30ah10x68hbg3a58js0syai32v12pm"; + }; + + buildInputs = with python3Packages; [ nose pytest ]; + + checkPhase = '' + py.test . + ''; + + propagatedBuildInputs = with python3Packages; [ pyyaml dateutil pexpect ]; + + patches = [ ./remove-argparse.patch ]; + + makeWrapperArgs = ["--prefix PATH : ${tarsnap}/bin"]; +} diff --git a/pkgs/tools/backup/tarsnapper/remove-argparse.patch b/pkgs/tools/backup/tarsnapper/remove-argparse.patch new file mode 100644 index 00000000000..5fd36b14a13 --- /dev/null +++ b/pkgs/tools/backup/tarsnapper/remove-argparse.patch @@ -0,0 +1,10 @@ +--- tarsnapper-0.4-src.org/setup.py 1980-01-02 00:00:00.000000000 +0000 ++++ tarsnapper-0.4-src/setup.py 2017-07-16 10:54:36.596499451 +0100 +@@ -45,6 +45,6 @@ + url='http://github.com/miracle2k/tarsnapper', + license='BSD', + packages=['tarsnapper'], +- install_requires = ['argparse>=1.1', 'pyyaml>=3.09', 'python-dateutil>=2.4.0', 'pexpect>=3.1'], ++ install_requires = ['pyyaml>=3.09', 'python-dateutil>=2.4.0', 'pexpect>=3.1'], + **kw + ) diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index 5a27d336c29..cb7dc65c710 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -15,10 +15,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ xz.bin ]; - preConfigure = if stdenv.isCygwin then '' - sed -i lib/fpending.h -e 's,include ,,' - '' else null; - # In stdenv-linux, prevent a dependency on bootstrap-tools. makeFlags = "SHELL=/bin/sh GREP=grep"; diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix index c41553b562d..8c9f7433058 100644 --- a/pkgs/tools/compression/upx/default.nix +++ b/pkgs/tools/compression/upx/default.nix @@ -2,31 +2,21 @@ stdenv.mkDerivation rec { name = "upx-${version}"; - version = "3.93"; - src = fetchFromGitHub { - owner = "upx"; - repo = "upx"; - rev = "v${version}"; - sha256 = "03ah23q85hx3liqyyj4vm8vip2d47bijsimagqd39q762a2rin3i"; + version = "3.94"; + src = fetchurl { + url = "https://github.com/upx/upx/releases/download/v3.94/upx-3.94-src.tar.xz"; + sha256 = "08anybdliqsbsl6x835iwzljahnm9i7v26icdjkcv33xmk6p5vw1"; }; buildInputs = [ ucl zlib perl ]; - lzmaSrc = fetchFromGitHub { - owner = "upx"; - repo = "upx-lzma-sdk"; - rev = "v${version}"; - sha256 = "16vj1c5bl04pzma0sr4saqk80y2iklyslzmrb4rm66aifa365zqj"; - }; - preConfigure = " export UPX_UCLDIR=${ucl} - cp -a $lzmaSrc/* src/lzma-sdk - export UPX_LZMADIR=`pwd`/src/lzma-sdk cd src "; - buildPhase = "make CHECK_WHITESPACE=true"; + makeFlags = [ "CHECK_WHITESPACE=true" ]; + installPhase = "mkdir -p $out/bin ; cp upx.out $out/bin/upx"; meta = { diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 525aa2fec28..d9b01eb5239 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -21,6 +21,10 @@ stdenv.mkDerivation rec { # This should be fine on all platforms so apply universally patchPhase = "sed -i s/-O1/-O2/ configure"; + postInstall = '' + install -v -m 444 -D btrfs-completion $out/etc/bash_completion.d/btrfs + ''; + meta = with stdenv.lib; { description = "Utilities for the btrfs filesystem"; homepage = https://btrfs.wiki.kernel.org/; diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix index 72118cada9f..db69fa64c84 100644 --- a/pkgs/tools/filesystems/irods/default.nix +++ b/pkgs/tools/filesystems/irods/default.nix @@ -40,6 +40,8 @@ in rec { -DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath,$out/lib -DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath,$out/lib " + + substituteInPlace cmake/server.cmake --replace SETUID "" ''; meta = common.meta // { diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix index 81f82108995..929c6690a26 100644 --- a/pkgs/tools/filesystems/mergerfs/default.nix +++ b/pkgs/tools/filesystems/mergerfs/default.nix @@ -1,18 +1,20 @@ -{ stdenv, fetchgit, fuse, pkgconfig, which, attr, pandoc, git }: +{ stdenv, fetchgit, autoconf, automake, pkgconfig, gettext, libtool, git, pandoc, which, attr, libiconv }: stdenv.mkDerivation rec { name = "mergerfs-${version}"; - version = "2.16.1"; + version = "2.23.0"; # not using fetchFromGitHub because of changelog being built with git log src = fetchgit { url = "https://github.com/trapexit/mergerfs"; rev = "refs/tags/${version}"; - sha256 = "12fqgk54fnnibqiq82p4g2k6qnw3iy6dd64csmlf73yi67za5iwf"; + sha256 = "0k4nn0f4c355q7hnni7iia8qi9m0khvyd04hx1hmlrnf0zsi9mfw"; deepClone = true; + leaveDotGit = true; }; - buildInputs = [ fuse pkgconfig which attr pandoc git ]; + nativeBuildInputs = [ autoconf automake pkgconfig gettext libtool git pandoc which ]; + buildInputs = [ attr libiconv ]; makeFlags = [ "PREFIX=$(out)" "XATTR_AVAILABLE=1" ]; @@ -21,6 +23,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/trapexit/mergerfs; license = stdenv.lib.licenses.isc; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ makefu ]; + maintainers = with stdenv.lib.maintainers; [ jfrankenau makefu ]; }; } diff --git a/pkgs/tools/filesystems/mtdutils/default.nix b/pkgs/tools/filesystems/mtdutils/default.nix index ed3850b9fdd..d0ceaf94a75 100644 --- a/pkgs/tools/filesystems/mtdutils/default.nix +++ b/pkgs/tools/filesystems/mtdutils/default.nix @@ -15,10 +15,6 @@ stdenv.mkDerivation rec { buildInputs = [ libuuid lzo zlib acl ]; - crossAttrs = { - makeFlags = "CC=${stdenv.cross.config}-gcc"; - }; - meta = { description = "Tools for MTD filesystems"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix index a96612c2804..0cf439c9fe9 100644 --- a/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -2,7 +2,7 @@ , crypto ? false, libgcrypt, gnutls, pkgconfig}: stdenv.mkDerivation rec { - pname = "ntfs-3g"; + pname = "ntfs3g"; version = "2017.3.23"; name = "${pname}-${version}"; diff --git a/pkgs/tools/filesystems/unionfs-fuse/default.nix b/pkgs/tools/filesystems/unionfs-fuse/default.nix index b7d7a07a084..cfe3ff421fe 100644 --- a/pkgs/tools/filesystems/unionfs-fuse/default.nix +++ b/pkgs/tools/filesystems/unionfs-fuse/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "unionfs-fuse-${version}"; - version = "1.0"; + version = "2.0"; src = fetchFromGitHub { owner = "rpodgorny"; repo = "unionfs-fuse"; rev = "v${version}"; - sha256 = "0g2hd6yi6v8iqzmgncg1zi9a7ixy9hsh51rzf6jnmzi79543dihf"; + sha256 = "0lb8zgdxnjy2fjr2284hvdfn7inc1in44ynzgcr66x54bxzvynj6"; }; patches = @@ -34,10 +34,11 @@ stdenv.mkDerivation rec { substituteInPlace $out/sbin/mount.unionfs-fuse --replace unionfs $out/bin/unionfs ''; - meta = { + meta = with stdenv.lib; { description = "FUSE UnionFS implementation"; - homepage = http://podgorny.cz/moin/UnionFsFuse; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; + homepage = https://github.com/rpodgorny/unionfs-fuse; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ orivej ]; }; } diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix index ed41470f600..eaea921c6f5 100644 --- a/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/pkgs/tools/filesystems/xfsprogs/default.nix @@ -1,56 +1,59 @@ -{ stdenv, fetchurl, gettext, libuuid, readline }: +{ stdenv, fetchpatch, fetchgit, autoconf, automake, gettext, libtool, readline, utillinux }: + +let + gentooPatch = name: sha256: fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-fs/xfsprogs/files/${name}?id=8293574ab30c85e2965fb2b7dd890b44841b8404"; + inherit sha256; + }; +in stdenv.mkDerivation rec { - name = "xfsprogs-4.5.0"; + name = "xfsprogs-${version}"; + version = "4.11.0"; - src = fetchurl { - urls = map (dir: "ftp://oss.sgi.com/projects/xfs/${dir}/${name}.tar.gz") - [ "cmd_tars" "previous" ]; - sha256 = "1y49rwvbbvqdq2a1x7p5i05bcfyv6xhmrfwafl6vvvw494qyp6z4"; + src = fetchgit { + url = "git://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git"; + rev = "refs/tags/v${version}"; + sha256 = "0icliinacg6c3ziaqzyyxfz9jykn80njj9fdv3milhsf81yhnrpn"; }; - prePatch = '' - sed -i "s,/bin/bash,$(type -P bash),g" install-sh - sed -i "s,ldconfig,$(type -P ldconfig),g" configure m4/libtool.m4 + outputs = [ "bin" "dev" "out" "doc" ]; - # Fixes from gentoo 3.2.1 ebuild - sed -i "/^PKG_DOC_DIR/s:@pkg_name@:${name}:" include/builddefs.in - sed -i "/LLDFLAGS.*libtool-libs/d" $(find -name Makefile) - sed -i '/LIB_SUBDIRS/s:libdisk::' Makefile - ''; + nativeBuildInputs = [ autoconf automake libtool gettext ]; + propagatedBuildInputs = [ utillinux ]; # Dev headers include + buildInputs = [ readline ]; + enableParallelBuilding = true; + + # Why is all this garbage needed? Why? Why? patches = [ - # This patch fixes shared libs installation, still not fixed in 4.2.0 - ./4.3.0-sharedlibs.patch + (gentooPatch "xfsprogs-4.7.0-sharedlibs.patch" "1s83ihaccmjrw4zm0nbdwqk3jx4wc1rijpsqrg7ir71ln7qknwzz") + (gentooPatch "xfsprogs-4.7.0-libxcmd-link.patch" "1lvy1ajzml39a631a7jqficnzsd40bzkca7hkxv1ybiqyp8sf55s") + (gentooPatch "xfsprogs-4.9.0-underlinking.patch" "1r7l8jphspy14i43zbfnjrnyrdm4cpgyfchblascxylmans0gci7") ]; - propagatedBuildInputs = [ libuuid ]; - buildInputs = [ gettext readline ]; - - outputs = [ "bin" "dev" "out" ]; # TODO: review xfs - preConfigure = '' - NIX_LDFLAGS="$(echo $NIX_LDFLAGS | sed "s,$out,$lib,g")" + sed -i Makefile -e '/cp include.install-sh/d' + make configure ''; configureFlags = [ - "MAKE=make" - "MSGFMT=msgfmt" - "MSGMERGE=msgmerge" - "XGETTEXT=xgettext" "--disable-lib64" "--enable-readline" ]; installFlags = [ "install-dev" ]; - enableParallelBuilding = true; + # FIXME: forbidden rpath + postInstall = '' + find . -type d -name .libs | xargs rm -rf + ''; meta = with stdenv.lib; { homepage = http://xfs.org/; description = "SGI XFS utilities"; license = licenses.lgpl21; platforms = platforms.linux; - maintainers = with maintainers; [ wkennington ]; + maintainers = with maintainers; [ dezgeg ]; }; } diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix index 2a8255e3744..39933e70e39 100644 --- a/pkgs/tools/graphics/maim/default.nix +++ b/pkgs/tools/graphics/maim/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "maim-${version}"; - version = "5.4.63"; + version = "5.4.64"; src = fetchFromGitHub { owner = "naelstrof"; repo = "maim"; rev = "v${version}"; - sha256 = "16jl62hzrq1kciqwr9s3bxgcf9yz42kiwc5abkay1yd0vfcx200i"; + sha256 = "16ipqs4s5hn7a7380n8w1ijj26d9n356bqwl1h8z5i1skbj4w7hj"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/tools/graphics/optipng/default.nix b/pkgs/tools/graphics/optipng/default.nix index 0f7f7e2da2a..471e8ee8df4 100644 --- a/pkgs/tools/graphics/optipng/default.nix +++ b/pkgs/tools/graphics/optipng/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, libpng, static ? false }: +{ stdenv, fetchurl, libpng, static ? false +, buildPlatform, hostPlatform +}: # This package comes with its own copy of zlib, libpng and pngxtern @@ -15,20 +17,16 @@ stdenv.mkDerivation rec { buildInputs = [ libpng ]; LDFLAGS = optional static "-static"; - configureFlags = "--with-system-zlib --with-system-libpng"; + configureFlags = [ + "--with-system-zlib" + "--with-system-libpng" + ] ++ stdenv.lib.optionals (hostPlatform != buildPlatform) [ + #"-prefix=$out" + ]; - crossAttrs = { - CC="${stdenv.cross.config}-gcc"; - LD="${stdenv.cross.config}-gcc"; - AR="${stdenv.cross.config}-ar"; - RANLIB="${stdenv.cross.config}-ranlib"; - configurePhase = '' - ./configure -prefix="$out" --with-system-zlib --with-system-libpng - ''; - postInstall = optional (stdenv.cross.libc == "msvcrt") '' - mv "$out"/bin/optipng "$out"/bin/optipng.exe - ''; - }; + postInstall = if hostPlatform != buildPlatform && hostPlatform.isWindows then '' + mv "$out"/bin/optipng{,.exe} + '' else null; meta = with stdenv.lib; { homepage = http://optipng.sourceforge.net/; diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix index 170dfdac2b6..9fdf0ad0465 100644 --- a/pkgs/tools/graphics/pstoedit/default.nix +++ b/pkgs/tools/graphics/pstoedit/default.nix @@ -13,11 +13,17 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ zlib ghostscript imagemagick plotutils gd libjpeg libwebp ] + buildInputs = [ zlib ghostscript imagemagick plotutils gd libjpeg libwebp ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ libiconv ApplicationServices ]); + # '@LIBPNG_LDFLAGS@' is no longer substituted by autoconf (the code is commented out) + # so we need to remove it from the pkg-config file as well + preConfigure = '' + substituteInPlace config/pstoedit.pc.in --replace '@LIBPNG_LDFLAGS@' "" + ''; + meta = with stdenv.lib; { description = "Translates PostScript and PDF graphics into other vector formats"; homepage = https://sourceforge.net/projects/pstoedit/; diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix index f466da91dff..af9861ea6ed 100644 --- a/pkgs/tools/misc/brltty/default.nix +++ b/pkgs/tools/misc/brltty/default.nix @@ -4,14 +4,12 @@ assert alsaSupport -> alsaLib != null; assert systemdSupport -> systemd != null; stdenv.mkDerivation rec { - name = "brltty-5.4"; + name = "brltty-5.5"; src = fetchurl { url = "http://brltty.com/archive/${name}.tar.gz"; - sha256 = "1993brxa76yf7z3ckax0bbmqv6jp8vjwxp19h425v4gpm0m17k7l"; + sha256 = "0slrqanwj9cm7ql0rpb296xq676zrc1sjyr13lh5lygp4b8qfpci"; }; - - patches = [ ./systemd.patch ]; buildInputs = [ pkgconfig bluez ] ++ stdenv.lib.optional alsaSupport alsaLib diff --git a/pkgs/tools/misc/brltty/systemd.patch b/pkgs/tools/misc/brltty/systemd.patch deleted file mode 100644 index 24a0d617b30..00000000000 --- a/pkgs/tools/misc/brltty/systemd.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/config.mk.in b/config.mk.in -index 5093b9c..b707bd4 100644 ---- a/config.mk.in -+++ b/config.mk.in -@@ -235,7 +235,7 @@ TUNE_OBJECTS = tune.$O notes.$O $(BEEP_OBJECTS) $(PCM_OBJECTS) $(MIDI_OBJECTS) $ - ASYNC_OBJECTS = async_handle.$O async_data.$O async_wait.$O async_alarm.$O async_task.$O async_io.$O async_event.$O async_signal.$O thread.$O - BASE_OBJECTS = log.$O addresses.$O file.$O device.$O parse.$O variables.$O datafile.$O unicode.$O $(CHARSET_OBJECTS) timing.$O $(ASYNC_OBJECTS) queue.$O lock.$O $(DYNLD_OBJECTS) $(PORTS_OBJECTS) $(SYSTEM_OBJECTS) - OPTIONS_OBJECTS = options.$O $(PARAMS_OBJECTS) --PROGRAM_OBJECTS = program.$O $(PGMPATH_OBJECTS) $(SERVICE_OBJECTS) $(SERVICE_LIBS) pid.$O $(OPTIONS_OBJECTS) $(BASE_OBJECTS) -+PROGRAM_OBJECTS = program.$O $(PGMPATH_OBJECTS) $(SERVICE_OBJECTS) pid.$O $(OPTIONS_OBJECTS) $(BASE_OBJECTS) - - CC = @CC@ - CPPFLAGS = -I$(BLD_DIR) -I$(SRC_DIR) -I$(BLD_TOP:/=)/$(PGM_DIR) -I$(SRC_TOP:/=)/$(PGM_DIR) -I$(SRC_TOP:/=)/$(HDR_DIR) -I$(BLD_TOP:/=) -I$(SRC_TOP:/=) @CPPFLAGS@ @DEFS@ -@@ -248,7 +248,7 @@ LIBCXXFLAGS = $(CXXFLAGS) @LIBCXXFLAGS@ - - LD = @LD@ - LDFLAGS = @LDFLAGS@ --LDLIBS = $(ICU_LIBS) $(POLKIT_LIBS) $(SYSTEM_LIBS) @LIBS@ -+LDLIBS = $(ICU_LIBS) $(POLKIT_LIBS) $(SYSTEM_LIBS) $(SERVICE_LIBS) @LIBS@ - - MKOBJ = @MKOBJ@ - MKMOD = @MKMOD@ diff --git a/pkgs/tools/misc/clac/default.nix b/pkgs/tools/misc/clac/default.nix index 48f3b613564..55aa438226f 100644 --- a/pkgs/tools/misc/clac/default.nix +++ b/pkgs/tools/misc/clac/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "clac"; - version = "0.0.0.20170416"; + version = "0.0.0.20170503"; src = fetchFromGitHub { owner = "soveran"; repo = "clac"; - rev = "828600b01e80166bc435d4d73506f0c3e16f2459"; - sha256 = "08fhhvjrc7rn5fjjdqlallr76m6ybj3wm5gx407jbgfbky0fj7mb"; + rev = "e92bd5cbab0d694cef945e3478820c9505e06f04"; + sha256 = "0j8p1npgq32s377c9lw959h5i2csq4yb27cvg7av17bji46816bv"; }; buildInputs = []; diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index d87976cbc5e..9a988a2b431 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -1,8 +1,9 @@ -{ lib, stdenv, buildPackages, fetchurl, perl, xz, gmp ? null +{ stdenv, lib, buildPackages +, autoconf, automake114x, texinfo, fetchurl, perl, xz, libiconv, gmp ? null +, hostPlatform, buildPlatform , aclSupport ? false, acl ? null , attrSupport ? false, attr ? null , selinuxSupport? false, libselinux ? null, libsepol ? null -, autoconf, automake114x, texinfo , withPrefix ? false , singleBinary ? "symlinks" # you can also pass "shebangs" or false }: @@ -23,14 +24,17 @@ stdenv.mkDerivation rec { # FIXME needs gcc 4.9 in bootstrap tools hardeningDisable = [ "stackprotector" ]; - patches = optional stdenv.isCygwin ./coreutils-8.23-4.cygwin.patch; + patches = optional hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch; # The test tends to fail on btrfs and maybe other unusual filesystems. - postPatch = optionalString (!stdenv.isDarwin) '' + postPatch = optionalString (!hostPlatform.isDarwin) '' sed '2i echo Skipping dd sparse test && exit 0' -i ./tests/dd/sparse.sh sed '2i echo Skipping cp sparse test && exit 0' -i ./tests/cp/sparse.sh sed '2i echo Skipping rm deep-2 test && exit 0' -i ./tests/rm/deep-2.sh sed '2i echo Skipping du long-from-unreadable test && exit 0' -i ./tests/du/long-from-unreadable.sh + sed '2i echo Skipping chmod setgid test && exit 0' -i ./tests/chmod/setgid.sh + substituteInPlace ./tests/install/install-C.sh \ + --replace 'mode3=2755' 'mode3=1755' ''; outputs = [ "out" "info" ]; @@ -39,58 +43,54 @@ stdenv.mkDerivation rec { configureFlags = optional (singleBinary != false) ("--enable-single-binary" + optionalString (isString singleBinary) "=${singleBinary}") - ++ optional stdenv.isSunOS "ac_cv_func_inotify_init=no" - ++ optional withPrefix "--program-prefix=g"; + ++ optional hostPlatform.isSunOS "ac_cv_func_inotify_init=no" + ++ optional withPrefix "--program-prefix=g" + ++ optionals (hostPlatform != buildPlatform && hostPlatform.libc == "glibc") [ + # TODO(19b98110126fde7cbb1127af7e3fe1568eacad3d): Needed for fstatfs() I + # don't know why it is not properly detected cross building with glibc. + "fu_cv_sys_stat_statfs2_bsize=yes" + ]; + buildInputs = [ gmp ] ++ optional aclSupport acl ++ optional attrSupport attr - ++ optionals stdenv.isCygwin [ autoconf automake114x texinfo ] # due to patch - ++ optionals selinuxSupport [ libselinux libsepol ]; - - crossAttrs = { - buildInputs = [ gmp.crossDrv ] - ++ optional aclSupport acl.crossDrv - ++ optional attrSupport attr.crossDrv - ++ optionals selinuxSupport [ libselinux.crossDrv libsepol.crossDrv ] - ++ optional (stdenv ? ccCross.libc.libiconv) - stdenv.ccCross.libc.libiconv.crossDrv; - - # Prevents attempts of running 'help2man' on cross-built binaries. - PERL = "missing"; - - # Works around a bug with 8.26: - # Makefile:3440: *** Recursive variable 'INSTALL' references itself (eventually). Stop. - preInstall = '' - sed -i Makefile -e 's|^INSTALL =.*|INSTALL = ${buildPackages.coreutils}/bin/install -c|' - ''; - - postInstall = '' - rm $out/share/man/man1/* - cp ${buildPackages.coreutils}/share/man/man1/* $out/share/man/man1 - ''; - - # Needed for fstatfs() - # I don't know why it is not properly detected cross building with glibc. - configureFlags = [ "fu_cv_sys_stat_statfs2_bsize=yes" ]; - doCheck = false; - }; + ++ optionals hostPlatform.isCygwin [ autoconf automake114x texinfo ] # due to patch + ++ optionals selinuxSupport [ libselinux libsepol ] + # TODO(@Ericson2314): Investigate whether Darwin could benefit too + ++ optional (hostPlatform != buildPlatform && hostPlatform.libc != "glibc") libiconv; # The tests are known broken on Cygwin # (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19025), # Darwin (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19351), # and {Open,Free}BSD. # With non-standard storeDir: https://github.com/NixOS/nix/issues/512 - doCheck = stdenv ? glibc && builtins.storeDir == "/nix/store"; + doCheck = hostPlatform == buildPlatform + && hostPlatform.libc == "glibc" + && builtins.storeDir == "/nix/store"; + + # Prevents attempts of running 'help2man' on cross-built binaries. + PERL = if hostPlatform == buildPlatform then null else "missing"; # Saw random failures like ‘help2man: can't get '--help' info from # man/sha512sum.td/sha512sum’. enableParallelBuilding = false; NIX_LDFLAGS = optionalString selinuxSupport "-lsepol"; - FORCE_UNSAFE_CONFIGURE = optionalString stdenv.isSunOS "1"; + FORCE_UNSAFE_CONFIGURE = optionalString hostPlatform.isSunOS "1"; - makeFlags = optionalString stdenv.isDarwin "CFLAGS=-D_FORTIFY_SOURCE=0"; + makeFlags = optionalString hostPlatform.isDarwin "CFLAGS=-D_FORTIFY_SOURCE=0"; + + # Works around a bug with 8.26: + # Makefile:3440: *** Recursive variable 'INSTALL' references itself (eventually). Stop. + preInstall = optionalString (hostPlatform != buildPlatform) '' + sed -i Makefile -e 's|^INSTALL =.*|INSTALL = ${buildPackages.coreutils}/bin/install -c|' + ''; + + postInstall = optionalString (hostPlatform != buildPlatform) '' + rm $out/share/man/man1/* + cp ${buildPackages.coreutils}/share/man/man1/* $out/share/man/man1 + ''; meta = { homepage = http://www.gnu.org/software/coreutils/; @@ -109,4 +109,5 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.eelco ]; }; + } diff --git a/pkgs/tools/misc/cpuminer/default.nix b/pkgs/tools/misc/cpuminer/default.nix index 375aa999e3b..b4abb3097b9 100644 --- a/pkgs/tools/misc/cpuminer/default.nix +++ b/pkgs/tools/misc/cpuminer/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cpuminer-${version}"; - version = "2.4.5"; + version = "2.5.0"; src = fetchurl { url = "mirror://sourceforge/cpuminer/pooler-${name}.tar.gz"; - sha256 = "130ab6vcbm9azl9w8n97fzjnjbakm0k2n3wc1bcgy5y5c8s0220h"; + sha256 = "1xalrfrk5hvh1jh9kbqhib2an82ypd46vl9glaxhz3rbjld7c5pa"; }; patchPhase = if stdenv.cc.isClang then "${perl}/bin/perl ./nomacro.pl" else null; diff --git a/pkgs/tools/misc/cutecom/default.nix b/pkgs/tools/misc/cutecom/default.nix index de9604200ba..e3f8a4c43a5 100644 --- a/pkgs/tools/misc/cutecom/default.nix +++ b/pkgs/tools/misc/cutecom/default.nix @@ -1,16 +1,22 @@ -{ stdenv, fetchurl, qt4, cmake }: +{ stdenv, fetchFromGitHub, qtbase, qtserialport, cmake }: stdenv.mkDerivation rec { - name = "cutecom-0.22.0"; - src = fetchurl { - url = "http://cutecom.sourceforge.net/${name}.tar.gz"; - sha256 = "199fvl463nyn77r3nm8xgzgifs28j5759kkcnc5xbwww2nk20rhv"; + name = "cutecom-${version}"; + version = "0.40.0"; + src = fetchFromGitHub { + owner = "neundorf"; + repo = "CuteCom"; + rev = "v${version}"; + sha256 = "1bn6vndqlvn73riq6p0nanmcl35ja9gsil5hvfpf509r7i8gx4ds"; }; - buildInputs = [qt4 cmake]; + + preConfigure = '' + substituteInPlace CMakeLists.txt --replace "#find_package(Serialport REQUIRED)" "find_package(Qt5SerialPort REQUIRED)" + ''; + buildInputs = [qtbase qtserialport cmake]; meta = { description = "A graphical serial terminal"; - version = "0.22.0"; homepage = http://cutecom.sourceforge.net/; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.bennofs ]; diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix index ddf9c38ec93..b3aca778cd9 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -28,6 +28,8 @@ stdenv.mkDerivation { oldPath+="{datadir}\/ddccontrol-db" sed "s/$oldPath/$newPath/" configure.ac rm configure.ac.old + + sed -e "s/chmod 4711/chmod 0711/" -i src/ddcpci/Makefile* ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index 4dd49e02e0e..110125727bf 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -21,15 +21,15 @@ let ''; in buildRustPackage rec { name = "exa-${version}"; - version = "0.6.0"; + version = "0.7.0"; - depsSha256 = "0c1vyl1c67xq18ss0xs5cjdfn892jpwj6ml51dfppzfyns3namm4"; + depsSha256 = "0j320hhf2vqaha137pjj4pyiw6d3p5h3nhy3pl9vna1g5mnl1sn7"; src = fetchFromGitHub { owner = "ogham"; repo = "exa"; rev = "v${version}"; - sha256 = "0065gj4pbbppbnwp23s6bb7zlz428nrir00d0kz7axydxk6swhyv"; + sha256 = "0i9psgna2wwv9qyw9cif4qznqiyi16vl763hpm2yr195aj700339"; }; nativeBuildInputs = [ cmake pkgconfig perl ]; diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index 53d75485d5c..06a140fed50 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -1,4 +1,9 @@ -{ stdenv, fetchurl, coreutils }: +{ stdenv, fetchurl +, coreutils +, buildPlatform, hostPlatform +}: + +let inherit (stdenv.lib) optionals; in stdenv.mkDerivation rec { name = "findutils-4.6.0"; @@ -10,20 +15,18 @@ stdenv.mkDerivation rec { patches = [ ./memory-leak.patch ./no-install-statedir.patch ]; - buildInputs = [ coreutils ]; # bin/updatedb script needs to call sort + buildInputs = optionals (hostPlatform == buildPlatform) [ coreutils ]; # bin/updatedb script needs to call sort # Since glibc-2.25 the i686 tests hang reliably right after test-sleep. - doCheck = !stdenv.isDarwin && (stdenv.system != "i686-linux"); + doCheck + = !hostPlatform.isDarwin + && !(hostPlatform.libc == "glibc" && hostPlatform.isi686) + && hostPlatform == buildPlatform; outputs = [ "out" "info" ]; configureFlags = [ "--localstatedir=/var/cache" ]; - crossAttrs = { - # Fix the 'buildInputs = [ coreutils ]' above - that adds the cross coreutils to PATH :( - propagatedBuildInputs = [ ]; - }; - enableParallelBuilding = true; meta = { diff --git a/pkgs/tools/misc/fsql/default.nix b/pkgs/tools/misc/fsql/default.nix index e3a9297c4ab..32deb0c2306 100644 --- a/pkgs/tools/misc/fsql/default.nix +++ b/pkgs/tools/misc/fsql/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "fsql-${version}"; - version = "0.2.1"; + version = "0.3.1"; goPackagePath = "github.com/kshvmdn/fsql"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "kshvmdn"; repo = "fsql"; rev = "v${version}"; - sha256 = "1izcfxm77hjj8z7a2nk9bbwbz4wc2yqzs2ir8v3k822m1hvgwb9a"; + sha256 = "1accpxryk4744ydfrqc3la5k376ji11yr84n66dz5cx0f3n71vmz"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 55f36b5e446..9d40077e0d6 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -39,6 +39,7 @@ buildGoPackage rec { cp -r $src/man/man1 $man/share/man mkdir -p $out/share/vim-plugins ln -s $out/share/go/src/github.com/junegunn/fzf $out/share/vim-plugins/${name} + cp -R $src/shell $out/share/shell ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 7a70f2bdbff..2bbeea8133e 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -3,6 +3,7 @@ , zfs ? null , efiSupport ? false , zfsSupport ? true +, xenSupport ? false }: with stdenv.lib; @@ -46,6 +47,7 @@ in ( assert efiSupport -> canEfi; assert zfsSupport -> zfs != null; +assert !(efiSupport && xenSupport); stdenv.mkDerivation rec { name = "grub-${version}"; @@ -98,7 +100,8 @@ stdenv.mkDerivation rec { patches = [ ./fix-bash-completion.patch ]; configureFlags = optional zfsSupport "--enable-libzfs" - ++ optionals efiSupport [ "--with-platform=efi" "--target=${efiSystemsBuild.${stdenv.system}.target}" "--program-prefix=" ]; + ++ optionals efiSupport [ "--with-platform=efi" "--target=${efiSystemsBuild.${stdenv.system}.target}" "--program-prefix=" ] + ++ optionals xenSupport [ "--with-platform=xen" "--target=${efiSystemsBuild.${stdenv.system}.target}"]; # save target that grub is compiled for grubTarget = if efiSupport diff --git a/pkgs/tools/misc/grub/pvgrub_image/configs/grub-bootstrap.cfg b/pkgs/tools/misc/grub/pvgrub_image/configs/grub-bootstrap.cfg new file mode 100644 index 00000000000..e9883149ab5 --- /dev/null +++ b/pkgs/tools/misc/grub/pvgrub_image/configs/grub-bootstrap.cfg @@ -0,0 +1 @@ +normal (memdisk)/grub.cfg diff --git a/pkgs/tools/misc/grub/pvgrub_image/configs/grub.cfg b/pkgs/tools/misc/grub/pvgrub_image/configs/grub.cfg new file mode 100644 index 00000000000..69115b7101c --- /dev/null +++ b/pkgs/tools/misc/grub/pvgrub_image/configs/grub.cfg @@ -0,0 +1,10 @@ +# The parentheses around ${root} here to match Grub's config file syntax +if search -s -f /boot/grub/grub.cfg ; then + echo "Reading (${root})/boot/grub/grub.cfg" + configfile /boot/grub/grub.cfg +fi + +if search -s -f /grub/grub.cfg ; then + echo "Reading (${root})/grub/grub.cfg" + configfile /grub/grub.cfg +fi diff --git a/pkgs/tools/misc/grub/pvgrub_image/default.nix b/pkgs/tools/misc/grub/pvgrub_image/default.nix new file mode 100644 index 00000000000..ee6e5065f40 --- /dev/null +++ b/pkgs/tools/misc/grub/pvgrub_image/default.nix @@ -0,0 +1,42 @@ +{ stdenv, grub2_xen }: + +with stdenv.lib; +let + efiSystemsBuild = { + "i686-linux".target = "i386"; + "x86_64-linux".target = "x86_64"; + "aarch64-linux".target = "aarch64"; + }; + +in ( + +stdenv.mkDerivation rec { + name = "pvgrub-image"; + + configs = ./configs; + + buildInputs = [ grub2_xen ]; + + buildCommand = '' + cp "${configs}"/* . + tar -cf memdisk.tar grub.cfg + # We include all modules except all_video.mod as otherwise grub will fail printing "no symbol table" + # if we include it. + grub-mkimage -O "${efiSystemsBuild.${stdenv.system}.target}-xen" -c grub-bootstrap.cfg \ + -m memdisk.tar -o "grub-${efiSystemsBuild.${stdenv.system}.target}-xen.bin" \ + $(ls "${grub2_xen}/lib/grub/${efiSystemsBuild.${stdenv.system}.target}-xen/" |grep 'mod''$'|grep -v '^all_video\.mod''$') + mkdir -p "$out/lib/grub-xen" + cp "grub-${efiSystemsBuild.${stdenv.system}.target}-xen.bin" $out/lib/grub-xen/ + ''; + + meta = with stdenv.lib; { + description = "PvGrub image for use for booting PV Xen guests"; + + longDescription = + '' This package provides a PvGrub image for booting Para-Virtualized (PV) + Xen guests + ''; + + platforms = platforms.gnu; + }; +}) diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix new file mode 100644 index 00000000000..bc8ea769e8b --- /dev/null +++ b/pkgs/tools/misc/hdf4/default.nix @@ -0,0 +1,77 @@ +{ stdenv +, fetchurl +, cmake +, libjpeg +, zlib +, szip ? null +}: + +stdenv.mkDerivation rec { + name = "hdf-${version}"; + version = "4.2.12"; + src = fetchurl { + url = "https://support.hdfgroup.org/ftp/HDF/releases/HDF${version}/src/hdf-${version}.tar.bz2"; + sha256 = "020jh563sjyxsgml8l809d2i1d4ms9shivwj3gbm7n0ilxbll8id"; + }; + + buildInputs = [ + cmake + libjpeg + szip + zlib + ]; + + preConfigure = stdenv.lib.optionalString (szip != null) "export SZIP_INSTALL=${szip}"; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DBUILD_TESTING=ON" + "-DHDF4_BUILD_TOOLS=ON" + "-DHDF4_BUILD_UTILS=ON" + "-DHDF4_BUILD_WITH_INSTALL_NAME=OFF" + "-DHDF4_ENABLE_JPEG_LIB_SUPPORT=ON" + "-DHDF4_ENABLE_NETCDF=OFF" + "-DHDF4_ENABLE_Z_LIB_SUPPORT=ON" + "-DHDF4_BUILD_FORTRAN=OFF" + "-DJPEG_DIR=${libjpeg}" + ] ++ stdenv.lib.optionals (szip != null) [ + "-DHDF4_ENABLE_SZIP_ENCODING=ON" + "-DHDF4_ENABLE_SZIP_SUPPORT=ON" + ]; + + doCheck = true; + + preCheck = '' + export LD_LIBRARY_PATH=$(pwd)/bin + '' + stdenv.lib.optionalString (stdenv.isDarwin) '' + export DYLD_LIBRARY_PATH=$(pwd)/bin + ''; + + excludedTests = [ + "MFHDF_TEST-hdftest" + "MFHDF_TEST-hdftest-shared" + "HDP-dumpsds-18" + "NC_TEST-nctest" + ]; + + checkPhase = let excludedTestsRegex = if (excludedTests != []) + then "(" + (stdenv.lib.concatStringsSep "|" excludedTests) + ")" + else ""; in '' + runHook preCheck + ctest -E "${excludedTestsRegex}" --output-on-failure + runHook postCheck + ''; + + outputs = [ "bin" "dev" "out" ]; + + postInstall = '' + moveToOutput bin "$bin" + ''; + + meta = { + description = "Data model, library, and file format for storing and managing data"; + homepage = https://support.hdfgroup.org/products/hdf4/; + maintainers = with stdenv.lib.maintainers; [ knedlsepp ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/tools/misc/hebcal/default.nix b/pkgs/tools/misc/hebcal/default.nix new file mode 100644 index 00000000000..f7be5dbbbe4 --- /dev/null +++ b/pkgs/tools/misc/hebcal/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation rec { + version = "4.13"; + name = "hebcal-${version}"; + + src = fetchFromGitHub { + owner = "hebcal"; + repo = "hebcal"; + rev = "v${version}"; + sha256 = "0h9hbfkbq620sw9gnnkivv7yi7dnp1k6axzwr0yccbv5cg67xs3h"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + doCheck = true; + + meta = with stdenv.lib; { + homepage = "https://hebcal.github.io"; + description = "A perpetual Jewish Calendar"; + longDescription = "Hebcal is a program which prints out the days in the Jewish calendar for a given Gregorian year. Hebcal is fairly flexible in terms of which events in the Jewish calendar it displays."; + license = licenses.gpl2; + maintainers = [ maintainers.hhm ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix index 4fb71b688c3..9e21ab5e38f 100644 --- a/pkgs/tools/misc/heimdall/default.nix +++ b/pkgs/tools/misc/heimdall/default.nix @@ -1,49 +1,47 @@ -{ stdenv, fetchFromGitHub, zlib, libusb1, cmake, qt5, enableGUI ? false }: +{ stdenv, fetchFromGitHub, cmake +, zlib, libusb1 +, enableGUI ? false, qtbase ? null }: -let version = "1.4.1-37-gb6fe7f8"; in - -stdenv.mkDerivation { - name = "heimdall-${version}"; +stdenv.mkDerivation rec { + name = "heimdall-${if enableGUI then "gui-" else ""}${version}"; + version = "1.4.2"; src = fetchFromGitHub { owner = "Benjamin-Dobell"; repo = "Heimdall"; rev = "v${version}"; - sha256 = "10c71k251wxd05j6c76qlar5sd73zam1c1g2cq3cscqayd7rzafg"; + sha256 = "1ygn4snvcmi98rgldgxf5hwm7zzi1zcsihfvm6awf9s6mpcjzbqz"; }; - buildInputs = [ zlib libusb1 cmake ]; + buildInputs = [ + zlib libusb1 + ] ++ stdenv.lib.optional enableGUI qtbase; + nativeBuildInputs = [ cmake ]; cmakeFlags = [ - "-DBUILD_TYPE=Release" "-DDISABLE_FRONTEND=${if enableGUI then "OFF" else "ON"}" - ] ++ stdenv.lib.optionals enableGUI [ - "-DQt5Widgets_DIR=${qt5.qtbase.dev}/lib/cmake/Qt5Widgets" - "-DQt5Gui_DIR=${qt5.qtbase.dev}/lib/cmake/Qt5Gui" - "-DQt5Core_DIR=${qt5.qtbase.dev}/lib/cmake/Qt5Core" ]; preConfigure = '' # Give ownership of the Galaxy S USB device to the logged in user. substituteInPlace heimdall/60-heimdall.rules --replace 'MODE="0666"' 'TAG+="uaccess"' - - # Fix version string reported by the executable. - sed -i -e 's/version = "v.*"/version = "v${version}"/' heimdall/source/Interface.cpp ''; installPhase = '' - mkdir -p $out/bin $out/share/doc/heimdall $out/lib/udev/rules.d - cp "bin/"* $out/bin/ - cp ../Linux/README $out/share/doc/heimdall - cp ../heimdall/60-heimdall.rules $out/lib/udev/rules.d + mkdir -p $out/{bin,share/doc/heimdall,lib/udev/rules.d} + install -m755 -t $out/bin bin/* + install -m644 -t $out/lib/udev/rules.d ../heimdall/60-heimdall.rules + install -m644 ../Linux/README $out/share/doc/heimdall/README.linux + install -m644 ../OSX/README.txt $out/share/doc/heimdall/README.osx ''; enableParallelBuilding = true; - meta = { - homepage = "http://www.glassechidna.com.au/products/heimdall/"; + meta = with stdenv.lib; { + homepage = http://www.glassechidna.com.au/products/heimdall/; description = "A cross-platform tool suite to flash firmware onto Samsung Galaxy S devices"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/hid-listen/default.nix b/pkgs/tools/misc/hid-listen/default.nix new file mode 100644 index 00000000000..0ebad4f7117 --- /dev/null +++ b/pkgs/tools/misc/hid-listen/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchzip }: +stdenv.mkDerivation rec { + name = "hid-listen"; + version = "1.01"; + + src = fetchzip { + name = "hid_listen_${version}"; + url = "https://www.pjrc.com/teensy/hid_listen_${version}.zip"; + sha256 = "0sd4dvi39fl4vy880mg531ryks5zglfz5mdyyqr7x6qv056ffx9w"; + }; + + installPhase = '' + mkdir -p $out/bin + mv ./hid_listen $out/bin/hid_listen + ''; + + meta = with stdenv.lib; { + description = "A tool thats prints debugging information from usb HID devices"; + homepage = https://www.pjrc.com/teensy/hid_listen.html; + license = licenses.gpl3; + maintainers = with maintainers; [ tomsmeets ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/kronometer/default.nix b/pkgs/tools/misc/kronometer/default.nix index 6db3278fade..d74e2b4e12a 100644 --- a/pkgs/tools/misc/kronometer/default.nix +++ b/pkgs/tools/misc/kronometer/default.nix @@ -1,7 +1,7 @@ { mkDerivation, fetchurl, lib, extra-cmake-modules, kdoctools, wrapGAppsHook, - kconfig, kinit + kconfig, kcrash, kinit }: let @@ -21,5 +21,5 @@ mkDerivation rec { maintainers = with maintainers; [ peterhoeg ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; - propagatedBuildInputs = [ kconfig kinit ]; + propagatedBuildInputs = [ kconfig kcrash kinit ]; } diff --git a/pkgs/tools/misc/logstash/5.x.nix b/pkgs/tools/misc/logstash/5.x.nix index 13387b5c1a9..2628c777140 100644 --- a/pkgs/tools/misc/logstash/5.x.nix +++ b/pkgs/tools/misc/logstash/5.x.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; - sha256 = "019bhsnbbbg1a4g9jf02j3jb1xhhmrr3i7882s5l4pmkyn1d3gd1"; + sha256 = "1z3rwpwafrn6h0rzdsmripnwj8ad33v92ryxq8xf9y7331rqb2gs"; }; dontBuild = true; diff --git a/pkgs/tools/misc/megacli/default.nix b/pkgs/tools/misc/megacli/default.nix index cbebd557d77..5341c9840be 100644 --- a/pkgs/tools/misc/megacli/default.nix +++ b/pkgs/tools/misc/megacli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rpmextract, ncurses, patchelf, makeWrapper, requireFile, unzip }: +{ stdenv, rpmextract, ncurses5, patchelf, makeWrapper, requireFile, unzip }: assert stdenv.system == "x86_64-linux"; @@ -12,10 +12,10 @@ stdenv.mkDerivation rec { sha256 = "11jzvh25mlygflazd37gi05xv67im4rgq7sbs5nwgw3gxdh4xfjj"; }; - buildInputs = [rpmextract ncurses unzip makeWrapper]; + buildInputs = [rpmextract ncurses5 unzip makeWrapper]; libPath = stdenv.lib.makeLibraryPath - [ stdenv.cc.cc stdenv.cc.libc ncurses ]; + [ stdenv.cc.cc stdenv.cc.libc ncurses5 ]; buildCommand = '' mkdir -p $out/bin diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix index 51ac3249fed..dbb80067e6d 100644 --- a/pkgs/tools/misc/moreutils/default.nix +++ b/pkgs/tools/misc/moreutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, libxml2, libxslt, docbook-xsl, docbook_xml_dtd_44, perl, IPCRun, TimeDate, TimeDuration, makeWrapper }: +{ stdenv, fetchgit, libxml2, libxslt, docbook-xsl, docbook_xml_dtd_44, perl, IPCRun, TimeDate, TimeDuration, makeWrapper, darwin }: with stdenv.lib; stdenv.mkDerivation rec { @@ -15,10 +15,12 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace /usr/share/xml/docbook/stylesheet/docbook-xsl ${docbook-xsl}/xml/xsl/docbook ''; - buildInputs = [ libxml2 libxslt docbook-xsl docbook_xml_dtd_44 makeWrapper ]; + buildInputs = [ libxml2 libxslt docbook-xsl docbook_xml_dtd_44 makeWrapper ] + ++ optional stdenv.isDarwin darwin.cctools; propagatedBuildInputs = [ perl IPCRun TimeDate TimeDuration ]; + buildFlags = "CC=cc"; installFlags = "PREFIX=$(out)"; postInstall = "wrapProgram $out/bin/chronic --prefix PERL5LIB : $PERL5LIB"; diff --git a/pkgs/tools/misc/partition-manager/default.nix b/pkgs/tools/misc/partition-manager/default.nix index 52183a3fff3..a1c1eccdd88 100644 --- a/pkgs/tools/misc/partition-manager/default.nix +++ b/pkgs/tools/misc/partition-manager/default.nix @@ -1,6 +1,6 @@ { mkDerivation, fetchurl, lib , extra-cmake-modules, kdoctools, wrapGAppsHook -, kconfig, kinit, kpmcore +, kconfig, kcrash, kinit, kpmcore , eject, libatasmart }: let @@ -22,5 +22,5 @@ in mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; # refer to kpmcore for the use of eject buildInputs = [ eject libatasmart ]; - propagatedBuildInputs = [ kconfig kinit kpmcore ]; + propagatedBuildInputs = [ kconfig kcrash kinit kpmcore ]; } diff --git a/pkgs/tools/misc/peruse/default.nix b/pkgs/tools/misc/peruse/default.nix index cd872fd966e..a3fdca001d9 100644 --- a/pkgs/tools/misc/peruse/default.nix +++ b/pkgs/tools/misc/peruse/default.nix @@ -1,7 +1,7 @@ { mkDerivation, fetchFromGitHub, fetchurl, lib, extra-cmake-modules, kdoctools, wrapGAppsHook, - baloo, kconfig, kfilemetadata, kinit, kirigami, knewstuff, plasma-framework + baloo, karchive, kconfig, kcrash, kfilemetadata, kinit, kirigami, knewstuff, plasma-framework }: let @@ -23,7 +23,7 @@ in mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; - propagatedBuildInputs = [ baloo kconfig kfilemetadata kinit kirigami knewstuff plasma-framework ]; + propagatedBuildInputs = [ baloo karchive kconfig kcrash kfilemetadata kinit kirigami knewstuff plasma-framework ]; pathsToLink = [ "/etc/xdg/peruse.knsrc"]; diff --git a/pkgs/tools/misc/phraseapp-client/default.nix b/pkgs/tools/misc/phraseapp-client/default.nix index 1823c2cfad6..d5908210cbd 100644 --- a/pkgs/tools/misc/phraseapp-client/default.nix +++ b/pkgs/tools/misc/phraseapp-client/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "phraseapp-client-${version}"; - version = "1.4.3"; + version = "1.4.5"; goPackagePath = "github.com/phrase/phraseapp-client"; subPackages = [ "." ]; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "phrase"; repo = "phraseapp-client"; rev = version; - sha256 = "1nfab7y75vl0vg9vy8gc46h7wikk94nky1n415im1xbpsnqg77wz"; + sha256 = "0zky7jcs7h6zmvkb0na4la6h7g63jlrziifqk831fd1gspdzgajp"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix index d1b5481ad01..8282c2a1cd9 100644 --- a/pkgs/tools/misc/plowshare/default.nix +++ b/pkgs/tools/misc/plowshare/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchFromGitHub, makeWrapper, curl, spidermonkey }: +{ stdenv, fetchFromGitHub, makeWrapper, curl, recode, spidermonkey }: stdenv.mkDerivation rec { - name = "plowshare4-${version}"; - version = "1.1.0"; + name = "plowshare-${version}"; + version = "2.1.6"; src = fetchFromGitHub { owner = "mcrapet"; repo = "plowshare"; rev = "v${version}"; - sha256 = "1xxkdv4q97dfzbcdnmy5079a59fwh8myxlvdr2dlxdv70fb72sq9"; + sha256 = "116291w0z1r61xm3a3zjlh85f05pk4ng9f1wbj9kv1j3xrjn4v4c"; }; buildInputs = [ makeWrapper ]; @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { installPhase = '' make PREFIX="$out" install - for fn in plow{del,down,list,up}; do - wrapProgram "$out/bin/$fn" --prefix PATH : "${stdenv.lib.makeBinPath [ curl spidermonkey ]}" + for fn in plow{del,down,list,mod,probe,up}; do + wrapProgram "$out/bin/$fn" --prefix PATH : "${stdenv.lib.makeBinPath [ curl recode spidermonkey ]}" done ''; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { A command-line download/upload tool for popular file sharing websites ''; license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.aforemny ]; + maintainers = with stdenv.lib.maintainers; [ aforemny jfrankenau ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix index 8a3aa08abb7..cd1e5457639 100644 --- a/pkgs/tools/misc/pv/default.nix +++ b/pkgs/tools/misc/pv/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl } : stdenv.mkDerivation rec { - name = "pv-1.6.0"; + name = "pv-1.6.6"; src = fetchurl { url = "http://www.ivarch.com/programs/sources/${name}.tar.bz2"; - sha256 = "13gg6r84pkvznpd1l11qw1jw9yna40gkgpni256khyx21m785khf"; + sha256 = "1wbk14xh9rfypiwyy68ssl8dliyji30ly70qki1y2xx3ywszk3k0"; }; meta = { diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix index 6d961c69b13..ee5c37ef6bb 100644 --- a/pkgs/tools/misc/rrdtool/default.nix +++ b/pkgs/tools/misc/rrdtool/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, gettext, perl, pkgconfig, libxml2, pango, cairo, groff +{ fetchurl, fetchpatch, stdenv, gettext, perl, pkgconfig, libxml2, pango, cairo, groff , tcl-8_5, darwin }: stdenv.mkDerivation rec { @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { sha256 = "0ssjqpa0dwwzbylc0drmlbq922qcw8crffc0rpr805xr6n4k8zgr"; }; + patches = [ + # fix regression https://github.com/oetiker/rrdtool-1.x/issues/794 + (fetchpatch { + url = "https://github.com/oetiker/rrdtool-1.x/compare/0f28f99...f1edd12.patch"; + sha256 = "10g56zy0rdjpv3kvvmf6vvaysmla05wi8byy3l0xrz2x8m02ylqq"; + }) + ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gettext perl libxml2 pango cairo groff ] diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index 7af602106ff..6ef042abb15 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "screen-${version}"; - version = "4.5.1"; + version = "4.6.1"; src = fetchurl { url = "mirror://gnu/screen/${name}.tar.gz"; - sha256 = "0bbv16gpxrh64sn4bvjy3qjy7jsxjlqlilyysin02fwnvla23nwp"; + sha256 = "0r3wpfxnr5kw73b8ndja26jk03nfbks06iyfmgb5aqb2rdkazadb"; }; configureFlags= [ diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix index b668b7af0d4..d2bf060edd0 100644 --- a/pkgs/tools/misc/slop/default.nix +++ b/pkgs/tools/misc/slop/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchFromGitHub, cmake -, glm, mesa, gengetopt, libX11, libXext, libXrender, cppcheck}: +, glew, glm, mesa, libX11, libXext, libXrender, cppcheck, icu}: stdenv.mkDerivation rec { name = "slop-${version}"; - version = "6.3.41"; + version = "6.3.47"; src = fetchFromGitHub { owner = "naelstrof"; repo = "slop"; rev = "v${version}"; - sha256 = "051w2hcpz4qmvy7bmnzv7llxr2jbcpfxdadlzr2cidr323cann27"; + sha256 = "05saxp5z2saq6b5hslxdc5kd7ln00svr5pazabcnchzydfhnkmsd"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ glm mesa gengetopt libX11 libXext libXrender ] + buildInputs = [ glew glm mesa libX11 libXext libXrender icu ] ++ stdenv.lib.optional doCheck cppcheck; doCheck = false; diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index 9a2f9b65e8c..ff69fb01cea 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -14,13 +14,13 @@ let in stdenv.mkDerivation rec { name = "tlp-${version}"; - version = "0.9"; + version = "1.0"; src = fetchFromGitHub { owner = "linrunner"; repo = "TLP"; rev = "${version}"; - sha256 = "1gwi0h9klhdvqfqvmn297l1vyhj4g9dqvf50lcbswry02mvnd2vn"; + sha256 = "0gq1y1qnzwyv7cw32g4ymlfssi2ayrbnd04y4l242k6n41d05bij"; }; makeFlags = [ "DESTDIR=$(out)" diff --git a/pkgs/tools/misc/tmate/default.nix b/pkgs/tools/misc/tmate/default.nix index f02c4148481..a528f5f394f 100644 --- a/pkgs/tools/misc/tmate/default.nix +++ b/pkgs/tools/misc/tmate/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, zlib, openssl, libevent, ncurses, cmake, ruby, libmsgpack, libssh }: +{ stdenv, fetchFromGitHub, autoreconfHook, cmake, libtool, pkgconfig +, zlib, openssl, libevent, ncurses, ruby, libmsgpack, libssh }: stdenv.mkDerivation rec { name = "tmate-${version}"; @@ -11,17 +12,17 @@ stdenv.mkDerivation rec { sha256 = "0pfl9vrswzim9ydi1n652h3rax2zrmy6sqkp0r09yy3lw83h4y1r"; }; - buildInputs = [ autoconf automake pkgconfig libtool zlib openssl libevent ncurses cmake ruby libmsgpack libssh ]; + dontUseCmakeConfigure = true; - dontUseCmakeConfigure=true; + buildInputs = [ libtool zlib openssl libevent ncurses ruby libmsgpack libssh ]; + nativeBuildInputs = [ autoreconfHook cmake pkgconfig ]; + enableParallelBuilding = true; - preConfigure = "./autogen.sh"; - - meta = { - homepage = http://tmate.io/; + meta = with stdenv.lib; { + homepage = http://tmate.io/; description = "Instant Terminal Sharing"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ ]; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/misc/ttyrec/default.nix b/pkgs/tools/misc/ttyrec/default.nix index a836a2a0d0e..238d2d73d3b 100644 --- a/pkgs/tools/misc/ttyrec/default.nix +++ b/pkgs/tools/misc/ttyrec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, buildPlatform }: stdenv.mkDerivation rec { name = "ttyrec-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = [ ./clang-fixes.patch ]; - makeFlags = [ "CFLAGS=-DSVR4" ] + makeFlags = stdenv.lib.optional buildPlatform.isLinux "CFLAGS=-DSVR4" ++ stdenv.lib.optional stdenv.cc.isClang "CC=clang"; installPhase = '' diff --git a/pkgs/tools/misc/x11idle/default.nix b/pkgs/tools/misc/x11idle/default.nix new file mode 100644 index 00000000000..5876cfb6b74 --- /dev/null +++ b/pkgs/tools/misc/x11idle/default.nix @@ -0,0 +1,33 @@ +{ stdenv, xlibs, fetchgit, libXScrnSaver, libX11 }: + +stdenv.mkDerivation { + name = "x11idle-unstable-2017-07-01"; + + src = fetchgit { + url = "git://orgmode.org/org-mode.git"; + rev = "fbd865941f3105f689f78bf053bb3b353b9b8a23"; + sha256 = "0ma3m48f4s38xln0gl1ww9i5x28ij0ipxc94kx5h2931zy7lqzvz"; + }; + + buildInputs = [ libXScrnSaver libX11 ]; + + unpackPhase = ":"; + + installPhase = '' + mkdir -p $out/bin + gcc -lXss -lX11 $src/contrib/scripts/x11idle.c -o $out/bin/x11idle + ''; + + meta = with stdenv.lib; { + description = '' + Compute consecutive idle time for current X11 session with millisecond resolution + ''; + longDescription = '' + Idle time passes when the user does not act, i.e. when the user doesn't move the mouse or use the keyboard. + ''; + homepage = "http://orgmode.org/"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.swflint ]; + }; +} diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix index 408879a4534..c64ae609bcb 100644 --- a/pkgs/tools/misc/xburst-tools/default.nix +++ b/pkgs/tools/misc/xburst-tools/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchgit, libusb, libusb1, autoconf, automake, confuse, pkgconfig -, gccCross ? null }: +, gccCross ? null, crossPrefix +}: let version = "2011-12-26"; @@ -18,7 +19,7 @@ stdenv.mkDerivation { ''; configureFlags = if gccCross != null then - "--enable-firmware CROSS_COMPILE=${gccCross.crossConfig}-" + "--enable-firmware CROSS_COMPILE=${crossPrefix}-" else ""; # Not to strip cross build binaries (this is for the gcc-cross-wrapper) diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix index 8da61ddc4af..7fc9589537f 100644 --- a/pkgs/tools/misc/yle-dl/default.nix +++ b/pkgs/tools/misc/yle-dl/default.nix @@ -1,28 +1,18 @@ { stdenv, fetchFromGitHub, rtmpdump, php, pythonPackages }: -stdenv.mkDerivation rec { +pythonPackages.buildPythonApplication rec { name = "yle-dl-${version}"; - version = "2.17"; + version = "2.20"; src = fetchFromGitHub { owner = "aajanki"; repo = "yle-dl"; rev = version; - sha256 = "06szrcm1xlz6i736qkxzhhvrzg63shxzy2bww91bgxfccmkapa14"; + sha256 = "06wzv230hfh3w9gs245kff8666bsfbax3ibr5zxj3h5z4qhhf9if"; }; - patchPhase = '' - substituteInPlace yle-dl --replace '/usr/local/share/' "$out/share/" - ''; - - buildInputs = [ pythonPackages.wrapPython ]; pythonPath = [ rtmpdump php ] ++ (with pythonPackages; [ pycrypto ]); - installPhase = '' - make install prefix=$out - wrapPythonPrograms - ''; - meta = with stdenv.lib; { description = "Downloads videos from Yle (Finnish Broadcasting Company) servers"; homepage = https://aajanki.github.io/yle-dl/; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 0af3b72f6af..b730d45c9e2 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -15,11 +15,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2017.06.18"; + version = "2017.07.09"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "16az9rwr71hvs2z2xagnk71xqs7si0nb8rkn63r7pfv4rb134ggm"; + sha256 = "0phrfby2nk5y5x5173bbg3jcr2ajk849al3zji5y39z39dj36ba2"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/zabbix-cli/default.nix b/pkgs/tools/misc/zabbix-cli/default.nix new file mode 100644 index 00000000000..77c06ea1911 --- /dev/null +++ b/pkgs/tools/misc/zabbix-cli/default.nix @@ -0,0 +1,24 @@ +{ fetchFromGitHub, lib, python2Packages }: +let + pythonPackages = python2Packages; + +in pythonPackages.buildPythonApplication rec { + name = "zabbix-cli-${version}"; + version = "1.6.1"; + + propagatedBuildInputs = with pythonPackages; [ argparse requests ]; + + src = fetchFromGitHub { + owner = "usit-gd"; + repo = "zabbix-cli"; + rev = version; + sha256 = "17ip3s8ifgj264zwxrr857wk02xmzmlsjrr613mdhkgdwizqbcs3"; + }; + + meta = with lib; { + description = "Command-line interface for Zabbix"; + homepage = src.meta.homepage; + license = [ licenses.gpl3 ]; + maintainers = [ maintainers.womfoo ]; + }; +} diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix index 6f7e4ba4b69..976285eeee7 100644 --- a/pkgs/tools/networking/burpsuite/default.nix +++ b/pkgs/tools/networking/burpsuite/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, jre }: let - version = "1.7.06"; + version = "1.7.23"; jar = fetchurl { name = "burpsuite.jar"; url = "https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar"; - sha256 = "13x3x0la2jmm7zr66mvczzlmsy1parfibnl9s4iwi1nls4ikv7kl"; + sha256 = "1y83qisn9pkn88vphpli7h8nacv8jv3sq0h04zbri25nfkgvl4an"; }; launcher = '' #!${stdenv.shell} diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index 3f2d81249d1..12a8a1a184f 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, fetchpatch, nodejs, which, python27, utillinux }: -let version = "19.1"; in +let version = "20"; in stdenv.mkDerivation { name = "cjdns-"+version; src = fetchurl { url = "https://github.com/cjdelisle/cjdns/archive/cjdns-v${version}.tar.gz"; - sha256 = "53c568a500215b055a9894178eb4477bd93a6e1abf751d0bc5ef2a03ea01a188"; + sha256 = "1dyqxi9l2pmrgm16a161909rg3vfzvib40frr7p6ddpk8yfh5888"; }; buildInputs = [ which python27 nodejs ] ++ diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index d1f7c4112c6..daf5a19b01c 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; + separateDebugInfo = stdenv.isLinux; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix index aeace91df19..a918aa6375f 100644 --- a/pkgs/tools/networking/dropbear/default.nix +++ b/pkgs/tools/networking/dropbear/default.nix @@ -22,13 +22,6 @@ stdenv.mkDerivation rec { makeFlags=VPATH=`cat $NIX_CC/nix-support/orig-libc`/lib ''; - crossAttrs = { - # This works for uclibc, at least. - preConfigure = '' - makeFlags=VPATH=`cat ${stdenv.ccCross}/nix-support/orig-libc`/lib - ''; - }; - patches = [ # Allow sessions to inherit the PATH from the parent dropbear. # Otherwise they only get the usual /bin:/usr/bin kind of PATH diff --git a/pkgs/tools/networking/email/default.nix b/pkgs/tools/networking/email/default.nix index 017da63a1e9..c7a6fbcfd7c 100644 --- a/pkgs/tools/networking/email/default.nix +++ b/pkgs/tools/networking/email/default.nix @@ -8,7 +8,7 @@ let sha256 = "1cxxzhm36civ6vjdgrk7mfmlzkih44kdii6l2xgy4r434s8rzcpn"; }; - srcRoot = "eMail-${eMailSrc.rev}-src"; + srcRoot = eMailSrc.name; dlibSrc = fetchFromGitHub { owner = "deanproxy"; diff --git a/pkgs/tools/networking/hue-cli/Gemfile b/pkgs/tools/networking/hue-cli/Gemfile new file mode 100644 index 00000000000..7049659d503 --- /dev/null +++ b/pkgs/tools/networking/hue-cli/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'hue-cli' diff --git a/pkgs/tools/networking/hue-cli/Gemfile.lock b/pkgs/tools/networking/hue-cli/Gemfile.lock new file mode 100644 index 00000000000..3b1f6570700 --- /dev/null +++ b/pkgs/tools/networking/hue-cli/Gemfile.lock @@ -0,0 +1,18 @@ +GEM + remote: https://rubygems.org/ + specs: + hue-cli (0.1.4) + hue-lib (>= 0.7.4) + json + hue-lib (0.7.4) + json + json (2.1.0) + +PLATFORMS + ruby + +DEPENDENCIES + hue-cli + +BUNDLED WITH + 1.15.1 diff --git a/pkgs/tools/networking/hue-cli/default.nix b/pkgs/tools/networking/hue-cli/default.nix new file mode 100644 index 00000000000..4f8d1039e5e --- /dev/null +++ b/pkgs/tools/networking/hue-cli/default.nix @@ -0,0 +1,10 @@ +{ bundlerEnv, ruby }: + +bundlerEnv rec { + name = "hue-cli-${version}"; + + version = (import gemset).hue-cli.version; + inherit ruby; + gemdir = ./.; + gemset = ./gemset.nix; +} diff --git a/pkgs/tools/networking/hue-cli/gemset.nix b/pkgs/tools/networking/hue-cli/gemset.nix new file mode 100644 index 00000000000..d1af93ff154 --- /dev/null +++ b/pkgs/tools/networking/hue-cli/gemset.nix @@ -0,0 +1,28 @@ +{ + hue-cli = { + dependencies = ["hue-lib" "json"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10gjf59pamfy2m17fs271d9ffrg1194b1m6vxzn6p7smzry52h9z"; + type = "gem"; + }; + version = "0.1.4"; + }; + hue-lib = { + dependencies = ["json"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pyl8g8gisdhl79gbzvnddqrsbq0lmflzg7n6yi6xrp5b5290shz"; + type = "gem"; + }; + version = "0.7.4"; + }; + json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + type = "gem"; + }; + version = "2.1.0"; + }; +} \ No newline at end of file diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix index d5b9ff665d4..e13ada5994c 100644 --- a/pkgs/tools/networking/i2p/default.nix +++ b/pkgs/tools/networking/i2p/default.nix @@ -1,10 +1,36 @@ { stdenv, procps, coreutils, fetchurl, jdk, jre, ant, gettext, which }: +let wrapper = stdenv.mkDerivation rec { + name = "wrapper-${version}"; + version = "3.5.32"; + src = fetchurl { + url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz"; + sha256 = "1v388p5jjbpwybw0zjv5glzny17fwdwppaci2lqcsnm6qw0667f1"; + }; + buildInputs = [ jdk ]; + buildPhase = '' + export ANT_HOME=${ant} + export JAVA_HOME=${jdk}/lib/openjdk/jre/ + export JAVA_TOOL_OPTIONS=-Djava.home=$JAVA_HOME + export CLASSPATH=${jdk}/lib/openjdk/lib/tools.jar + sed 's/ testsuite$//' -i src/c/Makefile-linux-x86-64.make + ${if stdenv.isi686 then "./build32.sh" else "./build64.sh"} + ''; + installPhase = '' + mkdir -p $out/{bin,lib} + cp bin/wrapper $out/bin/wrapper + cp lib/wrapper.jar $out/lib/wrapper.jar + cp lib/libwrapper.so $out/lib/libwrapper.so + ''; +}; + +in + stdenv.mkDerivation rec { - name = "i2p-0.9.28"; + name = "i2p-0.9.30"; src = fetchurl { url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz"; - sha256 = "1xagyywnck2c5xalr7bc7cv5ikk4igf7avmc0n28nz9pkais1y1y"; + sha256 = "03hrirmah3ba9ygql487jy233nsxkfjyz82mmyppazi0mcgiass1"; }; buildInputs = [ jdk ant gettext which ]; patches = [ ./i2p.patch ]; @@ -16,7 +42,11 @@ stdenv.mkDerivation rec { set -B mkdir -p $out/{bin,share} cp -r pkg-temp/* $out - cp installer/lib/wrapper/linux64/* $out + + cp ${wrapper}/bin/wrapper $out/i2psvc + cp ${wrapper}/lib/wrapper.jar $out/lib + cp ${wrapper}/lib/libwrapper.so $out/lib + sed -i $out/i2prouter -i $out/runplain.sh \ -e "s#uname#${coreutils}/bin/uname#" \ -e "s#which#${which}/bin/which#" \ @@ -38,7 +68,6 @@ stdenv.mkDerivation rec { description = "Applications and router for I2P, anonymity over the Internet"; maintainers = [ maintainers.joelmo ]; license = licenses.gpl2; - # TODO: support other systems, just copy appropriate lib/wrapper.. to $out - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/tools/networking/iperf/3.nix b/pkgs/tools/networking/iperf/3.nix index 0d1e3194bd8..a86e3e04530 100644 --- a/pkgs/tools/networking/iperf/3.nix +++ b/pkgs/tools/networking/iperf/3.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "iperf-3.1.7"; + name = "iperf-3.2"; src = fetchurl { url = "http://downloads.es.net/pub/iperf/${name}.tar.gz"; - sha256 = "0kvk8d0a3dcxc8fisyprbn01y8akxj4sx8ld5dh508p9dx077vx4"; + sha256 = "07cwrl9q5pmfjlh6ilpk7hm25lpkcaf917zhpmfq918lhrpv61zj"; }; postInstall = '' diff --git a/pkgs/tools/networking/isync/unstable.nix b/pkgs/tools/networking/isync/unstable.nix index 4adcaf2b9da..9d32f91d0e1 100644 --- a/pkgs/tools/networking/isync/unstable.nix +++ b/pkgs/tools/networking/isync/unstable.nix @@ -1,17 +1,20 @@ -{ fetchgit, stdenv, openssl, pkgconfig, db, cyrus_sasl, zlib -, autoconf, automake }: +{ + stdenv, fetchgit, + autoconf, automake, cyrus_sasl, db, openssl, perl, pkgconfig, zlib, +}: stdenv.mkDerivation rec { - name = "isync-git-20170329"; - rev = "1fdf793a3fb9f4704977ef49e0a490a83291ea4d"; + name = "isync-git-20170514"; + rev = "4b3768806278a70db696ba52645dc1b6eb8de58a"; src = fetchgit { url = "https://git.code.sf.net/p/isync/isync"; inherit rev; - sha256 = "1m54jjww1b7a6rfw4wckzx6z1nd90psbb6cs38b9c015cs0vwaf5"; + sha256 = "1cv1isw01cfp7724z6f4pf6k4rx3k1lg0pc1xcq17zpikx9d10fb"; }; - buildInputs = [ openssl pkgconfig db cyrus_sasl zlib autoconf automake ]; + nativeBuildInputs = [ autoconf automake perl pkgconfig ]; + buildInputs = [ cyrus_sasl db openssl zlib ]; preConfigure = '' touch ChangeLog diff --git a/pkgs/tools/networking/jnettop/default.nix b/pkgs/tools/networking/jnettop/default.nix index a09da684c98..ec2f34f5601 100644 --- a/pkgs/tools/networking/jnettop/default.nix +++ b/pkgs/tools/networking/jnettop/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, autoconf, libpcap, ncurses, pkgconfig, glib }: +{ fetchurl, fetchpatch, stdenv, autoconf, libpcap, ncurses, pkgconfig, glib }: stdenv.mkDerivation rec { name = "jnettop-0.13.0"; @@ -10,7 +10,14 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf libpcap ncurses pkgconfig glib ]; - patches = [ ./no-dns-resolution.patch ]; + patches = [ + ./no-dns-resolution.patch + (fetchpatch { + url = "https://sources.debian.net/data/main/j/jnettop/0.13.0-1/debian/patches/0001-Use-64-bit-integers-for-byte-totals-support-bigger-u.patch"; + sha256 = "1b0alc12sj8pzcb66f8xslbqlbsvq28kz34v6jfhbb1q25hyr7jg"; + }) + ]; + preConfigure = '' autoconf ''; meta = { diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix index ae62195342f..67181d8aec3 100644 --- a/pkgs/tools/networking/lftp/default.nix +++ b/pkgs/tools/networking/lftp/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "lftp-${version}"; - version = "4.7.7"; + version = "4.8.0"; src = fetchurl { urls = [ @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { "ftp://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/${name}.tar.bz2" "http://lftp.yar.ru/ftp/old/${name}.tar.bz2" ]; - sha256 = "104jvzmvbmblfg8n8ffrnrrg8za5l25n53lbkawwy5x3m4h1yi7y"; + sha256 = "0z2432zxzg808swi72yak9kia976qrjj030grk0v4p54mcib3s34"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix index 8e3bd7a82bf..6b816fc8740 100644 --- a/pkgs/tools/networking/lldpd/default.nix +++ b/pkgs/tools/networking/lldpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig +{ stdenv, lib, fetchurl, pkgconfig, removeReferencesTo , libevent, readline, net_snmp }: stdenv.mkDerivation rec { @@ -16,13 +16,17 @@ stdenv.mkDerivation rec { "--with-snmp" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig removeReferencesTo ]; buildInputs = [ libevent readline net_snmp ]; enableParallelBuilding = true; outputs = [ "out" "dev" "man" "doc" ]; + preFixup = '' + find $out -type f -exec remove-references-to -t ${stdenv.cc} '{}' + + ''; + meta = with lib; { description = "802.1ab implementation (LLDP) to help you locate neighbors of all your equipments"; homepage = "https://vincentbernat.github.io/lldpd/"; diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 0ae993db332..f83ea004db6 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -14,6 +14,12 @@ stdenv.mkDerivation rec { patches = [ ./path-to-cat.patch ./no-gets.patch ./scm_c_string.patch ]; + postPatch = '' + sed -i -e '/chown root:mail/d' \ + -e 's/chmod [24]755/chmod 0755/' \ + */Makefile{,.in,.am} + ''; + configureFlags = [ "--with-gsasl" "--with-gssapi=${gss}" diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix index 36bb9cb791b..fc496b416ff 100644 --- a/pkgs/tools/networking/mitmproxy/default.nix +++ b/pkgs/tools/networking/mitmproxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages }: +{ stdenv, fetchpatch, fetchFromGitHub, python3Packages }: python3Packages.buildPythonPackage rec { baseName = "mitmproxy"; @@ -12,6 +12,15 @@ python3Packages.buildPythonPackage rec { sha256 = "1x1a28al5clpfd69rjcpw26gjjnpsm1vfl4scrwpdd1jhkw044h9"; }; + patches = [ + # Bump pyopenssl dependency + # https://github.com/mitmproxy/mitmproxy/pull/2252 + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/mitmproxy/mitmproxy/pull/2252.patch"; + sha256 = "1smld21df79249qbh412w8gi2agcf4zjhxnlawy19yjl1fk2h67c"; + }) + ]; + propagatedBuildInputs = with python3Packages; [ blinker click certifi construct cryptography cssutils editorconfig h2 html2text hyperframe diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix index 666bb4942a9..03a0c99c421 100644 --- a/pkgs/tools/networking/mtr/default.nix +++ b/pkgs/tools/networking/mtr/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { sha256 = "17zi99n8bdqrwrnbfyjn327jz4gxx287wrq3vk459c933p34ff8r"; }; + preConfigure = "substituteInPlace Makefile.in --replace ' install-exec-hook' ''"; + configureFlags = optionalString (!withGtk) "--without-gtk"; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 33db7b1caba..595337906d0 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, sqlite, pkgconfig, autoreconfHook, pmccabe , xapian, glib, gmime, texinfo , emacs, guile -, gtk3, webkitgtk24x, libsoup, icu +, gtk3, webkitgtk24x-gtk3, libsoup, icu , withMug ? false }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # pmccabe should be a checkInput instead, but configure looks for it buildInputs = [ sqlite xapian glib gmime texinfo emacs guile libsoup icu - ] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk24x ]; + ] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk24x-gtk3 ]; nativeBuildInputs = [ pkgconfig autoreconfHook ]; checkInputs = [ pmccabe ]; diff --git a/pkgs/tools/networking/ndisc6/default.nix b/pkgs/tools/networking/ndisc6/default.nix index 86eec455564..56cdbd17825 100644 --- a/pkgs/tools/networking/ndisc6/default.nix +++ b/pkgs/tools/networking/ndisc6/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" + "--disable-suid-install" ]; installFlags = [ @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.remlab.net/ndisc6/; + homepage = https://www.remlab.net/ndisc6/; description = "A small collection of useful tools for IPv6 networking"; maintainers = with maintainers; [ eelco wkennington ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/netselect/default.nix b/pkgs/tools/networking/netselect/default.nix index f326059d9d7..6015ff9fbc7 100644 --- a/pkgs/tools/networking/netselect/default.nix +++ b/pkgs/tools/networking/netselect/default.nix @@ -8,10 +8,13 @@ stdenv.mkDerivation { sha256 = "0y69z59vylj9x9nk5jqn6ihx7dkzg09gpv2w1q1rs8fmi4jr90gy"; }; - preBuild = " + preBuild = '' makeFlagsArray=(PREFIX=$out) - substituteInPlace Makefile --replace '-o root' '' --replace '-g root' '' - "; + substituteInPlace Makefile \ + --replace "-o root" "" \ + --replace "-g root" "" \ + --replace "4755" "0755" + ''; meta = { homepage = http://alumnit.ca/~apenwarr/netselect/; diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 585ffe1d3b1..d2a51b3acc8 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -31,8 +31,7 @@ stdenv.mkDerivation rec { --replace /usr/bin/ping ${inetutils}/bin/ping \ --replace /usr/bin/ping6 ${inetutils}/bin/ping substituteInPlace src/devices/nm-arping-manager.c \ - --replace '("arping", NULL, NULL);' '("arping", "${inetutils}/bin/arping", NULL);' - substituteInPlace src/NetworkManagerUtils.c --replace /sbin/modprobe ${kmod}/bin/modprobe + --replace '("arping", NULL, NULL);' '("arping", "${iputils}/bin/arping", NULL);' substituteInPlace data/84-nm-drivers.rules \ --replace /bin/sh ${stdenv.shell} substituteInPlace data/85-nm-unmanaged.rules \ @@ -43,6 +42,8 @@ stdenv.mkDerivation rec { --replace /bin/kill ${coreutils}/bin/kill substituteInPlace clients/common/nm-vpn-helpers.c \ --subst-var-by openconnect ${openconnect} + substituteInPlace src/nm-core-utils.c \ + --subst-var-by modprobeBinPath ${kmod}/bin/modprobe # to enable link-local connections configureFlags="$configureFlags --with-udev-dir=$out/lib/udev" ''; @@ -79,6 +80,7 @@ stdenv.mkDerivation rec { url = "https://github.com/NetworkManager/NetworkManager/commit/4e8eddd100bbc8429806a70620c90b72cfd29cb1.patch"; }) ./openconnect_helper_path.patch + ./modprobe.patch ]; buildInputs = [ systemd libgudev libnl libuuid polkit ppp libndp diff --git a/pkgs/tools/networking/network-manager/modprobe.patch b/pkgs/tools/networking/network-manager/modprobe.patch new file mode 100644 index 00000000000..487c70b0165 --- /dev/null +++ b/pkgs/tools/networking/network-manager/modprobe.patch @@ -0,0 +1,11 @@ +--- a/src/nm-core-utils.c 2017-02-15 13:10:27.000000000 +0100 ++++ b/src/nm-core-utils.c 2017-07-06 14:28:41.575815695 +0200 +@@ -419,7 +419,7 @@ + + /* construct the argument list */ + argv = g_ptr_array_sized_new (4); +- g_ptr_array_add (argv, "/sbin/modprobe"); ++ g_ptr_array_add (argv, "@modprobeBinPath@"); + g_ptr_array_add (argv, (char *) arg1); + + va_start (ap, arg1); diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix index e7a23b70ce9..d72ee844c0e 100644 --- a/pkgs/tools/networking/nzbget/default.nix +++ b/pkgs/tools/networking/nzbget/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "nzbget-${version}"; - version = "18.1"; + version = "19.0"; src = fetchurl { url = "http://github.com/nzbget/nzbget/releases/download/v${version}/nzbget-${version}-src.tar.gz"; - sha256 = "069q75b0s9fzzy15m96dhn83jypgc91yx998rl0nykfcl7nzkxyx"; + sha256 = "08kgi4zmh4h1pvxh8x4c3ydf9xl2s6ncm579f0wdm2zknvpf0j16"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 70a4bc87b97..ae0318faaa7 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -2,7 +2,7 @@ asciidoc, libxml2, libxslt, docbook_xml_xslt }: pythonPackages.buildPythonApplication rec { - version = "7.1.0"; + version = "7.1.1"; name = "offlineimap-${version}"; namePrefix = ""; @@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec { owner = "OfflineIMAP"; repo = "offlineimap"; rev = "v${version}"; - sha256 = "10hxzp2hwkarvmwhw9mxbp9wkbclxwm6n0d7i4xs8r1s94yiffb3"; + sha256 = "12fv6fzi3cb0hkvs4h5vj2i440d85wzjjyjl90zvyxvlfy0pmljl"; }; postPatch = '' diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index f2741e2b724..78f21e78277 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -8,14 +8,15 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "openvpn-${version}"; - version = "2.4.2"; + version = "2.4.3"; src = fetchurl { url = "http://swupdate.openvpn.net/community/releases/${name}.tar.xz"; - sha256 = "1ydzy5i7yaifz0v1ivrckksvm0nkkx5sia3g5y5b1xkx9cw4yp6z"; + sha256 = "0w85915nvdws1n1zsn8zcy9wg23jsx782nvrx1a3x4mqlmkn3a3s"; }; - buildInputs = [ lzo openssl pkgconfig ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ lzo openssl ] ++ optionals stdenv.isLinux [ pam systemd iproute ] ++ optional pkcs11Support pkcs11helper; diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 2225df308ac..2c0352152d5 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, gmp, pkgconfig, python, autoreconfHook , curl, trousers, sqlite, iptables, libxml2, openresolv -, ldns, unbound, pcsclite, openssl, systemd +, ldns, unbound, pcsclite, openssl, systemd, pam , enableTNC ? false }: stdenv.mkDerivation rec { @@ -14,9 +14,11 @@ stdenv.mkDerivation rec { dontPatchELF = true; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = - [ gmp pkgconfig python autoreconfHook iptables ldns unbound openssl pcsclite systemd.dev ] - ++ stdenv.lib.optionals enableTNC [ curl trousers sqlite libxml2 ]; + [ gmp python iptables ldns unbound openssl pcsclite ] + ++ stdenv.lib.optionals enableTNC [ curl trousers sqlite libxml2 ] + ++ stdenv.lib.optionals stdenv.isLinux [ systemd.dev pam ]; patches = [ ./ext_auth-path.patch @@ -48,7 +50,7 @@ stdenv.mkDerivation rec { "--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-af-alg" ] + "--enable-af-alg" "--enable-xauth-pam" "--enable-chapoly" ] ++ stdenv.lib.optional stdenv.isx86_64 [ "--enable-aesni" "--enable-rdrand" ] ++ stdenv.lib.optional (stdenv.system == "i686-linux") "--enable-padlock" ++ stdenv.lib.optionals enableTNC [ diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index 42cb3867e05..a7130a3891b 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, libpcap, enableStatic ? false }: +{ stdenv, fetchurl, libpcap, enableStatic ? false +, hostPlatform +}: stdenv.mkDerivation rec { name = "tcpdump-${version}"; @@ -15,7 +17,7 @@ stdenv.mkDerivation rec { crossAttrs = { LDFLAGS = if enableStatic then "-static" else ""; configureFlags = [ "ac_cv_linux_vers=2" ] ++ (stdenv.lib.optional - (stdenv.cross.platform.kernelMajor == "2.4") "--disable-ipv6"); + (hostPlatform.platform.kernelMajor == "2.4") "--disable-ipv6"); }; meta = { diff --git a/pkgs/tools/networking/toxvpn/default.nix b/pkgs/tools/networking/toxvpn/default.nix index 05e833f2f8e..c7fa1c7a271 100644 --- a/pkgs/tools/networking/toxvpn/default.nix +++ b/pkgs/tools/networking/toxvpn/default.nix @@ -1,29 +1,36 @@ -{ stdenv, fetchFromGitHub, cmake, lib -, libtoxcore, jsoncpp, libsodium, systemd, libcap }: +{ stdenv, fetchFromGitHub, cmake, nlohmann_json, +libtoxcore, libsodium, systemd, libcap, zeromq }: -with lib; +with stdenv.lib; -stdenv.mkDerivation rec { +let + systemdOrNull = if stdenv.system == "x86_64-darwin" then null else systemd; + if_systemd = optional (systemdOrNull != null); +in stdenv.mkDerivation rec { name = "toxvpn-${version}"; - version = "20161230"; + version = "2017-06-25"; src = fetchFromGitHub { owner = "cleverca22"; repo = "toxvpn"; - rev = "4b7498a5fae680484cb5779ac01fb08ad3089bdd"; - sha256 = "0bazdspiym9xyzms7pd6i1f2gph13rnf764nm3jc27fbfwmc98rp"; + rev = "7bd6f169d69c511affa8c9672e8f794e4e205a44"; + sha256 = "1km8hkrxmrnca1b49vbw5kyldayaln5plvz78vhf8325r6c5san0"; }; - buildInputs = [ libtoxcore jsoncpp libsodium libcap ] ++ optional stdenv.isLinux systemd; + buildInputs = [ libtoxcore nlohmann_json libsodium zeromq ] + ++ if_systemd systemd + ++ optional (stdenv.system != "x86_64-darwin") libcap; nativeBuildInputs = [ cmake ]; cmakeFlags = optional stdenv.isLinux [ "-DSYSTEMD=1" ]; + postInstall = "$out/bin/toxvpn -h"; + meta = with stdenv.lib; { description = "A powerful tool that allows one to make tunneled point to point connections over Tox"; homepage = https://github.com/cleverca22/toxvpn; license = licenses.gpl3; maintainers = with maintainers; [ cleverca22 obadz ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/tools/networking/ucspi-tcp/default.nix b/pkgs/tools/networking/ucspi-tcp/default.nix index 0bcd35b21ef..fc46c6a15bc 100644 --- a/pkgs/tools/networking/ucspi-tcp/default.nix +++ b/pkgs/tools/networking/ucspi-tcp/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { url = "http://ftp.de.debian.org/debian/pool/main/u/ucspi-tcp/ucspi-tcp_0.88-3.diff.gz"; sha256 = "0mzmhz8hjkrs0khmkzs5i0s1kgmgaqz07h493bd5jj5fm5njxln6"; }) + ./remove-setuid.patch ]; # Apply Debian patches diff --git a/pkgs/tools/networking/ucspi-tcp/remove-setuid.patch b/pkgs/tools/networking/ucspi-tcp/remove-setuid.patch new file mode 100644 index 00000000000..dd693320804 --- /dev/null +++ b/pkgs/tools/networking/ucspi-tcp/remove-setuid.patch @@ -0,0 +1,15 @@ +diff --git a/hier.c b/hier.c +index 5663ada..1d73b84 100644 +--- a/hier.c ++++ b/hier.c +@@ -2,8 +2,8 @@ + + void hier() + { +- h(auto_home,-1,-1,02755); +- d(auto_home,"bin",-1,-1,02755); ++ h(auto_home,-1,-1,0755); ++ d(auto_home,"bin",-1,-1,0755); + + c(auto_home,"bin","tcpserver",-1,-1,0755); + c(auto_home,"bin","tcprules",-1,-1,0755); diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index 7fc5fb90173..e700ea4fb28 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unbound-${version}"; - version = "1.6.3"; + version = "1.6.4"; src = fetchurl { url = "http://unbound.net/downloads/${name}.tar.gz"; - sha256 = "0pw4m4z5qspsagxzbjb61xq5bhd57amw26xqvqzi6b8d3mf6azjc"; + sha256 = "1vbzfzp932nhii5vq7z7rpczdyv624p17sy9hj1cn763ds0qh2nz"; }; outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index e83f8047f4b..534f8767a05 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconv }: stdenv.mkDerivation { - name = "disnix-0.7"; + name = "disnix-0.7.1"; src = fetchurl { - url = https://github.com/svanderburg/disnix/files/842828/disnix-0.7.tar.gz; - sha256 = "120iaqpj7zcy94dpizzdxjwf8qb2rfrx5394jghmhc6jy88vdp71"; + url = https://github.com/svanderburg/disnix/releases/download/disnix-0.7.1/disnix-0.7.1.tar.gz; + sha256 = "0wxik73bk3hh4xjjj8jcgrwv1722m7cqgpiiwjsgxs346jvhrv2s"; }; buildInputs = [ pkgconfig glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconv dysnomia ]; diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 81be1549c83..2a6a0dcc78a 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, dysnomia, disnix, socat, pkgconfig, getopt }: stdenv.mkDerivation { - name = "disnixos-0.6"; + name = "disnixos-0.6.1"; src = fetchurl { - url = https://github.com/svanderburg/disnixos/files/842874/disnixos-0.6.tar.gz; - sha256 = "0pgqsk8qndn614z02jq3vbxzpx6fmgsm6pr1g0iqz55pzwamw9j7"; + url = https://github.com/svanderburg/disnixos/releases/download/disnixos-0.6.1/disnixos-0.6.1.tar.gz; + sha256 = "0pqv8n9942vjwmb32m1af29fi0vjlsbwkj2c7h1xs28z6wahr7wa"; }; buildInputs = [ socat pkgconfig dysnomia disnix getopt ]; diff --git a/pkgs/tools/package-management/elm-github-install/Gemfile b/pkgs/tools/package-management/elm-github-install/Gemfile new file mode 100644 index 00000000000..b97eab9777d --- /dev/null +++ b/pkgs/tools/package-management/elm-github-install/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'elm_install' diff --git a/pkgs/tools/package-management/elm-github-install/Gemfile.lock b/pkgs/tools/package-management/elm-github-install/Gemfile.lock new file mode 100644 index 00000000000..a551368eade --- /dev/null +++ b/pkgs/tools/package-management/elm-github-install/Gemfile.lock @@ -0,0 +1,39 @@ +GEM + remote: https://rubygems.org/ + specs: + adts (0.1.2) + commander (4.4.3) + highline (~> 1.7.2) + contracts (0.16.0) + elm_install (1.0.1) + adts (~> 0.1.2) + commander (~> 4.4, >= 4.4.2) + contracts (~> 0.16.0) + git (~> 1.3) + git_clone_url (~> 2.0) + hashdiff (~> 0.3.1) + indentation (~> 0.1.1) + smart_colored (~> 1.1, >= 1.1.1) + solve (~> 3.1) + git (1.3.0) + git_clone_url (2.0.0) + uri-ssh_git (>= 2.0) + hashdiff (0.3.4) + highline (1.7.8) + indentation (0.1.1) + molinillo (0.5.7) + semverse (2.0.0) + smart_colored (1.1.1) + solve (3.1.0) + molinillo (>= 0.5) + semverse (>= 1.1, < 3.0) + uri-ssh_git (2.0.0) + +PLATFORMS + ruby + +DEPENDENCIES + elm_install + +BUNDLED WITH + 1.14.4 diff --git a/pkgs/tools/package-management/elm-github-install/default.nix b/pkgs/tools/package-management/elm-github-install/default.nix new file mode 100644 index 00000000000..1f70dc1c8c8 --- /dev/null +++ b/pkgs/tools/package-management/elm-github-install/default.nix @@ -0,0 +1,17 @@ +{ lib, bundlerEnv, ruby }: + +bundlerEnv rec { + name = "elm-github-install-${version}"; + + version = (import ./gemset.nix).elm_install.version; + inherit ruby; + gemdir = ./.; + + meta = with lib; { + description = "Install Elm packages from git repositories."; + homepage = https://github.com/gdotdesign/elm-github-install; + license = licenses.unfree; + maintainers = [ maintainers.roberth ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/package-management/elm-github-install/gemset.nix b/pkgs/tools/package-management/elm-github-install/gemset.nix new file mode 100644 index 00000000000..d310b41d7aa --- /dev/null +++ b/pkgs/tools/package-management/elm-github-install/gemset.nix @@ -0,0 +1,114 @@ +{ + adts = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1793bfsgg8ca58b70xas9rglnspig41ih0iwqcad62s0grxzrjwz"; + type = "gem"; + }; + version = "0.1.2"; + }; + commander = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01qx76y05v29kgyjsfkai73gwfnqhypp1k8v024m9w7qzpv4mpxf"; + type = "gem"; + }; + version = "4.4.3"; + }; + contracts = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "119f5p1n6r5svbx8h09za6a4vrsnj5i1pzr9cqdn9hj3wrxvyl3a"; + type = "gem"; + }; + version = "0.16.0"; + }; + elm_install = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0d3fwhj54madabmzamss865kj8czicgaq5fbdll9kpapqvy6a2j5"; + type = "gem"; + }; + version = "1.0.1"; + }; + git = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1waikaggw7a1d24nw0sh8fd419gbf7awh000qhsf411valycj6q3"; + type = "gem"; + }; + version = "1.3.0"; + }; + git_clone_url = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qgq7pjl461si3m2gr28vwbx47dcbpyy682mcwra5y1klpkbcvr5"; + type = "gem"; + }; + version = "2.0.0"; + }; + hashdiff = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1n6hj7k7b9hazac0j48ypbak2nqi5wy4nh5cjra6xl3a92r8db0a"; + type = "gem"; + }; + version = "0.3.4"; + }; + highline = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nf5lgdn6ni2lpfdn4gk3gi47fmnca2bdirabbjbz1fk9w4p8lkr"; + type = "gem"; + }; + version = "1.7.8"; + }; + indentation = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ix64qgmm91xm1yiqxdcn9bqb1l6gwvkv7322yni34b3bd16lgvc"; + type = "gem"; + }; + version = "0.1.1"; + }; + molinillo = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19h1nks0x2ljwyijs2rd1f9sh05j8xqvjaqk1rslp5nyy6h4a758"; + type = "gem"; + }; + version = "0.5.7"; + }; + semverse = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cf6iv5wgwb7b8jf7il751223k9yahz9aym06s9r0prda5mwddyy"; + type = "gem"; + }; + version = "2.0.0"; + }; + smart_colored = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hccah5iwsvn9rf7zdgl7mdbh0h63vfwy1c6d280cb9qkfj8rdny"; + type = "gem"; + }; + version = "1.1.1"; + }; + solve = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bbzny2bl94mv1xwcfrxbi3fjhxxawlz6la7mip2wwz9kkaf376h"; + type = "gem"; + }; + version = "3.1.0"; + }; + uri-ssh_git = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0klyyvivbjll2ry18d8fhm1rbxbzd4kqa9lskxyiha4ndlb22cqj"; + type = "gem"; + }; + version = "2.0.0"; + }; +} \ No newline at end of file diff --git a/pkgs/tools/package-management/gx/default.nix b/pkgs/tools/package-management/gx/default.nix index b879ef002b1..524dc01cbe7 100644 --- a/pkgs/tools/package-management/gx/default.nix +++ b/pkgs/tools/package-management/gx/default.nix @@ -1,24 +1,19 @@ # This file was generated by go2nix. -{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "gx-${version}"; - version = "20160601-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "f84ddf792ceb329e20c857731154798e1ce87314"; + version = "0.12.0"; + rev = "refs/tags/v${version}"; goPackagePath = "github.com/whyrusleeping/gx"; src = fetchgit { inherit rev; url = "https://github.com/whyrusleeping/gx"; - sha256 = "10a6p9ba526jr6m66x3vsa3xsjlnzv7yma8vyp8d0bf0hs44bpih"; + sha256 = "0pvf0j14xnzy01fxilja8xbki0i0g7h7y20jzw74ds5a7ywsdx8r"; }; - prePatch = '' - substituteInPlace tests/lib/random-dep.go \ - --replace "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-random" "github.com/jbenet/go-random" - ''; - goDeps = ./deps.nix; meta = with stdenv.lib; { diff --git a/pkgs/tools/package-management/gx/deps.nix b/pkgs/tools/package-management/gx/deps.nix index 19372f807c2..c34d142c385 100644 --- a/pkgs/tools/package-management/gx/deps.nix +++ b/pkgs/tools/package-management/gx/deps.nix @@ -1,29 +1,11 @@ [ { - goPackagePath = "github.com/anacrolix/missinggo"; + goPackagePath = "github.com/agl/ed25519"; fetch = { type = "git"; - url = "https://github.com/anacrolix/missinggo"; - rev = "e40875155efce3d98562ca9e265e152c364ada3e"; - sha256 = "1p1qgnb430dz84d2395i6417jqnlvrx9zwg9rq1ri8d5v7dif4fg"; - }; - } - { - goPackagePath = "github.com/anacrolix/sync"; - fetch = { - type = "git"; - url = "https://github.com/anacrolix/sync"; - rev = "812602587b72df6a2a4f6e30536adc75394a374b"; - sha256 = "0pc38wanzws3vzqj0l5pakg3gn2hacqrb4n7pd0sqz083rss5k0l"; - }; - } - { - goPackagePath = "github.com/anacrolix/utp"; - fetch = { - type = "git"; - url = "https://github.com/anacrolix/utp"; - rev = "d7ad5aff2b8a5fa415d1c1ed00b71cfd8b4c69e0"; - sha256 = "07piwfny3b4prxf2shc512ai0qmrmrj839lbza9clhgcmj1a75d7"; + url = "https://github.com/agl/ed25519"; + rev = "5312a61534124124185d41f09206b9fef1d88403"; + sha256 = "1v8mhkf1m3ga5262s75vabskxvsw5rpqvi5nwhxwiv7gfk6h823i"; }; } { @@ -31,17 +13,17 @@ fetch = { type = "git"; url = "https://github.com/blang/semver"; - rev = "aea32c919a18e5ef4537bbd283ff29594b1b0165"; - sha256 = "1s80qlij6j6wrh0fhm0l11hbf3qjra67nca5bl7izyfjj4621fcd"; + rev = "4a1e882c79dcf4ec00d2e29fac74b9c8938d5052"; + sha256 = "07rk2jzmppw1v06qvsn11l1mwkyg6y9y06jfik316zq8glfh8b3m"; }; } { - goPackagePath = "github.com/bradfitz/iter"; + goPackagePath = "github.com/btcsuite/btcd"; fetch = { type = "git"; - url = "https://github.com/bradfitz/iter"; - rev = "454541ec3da2a73fc34fd049b19ee5777bf19345"; - sha256 = "0v07zlq2h2rjz5mdvh0rgizyzcj68qa235gci6hvlrai7igyi57i"; + url = "https://github.com/btcsuite/btcd"; + rev = "9822ffad6802d3b902442b727a238230194d961f"; + sha256 = "0mk3qxpn29gsbkvk6rj6jzsw3fn2z51afq890wpk4qz029kvip2h"; }; } { @@ -49,8 +31,26 @@ fetch = { type = "git"; url = "https://github.com/codegangsta/cli"; - rev = "e5bef42c62aa7d25aba4880dc02b7624f01e9e19"; - sha256 = "1g0z2klbaivd0w1fwf1k1dkyk8jbq28qd7fvczjv0yj6hg4vz1wq"; + rev = "4b90d79a682b4bf685762c7452db20f2a676ecb2"; + sha256 = "0ls3lfmbfwirm9j95b6yrw41wgh72lfkp1cvs873zw04si4yvaqr"; + }; + } + { + goPackagePath = "github.com/coreos/go-semver"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-semver"; + rev = "1817cd4bea52af76542157eeabd74b057d1a199e"; + sha256 = "0hfxcg87ag0zdfarbymfx2qmhcdzm8br39sxvhfc7n37rqdcsh9n"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "dda3e8acadcc9affc16faf33fbb229db78399245"; + sha256 = "1f1lm6bgwnrd985n1aagqw0bxfx37z71fwfcijiz9k258vj4wlga"; }; } { @@ -58,8 +58,26 @@ fetch = { type = "git"; url = "https://github.com/ipfs/go-ipfs-api"; - rev = "7c354892da3abdaafb6ac576c100b259b1a73dac"; - sha256 = "0n8k9ydn2l362vq0bpbjkciw08div3hpc22qygp6zsrlammizcvc"; + rev = "2da86eb64d56571c123c02ae82140c7b4b95f72a"; + sha256 = "1ljlzjig0qv2mjzyk2piid12b4043584qskx6ikbz5i16cnbvqsq"; + }; + } + { + goPackagePath = "github.com/ipfs/go-ipfs-util"; + fetch = { + type = "git"; + url = "https://github.com/ipfs/go-ipfs-util"; + rev = "f25fcc891281327394bb48000ef0970d11baff2b"; + sha256 = "1a79ggx0ma9ny39kjm0gzicrn541gyis4fn7kmkkfjjfaj8v5l3y"; + }; + } + { + goPackagePath = "github.com/ipfs/go-log"; + fetch = { + type = "git"; + url = "https://github.com/ipfs/go-log"; + rev = "48d644b006ba26f1793bffc46396e981801078e3"; + sha256 = "0q2bk2s2v626ikm2pjalq4qg4n53yyf1bb81jbljb23iijxrqsbr"; }; } { @@ -71,33 +89,6 @@ sha256 = "11yp7yg62bhw6jqdrlf2144bffk12jmb1nvqkm172pdhxfwrp3bf"; }; } - { - goPackagePath = "github.com/jbenet/go-multiaddr"; - fetch = { - type = "git"; - url = "https://github.com/jbenet/go-multiaddr"; - rev = "f3dff105e44513821be8fbe91c89ef15eff1b4d4"; - sha256 = "0rz17cvhslspp2z8jbxah22kndqiq9zl8nlf14ng8hfxdfm1x4n7"; - }; - } - { - goPackagePath = "github.com/jbenet/go-multiaddr-net"; - fetch = { - type = "git"; - url = "https://github.com/jbenet/go-multiaddr-net"; - rev = "d4cfd691db9f50e430528f682ca603237b0eaae0"; - sha256 = "031xb8j5nysw052cm36rjn19c5wkjf8dh8x21vrbyb7220h5zp90"; - }; - } - { - goPackagePath = "github.com/jbenet/go-multihash"; - fetch = { - type = "git"; - url = "https://github.com/jbenet/go-multihash"; - rev = "e8d2374934f16a971d1e94a864514a21ac74bf7f"; - sha256 = "1hlzgmjszn8mfvn848jbnpsvccm9g3m42saavgbh48qdryraqscp"; - }; - } { goPackagePath = "github.com/jbenet/go-os-rename"; fetch = { @@ -108,21 +99,12 @@ }; } { - goPackagePath = "github.com/jbenet/go-random"; + goPackagePath = "github.com/jbenet/goprocess"; fetch = { type = "git"; - url = "https://github.com/jbenet/go-random"; - rev = "384f606e91f542a98e779e652eed88051618f0f7"; - sha256 = "0gcshzl9n3apzc0jaxqrjsc038yfrzfyhpdqgbpcnajin83l2msa"; - }; - } - { - goPackagePath = "github.com/jbenet/go-random-files"; - fetch = { - type = "git"; - url = "https://github.com/jbenet/go-random-files"; - rev = "737479700b40b4b50e914e963ce8d9d44603e3c8"; - sha256 = "1klpdc4qkrfy31r7qh00fcz42blswzabmcnry9byd5adhszxj9bw"; + url = "https://github.com/jbenet/goprocess"; + rev = "b497e2f366b8624394fb2e89c10ab607bebdde0b"; + sha256 = "1lnvkzki7vnqn5c4m6bigk0k85haicmg27w903kwg30rdvblm82s"; }; } { @@ -134,13 +116,139 @@ sha256 = "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly"; }; } + { + goPackagePath = "github.com/libp2p/go-floodsub"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-floodsub"; + rev = "a922092abea58f07c32eabe303ec817569578740"; + sha256 = "0wbi67jyfvrzfsb9lkrhjgg9k66yk5sww7nvihhc9rdnblygigs3"; + }; + } + { + goPackagePath = "github.com/libp2p/go-libp2p-crypto"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-libp2p-crypto"; + rev = "e89e1de117dd65c6129d99d1d853f48bc847cf17"; + sha256 = "1lb0qzspx99sqbdxbf9dczwcmmirl4h26q9x3v6ris253zmqcbyw"; + }; + } + { + goPackagePath = "github.com/libp2p/go-libp2p-host"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-libp2p-host"; + rev = "c1fc482de113ce7e4cdc9453a1c1c0fe4164d985"; + sha256 = "1hiz5j64s248vml7i4gwjvz59g7l08zjfklhrbmk0cjxwhx9ypy0"; + }; + } + { + goPackagePath = "github.com/libp2p/go-libp2p-interface-conn"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-libp2p-interface-conn"; + rev = "95afdbf0c900237f3b9104f1f7cfd3d56175a241"; + sha256 = "0dv0jc08hfzb8gsi14c2ivancq7pxs8d482l4rw89mg04m2pgnaa"; + }; + } + { + goPackagePath = "github.com/libp2p/go-libp2p-net"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-libp2p-net"; + rev = "2680a9894c7aabada540f728a53d7c1a16a1a44a"; + sha256 = "1k44dz2dk7ahlfls6vk747jy8kbxmjhqyni8zw2wiz6sfm5hyw10"; + }; + } + { + goPackagePath = "github.com/libp2p/go-libp2p-peer"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-libp2p-peer"; + rev = "166a39e33e7a2a47a4bf999264f254ecaa4fe232"; + sha256 = "0kgv1n2c8rfz92vk014sqm1bla7a99w18ydyphjjhc96fmlbrzgl"; + }; + } + { + goPackagePath = "github.com/libp2p/go-libp2p-peerstore"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-libp2p-peerstore"; + rev = "744a149e48eb42e032540507c8545d12cc3b7f6f"; + sha256 = "1bcmqkdlvvxdz9dbqrcfmvhx0wnnk94fb2yl9ys1nx7mnqgl64y8"; + }; + } + { + goPackagePath = "github.com/libp2p/go-libp2p-protocol"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-libp2p-protocol"; + rev = "40488c03777c16bfcd65da2f675b192863cbc2dc"; + sha256 = "1mvhi8pdfyn3lb1j1y4iz2mggnf0dz7ccbmrbij739v6cpjfwwbb"; + }; + } + { + goPackagePath = "github.com/libp2p/go-libp2p-transport"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-libp2p-transport"; + rev = "5d3cb5861b59c26052a5fe184e45c381ec17e22d"; + sha256 = "1v63gavw98f6hs151mqk0bbdl46a9ci9m2pcx807wxdsmfphynar"; + }; + } + { + goPackagePath = "github.com/libp2p/go-maddr-filter"; + fetch = { + type = "git"; + url = "https://github.com/libp2p/go-maddr-filter"; + rev = "90aacb5ee155f0d6f3fa8b34d775de842606c0b1"; + sha256 = "0ijs599hppj78dg2v7rcglqs82pysygq84yabpis5b99fjp9bay0"; + }; + } { goPackagePath = "github.com/mitchellh/go-homedir"; fetch = { type = "git"; url = "https://github.com/mitchellh/go-homedir"; - rev = "1111e456ffea841564ac0fa5f69c26ef44dafec9"; - sha256 = "1ycb1cffgs46jnj4cbpjd46mcl584kxdmldlvfysg0wza9pp4x23"; + rev = "b8bc1bf767474819792c23f32d8286a45736f1c6"; + sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q"; + }; + } + { + goPackagePath = "github.com/multiformats/go-multiaddr"; + fetch = { + type = "git"; + url = "https://github.com/multiformats/go-multiaddr"; + rev = "33741da7b3f5773a599d4a03c333704fc560ef34"; + sha256 = "0idhv960k68jvh0frhh28dw46p527m2g67rjwjh6r5va5sd8qjcd"; + }; + } + { + goPackagePath = "github.com/multiformats/go-multiaddr-net"; + fetch = { + type = "git"; + url = "https://github.com/multiformats/go-multiaddr-net"; + rev = "a7b93d11855f04f56908e1385991eb6a400fcc43"; + sha256 = "1q0d8asxxhxhm774xn29n1x6zni6pmm78lvm3652ipyj026y243k"; + }; + } + { + goPackagePath = "github.com/multiformats/go-multihash"; + fetch = { + type = "git"; + url = "https://github.com/multiformats/go-multihash"; + rev = "a52a6a4768da72eba89ea7f59f70e9d42ddd3072"; + sha256 = "0r6fmzvg4vjwc5wzfqn7jjxndcw8n0galdx6f524yd9bcfdlph5b"; + }; + } + { + goPackagePath = "github.com/multiformats/go-multistream"; + fetch = { + type = "git"; + url = "https://github.com/multiformats/go-multistream"; + rev = "b8f1996688ab586031517919b49b1967fca8d5d9"; + sha256 = "0y2hl78lmnd0rbryfmscgxa6kmjdfz00pz60ymhg8k4cifqai0x2"; }; } { @@ -148,8 +256,26 @@ fetch = { type = "git"; url = "https://github.com/sabhiram/go-git-ignore"; - rev = "228fcfa2a06e870a3ef238d54c45ea847f492a37"; - sha256 = "0xyj2zsxjjbyd3ppxvs294c8y2ip181dxhvycaxxx6qysbm2nlzj"; + rev = "87c28ffedb6cb7ff29ae89e0440e9ddee0d95a9e"; + sha256 = "1qysvwjvbzq1wms09dm0sban58xq22bbkwpd7qnk28r99g6267rl"; + }; + } + { + goPackagePath = "github.com/spaolacci/murmur3"; + fetch = { + type = "git"; + url = "https://github.com/spaolacci/murmur3"; + rev = "0d12bf811670bf6a1a63828dfbd003eded177fce"; + sha256 = "0fv74n0cvgnxpfd04xyiry6ii1ag7mhwwk0kwplpvnbwi8y9yq1x"; + }; + } + { + goPackagePath = "github.com/whyrusleeping/go-logging"; + fetch = { + type = "git"; + url = "https://github.com/whyrusleeping/go-logging"; + rev = "0457bb6b88fc1973573aaf6b5145d8d3ae972390"; + sha256 = "1bl180mhg03hdqhyr5sfjcg16ns2ppal625g9ag5m10l2pvlwnqn"; }; } { @@ -166,8 +292,26 @@ fetch = { type = "git"; url = "https://github.com/whyrusleeping/json-filter"; - rev = "e9937f5649231265a56d0a419f062530425401a1"; - sha256 = "1b7czlx57acbi30b9m1w2lvlxnh65c4pmxaa0546pjjip83byb3s"; + rev = "ff25329a9528f01c5175414f16cc0a6a162a5b8b"; + sha256 = "0cai0drvx4c8j686l908vpcsz3mw3vxi3ziz94b0f3c5ylpj07j7"; + }; + } + { + goPackagePath = "github.com/whyrusleeping/mafmt"; + fetch = { + type = "git"; + url = "https://github.com/whyrusleeping/mafmt"; + rev = "15300f9d3a2d71db61951a8705d5ea8878764837"; + sha256 = "0fiwrj8pla9y8q0m4ifyrh8gacmrz278h2zihdbqbk2b17b002yr"; + }; + } + { + goPackagePath = "github.com/whyrusleeping/progmeter"; + fetch = { + type = "git"; + url = "https://github.com/whyrusleeping/progmeter"; + rev = "974d8fe8cd87585865b1370184050e89d606e817"; + sha256 = "05njc5minpaxzwb6yg5zjr52ar4ar7qkiml45zsrp2ny92dyx07j"; }; } { @@ -188,13 +332,31 @@ sha256 = "07z4is00ridjp8c6cn68lkg1fz6ksj1q7f26g7ir7qx8mx10fj72"; }; } + { + goPackagePath = "github.com/whyrusleeping/timecache"; + fetch = { + type = "git"; + url = "https://github.com/whyrusleeping/timecache"; + rev = "cfcb2f1abfee846c430233aef0b630a946e0a5a6"; + sha256 = "0nnra7ivq7cj34rj2ib8hgfdpik3smr1hy7x18svhfin8z1xsj2s"; + }; + } { goPackagePath = "golang.org/x/crypto"; fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "f3241ce8505855877cc8a9717bd61a0f7c4ea83c"; - sha256 = "0wxfnbhaq1m3i5jylww9llm2xl9hk33q6nxyz5i475rfrg0p3wsq"; + rev = "a48ac81e47fd6f9ed1258f3b60ae9e75f93cb7ed"; + sha256 = "0zpgwc362rghm3fv0s964dqmw6krixzxww2qxhnik9hvf7srapjd"; + }; + } + { + goPackagePath = "leb.io/hashland"; + fetch = { + type = "git"; + url = "https://github.com/tildeleb/hashland"; + rev = "e13accbe55f7fa03c73c74ace4cca4c425e47260"; + sha256 = "1ygfp7kjnm964w2bv61bsyxpw5y6vy6k4pra1lhd5r3nhlxgs31g"; }; } ] diff --git a/pkgs/tools/package-management/gx/go/default.nix b/pkgs/tools/package-management/gx/go/default.nix index aa5acfa22d5..6a9589f9ac2 100644 --- a/pkgs/tools/package-management/gx/go/default.nix +++ b/pkgs/tools/package-management/gx/go/default.nix @@ -5,15 +5,15 @@ buildGoPackage rec { name = "gx-go-${version}"; - version = "20160611-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "639fc0be1a153c59d8946904cceecf0b66ab2944"; + version = "1.5.0"; + rev = "refs/tags/v${version}"; goPackagePath = "github.com/whyrusleeping/gx-go"; src = fetchgit { inherit rev; url = "https://github.com/whyrusleeping/gx-go"; - sha256 = "0qxp7gqrx1rhcbqvp4jdb3gj1dlj200bdc4gq8pfklc8fcz1lc6l"; + sha256 = "0bg4h5lzs293qmlsr9n257vjpr5w6bxb4ampb25gsn3fgy3rvsis"; }; goDeps = ../deps.nix; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 3aa18fad942..2c81b972f92 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -2,6 +2,7 @@ , pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli, readline , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook5_xsl , libseccomp, busybox +, hostPlatform , storeDir ? "/nix/store" , stateDir ? "/nix/var" , confDir ? "/etc" @@ -78,6 +79,9 @@ let doInstallCheck = true; + # socket path becomes too long otherwise + preInstallCheck = lib.optional stdenv.isDarwin "export TMPDIR=/tmp"; + separateDebugInfo = stdenv.isLinux; crossAttrs = { @@ -95,8 +99,8 @@ let --disable-init-state --enable-gc '' + stdenv.lib.optionalString ( - stdenv.cross ? nix && stdenv.cross.nix ? system - ) ''--with-system=${stdenv.cross.nix.system}''; + hostPlatform ? nix && hostPlatform.nix ? system + ) ''--with-system=${hostPlatform.nix.system}''; doInstallCheck = false; }; @@ -148,21 +152,21 @@ in rec { nix = nixStable; nixStable = (common rec { - name = "nix-1.11.11"; + name = "nix-1.11.13"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "f5b9da21fb412e4c35b6e2bc771cfbf4ca44746be5d99868ff29d6e7604760e5"; + sha256 = "0913975e262f8069fde6e71a5fae757bb3aef558c51d1711034c525146ea5913"; }; }) // { perl-bindings = nixStable; }; nixUnstable = (lib.lowPrio (common rec { name = "nix-1.12${suffix}"; - suffix = "pre5413_b4b1f452"; + suffix = "pre5506_3162ad5f"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "b4b1f4525f8dc8f320d666c208bff5cb36777580"; - sha256 = "0qb18k2rp6bbg8g50754srl95dq0lr96i297856yhrx1hh1ja37z"; + rev = "3162ad5ff497b92fc25cd3f397eaff01d67340cc"; + sha256 = "0gs1fqqm2ghbq2svz1h4bna9f0zjw2cs8ha7cn27kwajb14qw8fk"; }; fromGit = true; })) // { perl-bindings = perl-bindings { nix = nixUnstable; }; }; diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix index 820bcbb9a35..1467faac8e3 100644 --- a/pkgs/tools/package-management/nixops/default.nix +++ b/pkgs/tools/package-management/nixops/default.nix @@ -1,9 +1,9 @@ { callPackage, fetchurl }: callPackage ./generic.nix (rec { - version = "1.5"; + version = "1.5.1"; src = fetchurl { url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; - sha256 = "0z4pzc55wjab8v4bkrff94f8qp1g9ydgxxpl2dvy5130bg1s52wd"; + sha256 = "0pba9c8ya4hvqmg458p74g69hb06lh0f5bsgw7dsi8pjrcb0624g"; }; }) diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index 3b636ab0e29..e1e57a84b55 100644 --- a/pkgs/tools/package-management/opkg/default.nix +++ b/pkgs/tools/package-management/opkg/default.nix @@ -2,11 +2,11 @@ , autoreconfHook }: stdenv.mkDerivation rec { - version = "0.3.4"; + version = "0.3.5"; name = "opkg-${version}"; src = fetchurl { url = "http://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz"; - sha256 = "1glkxjhsaaji172phd1gv8g0k0fs09pij6k01cl9namnac5r02vm"; + sha256 = "0ciz6h6sx9hnz463alpkcqwqnq8jk382ifc6z89j29hix8fw4jvk"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix index 1d6307f807c..4c3dfe4d07c 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 = "2.43b"; + version = "2.48b"; src = fetchurl { url = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz"; - sha256 = "1jv2y9b53k3p8hngm78ikakhcf4vv3yyz6ip17jhg5gsis29gdwx"; + sha256 = "00x7p8lqrpx60hwynl5dqwn6isr8yhl263avcwfw3dqc7v9lwhrz"; }; # Note: libcgroup isn't needed for building, just for the afl-cgroup diff --git a/pkgs/tools/security/browserpass/default.nix b/pkgs/tools/security/browserpass/default.nix index edc46fee582..9f8a00c5956 100644 --- a/pkgs/tools/security/browserpass/default.nix +++ b/pkgs/tools/security/browserpass/default.nix @@ -1,17 +1,17 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.2.0 -{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "browserpass-${version}"; - version = "2017-04-11"; - rev = "e0fe250ed8fd061125746f5d99a1f9a678d21004"; + version = "1.0.5"; goPackagePath = "github.com/dannyvankooten/browserpass"; - src = fetchgit { - inherit rev; - url = "https://github.com/dannyvankooten/browserpass"; - sha256 = "0khwlh5agdd2mm2yzklg8r2h084n8j7jbjjxsiaj67zm8zz6b39c"; + src = fetchFromGitHub { + repo = "browserpass"; + owner = "dannyvankooten"; + rev = version; + sha256 = "1r9x1asgblay7pry2jpgfisfgb3423x3cqd3g68q8b98zvc9l9lz"; }; postInstall = '' @@ -21,14 +21,15 @@ buildGoPackage rec { sed -e "s!%%replace%%!$host_file!" go/src/${goPackagePath}/chrome/host.json > chrome-host.json sed -e "s!%%replace%%!$host_file!" go/src/${goPackagePath}/firefox/host.json > firefox-host.json - install -D chrome-host.json $bin/etc/chrome-host.json + install chrome-host.json $bin/etc/ install -D firefox-host.json $bin/lib/mozilla/native-messaging-hosts/com.dannyvankooten.browserpass.json + install go/src/${goPackagePath}/chrome/policy.json $bin/etc/chrome-policy.json ''; - meta = { + meta = with stdenv.lib; { description = "A Chrome & Firefox extension for zx2c4's pass"; - homepage = "https://github.com/dannyvankooten/browserpass"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + homepage = https://github.com/dannyvankooten/browserpass; + license = licenses.mit; + platforms = with platforms; linux ++ darwin ++ openbsd; }; } diff --git a/pkgs/tools/security/certstrap/default.nix b/pkgs/tools/security/certstrap/default.nix new file mode 100644 index 00000000000..bf659f19e9b --- /dev/null +++ b/pkgs/tools/security/certstrap/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "certstrap-${version}"; + version = "1.0.1"; + + goPackagePath = "github.com/square/certstrap"; + + src = fetchFromGitHub { + owner = "square"; + repo = "certstrap"; + rev = "v${version}"; + sha256 = "0pw1g6nyb212ayic42rkm6i0cf4n2003f02qym6zp130m6aysb47"; + }; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "Tools to bootstrap CAs, certificate requests, and signed certificates"; + platforms = platforms.all; + license = licenses.asl20; + maintainers = with maintainers; [ volth ]; + }; +} diff --git a/pkgs/tools/security/gen-oath-safe/default.nix b/pkgs/tools/security/gen-oath-safe/default.nix new file mode 100644 index 00000000000..49770813b2b --- /dev/null +++ b/pkgs/tools/security/gen-oath-safe/default.nix @@ -0,0 +1,41 @@ +{ coreutils, fetchFromGitHub, libcaca, makeWrapper, python, openssl, qrencode, stdenv, yubikey-manager }: + +stdenv.mkDerivation { + name = "gen-oath-safe-2017-01-23"; + src = fetchFromGitHub { + owner = "mcepl"; + repo = "gen-oath-safe"; + rev = "fb53841"; + sha256 = "0018kqmhg0861r5xkbis2a1rx49gyn0dxcyj05wap5ms7zz69m0m"; + }; + + buildInputs = [ makeWrapper ]; + + buildPhase = ":"; + + installPhase = + let + path = stdenv.lib.makeBinPath [ + coreutils + libcaca.bin + openssl.bin + python + qrencode + yubikey-manager + ]; + in + '' + mkdir -p $out/bin + cp gen-oath-safe $out/bin/ + wrapProgram $out/bin/gen-oath-safe \ + --prefix PATH : ${path} + ''; + meta = with stdenv.lib; { + homepage = https://github.com/mcepl/gen-oath-safe; + description = "Script for generating HOTP/TOTP keys (and QR code)"; + platforms = platforms.unix; + license = licenses.mit; + maintainers = [ maintainers.makefu ]; + }; + +} diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/tools/security/hologram/default.nix index abdcd5d2d3e..911c1b12562 100644 --- a/pkgs/tools/security/hologram/default.nix +++ b/pkgs/tools/security/hologram/default.nix @@ -15,6 +15,10 @@ buildGoPackage rec { goDeps = ./deps.nix; + preConfigure = '' + sed -i 's|cacheTimeout != 3600|cacheTimeout != 0|' cmd/hologram-server/main.go + ''; + meta = with stdenv.lib; { homepage = https://github.com/AdRoll/hologram/; description = "Easy, painless AWS credentials on developer laptops."; diff --git a/pkgs/tools/security/jd-gui/default.nix b/pkgs/tools/security/jd-gui/default.nix index 106fbf0a150..32bc1a4d711 100644 --- a/pkgs/tools/security/jd-gui/default.nix +++ b/pkgs/tools/security/jd-gui/default.nix @@ -1,8 +1,22 @@ -{ stdenv, fetchurl, gtk2, atk, gdk_pixbuf, pango, makeWrapper }: +{ stdenv, fetchurl, gtk2, atk, gdk_pixbuf, glib, pango, fontconfig, zlib, xorg, upx, patchelf }: let dynlibPath = stdenv.lib.makeLibraryPath - [ gtk2 atk gdk_pixbuf pango ]; + ([ gtk2 atk gdk_pixbuf glib pango fontconfig zlib stdenv.cc.cc.lib ] + ++ (with xorg; [ + libX11 + libXext + libXrender + libXrandr + libSM + libXfixes + libXdamage + libXcursor + libXinerama + libXi + libXcomposite + libXxf86vm + ])); in stdenv.mkDerivation rec { name = "jd-gui-${version}"; @@ -13,14 +27,18 @@ stdenv.mkDerivation rec { sha256 = "0jrvzs2s836yvqi41c7fq0gfiwf187qg765b9r1il2bjc0mb3dqv"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ upx patchelf ]; phases = "unpackPhase installPhase"; unpackPhase = "tar xf ${src}"; installPhase = '' - mkdir -p $out/bin && mv jd-gui $out/bin - wrapProgram $out/bin/jd-gui \ - --prefix LD_LIBRARY_PATH ":" "${dynlibPath}" + mkdir -p $out/bin + upx -d jd-gui -o $out/bin/jd-gui + + patchelf \ + --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ + --set-rpath ${dynlibPath} \ + $out/bin/jd-gui ''; meta = { diff --git a/pkgs/tools/security/kbfs/default.nix b/pkgs/tools/security/kbfs/default.nix index e502c296a50..28c6caae6c3 100644 --- a/pkgs/tools/security/kbfs/default.nix +++ b/pkgs/tools/security/kbfs/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "kbfs-${version}"; - version = "20170209.d1db463"; + version = "20170429.44efa06"; goPackagePath = "github.com/keybase/kbfs"; subPackages = [ "kbfsfuse" ]; @@ -12,8 +12,8 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "keybase"; repo = "kbfs"; - rev = "d1db46315d9271f21ca2700a84ca19767e638296"; - sha256 = "12i2m370r27mmn37s55krdkhr5k8kpl3x8y3gzg7w5zn2wiw8i1g"; + rev = "44efa0682d931d8489f5e84542e8d00baeb12592"; + sha256 = "1q6hklyr6zq3xr1azz1c6rlpsjc036f222cd20vf79m58dn906n5"; }; buildFlags = [ "-tags production" ]; @@ -22,6 +22,6 @@ buildGoPackage rec { homepage = https://www.keybase.io; description = "The Keybase FS FUSE driver"; platforms = platforms.linux; - maintainers = with maintainers; [ bennofs ]; + maintainers = with maintainers; [ bennofs np ]; }; } diff --git a/pkgs/tools/security/keybase-gui/default.nix b/pkgs/tools/security/keybase-gui/default.nix index 636b955ddfc..a45a6ea2a04 100644 --- a/pkgs/tools/security/keybase-gui/default.nix +++ b/pkgs/tools/security/keybase-gui/default.nix @@ -22,7 +22,7 @@ let pango systemd xorg.libX11 - xorg.libXScrnSaver + xorg.libxcb xorg.libXcomposite xorg.libXcursor xorg.libXdamage @@ -31,15 +31,16 @@ let xorg.libXi xorg.libXrandr xorg.libXrender + xorg.libXScrnSaver xorg.libXtst ]; in stdenv.mkDerivation rec { name = "keybase-gui-${version}"; - version = "1.0.23-20170519175207.d6c5e9e"; + version = "1.0.25-20170714172717.73f9070"; src = fetchurl { url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version}_amd64.deb"; - sha256 = "14nylwpd64ngx1kdb4pk2laghslx9872fb2a9jgkbgbgnan5nkmm"; + sha256 = "0yrq18rrc30f7ymajvd71r29z1by7h6abyaxx2gmrg648qgc6zv4"; }; phases = ["unpackPhase" "installPhase" "fixupPhase"]; unpackPhase = '' @@ -86,6 +87,6 @@ stdenv.mkDerivation rec { homepage = https://www.keybase.io/; description = "The Keybase official GUI."; platforms = platforms.linux; - maintainers = with maintainers; [ puffnfresh ]; + maintainers = with maintainers; [ puffnfresh np ]; }; } diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index 5d212c0b80f..e4fa484b08e 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "keybase-${version}"; - version = "1.0.20"; + version = "1.0.22"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/keybase" ]; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - sha256 = "1418x2z1j4bzq29qab8pmqrvg8piycqcabdjmq2inkvlll3s5n3v"; + sha256 = "1642d11gjgkdklppmm1j3vwc2r3qg9qqw5x07jnqs819i57mr47f"; }; buildFlags = [ "-tags production" ]; @@ -22,6 +22,6 @@ buildGoPackage rec { homepage = https://www.keybase.io/; description = "The Keybase official command-line utility and service."; platforms = platforms.linux; - maintainers = with maintainers; [ carlsverre ]; + maintainers = with maintainers; [ carlsverre np ]; }; } diff --git a/pkgs/tools/security/munge/default.nix b/pkgs/tools/security/munge/default.nix index 96847c983f1..f04f67c7a43 100644 --- a/pkgs/tools/security/munge/default.nix +++ b/pkgs/tools/security/munge/default.nix @@ -1,31 +1,33 @@ -{ stdenv, fetchFromGitHub, gnused, perl, libgcrypt, zlib, bzip2 }: +{ stdenv, fetchFromGitHub, autoreconfHook, gawk, gnused, libgcrypt, zlib, bzip2 }: stdenv.mkDerivation rec { - name = "munge-0.5.11"; + name = "munge-0.5.12"; src = fetchFromGitHub { owner = "dun"; repo = "munge"; rev = "${name}"; - sha256 = "02847p742nq3cb8ayf5blrdicybq72nfsnggqkxr33cpppmsfwg9"; + sha256 = "1wvkc63bqclpm5xmp3rn199x3jqd99255yicyydgz83cixp7wdbh"; }; - buildInputs = [ gnused perl libgcrypt zlib bzip2 ]; + nativeBuildInputs = [ autoreconfHook gawk gnused ]; + buildInputs = [ libgcrypt zlib bzip2 ]; - preConfigure = '' + preAutoreconf = '' # Remove the install-data stuff, since it tries to write to /var - sed -i '505,511d' src/etc/Makefile.in + substituteInPlace src/Makefile.am --replace "etc \\" "\\" ''; configureFlags = [ "--localstatedir=/var" ]; - meta = { + meta = with stdenv.lib; { description = '' An authentication service for creating and validating credentials ''; - maintainers = [ stdenv.lib.maintainers.rickynils ]; - platforms = stdenv.lib.platforms.unix; + license = licenses.lgpl3; + platforms = platforms.unix; + maintainers = [ maintainers.rickynils ]; }; } diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index baa53492d3e..331a75495ed 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl +{ stdenv, lib, fetchurl, fetchFromGitHub , coreutils, gnused, getopt, git, tree, gnupg, which, procps, qrencode , makeWrapper @@ -12,7 +12,17 @@ assert x11Support -> xclip != null && xdotool != null && dmenu != null; -stdenv.mkDerivation rec { +let + plugins = map (p: (fetchFromGitHub { + owner = "roddhjav"; + repo = "pass-${p.name}"; + inherit (p) rev sha256; + })) [ + { name = "import"; rev = "491935bd275f29ceac2b876b3a288011d1ce31e7"; sha256 = "02mbh05ab8h7kc30hz718d1d1vkjz43b96c7p0xnd92610d2q66q"; } + { name = "update"; rev = "cf576c9036fd18efb9ed29e0e9f811207b556fde"; sha256 = "1hhbrg6a2walrvla6q4cd3pgrqbcrf9brzjkb748735shxfn52hd"; } + ]; + +in stdenv.mkDerivation rec { version = "1.7.1"; name = "password-store-${version}"; @@ -29,6 +39,13 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" "WITH_ALLCOMP=yes" ]; postInstall = '' + # plugins + ${stdenv.lib.concatStringsSep "\n" (map (plugin: '' + pushd ${plugin} + PREFIX=$out make install + popd + '') plugins)} + # Install Emacs Mode. NOTE: We can't install the necessary # dependencies (s.el and f.el) here. The user has to do this # himself. diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 97e66a250d7..25edec9efd4 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -10,11 +10,11 @@ let in with stdenv.lib; stdenv.mkDerivation rec { - name = "pinentry-0.9.7"; + name = "pinentry-1.0.0"; src = fetchurl { url = "mirror://gnupg/pinentry/${name}.tar.bz2"; - sha256 = "1cp7wjqr6nx31mdclr61s2h84ijqjl0ph99kgj4vyawpjj1j1633"; + sha256 = "0ni7g4plq6x78p32al7m8h2zsakvg1rhfz0qbc3kdc7yq7nw4whn"; }; buildInputs = [ libgpgerror libassuan libcap gtk2 ncurses qt4 ]; diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index daa02497d0f..2d663175ec9 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -1,23 +1,28 @@ -{ stdenv, pythonPackages, fetchurl, makeWrapper, pandoc +{ stdenv, python3Packages, fetchurl, makeWrapper, pandoc , coreutils, iptables, nettools, openssh, procps }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { name = "sshuttle-${version}"; - version = "0.78.0"; + version = "0.78.3"; src = fetchurl { - sha256 = "18hrwi2gyri1n2rq0nghvv7hfhbhh5h67am89524vc1yyx40vn3b"; + sha256 = "12xyq5h77b57cnkljdk8qyjxzys512b73019s20x6ck5brj1m8wa"; url = "mirror://pypi/s/sshuttle/${name}.tar.gz"; }; patches = [ ./sudo.patch ]; - propagatedBuildInputs = with pythonPackages; [ PyXAPI mock pytest ]; - nativeBuildInputs = [ makeWrapper pandoc pythonPackages.setuptools_scm ]; + nativeBuildInputs = [ makeWrapper pandoc python3Packages.setuptools_scm ]; buildInputs = [ coreutils openssh ] ++ stdenv.lib.optionals stdenv.isLinux [ iptables nettools procps ]; + checkInputs = with python3Packages; [ mock pytest pytestrunner ]; + + # Tests only run with Python 3. Server-side Python 2 still works if client + # uses Python 3, so it should be fine. + doCheck = true; + postInstall = let mapPath = f: x: stdenv.lib.concatStringsSep ":" (map f x); in '' diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 05dbe6b7d84..2555aeccea4 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "tor-0.3.0.8"; + name = "tor-0.3.0.9"; src = fetchurl { url = "https://dist.torproject.org/${name}.tar.gz"; - sha256 = "0j0dhq1zp6w6zy7y4kiw7zg1imbgv8nsl7imlzwc0951p2kknfk6"; + sha256 = "0hhyb1wil8japynqnm07r1f67w3wdnafdg9amzlrrcfcyq5qim28"; }; outputs = [ "out" "geoip" ]; diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 0344fc0a74e..9de6216ea59 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, go, gox, removeReferencesTo }: let vaultBashCompletions = fetchFromGitHub { @@ -7,27 +7,35 @@ let rev = "e2f59b64be1fa5430fa05c91b6274284de4ea77c"; sha256 = "10m75rp3hy71wlmnd88grmpjhqy0pwb9m8wm19l0f463xla54frd"; }; -in buildGoPackage rec { +in stdenv.mkDerivation rec { name = "vault-${version}"; - version = "0.6.5"; - - goPackagePath = "github.com/hashicorp/vault"; + version = "0.7.3"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "0ci46zn9d9h26flgjf4inmvk4mb1hlixvx5g7vg02raw0cqvknnb"; + sha256 = "15wj1pfgzwzjfrqy7b5bx4y9f0hbpqlfif58l5xamwm88229qk4m"; }; - buildFlagsArray = '' - -ldflags= - -X github.com/hashicorp/vault/version.GitCommit=${version} + nativeBuildInputs = [ go gox removeReferencesTo ]; + + buildPhase = '' + substituteInPlace scripts/build.sh --replace 'git rev-parse HEAD' 'echo ${src.rev}' + + mkdir -p src/github.com/hashicorp + ln -s $(pwd) src/github.com/hashicorp/vault + + GOPATH=$(pwd) make ''; - postInstall = '' - mkdir -p $bin/share/bash-completion/completions/ - cp ${vaultBashCompletions}/vault-bash-completion.sh $bin/share/bash-completion/completions/vault + installPhase = '' + mkdir -p $out/bin $out/share/bash-completion/completions + + cp pkg/*/* $out/bin/ + find $out/bin -type f -exec remove-references-to -t ${go} '{}' + + + cp ${vaultBashCompletions}/vault-bash-completion.sh $out/share/bash-completion/completions/vault ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/vulnix/requirements.nix b/pkgs/tools/security/vulnix/requirements.nix index c1cbf9c4d3b..11faca44ef9 100644 --- a/pkgs/tools/security/vulnix/requirements.nix +++ b/pkgs/tools/security/vulnix/requirements.nix @@ -10,8 +10,7 @@ rec { propagatedBuildInputs = [ persistent transaction - zope_interface - ] ++ (with pythonPackages; [ coverage ]); + ] ++ (with pythonPackages; [ zope_interface coverage ]); meta = with stdenv.lib; { homepage = ""; @@ -26,7 +25,7 @@ rec { url = "https://pypi.python.org/packages/52/b3/a96d62711a26d8cfbe546519975dc9ed54d2eb50b3238d2e6de045764796/ZConfig-3.1.0.tar.gz"; sha256 = "c21fa3a073a56925a8098036d46717392994a92cffea1b3cda3176b70c0a842e"; }; - propagatedBuildInputs = [ pythonPackages.zope_testrunner ]; + propagatedBuildInputs = with pythonPackages; [ zope_testrunner ]; meta = with stdenv.lib; { homepage = ""; license = licenses.zpt21; @@ -62,9 +61,7 @@ rec { url = "https://pypi.python.org/packages/3d/71/3302512282b606ec4d054e09be24c065915518903b29380b6573bff79c24/persistent-4.2.2.tar.gz"; sha256 = "52ececc6dbba5ef572d3435189318b4dff07675bafa9620e32f785e147c6563c"; }; - propagatedBuildInputs = [ - zope_interface - ] ++ (with pythonPackages; [ six wheel ]); + propagatedBuildInputs = with pythonPackages; [ zope_interface six wheel ]; meta = with stdenv.lib; { homepage = ""; license = licenses.zpt21; @@ -78,9 +75,7 @@ rec { url = "https://pypi.python.org/packages/8c/af/3ffafe85bcc93ecb09459f3f2bd8fbe142e9ab34048f9e2774543b470cbd/transaction-2.0.3.tar.gz"; sha256 = "67bfb81309ba9717edbb2ca2e5717c325b78beec0bf19f44e5b4b9410f82df7f"; }; - propagatedBuildInputs = [ - zope_interface - ] ++ (with pythonPackages; [ six wheel ]); + propagatedBuildInputs = with pythonPackages; [ zope_interface six wheel ]; meta = with stdenv.lib; { homepage = ""; license = licenses.zpt21; @@ -115,18 +110,4 @@ rec { description = "Fork of Python 3 pickle module."; }; }; - - zope_interface = pythonPackages.buildPythonPackage { - name = "zope.interface-4.3.3"; - src = fetchurl { - url = "https://pypi.python.org/packages/44/af/cea1e18bc0d3be0e0824762d3236f0e61088eeed75287e7b854d65ec9916/zope.interface-4.3.3.tar.gz"; - sha256 = "8780ef68ca8c3fe1abb30c058a59015129d6e04a6b02c2e56b9c7de6078dfa88"; - }; - propagatedBuildInputs = [ ]; - meta = with stdenv.lib; { - homepage = ""; - license = licenses.zpt21; - description = "Interfaces for Python"; - }; - }; } diff --git a/pkgs/tools/system/acct/default.nix b/pkgs/tools/system/acct/default.nix index 6ec9cc62744..ca8fbdcf031 100644 --- a/pkgs/tools/system/acct/default.nix +++ b/pkgs/tools/system/acct/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "acct-6.6.3"; + name = "acct-6.6.4"; src = fetchurl { url = "mirror://gnu/acct/${name}.tar.gz"; - sha256 = "14x0zklwlg7cc7amlyzffqr8az3fqj1h9dyj0hvl1kpi7cr7kbjy"; + sha256 = "0gv6m8giazshvgpvwbng98chpas09myyfw1zr2y7hqxib0mvy5ac"; }; doCheck = true; diff --git a/pkgs/tools/system/awstats/default.nix b/pkgs/tools/system/awstats/default.nix index ecf31d6c9d6..1b3b694bf78 100644 --- a/pkgs/tools/system/awstats/default.nix +++ b/pkgs/tools/system/awstats/default.nix @@ -44,9 +44,9 @@ perlPackages.buildPerlPackage rec { mkdir -p "$bin/bin" ln -s "$out/wwwroot/cgi-bin/awstats.pl" "$bin/bin/awstats" - mkdir -p "$doc/share/" + mkdir -p "$doc/share/doc" mv README.md docs/ - mv docs "$doc/share/awstats" + mv docs "$doc/share/doc/awstats" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index 4aa5aee4c27..824eb74b72e 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -52,9 +52,21 @@ stdenv.mkDerivation rec { # for some reason libsigrok isn't auto-detected configureFlags = + [ "--localstatedir=/var" ] ++ stdenv.lib.optional (libsigrok != null) "--with-libsigrok" ++ stdenv.lib.optional (python != null) "--with-python=${python}/bin/python"; + # do not create directories in /var during installPhase + postConfigure = '' + substituteInPlace Makefile --replace '$(mkinstalldirs) $(DESTDIR)$(localstatedir)/' '#' + ''; + + postInstall = '' + if [ -d $out/share/collectd/java ]; then + mv $out/share/collectd/java $out/share/ + fi + ''; + meta = with stdenv.lib; { description = "Daemon which collects system performance statistics periodically"; homepage = https://collectd.org; diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix index 3dcbf59d4d7..5f439ccdb53 100644 --- a/pkgs/tools/system/ddrescue/default.nix +++ b/pkgs/tools/system/ddrescue/default.nix @@ -1,4 +1,9 @@ -{ stdenv, fetchurl, lzip }: +{ stdenv +, fetchurl, lzip +, hostPlatform, buildPlatform +}: + +let inherit (stdenv.lib) optionals; in stdenv.mkDerivation rec { name = "ddrescue-1.22"; @@ -10,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ lzip ]; - doCheck = true; + doCheck = hostPlatform == buildPlatform; meta = with stdenv.lib; { description = "GNU ddrescue, a data recovery tool"; diff --git a/pkgs/tools/system/di/default.nix b/pkgs/tools/system/di/default.nix index 3e00ee795ff..8bc94b64be9 100644 --- a/pkgs/tools/system/di/default.nix +++ b/pkgs/tools/system/di/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "di-${version}"; - version = "4.43"; + version = "4.44"; src = fetchurl { url = "http://gentoo.com/di/${name}.tar.gz"; - sha256 = "1q25jy51qfzsym9b2w0cqzscq2j492gn60dy6gbp88m8nwm4sdy8"; + sha256 = "0803lp8kd3mp1jcm17i019xiqxdy85hhs6xk67zib8gmvg500gcn"; }; makeFlags = [ "INSTALL_DIR=$(out)" ]; diff --git a/pkgs/tools/system/journalwatch/default.nix b/pkgs/tools/system/journalwatch/default.nix new file mode 100644 index 00000000000..a424eb6c4b2 --- /dev/null +++ b/pkgs/tools/system/journalwatch/default.nix @@ -0,0 +1,43 @@ +{ stdenv, buildPythonPackage, fetchurl, fetchgit, pythonOlder, systemd, pytest }: + +buildPythonPackage rec { + pname = "journalwatch"; + name = "${pname}-${version}"; + version = "1.1.0"; + disabled = pythonOlder "3.3"; + + + src = fetchurl { + url = "https://github.com/The-Compiler/${pname}/archive/v${version}.tar.gz"; + sha512 = "3hvbgx95hjfivz9iv0hbhj720wvm32z86vj4a60lji2zdfpbqgr2b428lvg2cpvf71l2xn6ca5v0hzyz57qylgwqzgfrx7hqhl5g38s"; + }; + + # can be removed post 1.1.0 + postPatch = '' + substituteInPlace test_journalwatch.py \ + --replace "U Thu Jan 1 00:00:00 1970 prio foo [1337]" "U Thu Jan 1 00:00:00 1970 pprio foo [1337]" + ''; + + + doCheck = true; + + checkPhase = '' + pytest test_journalwatch.py + ''; + + buildInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + systemd + ]; + + + meta = with stdenv.lib; { + description = "journalwatch is a tool to find error messages in the systemd journal."; + homepage = "https://github.com/The-Compiler/journalwatch"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ florianjacob ]; + }; +} diff --git a/pkgs/tools/system/mcron/default.nix b/pkgs/tools/system/mcron/default.nix index a90d6afdc61..5863504c704 100644 --- a/pkgs/tools/system/mcron/default.nix +++ b/pkgs/tools/system/mcron/default.nix @@ -10,6 +10,11 @@ stdenv.mkDerivation rec { patches = [ ./install-vixie-programs.patch ]; + # don't attempt to chmod +s files in the nix store + postPatch = '' + substituteInPlace makefile.in --replace "rwxs" "rwx" + ''; + buildInputs = [ guile which ed ]; doCheck = true; diff --git a/pkgs/tools/system/runit/default.nix b/pkgs/tools/system/runit/default.nix index 03da7bc657f..61c61226acd 100644 --- a/pkgs/tools/system/runit/default.nix +++ b/pkgs/tools/system/runit/default.nix @@ -23,6 +23,9 @@ stdenv.mkDerivation rec { postPatch = '' sed -i "s,\(#define RUNIT\) .*,\1 \"$out/bin/runit\"," src/runit.h + # usernamespace sandbox of nix seems to conflict with runit's assumptions + # about unix users. Therefor skip the check + sed -i '/.\/chkshsgr/d' src/Makefile '' + stdenv.lib.optionalString (!static) '' sed -i 's,-static,,g' src/Makefile ''; diff --git a/pkgs/tools/system/socklog/default.nix b/pkgs/tools/system/socklog/default.nix index 0b893bfe0dc..0b95dcdb193 100644 --- a/pkgs/tools/system/socklog/default.nix +++ b/pkgs/tools/system/socklog/default.nix @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { mv man"/"*.$i $man/share/man/man$i done - mkdir -p $doc/share/socklog/html - mv doc"/"*.html $doc/share/socklog/html/ + mkdir -p $doc/share/doc/socklog/html + mv doc/*.html $doc/share/doc/socklog/html/ runHook postInstall ''; diff --git a/pkgs/tools/system/stress/default.nix b/pkgs/tools/system/stress/default.nix index 52cfd4dde74..5a4734328ff 100644 --- a/pkgs/tools/system/stress/default.nix +++ b/pkgs/tools/system/stress/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple workload generator for POSIX systems. It imposes a configurable amount of CPU, memory, I/O, and disk stress on the system"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/system/suid-chroot/default.nix b/pkgs/tools/system/suid-chroot/default.nix index 1278480973f..ebedf5f544e 100644 --- a/pkgs/tools/system/suid-chroot/default.nix +++ b/pkgs/tools/system/suid-chroot/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace Makefile --replace /usr $out + sed -i -e '/chmod u+s/d' Makefile ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/system/tm/default.nix b/pkgs/tools/system/tm/default.nix index 3326f535b5f..3442dbb62b0 100644 --- a/pkgs/tools/system/tm/default.nix +++ b/pkgs/tools/system/tm/default.nix @@ -10,10 +10,6 @@ stdenv.mkDerivation { sed -i 's@/usr/bin/install@install@g ; s/gcc/cc/g' Makefile ''; - crossAttrs = { - makeFlags = "CC=${stdenv.cross.config}-gcc"; - }; - src = fetchurl { url = http://vicerveza.homeunix.net/~viric/soft/tm/tm-0.4.1.tar.gz; sha256 = "3b389bc03b6964ad5ffa57a344b891fdbcf7c9b2604adda723a863f83657c4a0"; diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix index 97b35378673..cce18b5d54b 100644 --- a/pkgs/tools/system/ts/default.nix +++ b/pkgs/tools/system/ts/default.nix @@ -1,5 +1,6 @@ -{stdenv, fetchurl, -sendmailPath ? "/run/wrappers/bin/sendmail" }: +{ stdenv, fetchurl +, sendmailPath ? "/run/wrappers/bin/sendmail" +}: stdenv.mkDerivation rec { @@ -7,10 +8,6 @@ stdenv.mkDerivation rec { installPhase=''make install "PREFIX=$out"''; - crossAttrs = { - makeFlags = "CC=${stdenv.cross.config}-gcc"; - }; - patchPhase = '' sed -i s,/usr/sbin/sendmail,${sendmailPath}, mail.c ts.1 ''; diff --git a/pkgs/tools/system/undaemonize/default.nix b/pkgs/tools/system/undaemonize/default.nix new file mode 100644 index 00000000000..e82ee18b831 --- /dev/null +++ b/pkgs/tools/system/undaemonize/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + name = "undaemonize-2017-07-11"; + src = fetchFromGitHub { + repo = "undaemonize"; + owner = "nickstenning"; + rev = "a181cfd900851543ee1f85fe8f76bc8916b446d4"; + sha256 = "1fkrgj3xfhj820qagh5p0rabl8z2hpad6yp984v92h9pgbfwxs33"; + }; + installPhase = '' + install -D undaemonize $out/bin/undaemonize + ''; + meta = { + description = "Tiny helper utility to force programs which insist on daemonizing themselves to run in the foreground"; + homepage = "https://github.com/nickstenning/undaemonize"; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.canndrew ]; + platforms = stdenv.lib.platforms.linux; + }; +} + diff --git a/pkgs/tools/text/codesearch/default.nix b/pkgs/tools/text/codesearch/default.nix index ccb3f1d9ed9..fc7d74804fe 100644 --- a/pkgs/tools/text/codesearch/default.nix +++ b/pkgs/tools/text/codesearch/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { name = "codesearch-${version}"; - version = "20150617-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20150717-${stdenv.lib.strings.substring 0 7 rev}"; rev = "a45d81b686e85d01f2838439deaf72126ccd5a96"; goPackagePath = "github.com/google/codesearch"; diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix index adbd69154ec..13579b57e79 100644 --- a/pkgs/tools/text/gnupatch/default.nix +++ b/pkgs/tools/text/gnupatch/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl, ed }: +{ stdenv, fetchurl +, ed +, buildPlatform, hostPlatform +}: stdenv.mkDerivation rec { name = "patch-2.7.5"; @@ -10,11 +13,11 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional doCheck ed; - crossAttrs = { - configureFlags = [ "ac_cv_func_strnlen_working=yes" ]; - }; + configureFlags = stdenv.lib.optionals (hostPlatform != buildPlatform) [ + "ac_cv_func_strnlen_working=yes" + ]; - doCheck = true; + doCheck = hostPlatform == buildPlatform; meta = { description = "GNU Patch, a program to apply differences to files"; diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index aa9ece8955b..fc6b1abf24d 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -57,8 +57,11 @@ stdenv.mkDerivation rec { # Remove example output with (random?) colors and creation date # to avoid non-determinism in the output. postInstall = '' - rm $doc/share/doc/groff/examples/hdtbl/*color*ps - find $doc/share/doc/groff/ -type f -print0 | xargs -0 sed -i -e 's/%%CreationDate: .*//' + rm "$doc"/share/doc/groff/examples/hdtbl/*color*ps + find "$doc"/share/doc/groff/ -type f -print0 | xargs -0 sed -i -e 's/%%CreationDate: .*//' + for f in 'man.local' 'mdoc.local'; do + cat '${./site.tmac}' >>"$out/share/groff/site-tmac/$f" + done ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/text/groff/site.tmac b/pkgs/tools/text/groff/site.tmac new file mode 100644 index 00000000000..8ef1040ca4a --- /dev/null +++ b/pkgs/tools/text/groff/site.tmac @@ -0,0 +1,16 @@ +. +.if n \{\ +. \" Character translations for non-keyboard +. \" characters - to make them searchable +. if '\*[.T]'utf8' \{\ +. char \- \N'45' +. char - \N'45' +. char ' \N'39' +. char \' \N'39' +. \} +. +. \" Shut off SGR by default (groff colors) +. \" Require GROFF_SGR envvar defined to turn it on +. if '\V[GROFF_SGR]'' \ +. output x X tty: sgr 0 +.\} diff --git a/pkgs/tools/text/html-tidy/default.nix b/pkgs/tools/text/html-tidy/default.nix index 1a264885b48..cc3283cf854 100644 --- a/pkgs/tools/text/html-tidy/default.nix +++ b/pkgs/tools/text/html-tidy/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, libxslt }: +{ stdenv, fetchFromGitHub, cmake, libxslt +, hostPlatform +}: stdenv.mkDerivation rec { name = "html-tidy-${version}"; @@ -14,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake libxslt/*manpage*/ ]; cmakeFlags = stdenv.lib.optional - (stdenv.cross.libc or null == "msvcrt") "-DCMAKE_SYSTEM_NAME=Windows"; + (hostPlatform.libc or null == "msvcrt") "-DCMAKE_SYSTEM_NAME=Windows"; # ATM bin/tidy is statically linked, as upstream provides no other option yet. # https://github.com/htacg/tidy-html5/issues/326#issuecomment-160322107 diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index e1a2f157085..38362333cad 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchgit, fetchpatch, extra-cmake-modules, kdoctools, wrapGAppsHook, - kconfig, kinit, kparts + kcrash, kconfig, kinit, kparts }: mkDerivation rec { @@ -32,7 +32,7 @@ mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; - propagatedBuildInputs = [ kconfig kinit kparts ]; + propagatedBuildInputs = [ kconfig kcrash kinit kparts ]; meta = with lib; { homepage = http://kdiff3.sourceforge.net/; diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix index 62d544ff408..e08a5941ba9 100644 --- a/pkgs/tools/text/languagetool/default.nix +++ b/pkgs/tools/text/languagetool/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { for lt in languagetool{,-commandline,-server};do cat > $out/bin/$lt < +Date: Mon, 29 May 2017 22:36:15 +0100 +Subject: [PATCH] allow nologin on other paths + +--- + google_compute_engine/accounts/accounts_utils.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/google_compute_engine/accounts/accounts_utils.py b/google_compute_engine/accounts/accounts_utils.py +index 57e62be..d7eda06 100644 +--- a/google_compute_engine/accounts/accounts_utils.py ++++ b/google_compute_engine/accounts/accounts_utils.py +@@ -295,8 +295,8 @@ class AccountsUtils(object): + # logins. This helps avoid problems caused by operator and root sharing + # a home directory in CentOS and RHEL. + pw_entry = self._GetUser(user) +- if pw_entry and pw_entry.pw_shell == '/sbin/nologin': +- message = 'Not updating user %s. User set /sbin/nologin as login shell.' ++ if pw_entry and os.path.basename(pw_entry.pw_shell) == 'nologin': ++ message = 'Not updating user %s. User set `nologin` as login shell.' + self.logger.debug(message, user) + return True + +-- +2.13.0 + diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix new file mode 100644 index 00000000000..7a5350fe2eb --- /dev/null +++ b/pkgs/tools/virtualization/google-compute-engine/default.nix @@ -0,0 +1,55 @@ +{ lib +, fetchFromGitHub +, pythonPackages +, bash +, shadow +, systemd +, utillinux +}: +let + version = "20170523"; +in +pythonPackages.buildPythonApplication { + name = "google-compute-engine-${version}"; + namePrefix = ""; + + src = fetchFromGitHub { + owner = "GoogleCloudPlatform"; + repo = "compute-image-packages"; + rev = version; + sha256 = "1qxyj3lj9in6m8yi6y6wcmc3662h9z4qax07v97rdnay99mxdv68"; + }; + + patches = [ ./0001-allow-nologin-other-paths.patch ]; + + postPatch = '' + for file in $(find google_compute_engine -type f); do + substituteInPlace "$file" \ + --replace /bin/systemctl "${systemd}/bin/systemctl" \ + --replace /bin/bash "${bash}/bin/bash" \ + --replace /sbin/hwclock "${utillinux}/bin/hwclock" + + # SELinux tool ??? /sbin/restorecon + done + + substituteInPlace google_config/udev/64-gce-disk-removal.rules \ + --replace /bin/sh "${bash}/bin/sh" \ + --replace /bin/umount "${utillinux}/bin/umount" \ + --replace /usr/bin/logger "${utillinux}/bin/logger" + ''; + + postInstall = '' + # allows to install the package in `services.udev.packages` in NixOS + mkdir -p $out/lib/udev/rules.d + cp -r google_config/udev/*.rules $out/lib/udev/rules.d + ''; + + propagatedBuildInputs = with pythonPackages; [ boto setuptools ]; + + meta = with lib; { + description = "Google Compute Engine tools and services"; + homepage = https://github.com/GoogleCloudPlatform/compute-image-packages; + license = licenses.asl20; + maintainers = with maintainers; [ zimbatm ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8ffb377bc2..eb970dfd8dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -185,8 +185,10 @@ with pkgs; fetchzip = callPackage ../build-support/fetchzip { }; + gitRepoToName = callPackage ../build-support/fetchgit/gitrepotoname.nix { }; + fetchFromGitHub = { - owner, repo, rev, name ? "${repo}-${rev}-src", + owner, repo, rev, name ? gitRepoToName repo rev, fetchSubmodules ? false, private ? false, githubBase ? "github.com", varPrefix ? null, ... # For hash agility @@ -223,7 +225,7 @@ with pkgs; } // passthruAttrs) // { inherit rev; }; fetchFromBitbucket = { - owner, repo, rev, name ? "${repo}-${rev}-src", + owner, repo, rev, name ? gitRepoToName repo rev, ... # For hash agility }@args: fetchzip ({ inherit name; @@ -234,7 +236,7 @@ with pkgs; # cgit example, snapshot support is optional in cgit fetchFromSavannah = { - repo, rev, name ? "${repo}-${rev}-src", + repo, rev, name ? gitRepoToName repo rev, ... # For hash agility }@args: fetchzip ({ inherit name; @@ -244,7 +246,7 @@ with pkgs; # gitlab example fetchFromGitLab = { - owner, repo, rev, name ? "${repo}-${rev}-src", + owner, repo, rev, name ? gitRepoToName repo rev, ... # For hash agility }@args: fetchzip ({ inherit name; @@ -254,7 +256,7 @@ with pkgs; # gitweb example, snapshot support is optional in gitweb fetchFromRepoOrCz = { - repo, rev, name ? "${repo}-${rev}-src", + repo, rev, name ? gitRepoToName repo rev, ... # For hash agility }@args: fetchzip ({ inherit name; @@ -410,6 +412,10 @@ with pkgs; albert = libsForQt5.callPackage ../applications/misc/albert {}; + alacritty = callPackage ../applications/misc/alacritty { + inherit (xorg) libXcursor libXxf86vm libXi; + }; + amazon-glacier-cmd-interface = callPackage ../tools/backup/amazon-glacier-cmd-interface { }; ammonite = callPackage ../development/tools/ammonite {}; @@ -529,6 +535,8 @@ with pkgs; bonnie = callPackage ../tools/filesystems/bonnie { }; + container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { }; + djmount = callPackage ../tools/filesystems/djmount { }; dgsh = callPackage ../shells/dgsh { }; @@ -543,6 +551,8 @@ with pkgs; enpass = callPackage ../tools/security/enpass { }; + ezstream = callPackage ../tools/audio/ezstream { }; + genymotion = callPackage ../development/mobile/genymotion { }; grc = callPackage ../tools/misc/grc { }; @@ -579,6 +589,10 @@ with pkgs; pkgs_i686 = pkgsi686Linux; }; + adbfs-rootless = callPackage ../development/mobile/adbfs-rootless { + adb = androidenv.platformTools; + }; + adb-sync = callPackage ../development/mobile/adb-sync { }; androidenv = callPackage ../development/mobile/androidenv { @@ -771,6 +785,14 @@ with pkgs; ''; }); + stack2nix = with haskell.lib; overrideCabal (justStaticExecutables haskellPackages.stack2nix) (drv: { + executableToolDepends = [ makeWrapper ]; + postInstall = '' + wrapProgram $out/bin/stack2nix \ + --prefix PATH ":" "${git}/bin:${cabal2nix}/bin:${cabal-install}/bin:${stack}/bin" + ''; + }); + caddy = callPackage ../servers/caddy { }; capstone = callPackage ../development/libraries/capstone { }; @@ -945,6 +967,8 @@ with pkgs; elementary-icon-theme = callPackage ../data/icons/elementary-icon-theme { }; + elm-github-install = callPackage ../tools/package-management/elm-github-install { }; + emby = callPackage ../servers/emby { }; enca = callPackage ../tools/text/enca { }; @@ -967,6 +991,10 @@ with pkgs; fastJson = callPackage ../development/libraries/fastjson { }; + fast-cli = nodePackages.fast-cli.overrideDerivation (old: { + buildInputs = old.buildInputs ++ [phantomjs2]; + }); + filebench = callPackage ../tools/misc/filebench { }; fsmon = callPackage ../tools/misc/fsmon { }; @@ -1017,8 +1045,12 @@ with pkgs; heatseeker = callPackage ../tools/misc/heatseeker { }; + hebcal = callPackage ../tools/misc/hebcal {}; + hexio = callPackage ../development/tools/hexio { }; + hid-listen = callPackage ../tools/misc/hid-listen { }; + hostsblock = callPackage ../tools/misc/hostsblock { }; hr = callPackage ../applications/misc/hr { }; @@ -1071,6 +1103,8 @@ with pkgs; syslogng_incubator = callPackage ../tools/system/syslog-ng-incubator { }; + ring-daemon = callPackage ../applications/networking/instant-messengers/ring-daemon { }; + rsyslog = callPackage ../tools/system/rsyslog { hadoop = null; # Currently Broken czmq = czmq3; @@ -1198,8 +1232,6 @@ with pkgs; bup = callPackage ../tools/backup/bup { }; - burp_1_3 = callPackage ../tools/backup/burp/1.3.48.nix { }; - burp = callPackage ../tools/backup/burp { }; buku = callPackage ../applications/misc/buku { @@ -1330,7 +1362,7 @@ with pkgs; unifdef = callPackage ../development/tools/misc/unifdef { }; - "unionfs-fuse" = callPackage ../tools/filesystems/unionfs-fuse { }; + unionfs-fuse = callPackage ../tools/filesystems/unionfs-fuse { }; usb-modeswitch = callPackage ../development/tools/misc/usb-modeswitch { }; usb-modeswitch-data = callPackage ../development/tools/misc/usb-modeswitch/data.nix { }; @@ -1390,6 +1422,8 @@ with pkgs; c14 = callPackage ../applications/networking/c14 { }; + certstrap = callPackage ../tools/security/certstrap { }; + cfssl = callPackage ../tools/security/cfssl { }; checkbashisms = callPackage ../development/tools/misc/checkbashisms { }; @@ -1697,6 +1731,8 @@ with pkgs; mcrcon = callPackage ../tools/networking/mcrcon {}; + zabbix-cli = callPackage ../tools/misc/zabbix-cli { }; + ### DEVELOPMENT / EMSCRIPTEN buildEmscriptenPackage = callPackage ../development/em-modules/generic { }; @@ -1730,7 +1766,7 @@ with pkgs; evemu = callPackage ../tools/system/evemu { }; # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. - elk5Version = "5.4.0"; + elk5Version = "5.4.2"; elasticsearch = callPackage ../servers/search/elasticsearch { }; elasticsearch2 = callPackage ../servers/search/elasticsearch/2.x.nix { }; @@ -1898,6 +1934,8 @@ with pkgs; fdk_aac = callPackage ../development/libraries/fdk-aac { }; + flac123 = callPackage ../applications/audio/flac123 { }; + flamegraph = callPackage ../development/tools/flamegraph { }; # Awkward historical capitalization for flamegraph. Remove eventually @@ -2025,6 +2063,8 @@ with pkgs; gdmap = callPackage ../tools/system/gdmap { }; + gen-oath-safe = callPackage ../tools/security/gen-oath-safe { }; + genext2fs = callPackage ../tools/filesystems/genext2fs { }; gengetopt = callPackage ../development/tools/misc/gengetopt { }; @@ -2045,10 +2085,14 @@ with pkgs; gifsicle = callPackage ../tools/graphics/gifsicle { }; + git-big-picture = callPackage ../applications/version-management/git-and-tools/git-big-picture { }; + git-crecord = callPackage ../applications/version-management/git-crecord { }; git-lfs = callPackage ../applications/version-management/git-lfs { }; + git-ftp = callPackage ../development/tools/git-ftp { }; + git-series = callPackage ../development/tools/git-series { }; git-up = callPackage ../applications/version-management/git-up { }; @@ -2082,6 +2126,8 @@ with pkgs; gmvault = callPackage ../tools/networking/gmvault { }; + gnash = callPackage ../misc/gnash { }; + gnaural = callPackage ../applications/audio/gnaural { stdenv = overrideCC stdenv gcc49; }; @@ -2155,6 +2201,8 @@ with pkgs; google-fonts = callPackage ../data/fonts/google-fonts { }; + google-compute-engine = callPackage ../tools/virtualization/google-compute-engine { }; + gource = callPackage ../applications/version-management/gource { }; gpart = callPackage ../tools/filesystems/gpart { }; @@ -2239,6 +2287,12 @@ with pkgs; zfsSupport = false; }; + grub2_xen = callPackage ../tools/misc/grub/2.0x.nix { + xenSupport = true; + }; + + grub2_pvgrub_image = callPackage ../tools/misc/grub/pvgrub_image { }; + grub4dos = callPackage ../tools/misc/grub4dos { stdenv = stdenv_32bit; }; @@ -2344,6 +2398,10 @@ with pkgs; hddtemp = callPackage ../tools/misc/hddtemp { }; + hdf4 = callPackage ../tools/misc/hdf4 { + szip = null; + }; + hdf5 = callPackage ../tools/misc/hdf5 { gfortran = null; szip = null; @@ -2367,7 +2425,9 @@ with pkgs; heaptrack = libsForQt5.callPackage ../development/tools/profiling/heaptrack {}; - heimdall = callPackage ../tools/misc/heimdall { }; + heimdall = libsForQt5.callPackage ../tools/misc/heimdall { enableGUI = false; }; + + heimdall-gui = libsForQt5.callPackage ../tools/misc/heimdall { enableGUI = true; }; hevea = callPackage ../tools/typesetting/hevea { }; @@ -2392,6 +2452,8 @@ with pkgs; host = bind.host; + hotspot = libsForQt56.callPackage ../development/tools/analysis/hotspot { }; + hping = callPackage ../tools/networking/hping { }; htpdate = callPackage ../tools/networking/htpdate { }; @@ -2548,6 +2610,8 @@ with pkgs; jade = callPackage ../tools/text/sgml/jade { }; + jd = callPackage ../development/tools/jd { }; + jd-gui = callPackage_i686 ../tools/security/jd-gui { }; jdiskreport = callPackage ../tools/misc/jdiskreport { }; @@ -2707,6 +2771,8 @@ with pkgs; kzipmix = callPackage_i686 ../tools/compression/kzipmix { }; + mailcatcher = callPackage ../development/web/mailcatcher { }; + makebootfat = callPackage ../tools/misc/makebootfat { }; matrix-synapse = callPackage ../servers/matrix-synapse { }; @@ -2992,6 +3058,8 @@ with pkgs; maildrop = callPackage ../tools/networking/maildrop { }; + mailhog = callPackage ../servers/mail/mailhog {}; + mailnag = callPackage ../applications/networking/mailreaders/mailnag { }; mailsend = callPackage ../tools/networking/mailsend { }; @@ -3213,6 +3281,8 @@ with pkgs; ndjbdns = callPackage ../tools/networking/ndjbdns { }; + ndppd = callPackage ../applications/networking/ndppd { }; + neofetch = callPackage ../tools/misc/neofetch { }; nerdfonts = callPackage ../data/fonts/nerdfonts { }; @@ -3294,6 +3364,8 @@ with pkgs; ngrok = callPackage ../tools/networking/ngrok { }; + noice = callPackage ../applications/misc/noice { }; + noip = callPackage ../tools/networking/noip { }; nomad = callPackage ../applications/networking/cluster/nomad { }; @@ -3335,6 +3407,8 @@ with pkgs; graphicalSupport = true; }; + nnn = callPackage ../applications/misc/nnn { }; + notify-osd = callPackage ../applications/misc/notify-osd { }; nox = callPackage ../tools/package-management/nox { @@ -3410,6 +3484,8 @@ with pkgs; opendbx = callPackage ../development/libraries/opendbx { }; + opendht = callPackage ../development/libraries/opendht {}; + opendkim = callPackage ../development/libraries/opendkim { }; opendylan = callPackage ../development/compilers/opendylan { @@ -4306,6 +4382,8 @@ with pkgs; tarsnap = callPackage ../tools/backup/tarsnap { }; + tarsnapper = callPackage ../tools/backup/tarsnapper { }; + tcpcrypt = callPackage ../tools/security/tcpcrypt { }; tcptraceroute = callPackage ../tools/networking/tcptraceroute { }; @@ -4501,6 +4579,8 @@ with pkgs; uriparser = callPackage ../development/libraries/uriparser {}; + urlscan = callPackage ../applications/misc/urlscan { }; + urlview = callPackage ../applications/misc/urlview {}; usbmuxd = callPackage ../tools/misc/usbmuxd {}; @@ -4816,15 +4896,16 @@ with pkgs; x11_ssh_askpass = callPackage ../tools/networking/x11-ssh-askpass { }; - xbursttools = assert stdenv ? glibc; callPackage ../tools/misc/xburst-tools { + xbursttools = assert stdenv ? glibc; callPackage ../tools/misc/xburst-tools rec { # It needs a cross compiler for mipsel to build the firmware it will # load into the Ben Nanonote + crossPrefix = "mipsel-unknown-linux"; gccCross = let pkgsCross = nixpkgsFun { # Ben Nanonote system crossSystem = { - config = "mipsel-unknown-linux"; + config = crossPrefix; bigEndian = true; arch = "mips"; float = "soft"; @@ -4843,11 +4924,13 @@ with pkgs; }; }; in - pkgsCross.gccCrossStageStatic; + pkgsCross.buildPackages.gccCrossStageStatic; }; xclip = callPackage ../tools/misc/xclip { }; + xcwd = callPackage ../tools/X11/xcwd { }; + xtitle = callPackage ../tools/misc/xtitle { }; xdelta = callPackage ../tools/compression/xdelta { }; @@ -4864,8 +4947,8 @@ with pkgs; gnome_python = gnome2.gnome_python; }; - xfsprogs = callPackage ../tools/filesystems/xfsprogs { }; - libxfs = xfsprogs.dev; # outputs TODO + xfsprogs = callPackage ../tools/filesystems/xfsprogs { utillinux = utillinuxMinimal; }; + libxfs = xfsprogs.dev; xml2 = callPackage ../tools/text/xml/xml2 { }; @@ -4971,6 +5054,7 @@ with pkgs; interactive = stdenv.isCygwin; # patch for cygwin requires readline support }); + # WARNING: this attribute is used by nix-shell so it shouldn't be removed/renamed bashInteractive = appendToName "interactive" (callPackage ../shells/bash/4.4.nix { interactive = true; }); @@ -4985,6 +5069,8 @@ with pkgs; fish-foreign-env = callPackage ../shells/fish-foreign-env { }; + ion = callPackage ../shells/ion { }; + mksh = callPackage ../shells/mksh { }; oh = callPackage ../shells/oh { }; @@ -5163,13 +5249,21 @@ with pkgs; gccApple = throw "gccApple is no longer supported"; + # Can't just overrideCC, because then the stdenv-cross mkDerivation will be + # thrown away. TODO: find a better solution for this. + crossLibcStdenv = buildPackages.makeStdenvCross { + inherit (buildPackages.buildPackages) stdenv; + inherit buildPlatform hostPlatform targetPlatform; + cc = buildPackages.gccCrossStageStatic; + }; + gccCrossStageStatic = assert targetPlatform != buildPlatform; let libcCross1 = - if targetPlatform.libc == "msvcrt" then windows.mingw_w64_headers + if targetPlatform.libc == "msvcrt" then __targetPackages.windows.mingw_w64_headers else if targetPlatform.libc == "libSystem" then darwin.xcode else null; - in wrapGCCCross { - gcc = forcedNativePackages.gcc.cc.override { + in wrapCCCross { + cc = forcedNativePackages.gcc.cc.override { crossStageStatic = true; langCC = false; libcCross = libcCross1; @@ -5179,19 +5273,17 @@ with pkgs; }; libc = libcCross1; inherit (forcedNativePackages) binutils; - cross = targetPlatform; }; # Only needed for mingw builds - gccCrossMingw2 = assert targetPlatform != buildPlatform; wrapGCCCross { - gcc = gccCrossStageStatic.gcc; + gccCrossMingw2 = assert targetPlatform != buildPlatform; wrapCCCross { + cc = gccCrossStageStatic.gcc; libc = windows.mingw_headers2; inherit (forcedNativePackages) binutils; - cross = targetPlatform; }; - gccCrossStageFinal = assert targetPlatform != buildPlatform; wrapGCCCross { - gcc = forcedNativePackages.gcc.cc.override { + gccCrossStageFinal = assert targetPlatform != buildPlatform; wrapCCCross { + cc = forcedNativePackages.gcc.cc.override { crossStageStatic = false; # Why is this needed? @@ -5199,7 +5291,6 @@ with pkgs; }; libc = libcCross; inherit (forcedNativePackages) binutils; - cross = targetPlatform; }; gcc45 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.5 { @@ -5438,9 +5529,10 @@ with pkgs; psc-package = haskell.lib.justStaticExecutables (haskellPackages.callPackage ../development/compilers/purescript/psc-package { }); - inherit (ocamlPackages) haxe; - - hxcpp = callPackage ../development/compilers/haxe/hxcpp.nix { }; + inherit (ocamlPackages.haxe) haxe_3_2 haxe_3_4; + haxe = haxe_3_4; + haxePackages = recurseIntoAttrs (callPackage ./haxe-packages.nix { }); + inherit (haxePackages) hxcpp; hhvm = callPackage ../development/compilers/hhvm { boost = boost160; @@ -5542,8 +5634,8 @@ with pkgs; (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } (openjdk7.jre // { outputs = [ "jre" ]; })); - jdk8 = openjdk8 // { outputs = [ "out" ]; }; - jre8 = lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}" + jdk8 = if stdenv.isArm then oraclejdk8 else openjdk8 // { outputs = [ "out" ]; }; + jre8 = if stdenv.isArm then oraclejre8 else lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}" (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } (openjdk8.jre // { outputs = [ "jre" ]; })); jre8_headless = @@ -5576,7 +5668,8 @@ with pkgs; supportsJDK = system == "i686-linux" || - system == "x86_64-linux"; + system == "x86_64-linux" || + system == "armv7l-linux"; jdkdistro = oraclejdk8distro; @@ -5639,8 +5732,7 @@ with pkgs; llvm_35 = llvmPackages_35.llvm; llvm_34 = llvmPackages_34.llvm; - llvmPackages = recurseIntoAttrs - (if stdenv.isDarwin then llvmPackages_4 else llvmPackages_39); + llvmPackages = recurseIntoAttrs llvmPackages_4; llvmPackagesSelf = llvmPackages_34.override { stdenv = libcxxStdenv; @@ -5710,6 +5802,11 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation; }); + mono50 = lowPrio (callPackage ../development/compilers/mono/5.0.nix { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) Foundation; + }); + monoDLLFixer = callPackage ../build-support/mono-dll-fixer { }; mozart-binary = callPackage ../development/compilers/mozart/binary.nix { }; @@ -5767,6 +5864,8 @@ with pkgs; inherit (darwin) apple_sdk; }; + rustRegistry = callPackage ./rust-packages.nix { }; + rust = rustStable; rustStable = callPackage ../development/compilers/rust { inherit (llvmPackages_4) llvm; @@ -5785,7 +5884,6 @@ with pkgs; rustNightlyBin = lowPrio (callPackage ../development/compilers/rust/nightlyBin.nix { buildRustPackage = callPackage ../build-support/rust { rust = rustNightlyBin; - rustRegistry = callPackage ./rust-packages.nix { }; }; }); @@ -5802,11 +5900,17 @@ with pkgs; in { inherit rust; - rustRegistry = callPackage ./rust-packages.nix { }; - buildRustPackage = callPackage ../build-support/rust { inherit rust; }; + + rustcSrc = stdenv.mkDerivation { + name = "rust-src"; + src = rust.rustc.src; + phases = ["unpackPhase" "installPhase"]; + installPhase = "mv src $out"; + }; + }); rainicorn = callPackage ../development/tools/rust/rainicorn { }; @@ -5924,14 +6028,19 @@ with pkgs; libc = glibc; }; - wrapGCCCross = - {gcc, libc, binutils, cross, shell ? "", name ? "gcc-cross-wrapper"}: + wrapCCCross = + {cc, libc, binutils, shell ? "", name ? "gcc-cross-wrapper"}: - forcedNativePackages.callPackage ../build-support/gcc-cross-wrapper { + forcedNativePackages.ccWrapperFun { nativeTools = false; nativeLibc = false; noLibc = (libc == null); - inherit gcc binutils libc shell name cross; + + dyld = if stdenv.isDarwin then darwin.dyld else null; + isGNU = cc.isGNU or false; + isClang = cc.isClang or false; + + inherit cc binutils libc shell name; }; # prolog @@ -5978,18 +6087,21 @@ with pkgs; inherit (beam.interpreters) erlang erlang_odbc erlang_javac erlang_odbc_javac - elixir - lfe + elixir elixir_1_5_rc elixir_1_4 elixir_1_3 + lfe lfe_1_2 erlangR16 erlangR16_odbc erlang_basho_R16B02 erlang_basho_R16B02_odbc erlangR17 erlangR17_odbc erlangR17_javac erlangR17_odbc_javac erlangR18 erlangR18_odbc erlangR18_javac erlangR18_odbc_javac - erlangR19 erlangR19_odbc erlangR19_javac erlangR19_odbc_javac; + erlangR19 erlangR19_odbc erlangR19_javac erlangR19_odbc_javac + erlangR20 erlangR20_odbc erlangR20_javac erlangR20_odbc_javac; - inherit (beam.packages) + inherit (beam.packages.erlang) rebar rebar3-open rebar3 hexRegistrySnapshot fetchHex beamPackages - hex2nix cuter relxExe; + hex2nix cuter; + + inherit (beam.packages.erlangR18) relxExe; groovy = callPackage ../development/interpreters/groovy { }; @@ -6062,7 +6174,8 @@ with pkgs; luaPackages = lua52Packages; - luajit = callPackage ../development/interpreters/luajit {}; + inherit (callPackages ../development/interpreters/luajit {}) + luajit luajit_2_0 luajit_2_1; luarocks = luaPackages.luarocks; @@ -6409,6 +6522,9 @@ with pkgs; antlr3_5 = callPackage ../development/tools/parsing/antlr/3.5.nix { }; antlr3 = antlr3_5; + antlr4_7 = callPackage ../development/tools/parsing/antlr/4.7.nix { }; + antlr4 = antlr4_7; + ant = apacheAnt; apacheAnt = callPackage ../development/tools/build-managers/apache-ant { }; @@ -6487,6 +6603,8 @@ with pkgs; bison3 = callPackage ../development/tools/parsing/bison/3.x.nix { }; bison = bison3; + blackmagic = callPackage ../development/tools/misc/blackmagic { }; + bloaty = callPackage ../development/tools/bloaty { }; bossa = callPackage ../development/tools/misc/bossa { @@ -6505,7 +6623,7 @@ with pkgs; pythonPackages = python2Packages; }; buildbot-ui = buildbot.withPlugins (with self.buildbot-plugins; [ www ]); - buildbot-full = buildbot.withPlugins (with self.buildbot-plugins; [ www console-view waterfall-view ]); + buildbot-full = buildbot.withPlugins (with self.buildbot-plugins; [ www console-view waterfall-view grid-view ]); buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent { }; @@ -6618,12 +6736,19 @@ with pkgs; creduce = callPackage ../development/tools/misc/creduce { inherit (perlPackages) perl ExporterLite FileWhich GetoptTabular RegexpCommon TermReadKey; - inherit (llvmPackages_39) llvm clang-unwrapped; + inherit (llvmPackages_4) llvm clang-unwrapped; utillinux = if stdenv.isLinux then utillinuxMinimal else null; }; cscope = callPackage ../development/tools/misc/cscope { }; + csmith = callPackage ../development/tools/misc/csmith { + inherit (perlPackages) perl SysCPU; + # Workaround optional dependency on libbsd that's + # currently broken on Darwin. + libbsd = if stdenv.isDarwin then null else libbsd; + }; + csslint = callPackage ../development/web/csslint { }; libcxx = llvmPackages.libcxx; @@ -6871,6 +6996,8 @@ with pkgs; libtool_2 = callPackage ../development/tools/misc/libtool/libtool2.nix { }; + linuxkit = callPackage ../development/tools/misc/linuxkit { }; + lit = callPackage ../development/tools/misc/lit { }; lsof = callPackage ../development/tools/misc/lsof { }; @@ -6896,6 +7023,8 @@ with pkgs; mk = callPackage ../development/tools/build-managers/mk { }; + moby = callPackage ../development/tools/misc/moby { }; + msgpack-tools = callPackage ../development/tools/msgpack-tools { }; msitools = callPackage ../development/tools/misc/msitools { }; @@ -6911,6 +7040,8 @@ with pkgs; }; }; + nailgun = callPackage ../development/tools/nailgun { }; + nant = callPackage ../development/tools/build-managers/nant { }; ninja = callPackage ../development/tools/build-managers/ninja { }; @@ -6938,6 +7069,8 @@ with pkgs; noweb = callPackage ../development/tools/literate-programming/noweb { }; nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-small; }; + obuild = callPackage ../development/tools/ocaml/obuild { }; + omake = callPackage ../development/tools/ocaml/omake { inherit (ocamlPackages_4_02) ocaml; }; @@ -6954,7 +7087,7 @@ with pkgs; pahole = callPackage ../development/tools/misc/pahole {}; - inherit (callPackages ../development/tools/build-managers/pants {}) pants pants13-pre; + pants = callPackage ../development/tools/build-managers/pants {}; parse-cli-bin = callPackage ../development/tools/parse-cli-bin { }; @@ -7280,6 +7413,8 @@ with pkgs; aspellDicts = recurseIntoAttrs (callPackages ../development/libraries/aspell/dictionaries.nix {}); + aspellWithDicts = callPackage ../development/libraries/aspell/aspell-with-dicts.nix { }; + attica = callPackage ../development/libraries/attica { }; attr = callPackage ../development/libraries/attr { }; @@ -7484,6 +7619,7 @@ with pkgs; db53 = callPackage ../development/libraries/db/db-5.3.nix { }; db6 = db60; db60 = callPackage ../development/libraries/db/db-6.0.nix { }; + db62 = callPackage ../development/libraries/db/db-6.2.nix { }; dbus = callPackage ../development/libraries/dbus { }; dbus_cplusplus = callPackage ../development/libraries/dbus-cplusplus { }; @@ -7543,6 +7679,8 @@ with pkgs; vmmlib = callPackage ../development/libraries/vmmlib {}; + elastix = callPackage ../development/libraries/science/biology/elastix { }; + enchant = callPackage ../development/libraries/enchant { }; enet = callPackage ../development/libraries/enet { }; @@ -7797,13 +7935,7 @@ with pkgs; # Being redundant to avoid cycles on boot. TODO: find a better way glibcCross = callPackage ../development/libraries/glibc { installLocales = config.glibc.locales or false; - # Can't just overrideCC, because then the stdenv-cross mkDerivation will be - # thrown away. TODO: find a better solution for this. - stdenv = buildPackages.makeStdenvCross - buildPackages.buildPackages.stdenv - buildPackages.targetPlatform - buildPackages.binutils - buildPackages.gccCrossStageStatic; + stdenv = crossLibcStdenv; }; # We can choose: @@ -7812,7 +7944,7 @@ with pkgs; # hack fixes the hack, *sigh*. /**/ if name == "glibc" then __targetPackages.glibcCross or glibcCross else if name == "uclibc" then uclibcCross - else if name == "msvcrt" then windows.mingw_w64 + else if name == "msvcrt" then __targetPackages.windows.mingw_w64 or windows.mingw_w64 else if name == "libSystem" then darwin.xcode else throw "Unknown libc"; @@ -7840,7 +7972,11 @@ with pkgs; glpk = callPackage ../development/libraries/glpk { }; - inherit (ocamlPackages) glsurf; + glsurf = callPackage ../applications/science/math/glsurf { + libpng = libpng12; + giflib = giflib_4_1; + ocamlPackages = ocaml-ng.ocamlPackages_4_01_0; + }; glui = callPackage ../development/libraries/glui {}; @@ -9493,20 +9629,19 @@ with pkgs; openjpeg_2_1 = callPackage ../development/libraries/openjpeg/2.1.nix { }; openjpeg = openjpeg_2_1; + openpa = callPackage ../development/libraries/openpa { }; + opensaml-cpp = callPackage ../development/libraries/opensaml-cpp { }; openscenegraph = callPackage ../development/libraries/openscenegraph { }; openslp = callPackage ../development/libraries/openslp {}; - libressl = libressl_2_5; - libressl_2_4 = callPackage ../development/libraries/libressl/2.4.nix { - fetchurl = fetchurlBoot; - }; - libressl_2_5 = callPackage ../development/libraries/libressl/2.5.nix { - fetchurl = fetchurlBoot; - }; + inherit (callPackages ../development/libraries/libressl { }) + libressl_2_5 + libressl_2_6; + libressl = libressl_2_5; boringssl = callPackage ../development/libraries/boringssl { }; @@ -9574,6 +9709,8 @@ with pkgs; pgroonga = callPackage ../servers/sql/postgresql/pgroonga {}; + plv8 = callPackage ../servers/sql/postgresql/plv8 {}; + phonon = callPackage ../development/libraries/phonon {}; phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix {}; @@ -9665,6 +9802,8 @@ with pkgs; re2 = callPackage ../development/libraries/re2 { }; + qbs = callPackage ../development/tools/build-managers/qbs { }; + qca2 = callPackage ../development/libraries/qca2 { qt = qt4; }; qca2-qt5 = callPackage ../development/libraries/qca2 { qt = qt5.qtbase; }; @@ -9721,8 +9860,8 @@ with pkgs; libsForQt56 = recurseIntoAttrs (lib.makeScope qt56.newScope mkLibsForQt5); - qt58 = recurseIntoAttrs (makeOverridable - (import ../development/libraries/qt-5/5.8) { + qt59 = recurseIntoAttrs (makeOverridable + (import ../development/libraries/qt-5/5.9) { inherit newScope; inherit stdenv fetchurl makeSetupHook makeWrapper; bison = bison2; # error: too few arguments to function 'int yylex(... @@ -9734,10 +9873,10 @@ with pkgs; inherit (gnome3) gtk3 dconf; }); - libsForQt58 = recurseIntoAttrs (lib.makeScope qt58.newScope mkLibsForQt5); + libsForQt59 = recurseIntoAttrs (lib.makeScope qt59.newScope mkLibsForQt5); - qt5 = qt58; - libsForQt5 = libsForQt58; + qt5 = qt59; + libsForQt5 = libsForQt59; qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { }; @@ -10281,6 +10420,7 @@ with pkgs; v8_3_16_14 = callPackage ../development/libraries/v8/3.16.14.nix { inherit (python2Packages) python gyp; + cctools = darwin.cctools; }; v8_3_24_10 = callPackage ../development/libraries/v8/3.24.10.nix { @@ -10368,7 +10508,7 @@ with pkgs; webkitgtk = webkitgtk216x; - webkitgtk24x = callPackage ../development/libraries/webkitgtk/2.4.nix { + webkitgtk24x-gtk3 = callPackage ../development/libraries/webkitgtk/2.4.nix { harfbuzz = harfbuzz-icu; gst-plugins-base = gst_all_1.gst-plugins-base; inherit (darwin) libobjc; @@ -10379,7 +10519,7 @@ with pkgs; gst-plugins-base = gst_all_1.gst-plugins-base; }; - webkitgtk2 = webkitgtk24x.override { + webkitgtk24x-gtk2 = webkitgtk24x-gtk3.override { withGtk2 = true; enableIntrospection = false; }; @@ -11024,6 +11164,8 @@ with pkgs; myserver = callPackage ../servers/http/myserver { }; + nas = callPackage ../servers/nas { }; + neard = callPackage ../servers/neard { }; nginx = nginxStable; @@ -11239,6 +11381,7 @@ with pkgs; prometheus-bind-exporter = callPackage ../servers/monitoring/prometheus/bind-exporter.nix { }; prometheus-blackbox-exporter = callPackage ../servers/monitoring/prometheus/blackbox-exporter.nix { }; prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { }; + prometheus-consul-exporter = callPackage ../servers/monitoring/prometheus/consul-exporter.nix { }; prometheus-fritzbox-exporter = callPackage ../servers/monitoring/prometheus/fritzbox-exporter.nix { }; prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { }; prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { }; @@ -11380,9 +11523,11 @@ with pkgs; storm = callPackage ../servers/computing/storm { }; - slurm-llnl = callPackage ../servers/computing/slurm { gtk2 = null; }; + slurm = callPackage ../servers/computing/slurm { gtk2 = null; }; + slurm-llnl = slurm; # renamed July 2017 - slurm-llnl-full = appendToName "full" (callPackage ../servers/computing/slurm { }); + slurm-full = appendToName "full" (callPackage ../servers/computing/slurm { }); + slurm-llnl-full = slurm-full; # renamed July 2017 systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { }; @@ -11404,6 +11549,8 @@ with pkgs; shaarli-material = callPackage ../servers/web-apps/shaarli/material-theme.nix { }; + piwik = callPackage ../servers/web-apps/piwik { }; + axis2 = callPackage ../servers/http/tomcat/axis2 { }; unifi = callPackage ../servers/unifi { }; @@ -11453,7 +11600,9 @@ with pkgs; xwayland = callPackage ../servers/x11/xorg/xwayland.nix { }; - yaws = callPackage ../servers/http/yaws { }; + yaws = callPackage ../servers/http/yaws { + erlang = erlangR18; + }; zabbix = recurseIntoAttrs (callPackages ../servers/monitoring/zabbix {}); @@ -11754,6 +11903,8 @@ with pkgs; flex = flex_2_5_35; }; + iptstate = callPackage ../os-specific/linux/iptstate { } ; + ipset = callPackage ../os-specific/linux/ipset { }; irqbalance = callPackage ../os-specific/linux/irqbalance { }; @@ -11787,6 +11938,8 @@ with pkgs; libaio = callPackage ../os-specific/linux/libaio { }; + libargon2 = callPackage ../development/libraries/libargon2 { }; + libatasmart = callPackage ../os-specific/linux/libatasmart { }; libcgroup = callPackage ../os-specific/linux/libcgroup { }; @@ -11840,6 +11993,19 @@ with pkgs; klibcShrunk = lowPrio (callPackage ../os-specific/linux/klibc/shrunk.nix { }); + linux_hardened_copperhead = callPackage ../os-specific/linux/kernel/linux-hardened-copperhead.nix { + kernelPatches = with kernelPatches; [ + kernelPatches.bridge_stp_helper + kernelPatches.p9_fixes + kernelPatches.modinst_arg_list_too_long + kernelPatches.cpu-cgroup-v2."4.11" + ]; + extraConfig = import ../os-specific/linux/kernel/hardened-config.nix { + inherit stdenv; + inherit (linux) version; + }; + }; + linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -11917,6 +12083,22 @@ with pkgs; ]; }; + linux_4_12 = callPackage ../os-specific/linux/kernel/linux-4.12.nix { + kernelPatches = + [ kernelPatches.bridge_stp_helper + kernelPatches.p9_fixes + # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md + # when adding a new linux version + kernelPatches.cpu-cgroup-v2."4.11" + kernelPatches.modinst_arg_list_too_long + ] + ++ lib.optionals ((platform.kernelArch or null) == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 + ]; + }; + linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -11929,6 +12111,20 @@ with pkgs; ]; }; + + linux_samus_4_12 = callPackage ../os-specific/linux/kernel/linux-samus-4.12.nix { + kernelPatches = + [ kernelPatches.bridge_stp_helper + kernelPatches.p9_fixes + # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md + # when adding a new linux version + kernelPatches.cpu-cgroup-v2."4.11" + kernelPatches.modinst_arg_list_too_long + ]; + }; + + linux_samus_latest = linux_samus_4_12; + linux_chromiumos_3_18 = callPackage ../os-specific/linux/kernel/linux-chromiumos-3.18.nix { kernelPatches = [ kernelPatches.chromiumos_Kconfig_fix_entries_3_18 kernelPatches.chromiumos_no_link_restrictions @@ -12087,16 +12283,18 @@ with pkgs; linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = linuxPackages_4_11; + linuxPackages_latest = linuxPackages_4_12; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. + linuxPackages_hardened_copperhead = linuxPackagesFor pkgs.linux_hardened_copperhead; linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp; linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi; linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10); linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); linuxPackages_4_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_11); + linuxPackages_4_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_12); # Don't forget to update linuxPackages_latest! # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds. @@ -12112,7 +12310,7 @@ with pkgs; linuxPackages_latest_xen_dom0 = recurseIntoAttrs (linuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; })); # Hardened linux - linux_hardened = let linux = pkgs.linux_4_11; in linux.override { + linux_hardened = let linux = pkgs.linuxPackages_latest.kernel; in linux.override { extraConfig = import ../os-specific/linux/kernel/hardened-config.nix { inherit stdenv; inherit (linux) version; @@ -12131,6 +12329,10 @@ with pkgs; linux_grsec_server_xen = linux_grsec_nixos; + # Samus kernels + linuxPackages_samus_4_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_samus_4_12); + linuxPackages_samus_latest = recurseIntoAttrs (linuxPackagesFor pkgs.linux_samus_latest); + # ChromiumOS kernels linuxPackages_chromiumos_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_3_18); linuxPackages_chromiumos_latest = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_latest); @@ -12325,6 +12527,8 @@ with pkgs; # Building with `xen` instead of `xen-slim` is possible, but makes no sense. qemu_xen = lowPrio (qemu.override { x86Only = true; xenSupport = true; xen = xen-slim; }); qemu_xen-light = lowPrio (qemu.override { x86Only = true; xenSupport = true; xen = xen-light; }); + qemu_xen_4_8 = lowPrio (qemu.override { x86Only = true; xenSupport = true; xen = xen_4_8-slim; }); + qemu_xen_4_8-light = lowPrio (qemu.override { x86Only = true; xenSupport = true; xen = xen_4_8-light; }); qemu_test = lowPrio (qemu.override { x86Only = true; nixosTestRunner = true; }); @@ -12558,17 +12762,12 @@ with pkgs; }; mingw_w64 = callPackage ../os-specific/windows/mingw-w64 { - gccCross = gccCrossStageStatic; - binutils = binutils; + stdenv = crossLibcStdenv; }; - mingw_w64_headers = callPackage ../os-specific/windows/mingw-w64 { - onlyHeaders = true; - }; + mingw_w64_headers = callPackage ../os-specific/windows/mingw-w64/headers.nix { }; - mingw_w64_pthreads = callPackage ../os-specific/windows/mingw-w64 { - onlyPthreads = true; - }; + mingw_w64_pthreads = callPackage ../os-specific/windows/mingw-w64/pthreads.nix { }; pthreads = callPackage ../os-specific/windows/pthread-w32 { mingw_headers = mingw_headers3; @@ -12829,6 +13028,8 @@ with pkgs; mobile_broadband_provider_info = callPackage ../data/misc/mobile-broadband-provider-info { }; + monoid = callPackage ../data/fonts/monoid { }; + mononoki = callPackage ../data/fonts/mononoki { }; moka-icon-theme = callPackage ../data/icons/moka-icon-theme { }; @@ -12874,6 +13075,8 @@ with pkgs; paper-icon-theme = callPackage ../data/icons/paper-icon-theme { }; + papirus-icon-theme = callPackage ../data/icons/papirus-icon-theme { }; + pecita = callPackage ../data/fonts/pecita {}; paratype-pt-mono = callPackage ../data/fonts/paratype-pt/mono.nix {}; @@ -12915,6 +13118,8 @@ with pkgs; poppler_data = callPackage ../data/misc/poppler-data { }; + qgo = libsForQt5.callPackage ../games/qgo { }; + quattrocento = callPackage ../data/fonts/quattrocento {}; quattrocento-sans = callPackage ../data/fonts/quattrocento-sans {}; @@ -12978,6 +13183,8 @@ with pkgs; ttf_bitstream_vera = callPackage ../data/fonts/ttf-bitstream-vera { }; + ttf-envy-code-r = callPackage ../data/fonts/ttf-envy-code-r {}; + tzdata = callPackage ../data/misc/tzdata { }; ubuntu_font_family = callPackage ../data/fonts/ubuntu-font-family { }; @@ -13102,11 +13309,9 @@ with pkgs; amsn = callPackage ../applications/networking/instant-messengers/amsn { }; - android-studio = callPackage ../applications/editors/android-studio { - fontsConf = makeFontsConf { - fontDirectories = []; - }; - }; + androidStudioPackages = callPackage ../applications/editors/android-studio/packages.nix {}; + android-studio = androidStudioPackages.stable; + android-studio-preview = androidStudioPackages.preview; antfs-cli = callPackage ../applications/misc/antfs-cli {}; @@ -13123,6 +13328,8 @@ with pkgs; inherit (vamp) vampSDK; }; + inherit (python34Packages) arelle; + ario = callPackage ../applications/audio/ario { }; arora = callPackage ../applications/networking/browsers/arora { }; @@ -13148,6 +13355,8 @@ with pkgs; audio-recorder = callPackage ../applications/audio/audio-recorder { }; + autotrace = callPackage ../applications/graphics/autotrace {}; + milkytracker = callPackage ../applications/audio/milkytracker { }; schismtracker = callPackage ../applications/audio/schismtracker { }; @@ -13170,6 +13379,8 @@ with pkgs; ethabi = self.altcoins.ethabi; ethrun = self.altcoins.ethrun; seth = self.altcoins.seth; + dapp = self.altcoins.dapp; + hsevm = self.altcoins.hsevm; stellar-core = self.altcoins.stellar-core; @@ -13227,6 +13438,8 @@ with pkgs; libgpod = pkgs.libgpod.override { monoSupport = true; }; }; + bashSnippets = callPackage ../applications/misc/bashSnippets { }; + batik = callPackage ../applications/graphics/batik { }; batti = callPackage ../applications/misc/batti { }; @@ -13452,7 +13665,7 @@ with pkgs; cuneiform = callPackage ../tools/graphics/cuneiform {}; - cutecom = callPackage ../tools/misc/cutecom { }; + cutecom = libsForQt5.callPackage ../tools/misc/cutecom { }; cutegram = let callpkg = libsForQt56.callPackage; @@ -13527,17 +13740,20 @@ with pkgs; dmenu2 = callPackage ../applications/misc/dmenu2 { }; + dmensamenu = callPackage ../applications/misc/dmensamenu { + inherit (python3Packages) buildPythonApplication requests; + }; + dmtx = dmtx-utils; dmtx-utils = callPackage (callPackage ../tools/graphics/dmtx-utils) { }; inherit (callPackage ../applications/virtualization/docker { }) - docker_17_03 - docker_17_05; + docker_17_06; - docker = docker_17_03; - docker-edge = docker_17_05; + docker = docker_17_06; + docker-edge = docker_17_06; docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; @@ -13550,6 +13766,10 @@ with pkgs; doodle = callPackage ../applications/search/doodle { }; + dr14_tmeter = callPackage ../applications/audio/dr14_tmeter { }; + + draftsight = callPackage ../applications/graphics/draftsight { }; + droopy = callPackage ../applications/networking/droopy { inherit (python3Packages) wrapPython; }; @@ -13587,7 +13807,7 @@ with pkgs; eaglemode = callPackage ../applications/misc/eaglemode { }; - eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { webkitgtk2 = null; }); + eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { webkitgtk24x-gtk2 = null; }); ecs-agent = callPackage ../applications/virtualization/ecs-agent { }; @@ -14207,7 +14427,7 @@ with pkgs; inherit (gnome3) dconf; gconf = gnome2.GConf; goffice = goffice_0_8; - webkit = webkitgtk2; + webkit = webkitgtk24x-gtk2; guile = guile_1_8; slibGuile = slibGuile.override { scheme = guile_1_8; }; glib = glib; @@ -14387,6 +14607,8 @@ with pkgs; ht = callPackage ../applications/editors/ht { }; + hue-cli = callPackage ../tools/networking/hue-cli { }; + hugin = callPackage ../applications/graphics/hugin { }; hugo = callPackage ../applications/misc/hugo { }; @@ -14590,7 +14812,7 @@ with pkgs; jbrout = callPackage ../applications/graphics/jbrout { }; jumanji = callPackage ../applications/networking/browsers/jumanji { - webkitgtk = webkitgtk24x; + webkitgtk = webkitgtk24x-gtk3; gtk = gtk3; }; @@ -14682,7 +14904,6 @@ with pkgs; konversation = libsForQt5.callPackage ../applications/networking/irc/konversation { }; krita = libsForQt5.callPackage ../applications/graphics/krita { - vc = vc_0_7; openjpeg = openjpeg_1; }; @@ -14926,9 +15147,7 @@ with pkgs; mjpg-streamer = callPackage ../applications/video/mjpg-streamer { }; - mldonkey = callPackage ../applications/networking/p2p/mldonkey { - ocaml = ocamlPackages_4_01_0.ocaml; - }; + mldonkey = callPackage ../applications/networking/p2p/mldonkey { }; MMA = callPackage ../applications/audio/MMA { }; @@ -14964,6 +15183,10 @@ with pkgs; mopidy-gmusic = callPackage ../applications/audio/mopidy-gmusic { }; + mopidy-local-images = callPackage ../applications/audio/mopidy-local-images { }; + + mopidy-local-sqlite = callPackage ../applications/audio/mopidy-local-sqlite { }; + mopidy-spotify = callPackage ../applications/audio/mopidy-spotify { }; mopidy-moped = callPackage ../applications/audio/mopidy-moped { }; @@ -14978,6 +15201,8 @@ with pkgs; mopidy-musicbox-webclient = callPackage ../applications/audio/mopidy-musicbox-webclient { }; + mopidy-iris = callPackage ../applications/audio/mopidy-iris { }; + motif = callPackage ../development/libraries/motif { }; mozplugger = callPackage ../applications/networking/browsers/mozilla-plugins/mozplugger {}; @@ -15033,10 +15258,6 @@ with pkgs; 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; - vaapiSupport = config.mpv.vaapiSupport or false; libva = libva-full; }; @@ -15589,7 +15810,7 @@ with pkgs; }; qutebrowser = libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { - inherit (python3Packages) buildPythonApplication pyqt5 jinja2 pygments pyyaml pypeg2 cssutils; + inherit (python3Packages) buildPythonApplication pyqt5 jinja2 pygments pyyaml pypeg2 cssutils pyopengl; inherit (gst_all_1) gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav; }; @@ -15808,6 +16029,8 @@ with pkgs; patches = config.st.patches or null; }; + xst = callPackage ../applications/misc/st/xst.nix { }; + stag = callPackage ../applications/misc/stag { curses = ncurses; }; @@ -16023,6 +16246,7 @@ with pkgs; tdesktop = qt5.callPackage ../applications/networking/instant-messengers/telegram/tdesktop { inherit (pythonPackages) gyp; + gcc = gcc6; }; telegram-cli = callPackage ../applications/networking/instant-messengers/telegram/telegram-cli { }; @@ -16064,6 +16288,8 @@ with pkgs; thinkingRock = callPackage ../applications/misc/thinking-rock { }; + nylas-mail-bin = callPackage ../applications/networking/mailreaders/nylas-mail-bin { }; + thunderbird = callPackage ../applications/networking/mailreaders/thunderbird { inherit (gnome2) libIDL; libpng = libpng_apng; @@ -16180,7 +16406,7 @@ with pkgs; uwimap = callPackage ../tools/networking/uwimap { }; uzbl = callPackage ../applications/networking/browsers/uzbl { - webkit = webkitgtk2; + webkit = webkitgtk24x-gtk2; }; utox = callPackage ../applications/networking/instant-messengers/utox { }; @@ -16408,7 +16634,9 @@ with pkgs; winswitch = callPackage ../tools/X11/winswitch { }; - wings = callPackage ../applications/graphics/wings { }; + wings = callPackage ../applications/graphics/wings { + erlang = erlangR18; + }; wireguard = callPackage ../os-specific/linux/wireguard { }; @@ -16546,6 +16774,8 @@ with pkgs; inherit (xorg) libXt; }; + xautomation = callPackage ../tools/X11/xautomation { }; + xawtv = callPackage ../applications/video/xawtv { }; xbindkeys = callPackage ../tools/X11/xbindkeys { }; @@ -16607,6 +16837,9 @@ with pkgs; xen = xenPackages.xen_4_5-vanilla; xen-slim = xenPackages.xen_4_5-slim; xen-light = xenPackages.xen_4_5-light; + xen_4_8 = xenPackages.xen_4_8-vanilla; + xen_4_8-slim = xenPackages.xen_4_8-slim; + xen_4_8-light = xenPackages.xen_4_8-light; xkbset = callPackage ../tools/X11/xkbset { }; @@ -16642,7 +16875,7 @@ with pkgs; gconf = gnome2.GConf; inherit (gnome2) gtkhtml libgtkhtml libglade scrollkeeper; python = python27; - webkitgtk = webkitgtk2; + webkitgtk = webkitgtk24x-gtk2; }; xournal = callPackage ../applications/graphics/xournal { @@ -16842,6 +17075,8 @@ with pkgs; bean-add = callPackage ../applications/office/beancount/bean-add.nix { }; + bench = haskell.lib.justStaticExecutables haskellPackages.bench; + beret = callPackage ../games/beret { }; bitsnbots = callPackage ../games/bitsnbots { @@ -17479,7 +17714,9 @@ with pkgs; gnome3 = gnome3_22; gnomeExtensions = { + caffeine = callPackage ../desktops/gnome-3/extensions/caffeine { }; dash-to-dock = callPackage ../desktops/gnome-3/extensions/dash-to-dock { }; + topicons-plus = callPackage ../desktops/gnome-3/extensions/topicons-plus { }; }; hsetroot = callPackage ../tools/X11/hsetroot { }; @@ -17534,6 +17771,8 @@ with pkgs; gtk_engines = callPackage ../misc/themes/gtk2/gtk-engines { }; + gtk-engine-bluecurve = callPackage ../misc/themes/gtk2/gtk-engine-bluecurve { }; + gtk-engine-murrine = callPackage ../misc/themes/gtk2/gtk-engine-murrine { }; gnome_themes_standard = gnome3.gnome_themes_standard; @@ -17610,6 +17849,10 @@ with pkgs; igv = callPackage ../applications/science/biology/igv { }; + iv = callPackage ../applications/science/biology/iv { + neuron-version = neuron.version; + }; + neuron = callPackage ../applications/science/biology/neuron { python = null; }; @@ -17618,6 +17861,8 @@ with pkgs; mpi = pkgs.openmpi; }); + neuron-full = neuron-mpi.override { inherit python; }; + mrbayes = callPackage ../applications/science/biology/mrbayes { }; minc_tools = callPackage ../applications/science/biology/minc-tools { }; @@ -17756,6 +18001,10 @@ with pkgs; cmake = cmakeCurses; }); + ### SCIENCE/MEDICINE + + aliza = callPackage ../applications/science/medicine/aliza { }; + ### PHYSICS sacrifice = callPackage ../applications/science/physics/sacrifice {}; @@ -17774,6 +18023,10 @@ with pkgs; abella = callPackage ../applications/science/logic/abella {}; + acgtk = callPackage ../applications/science/logic/acgtk { + ocamlPackages = ocamlPackages_4_03; + }; + alt-ergo = callPackage ../applications/science/logic/alt-ergo { ocamlPackages = ocamlPackages_4_02; }; @@ -17831,12 +18084,14 @@ with pkgs; }; coqPackages = coqPackages_8_5; + autosubst = callPackage ../development/coq-modules/autosubst {}; coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {}; coquelicot = callPackage ../development/coq-modules/coquelicot {}; dpdgraph = callPackage ../development/coq-modules/dpdgraph {}; flocq = callPackage ../development/coq-modules/flocq {}; interval = callPackage ../development/coq-modules/interval {}; mathcomp = callPackage ../development/coq-modules/mathcomp { }; + paco = callPackage ../development/coq-modules/paco {}; math-classes = callPackage ../development/coq-modules/math-classes { }; ssreflect = callPackage ../development/coq-modules/ssreflect { }; QuickChick = callPackage ../development/coq-modules/QuickChick {}; @@ -17848,14 +18103,19 @@ with pkgs; coq = callPackage ../applications/science/logic/coq {}; coqPackages = coqPackages_8_6; + autosubst = callPackage ../development/coq-modules/autosubst {}; coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {}; coquelicot = callPackage ../development/coq-modules/coquelicot {}; dpdgraph = callPackage ../development/coq-modules/dpdgraph {}; flocq = callPackage ../development/coq-modules/flocq {}; + heq = callPackage ../development/coq-modules/heq {}; interval = callPackage ../development/coq-modules/interval {}; mathcomp = callPackage ../development/coq-modules/mathcomp { }; + paco = callPackage ../development/coq-modules/paco {}; ssreflect = callPackage ../development/coq-modules/ssreflect { }; QuickChick = callPackage ../development/coq-modules/QuickChick {}; + CoLoR = callPackage ../development/coq-modules/CoLoR {}; + math-classes = callPackage ../development/coq-modules/math-classes { }; fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {}; }; @@ -17942,6 +18202,8 @@ with pkgs; picosat = callPackage ../applications/science/logic/picosat {}; + libpoly = callPackage ../applications/science/logic/poly/default.nix {}; + prooftree = (with ocamlPackages_4_01_0; callPackage ../applications/science/logic/prooftree { camlp5 = camlp5_transitional; @@ -17982,11 +18244,7 @@ with pkgs; z3 = callPackage ../applications/science/logic/z3 {}; z3_opt = callPackage ../applications/science/logic/z3_opt {}; - boolector = boolector15; - boolector15 = callPackage ../applications/science/logic/boolector {}; - boolector16 = lowPrio (callPackage ../applications/science/logic/boolector { - useV16 = true; - }); + boolector = callPackage ../applications/science/logic/boolector {}; ### SCIENCE / ELECTRONICS @@ -18243,6 +18501,9 @@ with pkgs; cups-bjnp = callPackage ../misc/cups/drivers/cups-bjnp { }; + # this driver ships with pre-compiled 32-bit binary libraries + cnijfilter_2_80 = callPackage_i686 ../misc/cups/drivers/cnijfilter_2_80 { }; + cnijfilter2 = callPackage ../misc/cups/drivers/cnijfilter2 { libusb = libusb1; }; @@ -18350,6 +18611,8 @@ with pkgs; greybird = callPackage ../misc/themes/greybird { }; + guetzli = callPackage ../applications/graphics/guetzli { }; + gxemul = callPackage ../misc/emulators/gxemul { }; hatari = callPackage ../misc/emulators/hatari { }; @@ -18436,6 +18699,7 @@ with pkgs; nix-serve = callPackage ../tools/package-management/nix-serve { }; nixos-artwork = callPackage ../data/misc/nixos-artwork { }; + nixos-icons = callPackage ../data/misc/nixos-artwork/icons.nix { }; nixos-container = callPackage ../tools/virtualization/nixos-container { }; @@ -18556,6 +18820,9 @@ with pkgs; mfcj6510dw-cupswrapper = callPackage ../misc/cups/drivers/mfcj6510dwcupswrapper { }; mfcj6510dwlpr = callPackage_i686 ../misc/cups/drivers/mfcj6510dwlpr { }; + mfcl2700dncupswrapper = callPackage ../misc/cups/drivers/mfcl2700dncupswrapper { }; + mfcl2700dnlpr = callPackage_i686 ../misc/cups/drivers/mfcl2700dnlpr { }; + samsung-unified-linux-driver_1_00_37 = callPackage ../misc/cups/drivers/samsung { }; samsung-unified-linux-driver_4_01_17 = callPackage ../misc/cups/drivers/samsung/4.01.17.nix { }; samsung-unified-linux-driver = callPackage ../misc/cups/drivers/samsung/4.00.39 { }; @@ -18606,10 +18873,10 @@ with pkgs; inherit (callPackage ../applications/networking/cluster/terraform {}) terraform_0_8_5 terraform_0_8_8 - terraform_0_9_6; + terraform_0_9_11; terraform_0_8 = terraform_0_8_8; - terraform_0_9 = terraform_0_9_6; + terraform_0_9 = terraform_0_9_11; terraform = terraform_0_9; terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {}; @@ -18683,12 +18950,12 @@ with pkgs; }); vimprobable2-unwrapped = callPackage ../applications/networking/browsers/vimprobable2 { - webkit = webkitgtk2; + webkit = webkitgtk24x-gtk2; }; vimprobable2 = wrapFirefox vimprobable2-unwrapped { }; vimb-unwrapped = callPackage ../applications/networking/browsers/vimb { - webkit = webkitgtk2; + webkit = webkitgtk24x-gtk2; }; vimb = wrapFirefox vimb-unwrapped { }; @@ -18785,6 +19052,8 @@ with pkgs; wxGTK = wxGTK30; }; + x11idle = callPackage ../tools/misc/x11idle {}; + x2x = callPackage ../tools/X11/x2x { }; xboxdrv = callPackage ../misc/drivers/xboxdrv { }; @@ -18883,7 +19152,9 @@ with pkgs; tomb = callPackage ../os-specific/linux/tomb {}; - tomboy = callPackage ../applications/misc/tomboy {}; + tomboy = callPackage ../applications/misc/tomboy { + mono = mono46; + }; imatix_gsl = callPackage ../development/tools/imatix_gsl {}; @@ -18930,4 +19201,8 @@ with pkgs; linode-cli = callPackage ../tools/virtualization/linode-cli { }; hss = callPackage ../tools/networking/hss {}; + + undaemonize = callPackage ../tools/system/undaemonize {}; + + houdini = callPackage ../applications/misc/houdini {}; } diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 3451816c0c5..62ffaec26f3 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -1,15 +1,16 @@ { pkgs, stdenv, callPackage, wxGTK30, darwin }: rec { - lib = import ../development/beam-modules/lib.nix { inherit pkgs; }; + lib = callPackage ../development/beam-modules/lib.nix {}; + # Each interpreters = rec { - # R18 is the Default version. - erlang = erlangR18; - erlang_odbc = erlangR18_odbc; - erlang_javac = erlangR18_javac; - erlang_odbc_javac = erlangR18_odbc_javac; + # R18 is the default version. + erlang = erlangR19; # The main switch to change default Erlang version. + erlang_odbc = erlangR19_odbc; + erlang_javac = erlangR19_javac; + erlang_odbc_javac = erlangR19_odbc_javac; # These are standard Erlang versions, using the generic builder. erlangR16 = lib.callErlang ../development/interpreters/erlang/R16.nix {}; @@ -36,6 +37,14 @@ rec { erlangR19_odbc_javac = erlangR19.override { javacSupport = true; odbcSupport = true; }; + erlangR20 = lib.callErlang ../development/interpreters/erlang/R20.nix { + wxGTK = wxGTK30; + }; + erlangR20_odbc = erlangR20.override { odbcSupport = true; }; + erlangR20_javac = erlangR20.override { javacSupport = true; }; + erlangR20_odbc_javac = erlangR20.override { + javacSupport = true; odbcSupport = true; + }; # Bash fork, using custom builder. erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-8-basho.nix { @@ -44,22 +53,28 @@ rec { odbcSupport = true; }; - # Other Beam languages. - elixir = callPackage ../development/interpreters/elixir { debugInfo = true; }; - lfe = callPackage ../development/interpreters/lfe { }; + # Other Beam languages. These are built with `beam.interpreters.erlang`. To + # access for example elixir built with different version of Erlang, use + # `beam.packages.erlangR19.elixir`. + inherit (packages.erlang) elixir elixir_1_5_rc elixir_1_4 elixir_1_3; + + inherit (packages.erlang) lfe lfe_1_2; }; + # Helper function to generate package set with a specific Erlang version. + packagesWith = erlang: callPackage ../development/beam-modules { inherit erlang; }; + + # Each field in this tuple represents all Beam packages in nixpkgs built with + # appropriate Erlang/OTP version. packages = rec { - rebar = callPackage ../development/tools/build-managers/rebar { }; - rebar3-open = callPackage ../development/tools/build-managers/rebar3 { hermeticRebar3 = false; }; - rebar3 = callPackage ../development/tools/build-managers/rebar3 { hermeticRebar3 = true; }; - hexRegistrySnapshot = callPackage ../development/beam-modules/hex-registry-snapshot.nix { }; - fetchHex = callPackage ../development/beam-modules/fetch-hex.nix { }; - beamPackages = callPackage ../development/beam-modules { }; - hex2nix = beamPackages.callPackage ../development/tools/erlang/hex2nix { }; - cuter = callPackage ../development/tools/erlang/cuter { }; + # Packages built with default Erlang version. + erlang = packagesWith interpreters.erlang; + erlangR16 = packagesWith interpreters.erlangR16; + erlangR17 = packagesWith interpreters.erlangR17; + erlangR18 = packagesWith interpreters.erlangR18; + erlangR19 = packagesWith interpreters.erlangR19; + erlangR20 = packagesWith interpreters.erlangR20; - relxExe = callPackage ../development/tools/erlang/relx-exe {}; }; } diff --git a/pkgs/top-level/haxe-packages.nix b/pkgs/top-level/haxe-packages.nix new file mode 100644 index 00000000000..5a85dc3433b --- /dev/null +++ b/pkgs/top-level/haxe-packages.nix @@ -0,0 +1,120 @@ +{ stdenv, fetchzip, fetchFromGitHub, newScope, haxe, neko, nodejs, wine, php, python3, jdk, mono, haskellPackages, fetchpatch }: + +let + self = haxePackages; + callPackage = newScope self; + haxePackages = with self; { + + withCommas = stdenv.lib.replaceChars ["."] [","]; + + # simulate "haxelib dev $libname ." + simulateHaxelibDev = libname: '' + devrepo=$(mktemp -d) + mkdir -p "$devrepo/${withCommas libname}" + echo $(pwd) > "$devrepo/${withCommas libname}/.dev" + export HAXELIB_PATH="$HAXELIB_PATH:$devrepo" + ''; + + installLibHaxe = { libname, version, files ? "*" }: '' + mkdir -p "$out/lib/haxe/${withCommas libname}/${withCommas version}" + echo -n "${version}" > $out/lib/haxe/${withCommas libname}/.current + cp -dpR ${files} "$out/lib/haxe/${withCommas libname}/${withCommas version}/" + ''; + + buildHaxeLib = { + libname, + version, + sha256, + meta, + ... + } @ attrs: + stdenv.mkDerivation (attrs // { + name = "${libname}-${version}"; + + buildInputs = (attrs.buildInputs or []) ++ [ haxe neko ]; # for setup-hook.sh to work + src = fetchzip rec { + name = "${libname}-${version}"; + url = "http://lib.haxe.org/files/3.0/${withCommas name}.zip"; + inherit sha256; + stripRoot = false; + }; + + installPhase = attrs.installPhase or '' + runHook preInstall + ( + if [ $(ls $src | wc -l) == 1 ]; then + cd $src/* || cd $src + else + cd $src + fi + ${installLibHaxe { inherit libname version; }} + ) + runHook postInstall + ''; + + meta = { + homepage = "http://lib.haxe.org/p/${libname}"; + license = stdenv.lib.licenses.bsd2; + platforms = stdenv.lib.platforms.all; + description = throw "please write meta.description"; + } // attrs.meta; + }); + + hxcpp = buildHaxeLib rec { + libname = "hxcpp"; + version = "3.4.64"; + sha256 = "04gyjm6wqmsm0ifcfkxmq1yv8xrfzys3z5ajqnvvjrnks807mw8q"; + postFixup = '' + for f in $out/lib/haxe/${withCommas libname}/${withCommas version}/{,project/libs/nekoapi/}bin/Linux{,64}/*; do + chmod +w "$f" + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) "$f" || true + patchelf --set-rpath ${ stdenv.lib.makeLibraryPath [ stdenv.cc.cc ] } "$f" || true + done + ''; + meta.description = "Runtime support library for the Haxe C++ backend"; + }; + + hxjava = buildHaxeLib { + libname = "hxjava"; + version = "3.2.0"; + sha256 = "1vgd7qvsdxlscl3wmrrfi5ipldmr4xlsiwnj46jz7n6izff5261z"; + meta.description = "Support library for the Java backend of the Haxe compiler"; + propagatedBuildInputs = [ jdk ]; + }; + + hxcs = buildHaxeLib { + libname = "hxcs"; + version = "3.4.0"; + sha256 = "0f5vgp2kqnpsbbkn2wdxmjf7xkl0qhk9lgl9kb8d5wdy89nac6q6"; + meta.description = "Support library for the C# backend of the Haxe compiler"; + propagatedBuildInputs = [ mono ]; + }; + + hxnodejs_4 = buildHaxeLib { + libname = "hxnodejs"; + version = "4.0.9"; + sha256 = "0b7ck48nsxs88sy4fhhr0x1bc8h2ja732zzgdaqzxnh3nir0bajm"; + meta.description = "Extern definitions for node.js 4.x"; + }; + + hxnodejs_6 = let + libname = "hxnodejs"; + version = "6.9.0"; + in stdenv.mkDerivation rec { + name = "${libname}-${version}"; + src = fetchFromGitHub { + owner = "HaxeFoundation"; + repo = "hxnodejs"; + rev = "cf80c6a"; + sha256 = "0mdiacr5b2m8jrlgyd2d3vp1fha69lcfb67x4ix7l7zfi8g460gs"; + }; + installPhase = installLibHaxe { inherit libname version; }; + meta = { + homepage = "http://lib.haxe.org/p/${libname}"; + license = stdenv.lib.licenses.bsd2; + platforms = stdenv.lib.platforms.all; + description = "Extern definitions for node.js 6.9"; + }; + }; + }; +in self diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 71aef7544dd..f33b397958c 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -311,24 +311,23 @@ let lrexlib = buildLuaPackage rec { name = "lrexlib-${version}"; - version = "2.7.2"; + version = "2.8.0"; src = fetchzip { - url = "https://github.com/rrthomas/lrexlib/archive/150c251be57c4e569da0f48bf6b01fbca97179fe.zip"; - sha256 = "0acb3258681bjq61piz331r99bdff6cnkjaigq5phg3699iz5h75"; + url = "https://github.com/rrthomas/lrexlib/archive/rel-2-8-0.zip"; + sha256 = "1c62ny41b1ih6iddw5qn81gr6dqwfffzdp7q6m8x09zzcdz78zhr"; }; buildInputs = [ unzip luastdlib pcre luarocks oniguruma gnulib tre glibc ]; buildPhase = let - luaVariable = "LUA_PATH=${luastdlib}/share/lua/${lua.luaversion}/?.lua"; + luaVariable = ''LUA_PATH="${luastdlib}/share/lua/${lua.luaversion}/?/init.lua;${luastdlib}/share/lua/${lua.luaversion}/?.lua"''; - pcreVariable = "PCRE_DIR=${pcre.dev}"; + pcreVariable = "PCRE_DIR=${pcre.out} PCRE_INCDIR=${pcre.dev}/include"; onigVariable = "ONIG_DIR=${oniguruma}"; gnuVariable = "GNU_INCDIR=${gnulib}/lib"; treVariable = "TRE_DIR=${tre}"; posixVariable = "POSIX_DIR=${glibc.dev}"; in '' - sed -e 's@$(LUAROCKS) $(LUAROCKS_COMMAND) $$i;@$(LUAROCKS) $(LUAROCKS_COMMAND) $$i ${pcreVariable} ${onigVariable} ${gnuVariable} ${treVariable} ${posixVariable};@' \ - -i Makefile + sed -e 's@$(LUAROCKS) $(LUAROCKS_COMMAND) $$i;@$(LUAROCKS) $(LUAROCKS_COMMAND) $$i ${pcreVariable} ${onigVariable} ${gnuVariable} ${treVariable} ${posixVariable};@' -i Makefile ${luaVariable} make ''; @@ -341,7 +340,6 @@ let homepage = "https://github.com/lua-stdlib/lua-stdlib/"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.mit; - broken = true; }; }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 4486049ef91..bc5253328cf 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -15,8 +15,6 @@ let buildOcaml = callPackage ../build-support/ocaml { }; - acgtk = callPackage ../applications/science/logic/acgtk { }; - alcotest = callPackage ../development/ocaml-modules/alcotest {}; angstrom = callPackage ../development/ocaml-modules/angstrom { }; @@ -114,9 +112,7 @@ let }; camlimages = camlimages_4_1; - conduit = callPackage ../development/ocaml-modules/conduit { - lwt = ocaml_lwt; - }; + benchmark = callPackage ../development/ocaml-modules/benchmark { }; biniou = callPackage ../development/ocaml-modules/biniou { }; @@ -132,10 +128,24 @@ let cmdliner_1_0 = callPackage ../development/ocaml-modules/cmdliner/1.0.nix { }; - cohttp = callPackage ../development/ocaml-modules/cohttp { - lwt = ocaml_lwt; + cohttp_p4 = callPackage ../development/ocaml-modules/cohttp/0.19.3.nix { + lwt = lwt2; }; + cohttp = + if lib.versionOlder "4.03" ocaml.version + then callPackage ../development/ocaml-modules/cohttp { } + else cohttp_p4; + + conduit_p4 = callPackage ../development/ocaml-modules/conduit/0.10.0.nix { + lwt = lwt2; + }; + + conduit = + if lib.versionOlder "4.03" ocaml.version + then callPackage ../development/ocaml-modules/conduit { } + else conduit_p4; + config-file = callPackage ../development/ocaml-modules/config-file { }; containers = callPackage ../development/ocaml-modules/containers { }; @@ -162,6 +172,8 @@ let ctypes = callPackage ../development/ocaml-modules/ctypes { }; + decompress = callPackage ../development/ocaml-modules/decompress { }; + dolmen = callPackage ../development/ocaml-modules/dolmen { }; dolog = callPackage ../development/ocaml-modules/dolog { }; @@ -170,7 +182,7 @@ let eff = callPackage ../development/interpreters/eff { }; - eliom = callPackage ../development/ocaml-modules/eliom { }; + eliom = callPackage ../development/ocaml-modules/eliom { lwt = lwt2; }; enumerate = callPackage ../development/ocaml-modules/enumerate { }; @@ -214,6 +226,10 @@ let higlo = callPackage ../development/ocaml-modules/higlo { }; + inotify = callPackage ../development/ocaml-modules/inotify { }; + + integers = callPackage ../development/ocaml-modules/integers { }; + io-page = callPackage ../development/ocaml-modules/io-page { }; ipaddr_p4 = callPackage ../development/ocaml-modules/ipaddr/2.6.1.nix { }; @@ -235,6 +251,12 @@ let gg = callPackage ../development/ocaml-modules/gg { }; + git = callPackage ../development/ocaml-modules/git { }; + + git-http = callPackage ../development/ocaml-modules/git-http { }; + + git-unix = callPackage ../development/ocaml-modules/git-unix { }; + gmetadom = callPackage ../development/ocaml-modules/gmetadom { }; gtktop = callPackage ../development/ocaml-modules/gtktop { }; @@ -248,7 +270,7 @@ let pcre = ocaml_pcre; }; - js_of_ocaml = callPackage ../development/tools/ocaml/js_of_ocaml { }; + js_of_ocaml = callPackage ../development/tools/ocaml/js_of_ocaml { lwt = lwt2; }; jsonm = callPackage ../development/ocaml-modules/jsonm { }; @@ -270,9 +292,9 @@ let gtkmathview = callPackage ../development/libraries/gtkmathview { }; }; - lambdaTerm-1_6 = callPackage ../development/ocaml-modules/lambda-term/1.6.nix { }; + lambdaTerm-1_6 = callPackage ../development/ocaml-modules/lambda-term/1.6.nix { lwt = lwt2; }; lambdaTerm = - if lib.versionOlder "4.01" ocaml.version + if lib.versionOlder "4.02" ocaml.version then callPackage ../development/ocaml-modules/lambda-term { } else lambdaTerm-1_6; @@ -284,13 +306,27 @@ let lwt = ocaml_lwt; }; + lwt2 = callPackage ../development/ocaml-modules/lwt { }; + + lwt3 = if lib.versionOlder "4.02" ocaml.version + then callPackage ../development/ocaml-modules/lwt { + version = "3.0.0"; + } + else throw "lwt3 is not available for OCaml ${ocaml.version}"; + + ocaml_lwt = if lib.versionOlder "4.02" ocaml.version then lwt3 else lwt2; + + lwt_react = callPackage ../development/ocaml-modules/lwt_react { + lwt = lwt3; + }; + macaque = callPackage ../development/ocaml-modules/macaque { }; magic-mime = callPackage ../development/ocaml-modules/magic-mime { }; magick = callPackage ../development/ocaml-modules/magick { }; - markup = callPackage ../development/ocaml-modules/markup { lwt = ocaml_lwt; }; + markup = callPackage ../development/ocaml-modules/markup { lwt = lwt2; }; menhir = callPackage ../development/ocaml-modules/menhir { }; @@ -306,6 +342,8 @@ let mparser = callPackage ../development/ocaml-modules/mparser { }; + mstruct = callPackage ../development/ocaml-modules/mstruct { }; + mtime = callPackage ../development/ocaml-modules/mtime { }; nocrypto = callPackage ../development/ocaml-modules/nocrypto { @@ -352,8 +390,6 @@ let ocamlify = callPackage ../development/tools/ocaml/ocamlify { }; - ocaml_lwt = callPackage ../development/ocaml-modules/lwt { }; - ocaml-migrate-parsetree = callPackage ../development/ocaml-modules/ocaml-migrate-parsetree { }; ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { }; @@ -363,7 +399,6 @@ let ocamlnet = callPackage ../development/ocaml-modules/ocamlnet { }; ocaml_oasis = callPackage ../development/tools/ocaml/oasis { }; - ocaml_oasis_46 = callPackage ../development/tools/ocaml/oasis/0.4.6.nix { }; ocaml_optcomp = callPackage ../development/ocaml-modules/optcomp { }; @@ -393,11 +428,15 @@ let ocp-index = callPackage ../development/tools/ocaml/ocp-index { ocpIndent = ocpIndent_1_5_2; }; + ocp-ocamlres = callPackage ../development/ocaml-modules/ocp-ocamlres { }; + ocplib-endian = callPackage ../development/ocaml-modules/ocplib-endian { }; + ocplib-json-typed = callPackage ../development/ocaml-modules/ocplib-json-typed { }; + ocplib-simplex = callPackage ../development/ocaml-modules/ocplib-simplex { }; - ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { }; + ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { lwt = lwt2; }; ocsigen-start = callPackage ../development/ocaml-modules/ocsigen-start { }; @@ -513,11 +552,11 @@ let ppx_tools_versioned = callPackage ../development/ocaml-modules/ppx_tools_versioned { }; + ptmap = callPackage ../development/ocaml-modules/ptmap { }; + pycaml = callPackage ../development/ocaml-modules/pycaml { }; - qcheck = callPackage ../development/ocaml-modules/qcheck { - oasis = ocaml_oasis; - }; + qcheck = callPackage ../development/ocaml-modules/qcheck { }; qtest = callPackage ../development/ocaml-modules/qtest { }; @@ -525,6 +564,8 @@ let reason = callPackage ../development/compilers/reason { }; + rope = callPackage ../development/ocaml-modules/rope { }; + rresult = callPackage ../development/ocaml-modules/rresult { }; safepass = callPackage ../development/ocaml-modules/safepass { }; @@ -754,6 +795,8 @@ let else bin_prot_p4; core_bench = + if lib.versionOlder "4.03" ocaml.version + then janeStreet.core_bench else callPackage ../development/ocaml-modules/janestreet/core_bench.nix {}; core_kernel = @@ -847,12 +890,6 @@ let else {} ); - glsurf = callPackage ../applications/science/math/glsurf { - libpng = pkgs.libpng12; - giflib = pkgs.giflib_4_1; - camlimages = camlimages_4_0; - }; - google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { }; @@ -904,7 +941,9 @@ in rec ocamlPackages_4_04 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.04.nix { }) (self: super: { }); - ocamlPackages_latest = ocamlPackages_4_04; + ocamlPackages_4_05 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.05.nix { }) (self: super: { }); + + ocamlPackages_latest = ocamlPackages_4_05; ocamlPackages = ocamlPackages_4_02; } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5d8ae3ddc1d..0bd8b0c5b0d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3,7 +3,7 @@ them. Also, because most Nix expressions for CPAN packages are trivial, most are actually defined here. I.e. there's no function for each package in a separate file: the call to the function would - be almost as must code as the function itself. */ + be almost as much code as the function itself. */ {pkgs, overrides}: @@ -5772,6 +5772,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Extensions and convenience methods to manage background processes"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + platforms = stdenv.lib.platforms.linux; }; }; @@ -7208,11 +7209,11 @@ let self = _self // overrides; _self = with self; { ImageExifTool = buildPerlPackage rec { name = "Image-ExifTool-${version}"; - version = "10.48"; + version = "10.55"; src = fetchurl { url = "http://www.sno.phy.queensu.ca/~phil/exiftool/${name}.tar.gz"; - sha256 = "1wbwapwhv4imh1lj4dw4a8z2mhw983wk5pzdbp7pkijfji0vjj0p"; + sha256 = "0z8zwjjfvyllnhsafhddbybywpgqv0pl1dbn1g034cs27yj836q2"; }; meta = with stdenv.lib; { @@ -7753,6 +7754,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/P/PV/PVANDRY/gettext-1.05.tar.gz; sha256 = "15262a00vx714szpx8p2z52wxkz46xp7acl72znwjydyq4ypydi7"; }; + LANG="C"; }; LocaleMaketext = buildPerlPackage { @@ -10717,16 +10719,16 @@ let self = _self // overrides; _self = with self; { }; PDFAPI2 = buildPerlPackage rec { - name = "PDF-API2-2.030"; + name = "PDF-API2-2.033"; src = fetchurl { url = "mirror://cpan/authors/id/S/SS/SSIMMS/${name}.tar.gz"; - sha256 = "a802c25c1f00b093778223fc7aea94ebd87a9abdb915151746b8ee5d4a358769"; + sha256 = "9c0866ec1a3053f73afaca5f5cdbe6925903b4ce606f4bf4ac317731a69d27a0"; }; + buildInputs = [ TestException TestMemoryCycle ]; propagatedBuildInputs = [ FontTTF ]; meta = { description = "Facilitates the creation and modification of PDF files"; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ maintainers.rycee ]; + license = stdenv.lib.licenses.lgpl21Plus; }; }; @@ -12621,6 +12623,15 @@ let self = _self // overrides; _self = with self; { }; }; + SysCPU = buildPerlPackage rec { + name = "Sys-CPU-0.61"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MZ/MZSANFORD/${name}.tar.gz"; + sha256 = "1r6976bs86j7zp51m5vh42xlyah951jgdlkimv202413kjvqc2i5"; + }; + buildInputs = stdenv.lib.optional stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.Carbon; + }; + SysHostnameLong = buildPerlPackage rec { name = "Sys-Hostname-Long-1.4"; src = fetchurl { diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 221427e0851..c5e3ac0ac55 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -286,4 +286,31 @@ let maintainers = with maintainers; [ javaguirre ]; }; }; + + phpcbf = pkgs.stdenv.mkDerivation rec { + name = "phpcbf-${version}"; + version = "2.6.0"; + + src = pkgs.fetchurl { + url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcbf.phar"; + sha256 = "1ijf52cgd85ypvw431nnmzij6156ryhfvmajpkr7plfw0iccqc5j"; + }; + + phases = [ "installPhase" ]; + nativeBuildInputs = [ pkgs.makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + install -D $src $out/libexec/phpcbf/phpcbf.phar + makeWrapper ${php}/bin/php $out/bin/phpcbf \ + --add-flags "$out/libexec/phpcbf/phpcbf.phar" + ''; + + meta = with pkgs.lib; { + description = "PHP coding standard beautifier and fixer"; + license = licenses.bsd3; + homepage = https://squizlabs.github.io/PHP_CodeSniffer/; + maintainers = with maintainers; [ cmcdragonkai ]; + }; + }; }; in self diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d93a3a012c1..104dd5354e7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -84,29 +84,7 @@ in { vowpalwabbit = callPackage ../development/python-modules/vowpalwabbit { pythonPackages = self; }; - acoustics = buildPythonPackage rec { - pname = "acoustics"; - version = "0.1.2"; - name = pname + "-" + version; - - buildInputs = with self; [ cython pytest ]; - propagatedBuildInputs = with self; [ numpy scipy matplotlib pandas tabulate ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz"; - sha256 = "b75a47de700d01e704de95953a6e969922b2f510d7eefe59f7f8980ad44ad1b7"; - }; - - # Tests not distributed - doCheck = false; - - meta = { - description = "A package for acousticians"; - maintainer = with maintainers; [ fridh ]; - license = with licenses; [ bsd3 ]; - homepage = https://github.com/python-acoustics/python-acoustics; - }; - }; + acoustics = callPackage ../development/python-modules/acoustics { }; "3to2" = callPackage ../development/python-modules/3to2 { }; @@ -122,22 +100,7 @@ in { agate-sql = callPackage ../development/python-modules/agate-sql { }; - ansicolor = buildPythonPackage rec { - name = "ansicolor-${version}"; - version = "0.2.4"; - - src = pkgs.fetchurl{ - url = "mirror://pypi/a/ansicolor/${name}.tar.gz"; - sha256 = "0zlkk9706xn5yshwzdn8xsfkim8iv44zsl6qjwg2f4gn62rqky1h"; - }; - - meta = { - homepage = "https://github.com/numerodix/ansicolor/"; - description = "A library to produce ansi color output and colored highlighting and diffing"; - license = licenses.asl20; - maintainers = with maintainers; [ andsild ]; - }; - }; + ansicolor = callPackage ../development/python-modules/ansicolor { }; asn1crypto = callPackage ../development/python-modules/asn1crypto { }; @@ -167,44 +130,13 @@ in { dkimpy = callPackage ../development/python-modules/dkimpy { }; - emcee = buildPythonPackage { - name = "emcee-2.1.0"; - src = pkgs.fetchurl { - url = "mirror://pypi/e/emcee/emcee-2.1.0.tar.gz"; - sha256 = "0qyafp9jfya0mkxgqfvljf0rkic5fm8nimzwadyrxyvq7nd07qaw"; - }; - propagatedBuildInputs = [ self.numpy ]; - meta = { - homepage = http://dan.iel.fm/emcee; - license = "MIT"; - description = "Kick ass affine-invariant ensemble MCMC sampling"; - }; - }; + emcee = callPackage ../development/python-modules/emcee { }; dbus-python = callPackage ../development/python-modules/dbus { dbus = pkgs.dbus; }; - discid = buildPythonPackage rec { - name = "discid-1.1.0"; - - meta = { - description = "Python binding of libdiscid"; - homepage = "https://python-discid.readthedocs.org/"; - license = licenses.lgpl3Plus; - platforms = platforms.linux; - }; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/discid/${name}.tar.gz"; - sha256 = "b39d443051b26d0230be7a6c616243daae93337a8711dd5d4119bb6a0e516fa8"; - }; - - patchPhase = '' - substituteInPlace discid/libdiscid.py \ - --replace '_open_library(_LIB_NAME)' "_open_library('${pkgs.libdiscid}/lib/libdiscid.so.0')" - ''; - }; + discid = callPackage ../development/python-modules/discid { }; discordpy = callPackage ../development/python-modules/discordpy { }; @@ -216,6 +148,8 @@ in { hdf5 = pkgs.hdf5-mpi; }; + intelhex = callPackage ../development/python-modules/intelhex { }; + mpi4py = callPackage ../development/python-modules/mpi4py { mpi = pkgs.openmpi; }; @@ -262,38 +196,10 @@ in { pygame-git = callPackage ../development/python-modules/pygame/git.nix { }; - pygame_sdl2 = buildPythonPackage rec { - pname = "pygame_sdl2"; - version = "6.99.10.1227"; - name = "${pname}-${version}"; - - meta = { - description = "A reimplementation of parts of pygame API using SDL2"; - homepage = "https://github.com/renpy/pygame_sdl2"; - # Some parts are also available under Zlib License - license = licenses.lgpl2; - maintainers = with maintainers; [ raskin ]; - }; - - propagatedBuildInputs = with self; [ ]; - buildInputs = with pkgs; with self; [ - SDL2 SDL2_image SDL2_ttf SDL2_mixer - cython libjpeg libpng ]; - - postInstall = '' - ( cd "$out"/include/python*/ ; - ln -s pygame-sdl2 pygame_sdl2 || true ; ) - ''; - - src = pkgs.fetchFromGitHub { - owner = "renpy"; - repo = "${pname}"; - rev = "renpy-${version}"; - sha256 = "10n6janvqh5adn7pcijqwqfh234sybjz788kb8ac6b4l11hy2lx1"; - }; - }; + pygame_sdl2 = callPackage ../development/python-modules/pygame_sdl2 { }; pygobject2 = callPackage ../development/python-modules/pygobject { }; + pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { }; pygtk = callPackage ../development/python-modules/pygtk { libglade = null; }; @@ -322,6 +228,10 @@ in { pysideTools = callPackage ../development/python-modules/pyside/tools.nix { }; + pyslurm = callPackage ../development/python-modules/pyslurm { + slurm = pkgs.slurm; + }; + python-sql = callPackage ../development/python-modules/python-sql { }; python-stdnum = callPackage ../development/python-modules/python-stdnum { }; @@ -346,261 +256,29 @@ in { hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; }; }; - unifi = buildPythonPackage rec { - name = "unifi-1.2.5"; - - propagatedBuildInputs = with self; [ urllib3 ]; - - # upstream has no tests - doCheck = false; - - meta = { - description = "An API towards the Ubiquity Networks UniFi controller"; - homepage = https://pypi.python.org/pypi/unifi/; - license = licenses.mit; - maintainers = with maintainers; [ peterhoeg ]; - }; - - src = pkgs.fetchurl { - url = "mirror://pypi/u/unifi/${name}.tar.gz"; - sha256 = "0prgx01hzs49prrazgxrinm7ivqzy57ch06qm2h7s1p957sazds8"; - }; - }; + unifi = callPackage ../development/python-modules/unifi { }; pyunbound = callPackage ../tools/networking/unbound/python.nix { }; # packages defined here - aafigure = buildPythonPackage rec { - name = "aafigure-0.5"; + aafigure = callPackage ../development/python-modules/aafigure { }; - src = pkgs.fetchurl { - url = "mirror://pypi/a/aafigure/${name}.tar.gz"; - sha256 = "090c88beb091d28a233f854e239713aa15d8d1906ea16211855345c912e8a091"; - }; + altair = callPackage ../development/python-modules/altair { }; - propagatedBuildInputs = with self; [ pillow ]; + vega = callPackage ../development/python-modules/vega { }; - # error: invalid command 'test' - doCheck = false; + acme = callPackage ../development/python-modules/acme { }; - # Fix impurity. TODO: Do the font lookup using fontconfig instead of this - # manual method. Until that is fixed, we get this whenever we run aafigure: - # WARNING: font not found, using PIL default font - patchPhase = '' - sed -i "s|/usr/share/fonts|/nonexisting-fonts-path|" aafigure/PILhelper.py - ''; + acme-tiny = callPackage ../development/python-modules/acme-tiny { }; - meta = { - description = "ASCII art to image converter"; - homepage = https://launchpad.net/aafigure/; - license = licenses.bsd2; - platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor ]; - }; - }; + actdiag = callPackage ../development/python-modules/actdiag { }; - altair = buildPythonPackage rec { - name = "altair-1.2.0"; + adal = callPackage ../development/python-modules/adal { }; - src = pkgs.fetchurl { - url = "mirror://pypi/a/altair/${name}.tar.gz"; - sha256 = "05c47dm20p7m0017p2h38il721rxag1q0457dj7whp0k8rc7qd1n"; - }; - buildInputs = [ self.pytest ]; + afew = callPackage ../development/python-modules/afew { }; - checkPhase = '' - export LANG=en_US.UTF-8 - py.test altair --doctest-modules - ''; - propagatedBuildInputs = with self; [ vega pandas ipython traitlets ]; - meta = { - description = "A declarative statistical visualization library for Python."; - homepage = https://github.com/altair-viz/altair; - license = licenses.bsd3; - platforms = platforms.linux; - maintainers = with maintainers; [ teh ]; - }; - }; - vega = buildPythonPackage rec { - name = "vega-0.4.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/v/vega/${name}.tar.gz"; - sha256 = "08k92afnk0bivm07h1l5nh26xl2rfp7qn03aq17q1hr3fs5r6cdm"; - }; - - buildInputs = [ self.pytest ]; - propagatedBuildInputs = with self; [ jupyter_core pandas ]; - - meta = { - description = " An IPython/Jupyter widget for Vega and Vega-Lite."; - longDescription = '' - To use this you have to enter a nix-shell with vega. Then run: - - jupyter nbextension install --user --py vega - jupyter nbextension enable --user vega - ''; - homepage = https://github.com/vega/ipyvega; - license = licenses.bsd3; - platforms = platforms.linux; - maintainers = with maintainers; [ teh ]; - }; - }; - - acme = buildPythonPackage rec { - inherit (pkgs.certbot) src version; - - name = "acme-${version}"; - - propagatedBuildInputs = with self; [ - cryptography pyasn1 pyopenssl pyRFC3339 pytz requests six werkzeug mock - ndg-httpsclient - ]; - - buildInputs = with self; [ nose ]; - postUnpack = "sourceRoot=\${sourceRoot}/acme"; - }; - - acme-tiny = buildPythonPackage rec { - name = "acme-tiny-${version}"; - version = "2016-03-26"; - - src = pkgs.fetchFromGitHub { - sha256 = "0ngmr3kxcvlqa9mrv3gx0rg4r67xvdjplqfminxliri3ipak853g"; - rev = "7a5a2558c8d6e5ab2a59b9fec9633d9e63127971"; - repo = "acme-tiny"; - owner = "diafygi"; - }; - - # source doesn't have any python "packaging" as such - configurePhase = " "; - buildPhase = " "; - # the tests are... complex - doCheck = false; - - patchPhase = '' - substituteInPlace acme_tiny.py --replace "openssl" "${pkgs.openssl.bin}/bin/openssl" - ''; - - installPhase = '' - mkdir -p $out/${python.sitePackages}/ - cp acme_tiny.py $out/${python.sitePackages}/ - mkdir -p $out/bin - ln -s $out/${python.sitePackages}/acme_tiny.py $out/bin/acme_tiny - chmod +x $out/bin/acme_tiny - ''; - - meta = { - description = "A tiny script to issue and renew TLS certs from Let's Encrypt"; - homepage = https://github.com/diafygi/acme-tiny; - license = licenses.mit; - }; - }; - - actdiag = buildPythonPackage rec { - name = "actdiag-0.5.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/actdiag/${name}.tar.gz"; - sha256 = "1vr4hnkr0gcvvpaycd8q3vcx029b2f5yv8swhdr8kwspaqb0dvfa"; - }; - - buildInputs = with self; [ pep8 nose unittest2 docutils ]; - - propagatedBuildInputs = with self; [ blockdiag ]; - - # One test fails: - # UnicodeEncodeError: 'ascii' codec can't encode character u'\u3042' in position 0: ordinal not in range(128) - doCheck = false; - - meta = { - description = "Generate activity-diagram image from spec-text file (similar to Graphviz)"; - homepage = http://blockdiag.com/; - license = licenses.asl20; - platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor ]; - }; - }; - - adal = buildPythonPackage rec { - version = "0.1.0"; - name = "adal-${version}"; - - src = pkgs.fetchurl { - url = mirror://pypi/a/adal/adal-0.1.0.tar.gz; - sha256 = "1f32k18ck54adqlgvh6fjhy4yavcyrwy813prjyqppqqq4bn1a09"; - }; - - propagatedBuildInputs = with self; [ requests pyjwt ]; - - meta = { - description = "Library to make it easy for python application to authenticate to Azure Active Directory (AAD) in order to access AAD protected web resources"; - homepage = https://github.com/AzureAD/azure-activedirectory-library-for-python; - license = licenses.mit; - maintainers = with maintainers; [ phreedom ]; - }; - }; - - afew = buildPythonPackage rec { - name = "afew-git-2017-02-08"; - - src = pkgs.fetchFromGitHub { - owner = "afewmail"; - repo = "afew"; - rev = "889a3b966835c4d16aa1f24bb89f12945b9b2a67"; - sha256 = "01gwrx1m3ka13ps3vj04a3y8llli2j2vkd3gcggcvxdphhpysckm"; - }; - - buildInputs = with self; [ pkgs.dbacl ]; - - propagatedBuildInputs = with self; [ - self.notmuch - self.chardet - ] ++ optional (!isPy3k) self.subprocess32; - - doCheck = false; - - preConfigure = '' - substituteInPlace afew/DBACL.py --replace "'dbacl'" "'${pkgs.dbacl}/bin/dbacl'" - ''; - - postInstall = '' - wrapProgram $out/bin/afew \ - --prefix LD_LIBRARY_PATH : ${pkgs.notmuch}/lib - ''; - - meta = { - homepage = https://github.com/teythoon/afew; - description = "An initial tagging script for notmuch mail"; - maintainers = with maintainers; [ garbas ]; - }; - }; - - aiodns = buildPythonPackage rec { - name = "aiodns-${version}"; - version = "1.0.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/aiodns/${name}.tar.gz"; - sha256 = "595b78b8d54115d937cf60d778c02dad76b6f789fd527dab308f99e5601e7f3d"; - }; - - propagatedBuildInputs = with self; [ pycares ] ++ optional isPy33 asyncio ++ optional (isPy26 || isPy27 || isPyPy) trollius; - - checkPhase = '' - ${python.interpreter} tests.py - ''; - - # 'Could not contact DNS servers' - doCheck = false; - - meta = { - homepage = http://github.com/saghul/aiodns; - license = licenses.mit; - description = "Simple DNS resolver for asyncio"; - }; - }; + aiodns = callPackage ../development/python-modules/aiodns { }; aiofiles = callPackage ../development/python-modules/aiofiles { }; @@ -627,64 +305,13 @@ in { }; }; - alabaster = buildPythonPackage rec { - name = "alabaster-0.7.7"; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/alabaster/${name}.tar.gz"; - sha256 = "f416a84e0d0ddbc288f6b8f2c276d10b40ca1238562cd9ed5a751292ec647b71"; - }; - - propagatedBuildInputs = with self; [ pygments ]; - - # No tests included - doCheck = false; - - meta = { - homepage = https://github.com/bitprophet/alabaster; - description = "A Sphinx theme"; - license = licenses.bsd3; - }; - }; - + alabaster = callPackage ../development/python-modules/alabaster {}; alembic = callPackage ../development/python-modules/alembic {}; - ansicolors = buildPythonPackage rec { - name = "ansicolors-${version}"; - version = "1.0.2"; + ansicolors = callPackage ../development/python-modules/ansicolors {}; - src = self.fetchPypi { - pname = "ansicolors"; - inherit version; - sha256 = "02lmh2fbqcwr98cq13l9ql0fvyad1dcb3ap3c5xq9qwjp45m6r3n"; - }; - - meta = { - homepage = "https://github.com/verigak/colors/"; - description = "ANSI colors for Python"; - license = licenses.isc; - maintainers = with maintainers; [ copumpkin ]; - }; - }; - - aniso8601 = buildPythonPackage rec { - name = "aniso8601-${version}"; - version = "1.2.0"; - - meta = { - description = "Parses ISO 8601 strings."; - homepage = "https://bitbucket.org/nielsenb/aniso8601"; - license = licenses.bsd3; - }; - - propagatedBuildInputs = with self; [ dateutil ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/aniso8601/${name}.tar.gz"; - sha256 = "502400f82574afa804cc915d83f15c67533d364dcd594f8a6b9d2053f3404dd4"; - }; - }; + aniso8601 = callPackage ../development/python-modules/aniso8601 {}; asgiref = callPackage ../development/python-modules/asgiref { }; @@ -692,69 +319,11 @@ in { asgi_redis = callPackage ../development/python-modules/asgi_redis { }; - python-editor = buildPythonPackage rec { - name = "python-editor-${version}"; - version = "0.4"; + python-editor = callPackage ../development/python-modules/python-editor { }; - src = pkgs.fetchurl { - url = "mirror://pypi/p/python-editor/${name}.tar.gz"; - sha256 = "1gykxn16anmsbcrwhx3rrhwjif95mmwvq9gjcrr9bbzkdc8sf8a4"; - }; + python-gnupg = callPackage ../development/python-modules/python-gnupg {}; - meta = with stdenv.lib; { - description = "`python-editor` is a library that provides the `editor` module for programmatically"; - homepage = "https://github.com/fmoo/python-editor"; - }; - }; - - python-gnupg = buildPythonPackage rec { - name = "python-gnupg-${version}"; - version = "0.4.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/python-gnupg/${name}.tar.gz"; - sha256 = "1yd88acafs9nwk6gzpbxjzpx0zd04qrvc6hmwhj1i89ghm2g7ap6"; - }; - - propagatedBuildInputs = [ pkgs.gnupg1 ]; - - # Let's make the library default to our gpg binary - patchPhase = '' - substituteInPlace gnupg.py \ - --replace "gpgbinary='gpg'" "gpgbinary='${pkgs.gnupg1}/bin/gpg'" - ''; - - doCheck = false; - - meta = { - description = "A wrapper for the Gnu Privacy Guard"; - homepage = "https://pypi.python.org/pypi/python-gnupg"; - license = licenses.bsd3; - maintainers = with maintainers; [ copumpkin ]; - platforms = platforms.unix; - }; - }; - - python-uinput = buildPythonPackage rec { - name = "python-uinput-${version}"; - version = "0.11.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/python-uinput/${name}.tar.gz"; - sha256 = "033zqiypjz0nigav6vz0s57pbzikvds55mxphrdpkdbpdikjnfcr"; - }; - - buildInputs = [ pkgs.udev ]; - - NIX_CFLAGS_LINK = [ "-ludev" ]; - - meta = with stdenv.lib; { - description = "Pythonic API to Linux uinput kernel module"; - homepage = "http://tjjr.fi/sw/python-uinput/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ abbradar ]; - }; - }; + python-uinput = callPackage ../development/python-modules/python-uinput {}; python-sybase = buildPythonPackage rec { name = "python-sybase-${version}"; @@ -984,10 +553,11 @@ in { }; ansible = self.ansible2; - ansible2 = self.ansible_2_2; + ansible2 = self.ansible_2_3; ansible_2_1 = callPackage ../development/python-modules/ansible/2.1.nix {}; ansible_2_2 = callPackage ../development/python-modules/ansible/2.2.nix {}; + ansible_2_3 = callPackage ../development/python-modules/ansible/2.3.nix {}; apipkg = buildPythonPackage rec { name = "apipkg-1.4"; @@ -1184,6 +754,15 @@ in { }; }; + arelle = callPackage ../development/python-modules/arelle { + gui = true; + }; + + arelle-headless = callPackage ../development/python-modules/arelle { + gui = false; + }; + + arrow = buildPythonPackage rec { name = "arrow-${version}"; version = "0.7.0"; @@ -1500,12 +1079,12 @@ in { in buildPythonPackage rec { name = "${pname}-${version}"; pname = "awscli"; - version = "1.11.95"; + version = "1.11.108"; namePrefix = ""; src = fetchPypi { inherit pname version; - sha256 = "1f99cg5x5kw1p1awny64adp07rvva57srdfrbi81yl2kpw33ybjc"; + sha256 = "1wz76hkljc25zzfa2l5jv0mbr5vx6d9ixq4sq0p3zf3l45ql6mdf"; }; # No tests included @@ -1971,6 +1550,9 @@ in { buildInputs = with self; [ docutils six ]; + # Tests fail due to nix file timestamp normalization. + doCheck = false; + meta = { homepage = https://github.com/botocore/bcdoc; license = licenses.asl20; @@ -3039,11 +2621,11 @@ in { botocore = buildPythonPackage rec { name = "${pname}-${version}"; pname = "botocore"; - version = "1.5.58"; + version = "1.5.71"; src = fetchPypi { inherit pname version; - sha256 = "1kd9hngdqvpjm01amizsmsnc08h2a0dxiasdk0f4kg1pibpqdni5"; + sha256 = "1fgg28halsy4g43wjpkbd6l0wqiwyzkd4zjrzbbyzw4dxbsf3xfm"; }; propagatedBuildInputs = @@ -3794,6 +3376,8 @@ in { }; }; + codecov = callPackage ../development/python-modules/codecov {}; + cogapp = buildPythonPackage rec { version = "2.3"; name = "cogapp-${version}"; @@ -4810,7 +4394,7 @@ in { url = "mirror://pypi/p/${pname}/${name}.tar.gz"; sha256 = "1mycn5cc9cp4fb0i2vzgkkk6d0glnkbilggwb4i99i09vr0vg5cd"; }; - buildInputs = with self; [ pyramid_mako nose django_1_9 jinja2 tornado pyramid Mako ]; + buildInputs = with self; [ pyramid_mako nose django jinja2 tornado pyramid Mako ]; propagatedBuildInputs = with self; [ six ]; patchPhase = '' sed -i 's/1.4.99/1.99/' setup.py @@ -7045,6 +6629,18 @@ in { }; }; + google-compute-engine = buildPythonPackage rec { + version = "2.3.0"; + name = "google-compute-engine-${version}"; + + src = pkgs.fetchurl { + url = "mirror://pypi/g/google-compute-engine/google-compute-engine-${version}.tar.gz"; + sha256 = "1pjj95b3l61h8xz5kjfcgnql066cr8bq5wl480a6dxd2inw8mynf"; + }; + + propagatedBuildInputs = with self; [ boto ]; + }; + googlecl = buildPythonPackage rec { version = "0.9.14"; name = "googlecl-${version}"; @@ -8155,34 +7751,28 @@ in { # These used to be here but were moved to all-packages, but I'll leave them around for a while. pants = pkgs.pants; - pants13-pre = pkgs.pants13-pre; paperwork-backend = buildPythonPackage rec { name = "paperwork-backend-${version}"; - version = "1.0.6"; + version = "1.2.0"; src = pkgs.fetchFromGitHub { owner = "jflesch"; repo = "paperwork-backend"; rev = version; - sha256 = "11jbhv9xcpimp9iq2b1hlpljzij73s86rb5lpgzhslqc7zmm5bxn"; + sha256 = "1pzyy14f9wzh9vwn855k1z48a8mbs73j1dk8730kdlcdkmn3l1ms"; }; # Python 2.x is not supported. disabled = !isPy3k && !isPyPy; - # Make sure that chkdeps exits with status 1 if a dependency is not found. - postPatch = '' - sed -i -e '/print.*Missing dependencies/,/^ *$/ { - /^ *$/ a \ sys.exit(1) - }' scripts/paperwork-shell - ''; - preCheck = "\"$out/bin/paperwork-shell\" chkdeps paperwork_backend"; propagatedBuildInputs = with self; [ pyenchant simplebayes pillow pycountry whoosh termcolor - python-Levenshtein pyinsane2 pygobject3 pyocr pkgs.poppler_gi + python-Levenshtein pyinsane2 pygobject3 pyocr + pkgs.poppler_gi pkgs.gtk3 + natsort ]; meta = { @@ -8351,14 +7941,18 @@ in { pex = buildPythonPackage rec { name = "pex-${version}"; - version = "1.2.2"; + version = "1.2.7"; src = self.fetchPypi { pname = "pex"; - sha256 = "1nwrf03cd6jw24lxyaalj59fdm2infr9glabznkpaq65mjzwshl3"; + sha256 = "1m0gx9182w1dybkyjwwjyd6i87x2dzv252ks2fj8yn6avlcp5z4q"; inherit version; }; + prePatch = '' + substituteInPlace setup.py --replace 'SETUPTOOLS_REQUIREMENT,' '"setuptools"' + ''; + # A few more dependencies I don't want to handle right now... doCheck = false; @@ -9805,34 +9399,13 @@ in { gdal = self.gdal; }; + # TODO: Django 1.10 will be maintained until the end of the year. Therefore, + # it will be dropped before 17.09. + # https://github.com/NixOS/nixpkgs/issues/25375#issuecomment-298522597 django_1_10 = callPackage ../development/python-modules/django/1_10.nix { gdal = self.gdal; }; - django_1_9 = buildPythonPackage rec { - name = "Django-${version}"; - version = "1.9.13"; - disabled = pythonOlder "2.7"; - - src = pkgs.fetchurl { - url = "http://www.djangoproject.com/m/releases/1.9/${name}.tar.gz"; - sha256 = "079zspfsvfnv9wf6qvg8xmz1m23d0723p2nqyk8gfqb012jxn1y0"; - }; - - # patch only $out/bin to avoid problems with starter templates (see #3134) - postFixup = '' - wrapPythonProgramsIn $out/bin "$out $pythonPath" - ''; - - # too complicated to setup - doCheck = false; - - meta = { - description = "A high-level Python Web framework"; - homepage = https://www.djangoproject.com/; - }; - }; - django_1_8 = buildPythonPackage rec { name = "Django-${version}"; version = "1.8.18"; @@ -9857,53 +9430,7 @@ in { }; }; - django_1_6 = buildPythonPackage rec { - name = "Django-${version}"; - version = "1.6.11.5"; - - # Support to python-3.4 and higher was introduced in django_1_7 - disabled = !(isPy26 || isPy27 || isPy33); - - src = pkgs.fetchurl { - url = "https://downloads.reviewboard.org/releases/Django/1.6/Django-${version}.tar.gz"; - sha256 = "0yj0fw3iql031z8l5ik1fb25sk3l5bw2vc63bbyg5rz2k3znl4il"; - }; - - # too complicated to setup - doCheck = false; - - # patch only $out/bin to avoid problems with starter templates (see #3134) - postFixup = '' - wrapPythonProgramsIn $out/bin "$out $pythonPath" - ''; - - meta = { - description = "A high-level Python Web framework"; - homepage = https://www.djangoproject.com/; - }; - }; - - django_appconf = buildPythonPackage rec { - name = "django-appconf-${version}"; - version = "1.0.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/django-appconf/django-appconf-${version}.tar.gz"; - sha256 = "0q3fg17qi4vwpipbj075zn4wk58p6a946kah8wayks1423xpa4xs"; - }; - - # No tests in archive - doCheck = false; - - propagatedBuildInputs = with self; [ six ]; - - meta = { - description = "A helper class for handling configuration defaults of packaged apps gracefully"; - homepage = http://django-appconf.readthedocs.org/; - license = licenses.bsd2; - maintainers = with maintainers; [ desiderius ]; - }; - }; + django_appconf = callPackage ../development/python-modules/django_appconf { }; django_colorful = buildPythonPackage rec { name = "django-colorful-${version}"; @@ -9927,27 +9454,7 @@ in { }; }; - django_compressor = buildPythonPackage rec { - name = "django-compressor-${version}"; - version = "1.5"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/django_compressor/django_compressor-${version}.tar.gz"; - sha256 = "0bp2acagc6b1mmcajlmjf5vvp6zj429bq7p2wks05n47pwfzv281"; - }; - - # Need to setup django testing - doCheck = false; - - propagatedBuildInputs = with self; [ django_appconf ]; - - meta = { - description = "Compresses linked and inline JavaScript or CSS into single cached files"; - homepage = http://django-compressor.readthedocs.org/en/latest/; - license = licenses.mit; - maintainers = with maintainers; [ desiderius ]; - }; - }; + django_compressor = callPackage ../development/python-modules/django_compressor { }; django_compat = callPackage ../development/python-modules/django-compat { }; @@ -9980,7 +9487,7 @@ in { sha256 = "1qbcx54hq8iy3n2n6cki3bka1m9rp39np4hqddrm9knc954fb7nv"; }; - propagatedBuildInputs = with self; [ django_1_6 ]; + propagatedBuildInputs = with self; [ django ]; meta = { description = "A database schema evolution tool for the Django web framework"; @@ -9990,33 +9497,18 @@ in { django_guardian = callPackage ../development/python-modules/django_guardian.nix { }; - django_tagging = buildPythonPackage rec { - name = "django-tagging-0.4.5"; + django_polymorphic = callPackage ../development/python-modules/django-polymorphic { }; - src = pkgs.fetchurl { - url = "mirror://pypi/d/django-tagging/${name}.tar.gz"; - sha256 = "00ki1g6pb2lnaj4lh0s865mmlf4kdwx7a6n38iy5qz9qv4xrvz4q"; - }; + django_tagging = callPackage ../development/python-modules/django_tagging { }; - # error: invalid command 'test' - doCheck = false; - - propagatedBuildInputs = with self; [ django ]; - - meta = { - description = "A generic tagging application for Django projects"; - homepage = https://github.com/Fantomas42/django-tagging; - }; - }; - - django_tagging_0_3 = self.django_tagging.override (attrs: rec { + django_tagging_0_3 = self.django_tagging.overrideAttrs (attrs: rec { name = "django-tagging-0.3.6"; src = pkgs.fetchurl { url = "mirror://pypi/d/django-tagging/${name}.tar.gz"; sha256 = "03zlbq13rydfh28wh0jk3x3cjk9x6jjmqnx1i3ngjmfwbxf8x6j1"; }; - propagatedBuildInputs = with self; [ django_1_6 ]; + propagatedBuildInputs = with self; [ django ]; }); django_classytags = buildPythonPackage rec { @@ -10218,7 +9710,7 @@ in { sha256 = "1y49fa8jj7x9qjj5wzhns3zxwj0s73sggvkrv660cqw5qb7d8hha"; }; - propagatedBuildInputs = with self; [ django_1_6 futures ]; + propagatedBuildInputs = with self; [ django futures ]; meta = with stdenv.lib; { description = "Pipeline is an asset packaging library for Django"; @@ -10236,7 +9728,10 @@ in { }); - djblets = buildPythonPackage rec { + djblets = if (versionOlder self.django.version "1.6.11") || + (versionAtLeast self.django.version "1.9") + then throw "djblets only suported for Django<1.8.999,>=1.6.11" + else buildPythonPackage rec { name = "Djblets-0.9"; src = pkgs.fetchurl { @@ -10245,7 +9740,7 @@ in { }; propagatedBuildInputs = with self; [ - django_1_6 feedparser django_pipeline_1_3 pillowfight pytz ]; + django feedparser django_pipeline_1_3 pillowfight pytz ]; meta = { description = "A collection of useful extensions for Django"; @@ -10724,22 +10219,7 @@ in { }; }; - pycodestyle = buildPythonPackage rec { - name = "pycodestyle-${version}"; - version = "2.0.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pycodestyle/${name}.tar.gz"; - sha256 = "1rz2v8506mdjdyxcnv9ygiw6v0d4dqx8z5sjyjm0w2v32h5l5w1p"; - }; - - meta = { - description = "Python style guide checker (formerly called pep8)"; - homepage = https://pycodestyle.readthedocs.io; - license = licenses.mit; - maintainers = with maintainers; [ garbas ]; - }; - }; + pycodestyle = callPackage ../development/python-modules/pycodestyle { }; filebytes = buildPythonPackage rec { name = "filebytes-0.9.12"; @@ -10945,6 +10425,7 @@ in { }; }; + flask-restplus = callPackage ../development/python-modules/flask-restplus/default.nix { }; # Exactly 0.8.6 is required by flexget flask-restplus_0_8 = callPackage ../development/python-modules/flask-restplus/0.8.nix { }; @@ -11045,6 +10526,8 @@ in { }; }; + pytorch = callPackage ../development/python-modules/pytorch { }; + python_tvrage = buildPythonPackage (rec { version = "0.4.1"; name = "tvrage-${version}"; @@ -11591,19 +11074,7 @@ in { }; - gflags = buildPythonPackage rec { - name = "gflags-2.0"; - - src = pkgs.fetchurl { - url = "http://python-gflags.googlecode.com/files/python-${name}.tar.gz"; - sha256 = "1mkc7315bpmh39vbn0jq237jpw34zsrjr1sck98xi36bg8hnc41i"; - }; - - meta = { - homepage = http://code.google.com/p/python-gflags/; - description = "A module for command line handling, similar to Google's gflags for C++"; - }; - }; + gflags = callPackage ../development/python-modules/gflags { }; ghdiff = callPackage ../development/python-modules/ghdiff.nix { }; @@ -11807,6 +11278,7 @@ in { }; }; + grammalecte = callPackage ../development/python-modules/grammalecte { }; greenlet = buildPythonPackage rec { name = "greenlet-${version}"; @@ -11899,6 +11371,7 @@ in { patches = optionals pkgs.stdenv.isDarwin [ ../development/python-modules/gyp/no-darwin-cflags.patch + ../development/python-modules/gyp/no-xcode.patch ]; disabled = isPy3k; @@ -12675,6 +12148,9 @@ in { }; }; + journalwatch = callPackage ../tools/system/journalwatch { + inherit (self) systemd pytest; + }; jrnl = buildPythonPackage rec { name = "jrnl-1.9.7"; @@ -12910,24 +12386,7 @@ in { kitchen = callPackage ../development/python-modules/kitchen/default.nix { }; - pylast = buildPythonPackage rec { - name = "pylast-${version}"; - version = "0.5.11"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pylast/${name}.tar.gz"; - sha256 = "bf35820be35447d55564d36072d40b09ac8a7fd41a6f1a7a9d408f4d0eaefac4"; - }; - - # error: invalid command 'test' - doCheck = false; - - meta = { - homepage = http://code.google.com/p/pylast/; - description = "A python interface to last.fm (and compatibles)"; - license = licenses.asl20; - }; - }; + pylast = callPackage ../development/python-modules/pylast/default.nix { }; pylru = buildPythonPackage rec { name = "pylru-${version}"; @@ -13460,6 +12919,8 @@ in { }; }; + markdownsuperscript = callPackage ../development/python-modules/markdownsuperscript {}; + markdown-macros = buildPythonPackage rec { name = "markdown-macros-${version}"; version = "0.1.2"; @@ -13493,7 +12954,10 @@ in { }; }; - mathics = buildPythonPackage rec { + mathics = if (versionOlder self.django.version "1.8") || + (versionAtLeast self.django.version "1.9") + then throw "mathics only supports django-1.8.x" + else buildPythonPackage rec { name = "mathics-${version}"; version = "0.9"; src = pkgs.fetchFromGitHub { @@ -13519,7 +12983,7 @@ in { propagatedBuildInputs = with self; [ cython sympy - django_1_8 + django ply mpmath dateutil @@ -13546,15 +13010,15 @@ in { mccabe = callPackage ../development/python-modules/mccabe { }; mechanize = buildPythonPackage (rec { - name = "mechanize-0.2.5"; + name = "mechanize-0.3.5"; disabled = isPy3k; src = pkgs.fetchurl { url = "mirror://pypi/m/mechanize/${name}.tar.gz"; - sha256 = "0rj7r166i1dyrq0ihm5rijfmvhs8a04im28lv05c0c3v206v4rrf"; + sha256 = "0rki9nl4y42q694parafcsdcdqvkdjckrbg6n0691302lfsrkyfl"; }; - propagatedBuildInputs = with self; [ clientform ]; + propagatedBuildInputs = with self; [ clientform html5lib ]; doCheck = false; @@ -13657,7 +13121,7 @@ in { buildInputs = with self; [ pyflakes pep8 ]; propagatedBuildInputs = with self; [ - django_1_6 filebrowser_safe grappelli_safe bleach tzlocal beautifulsoup4 + django filebrowser_safe grappelli_safe bleach tzlocal beautifulsoup4 requests requests_oauthlib future pillow ]; @@ -14539,25 +14003,7 @@ in { }; }; - pygraphviz = buildPythonPackage rec { - name = "pygraphviz-${version}"; - version = "1.4rc1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pygraphviz/${name}.tar.gz"; - sha256 = "00ck696rddjnrwfnh1zw87b9xzqfm6sqjy6kqf6kmn1xwsi6f19a"; - }; - - buildInputs = with self; [ doctest-ignore-unicode mock nose ]; - propagatedBuildInputs = [ pkgs.graphviz pkgs.pkgconfig ]; - - meta = { - description = "Python interface to Graphviz graph drawing package"; - homepage = https://github.com/pygraphviz/pygraphviz; - license = licenses.bsd3; - maintainers = with maintainers; [ matthiasbeyer ]; - }; - }; + pygraphviz = callPackage ../development/python-modules/pygraphviz { }; pympler = buildPythonPackage rec { pname = "Pympler"; @@ -18946,12 +18392,12 @@ in { pyelftools = buildPythonPackage rec { pname = "pyelftools"; - version = "0.23"; + version = "0.24"; name = "${pname}-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/p/${pname}/${name}.tar.gz"; - sha256 = "1pi1mdzfffgl5qcz0prsa7hlbriycy7mgagi0fdrp3vf17fslmzw"; + sha256 = "17259kf6hwwsmizr5myp9jv3k9g5i3dvmnl8m646pfd5hpb9gpg9"; }; checkPhase = '' @@ -20315,11 +19761,17 @@ in { pyopenssl = buildPythonPackage rec { name = "pyopenssl-${version}"; - version = "16.2.0"; + version = "17.0.0"; src = pkgs.fetchurl { url = "mirror://pypi/p/pyOpenSSL/pyOpenSSL-${version}.tar.gz"; - sha256 = "0vji4yrfshs15xpczbhzhasnjrwcarsqg87n98ixnyafnyxs6ybp"; + sha256 = "1pdg1gpmkzj8yasg6cmkhcivxcdp4c12nif88y4qvsxq5ffzxas8"; + }; + + patches = pkgs.fetchpatch { + url = "https://github.com/pyca/pyopenssl/commit/" + + "a40898b5f1d472f9449a344f703fa7f90cddc21d.patch"; + sha256 = "0bdfrhfvdfxhfknn46s4db23i3hww6ami2r1l5rfrri0pn8b8mh7"; }; preCheck = '' @@ -20708,7 +20160,7 @@ in { buildInputs = [ pkgs.pkgconfig pkgs.gtk2 self.pygtk pkgs.libxml2 - pkgs.libxslt pkgs.libsoup pkgs.webkitgtk2 pkgs.icu + pkgs.libxslt pkgs.libsoup pkgs.webkitgtk24x-gtk2 pkgs.icu ]; meta = { @@ -21118,6 +20570,8 @@ in { }; }; + rcssmin = callPackage ../development/python-modules/rcssmin { }; + recommonmark = buildPythonPackage rec { name = "recommonmark-${version}"; version = "0.4.0"; @@ -21268,6 +20722,8 @@ in { }; }; + rjsmin = callPackage ../development/python-modules/rjsmin { }; + pysolr = buildPythonPackage rec { name = "pysolr-${version}"; version = "3.3.3"; @@ -21303,7 +20759,7 @@ in { buildInputs = with self; [ coverage mock nose geopy ]; propagatedBuildInputs = with self; [ - django_1_6 dateutil_1_5 whoosh pysolr elasticsearch + django dateutil_1_5 whoosh pysolr elasticsearch ]; patchPhase = '' @@ -21388,7 +20844,7 @@ in { ''; propagatedBuildInputs = with self; - [ django_1_6 recaptcha_client pytz memcached dateutil_1_5 paramiko flup + [ django recaptcha_client pytz memcached dateutil_1_5 paramiko flup pygments djblets django_evolution pycrypto pysvn pillow psycopg2 django-haystack python_mimeparse markdown django-multiselectfield ]; @@ -23592,6 +23048,8 @@ in { }; }); + spotipy = callPackage ../development/python-modules/spotipy { }; + Pweave = buildPythonPackage (rec { name = "Pweave-0.25"; @@ -23620,8 +23078,6 @@ in { rope = if isPy3k then null else self.rope; }; - - sqlalchemy = callPackage ../development/python-modules/sqlalchemy { }; SQLAlchemy-ImageAttach = buildPythonPackage rec { @@ -23977,26 +23433,6 @@ in { }; }; - tarsnapper = buildPythonPackage rec { - name = "tarsnapper-0.2.1"; - disabled = isPy3k; - - src = pkgs.fetchgit { - url = https://github.com/miracle2k/tarsnapper.git; - rev = "620439bca68892f2ffaba1079a34b18496cc6596"; - sha256 = "1n2k2r9x11r1ph9jcjhlk44hsghfnl1pl3aakbx121qc5dg7b0yn"; - }; - - propagatedBuildInputs = with self; [ argparse pyyaml ]; - - patches = [ ../development/python-modules/tarsnapper-path.patch ]; - - preConfigure = '' - substituteInPlace src/tarsnapper/script.py \ - --replace '@NIXTARSNAPPATH@' '${pkgs.tarsnap}/bin/tarsnap' - ''; - }; - taskcoach = buildPythonPackage rec { name = "TaskCoach-1.3.22"; disabled = isPy3k; @@ -24966,6 +24402,8 @@ in { }; }; + uritools = callPackage ../development/python-modules/uritools { }; + traceback2 = buildPythonPackage rec { version = "1.4.0"; name = "traceback2-${version}"; @@ -25213,30 +24651,7 @@ in { }; }; - virtualenv = buildPythonPackage rec { - name = "virtualenv-15.0.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/v/virtualenv/${name}.tar.gz"; - sha256 = "6d9c760d3fc5fa0894b0f99b9de82a4647e1164f0b700a7f99055034bf548b1d"; - }; - - pythonPath = [ self.recursivePthLoader ]; - - patches = [ ../development/python-modules/virtualenv-change-prefix.patch ]; - - propagatedBuildInputs = with self; [ ]; - - # Tarball doesn't contain tests - doCheck = false; - - meta = { - description = "A tool to create isolated Python environments"; - homepage = http://www.virtualenv.org; - license = licenses.mit; - maintainers = with maintainers; [ goibhniu ]; - }; - }; + virtualenv = callPackage ../development/python-modules/virtualenv { }; virtualenv-clone = buildPythonPackage rec { name = "virtualenv-clone-0.2.5"; @@ -25275,9 +24690,9 @@ in { stevedore virtualenv virtualenv-clone - ] ++ optional isPy26 argparse; + ]; - patchPhase = '' + postPatch = '' for file in "virtualenvwrapper.sh" "virtualenvwrapper_lazy.sh"; do substituteInPlace "$file" --replace "which" "${pkgs.which}/bin/which" @@ -25308,7 +24723,7 @@ in { # WARNING: Don't indent the lines below because that would break EOF cat > "$wrapper" << EOF -export PATH="$PATH:\$PATH" +export PATH="${python}/bin:\$PATH" export VIRTUALENVWRAPPER_PYTHONPATH="$PYTHONPATH:$(toPythonPath $out)" source "$wrapped" EOF @@ -25763,24 +25178,8 @@ EOF }; }); - zconfig = buildPythonPackage rec { - name = "zconfig-${version}"; - version = "3.0.3"; - src = pkgs.fetchurl { - url = "mirror://pypi/Z/ZConfig/ZConfig-${version}.tar.gz"; - sha256 = "6577da957511d8c2f805fefd2e31cacc4117bb5c54aec03ad8ce374020c021f3"; - }; - - propagatedBuildInputs = with self; [ zope_testrunner ]; - - meta = { - description = "Structured Configuration Library"; - homepage = http://pypi.python.org/pypi/ZConfig; - license = licenses.zpt20; - maintainers = with maintainers; [ goibhniu ]; - }; - }; + zconfig = callPackage ../development/python-modules/zconfig { }; zc_lockfile = buildPythonPackage rec { @@ -26380,25 +25779,7 @@ EOF }; - zope_testrunner = buildPythonPackage rec { - name = "zope.testrunner-${version}"; - version = "4.4.10"; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/zope.testrunner/${name}.zip"; - sha256 = "1w09wbqiqmq6hvrammi4fzc7fr129v63gdnzlk4qi2b1xy5qpqab"; - }; - - propagatedBuildInputs = with self; [ zope_interface zope_exceptions zope_testing six ] ++ optional (!python.is_py3k or false) subunit; - - meta = { - description = "A flexible test runner with layer support"; - homepage = http://pypi.python.org/pypi/zope.testrunner; - license = licenses.zpt20; - maintainers = with maintainers; [ goibhniu ]; - }; - }; - + zope_testrunner = callPackage ../development/python-modules/zope_testrunner { }; zope_traversing = buildPythonPackage rec { name = "zope.traversing-4.0.0"; @@ -26419,23 +25800,8 @@ EOF }; - zope_interface = buildPythonPackage rec { - name = "zope.interface-4.1.3"; + zope_interface = callPackage ../development/python-modules/zope_interface { }; - src = pkgs.fetchurl { - url = "mirror://pypi/z/zope.interface/${name}.tar.gz"; - sha256 = "0ks8h73b2g4bkad821qbv0wzjppdrwys33i7ka45ik3wxjg1l8if"; - }; - - propagatedBuildInputs = with self; [ zope_event ]; - - meta = { - description = "Zope.Interface"; - homepage = http://zope.org/Products/ZopeInterface; - license = licenses.zpt20; - maintainers = with maintainers; [ goibhniu ]; - }; - }; hgsvn = buildPythonPackage rec { name = "hgsvn-0.3.11"; @@ -27192,7 +26558,7 @@ EOF sha256 = "1c0kclbv8shv9nvjx19wqm4asia58s3qmd9fapchc6y9fjpjax6q"; }; - propagatedBuildInputs = with self; [ django_1_6 django_tagging_0_3 whisper pycairo ldap memcached pytz ]; + propagatedBuildInputs = with self; [ django django_tagging_0_3 whisper pycairo ldap memcached pytz ]; postInstall = '' wrapProgram $out/bin/run-graphite-devel-server.py \ @@ -27473,13 +26839,13 @@ EOF }; libvirt = let - version = "3.1.0"; + version = "3.5.0"; in assert version == pkgs.libvirt.version; pkgs.stdenv.mkDerivation rec { name = "libvirt-python-${version}"; src = pkgs.fetchurl { url = "http://libvirt.org/sources/python/${name}.tar.gz"; - sha256 = "06524dhm27fjfnmr5bqdxlmm1g9ixvzaaq572hgyy5dqwfn64spk"; + sha256 = "06mc0cm4k90z8vxaslk3ifpajg8w8dvm0m2mxwcd6fdzps8fwpsw"; }; buildInputs = with self; [ python pkgs.pkgconfig pkgs.libvirt lxml ]; @@ -28576,7 +27942,7 @@ EOF disabled = isPyPy; # Wants to set up Django doCheck = false; - propagatedBuildInputs = with self; [ django_1_9 smartypants jinja2 ]; + propagatedBuildInputs = with self; [ django smartypants jinja2 ]; meta = { description = "Filters to enhance web typography, including support for Django & Jinja templates"; homepage = "https://github.com/mintchaos/typogrify"; @@ -30086,48 +29452,11 @@ EOF }; }; - yapf = buildPythonPackage rec { - name = "yapf-${version}"; - version = "0.11.0"; - - meta = { - description = "A formatter for Python code."; - homepage = "https://github.com/google/yapf"; - license = licenses.asl20; - maintainers = with maintainers; [ siddharthist ]; - }; - - src = pkgs.fetchurl { - url = "mirror://pypi/y/yapf/${name}.tar.gz"; - sha256 = "14kb9gxw39zhvrijhp066b4bm6bgv35iw56c394y4dyczpha0dij"; - }; - }; + yapf = callPackage ../development/python-modules/yapf { }; autobahn = callPackage ../development/python-modules/autobahn { }; - jsonref = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "jsonref"; - version = "0.1"; - - meta = { - description = "An implementation of JSON Reference for Python."; - homepage = "http://github.com/gazpachoking/jsonref"; - license = licenses.mit; - maintainers = with maintainers; [ nand0p ]; - platforms = platforms.all; - }; - - buildInputs = with self; [ pytest mock ]; - checkPhase = '' - py.test tests.py - ''; - - src = pkgs.fetchurl { - url = "mirror://pypi/j/${pname}/${name}.tar.gz"; - sha256 = "1lqa8dy1sr1bxi00ri79lmbxvzxi84ki8p46zynyrgcqhwicxq2n"; - }; - }; + jsonref = callPackage ../development/python-modules/jsonref { }; whoosh = callPackage ../development/python-modules/whoosh { }; @@ -30152,13 +29481,13 @@ EOF pwntools = buildPythonPackage rec { name = "pwntools-${version}"; - version = "3.1.0"; + version = "3.7.1"; src = pkgs.fetchurl { url = "mirror://pypi/p/pwntools/${name}.tar.gz"; - sha256 = "1siyky6iq2b155sfjhx10yg2ihvjp2s3kr6i0n5z9v5pi0r7gc6d"; + sha256 = "1c0n97cf3nql3n6sxpbp43x1byhkgfbpbl2b22h8nllgb8n0z9l0"; }; - propagatedBuildInputs = with self; [ Mako packaging pysocks pygments ROPGadget capstone paramiko pip psutil pyelftools pypandoc pyserial dateutil requests tox pkgs.pandoc ]; + propagatedBuildInputs = with self; [ Mako packaging pysocks pygments ROPGadget capstone paramiko pip psutil pyelftools pypandoc pyserial dateutil requests tox pkgs.pandoc unicorn intervaltree ]; disabled = isPy3k; @@ -30170,28 +29499,6 @@ EOF }; }; - pytoml = buildPythonPackage rec { - name = "pytoml-${version}"; - version = "0.1.11"; - - checkPhase = "${python.interpreter} test/test.py"; - - # fetchgit used to ensure test submodule is available - src = pkgs.fetchgit { - url = "${meta.homepage}.git"; - rev = "refs/tags/v${version}"; - sha256 = "1jiw04zk9ccynr8kb1vqh9r1p2kh0al7g7b1f94911iazg7dgs9j"; - }; - - meta = { - description = "A TOML parser/writer for Python"; - homepage = https://github.com/avakar/pytoml; - license = licenses.mit; - maintainers = with maintainers; [ peterhoeg ]; - }; - - }; - ROPGadget = buildPythonPackage rec { name = "ROPGadget-5.4"; src = pkgs.fetchurl { @@ -30207,72 +29514,31 @@ EOF }; }; - packaging = buildPythonPackage rec { - name = "packaging-16.8"; + unicorn = buildPythonPackage rec { + name = "unicorn-${version}"; + version = "1.0.1"; src = pkgs.fetchurl { - url = "mirror://pypi/p/packaging/${name}.tar.gz"; - sha256 = "5d50835fdf0a7edf0b55e311b7c887786504efea1177abd7e69329a8e5ea619e"; + url = "mirror://pypi/u/unicorn/${name}.tar.gz"; + sha256 = "0a5b4vh734b3wfkgapzzf8x18rimpmzvwwkly56da84n27wfw9bg"; }; - propagatedBuildInputs = with self; [ pyparsing six ]; - buildInputs = with self; [ pytest pretend ]; + setupPyBuildFlags = [ "--plat-name" "linux" ]; meta = with pkgs.stdenv.lib; { - description = "Core utilities for Python packages"; - homepage = "https://github.com/pypa/packaging"; - license = [ licenses.bsd2 licenses.asl20 ]; - maintainers = with maintainers; [ bennofs ]; - }; - - checkPhase = '' - py.test - ''; - }; - - pypandoc = buildPythonPackage rec { - name = "pypandoc-1.3.3"; - src = pkgs.fetchurl { - url = "mirror://pypi/p/pypandoc/${name}.tar.gz"; - sha256 = "0628f2kn4gqimnhpf251fgzl723hwgyl3idy69dkzyjvi45s5zm6"; - }; - - # Fix tests: first requires network access, second is a bug (reported upstream) - preConfigure = '' - substituteInPlace tests.py --replace "pypandoc.convert(url, 'html')" "'GPL2 license'" - substituteInPlace tests.py --replace "pypandoc.convert_file(file_name, lua_file_name)" "'

title

'" - ''; - - LC_ALL="en_US.UTF-8"; - - propagatedBuildInputs = with self; [ self.pip ]; - buildInputs = [ pkgs.pandoc pkgs.texlive.combined.scheme-small pkgs.haskellPackages.pandoc-citeproc pkgs.glibcLocales ]; - - meta = with pkgs.stdenv.lib; { - description = "Thin wrapper for pandoc"; - homepage = "https://github.com/bebraw/pypandoc"; - license = licenses.mit; - maintainers = with maintainers; [ bennofs kristoff3r ]; + description = "Unicorn CPU emulator engine"; + homepage = "http://www.unicorn-engine.org/"; + license = [ licenses.gpl2 ]; + maintainers = [ maintainers.bennofs ]; }; }; - yamllint = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "yamllint"; - version = "0.5.2"; + intervaltree = callPackage ../development/python-modules/intervaltree { }; - src = pkgs.fetchurl{ - url = "mirror://pypi/y/${pname}/${name}.tar.gz"; - sha256 = "0brdy1crhfng10hlw0420bv10c2xnjk8ndnhssybkzym47yrzg84"; - }; + packaging = callPackage ../development/python-modules/packaging { }; - buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ pyyaml ]; + pytoml = callPackage ../development/python-modules/pytoml { }; - meta = { - homepage = "https://github.com/adrienverge/yamllint"; - description = "A linter for YAML files"; - license = licenses.gpl3; - maintainers = with maintainers; [ mikefaille ]; - }; - }; + pypandoc = callPackage ../development/python-modules/pypandoc { }; + + yamllint = callPackage ../development/python-modules/yamllint { }; yarl = callPackage ../development/python-modules/yarl { }; @@ -30301,53 +29567,11 @@ EOF typed-ast = callPackage ../development/python-modules/typed-ast { }; - stripe = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "stripe"; - version = "1.41.1"; - - # Tests require network connectivity and there's no easy way to disable - # them. ~ C. - doCheck = false; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/${pname}/${name}.tar.gz"; - sha256 = "0zvffvq933ia5w5ll6xhx2zgvppgc6zc2mxhc6f0kypw5g2fxvz5"; - }; - - buildInputs = with self; [ unittest2 mock ]; - propagatedBuildInputs = with self; [ requests ]; - - meta = { - homepage = "https://github.com/stripe/stripe-python"; - description = "Stripe Python bindings"; - license = licenses.mit; - }; - }; + stripe = callPackage ../development/python-modules/stripe { }; uranium = callPackage ../development/python-modules/uranium { }; - urlscan = callPackage ../applications/misc/urlscan { }; - - vine = buildPythonPackage rec { - name = "vine-${version}"; - version = "1.1.3"; - - disable = pythonOlder "2.7"; - - src = pkgs.fetchurl { - url = "mirror://pypi/v/vine/${name}.tar.gz"; - sha256 = "0h94x9mc9bspg23lb1f73h7smdzc39ps7z7sm0q38ds9jahmvfc7"; - }; - - buildInputs = with self; [ case pytest ]; - - meta = { - homepage = https://github.com/celery/vine; - description = "python promises"; - license = licenses.bsd3; - }; - }; + vine = callPackage ../development/python-modules/vine { }; wp_export_parser = buildPythonPackage rec { name = "${pname}-${version}"; @@ -30361,36 +29585,16 @@ EOF }; }; - wptserve = callPackage ../development/python-modules/wptserve {}; + wptserve = callPackage ../development/python-modules/wptserve { }; - yenc = callPackage ../development/python-modules/yenc { - }; + yenc = callPackage ../development/python-modules/yenc { }; - zeep = callPackage ../development/python-modules/zeep { - }; + zeep = callPackage ../development/python-modules/zeep { }; zeitgeist = if isPy3k then throw "zeitgeist not supported for interpreter ${python.executable}" else (pkgs.zeitgeist.override{python2Packages=self;}).py; - zeroconf = buildPythonPackage rec { - pname = "zeroconf"; - version = "0.18.0"; - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "0s1840v2h4h19ad8lfadbm3dhzs8bw9c5c3slkxql1zsaiycvjy2"; - }; - - propagatedBuildInputs = with self; [ netifaces six enum-compat ]; - - meta = { - description = "A pure python implementation of multicast DNS service discovery"; - homepage = "https://github.com/jstasiak/python-zeroconf"; - license = licenses.lgpl21; - maintainers = with maintainers; [ abbradar ]; - }; - }; + zeroconf = callPackage ../development/python-modules/zeroconf { }; zipfile36 = buildPythonPackage rec { pname = "zipfile36"; diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index 45e4d8e812e..5e280fb91c4 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -4,47 +4,43 @@ # version that we define here. If you're having problems downloading / finding # a Rust library, try updating this to a newer commit. -{ runCommand, fetchFromGitHub, git }: +{ stdenv, fetchFromGitHub, git }: -let - version = "2017-06-16"; - rev = "cda0f689f844710a3d73c7ff459efa64997f73b5"; - sha256 = "1b3brl9nn3qqaysd8lx9gaazd863grqx547iw7y9j6mkcc7sakvc"; +stdenv.mkDerivation { + name = "rustRegistry-2017-07-17"; src = fetchFromGitHub { - inherit rev; - inherit sha256; - - owner = "rust-lang"; - repo = "crates.io-index"; + owner = "rust-lang"; + repo = "crates.io-index"; + rev = "14f1d497ede721229b23ad1e8b6122f34761f1a6"; + sha256 = "1a9aav9yg7ffrilsnzlbaysxgzfzg455jfdh260n9y6wvpnpfvg9"; }; + phases = [ "unpackPhase" "installPhase" ]; + installPhase = '' + # For some reason, cargo doesn't like fetchgit's git repositories, not even + # if we set leaveDotGit to true, set the fetchgit branch to 'master' and clone + # the repository (tested with registry rev + # 965b634156cc5c6f10c7a458392bfd6f27436e7e), failing with the message: + # + # "Target OID for the reference doesn't exist on the repository" + # + # So we'll just have to create a new git repository from scratch with the + # contents downloaded with fetchgit... -in + mkdir -p $out -runCommand "rustRegistry-${version}-${builtins.substring 0 7 rev}" { inherit src; } '' - # For some reason, cargo doesn't like fetchgit's git repositories, not even - # if we set leaveDotGit to true, set the fetchgit branch to 'master' and clone - # the repository (tested with registry rev - # 965b634156cc5c6f10c7a458392bfd6f27436e7e), failing with the message: - # - # "Target OID for the reference doesn't exist on the repository" - # - # So we'll just have to create a new git repository from scratch with the - # contents downloaded with fetchgit... + cp -r ./* $out/ - mkdir -p $out + cd $out - cp -r ${src}/* $out/ + git="${git}/bin/git" - cd $out + $git init + $git config --local user.email "example@example.com" + $git config --local user.name "example" + $git add . + $git commit --quiet -m 'Rust registry commit' - git="${git}/bin/git" - - $git init - $git config --local user.email "example@example.com" - $git config --local user.name "example" - $git add . - $git commit --quiet -m 'Rust registry commit' - - touch $out/touch . "$out/.cargo-index-lock" -'' + touch $out/touch . "$out/.cargo-index-lock" + ''; +} diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index f6e7f41ed88..617fa0c30ce 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -18,30 +18,6 @@ , # Use to reevaluate Nixpkgs; a dirty hack that should be removed nixpkgsFun - ## Platform parameters - ## - ## The "build" "host" "target" terminology below comes from GNU Autotools. See - ## its documentation for more information on what those words mean. Note that - ## each should always be defined, even when not cross compiling. - ## - ## For purposes of bootstrapping, think of each stage as a "sliding window" - ## over a list of platforms. Specifically, the host platform of the previous - ## stage becomes the build platform of the current one, and likewise the - ## target platform of the previous stage becomes the host platform of the - ## current one. - ## - -, # The platform on which packages are built. Consists of `system`, a - # string (e.g.,`i686-linux') identifying the most import attributes of the - # build platform, and `platform` a set of other details. - buildPlatform - -, # The platform on which packages run. - hostPlatform - -, # The platform which build tools (especially compilers) build for in this stage, - targetPlatform - ## Other parameters ## @@ -69,10 +45,10 @@ , # Non-GNU/Linux OSes are currently "impure" platforms, with their libc # outside of the store. Thus, GCC, GFortran, & co. must always look for files # in standard system directories (/usr/include, etc.) - noSysDirs ? buildPlatform.system != "x86_64-freebsd" - && buildPlatform.system != "i686-freebsd" - && buildPlatform.system != "x86_64-solaris" - && buildPlatform.system != "x86_64-kfreebsd-gnu" + noSysDirs ? stdenv.buildPlatform.system != "x86_64-freebsd" + && stdenv.buildPlatform.system != "i686-freebsd" + && stdenv.buildPlatform.system != "x86_64-solaris" + && stdenv.buildPlatform.system != "x86_64-kfreebsd-gnu" , # The configuration attribute set config @@ -98,21 +74,18 @@ let // { recurseForDerivations = false; }; __targetPackages = (if __targetPackages == null then self else __targetPackages) // { recurseForDerivations = false; }; - inherit stdenv - buildPlatform hostPlatform targetPlatform; + inherit stdenv; }; # The old identifiers for cross-compiling. These should eventually be removed, # and the packages that rely on them refactored accordingly. platformCompat = self: super: let - # TODO(@Ericson2314) this causes infinite recursion - #inherit (self) buildPlatform hostPlatform targetPlatform; + inherit (super.stdenv) buildPlatform hostPlatform targetPlatform; in { stdenv = super.stdenv // { - inherit (buildPlatform) platform; - } // lib.optionalAttrs (hostPlatform != buildPlatform) { - cross = hostPlatform; + inherit (super.stdenv.buildPlatform) platform; }; + inherit buildPlatform hostPlatform targetPlatform; inherit (buildPlatform) system platform; };